Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.
Sign upUse fuel from firewood source when starting fires #29132
Conversation
halfahermit
added some commits
Mar 30, 2019
mlangsdorf
added
<Enhancement / Feature>
[C++]
Fields / Furniture / Terrain / Traps
Quality of Life
labels
Mar 30, 2019
ZhilkinSerg
self-assigned this
Mar 31, 2019
ZhilkinSerg
merged commit dca9d26
into
CleverRaven:master
Apr 2, 2019
ZhilkinSerg
removed their assignment
Apr 2, 2019
halfahermit
deleted the
halfahermit:halfahermit-start-fire-fuel
branch
Apr 3, 2019
This comment has been minimized.
This comment has been minimized.
|
This pull request has been mentioned on Cataclysm: Dark Days Ahead. There might be relevant details there: https://discourse.cataclysmdda.org/t/latest-experimental-features/5582/1106 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
halfahermit commentedMar 30, 2019
Summary
SUMMARY: Features "Use fuel from firewood source when starting fires"
Purpose of change
Fixes #28963 - implements tinukedaya's very good idea of using fuel from a nearby firewood source when starting a fire.
Describe the solution
Moved the check for fuel from firestarter_actor::prep_firestarter_use to activity_handlers::start_fire_do_turn, and call activity_handlers::try_fuel_fire if none is found.
Lit torches and battletorches (not firestarters) use prep_firestarter_use, so removing the fuel check from that function made them work without fuel. I fixed that by giving firestarter to both and deleting their old iuse functions. As far as I can tell they don't work any differently.
Thanks, let me know if it needs any changes.