Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prying nails correctly deconstructs reinforced boarded window #3300

Merged

Conversation

RoyalFox2140
Copy link
Collaborator

@RoyalFox2140 RoyalFox2140 commented Sep 28, 2023

Summary

SUMMARY: [Balance] "Prying nails correctly deconstructs reinforced boarded window"

Purpose of change

There was no way to deconstructed a reinforced boarded window. I used the hammers pry nails function to do so.

Describe the solution

I added a new else if for the function in activity_handlers.cpp with the correct planks, nails, target terrain, and resulting terrain based on the construction recipe and the else if for boarded windows. I added it above the one for boarded window as its sequential.

Edit: I also added the two terrains to the iuse.cpp so they can be correctly targeted, and ensured you can't pry nails out while mounted.

Describe alternatives you've considered

JSONization via targeting a flag, which I can't do.

Testing

SDL is broken on compiling for me thanks to issues with the main branch. I could not test so it will need testing. This should be relatively simple and work however as its only a few lines and I rigorously copied the other else if for boarded window.

Additional context

Compiling truly be russian roulette. The day I try to learn is the day the one I choose is broken.

new else if for reinforced window in prying nails
@github-actions github-actions bot added the src changes related to source code. label Sep 28, 2023
@scarf005 scarf005 self-requested a review September 28, 2023 23:04
@scarf005 scarf005 self-assigned this Sep 28, 2023
added them to valid targets, and can't pry while mounted
Copy link
Member

@scarf005 scarf005 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cataclysm: Bright Nights - d49f4524c1f_01

image

2023-09-29_08-29-47.mp4

LGTM.
by the way, why is prying stuff hardcoded, awesome...

@scarf005 scarf005 added this pull request to the merge queue Sep 28, 2023
Merged via the queue into cataclysmbnteam:upload with commit 61c1386 Sep 28, 2023
13 of 14 checks passed
@RoyalFox2140 RoyalFox2140 deleted the unboard-reinforced-window branch September 28, 2023 23:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
src changes related to source code.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants