refactor(content): JSONize Pumps #3633
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
src
scarf005
approved these changes
Nov 15, 2023
Comment on lines
+3813
to
3823
| //Note that these three functions are checked by pointer in map::water_from. Yes it's awful. | ||
| void iexamine::water_source( player &, const tripoint &examp ) | ||
| { | ||
| liquid_handler::handle_liquid( examp ); | ||
| } | ||
|
|
||
| //Note that these two functions are checked by pointer in map::water_from. Yes it's awful. | ||
| //Note that these three functions are checked by pointer in map::water_from. Yes it's awful. | ||
| void iexamine::clean_water_source( player &, const tripoint &examp ) | ||
| { | ||
| liquid_handler::handle_liquid( examp ); | ||
| } |
There was a problem hiding this comment.
since iexamine::liquid_source can handle any liquid, it'd be great to be able to replace iexamine::water_source and iexamine::clean_water_source with it someday to cleanup more code.
There was a problem hiding this comment.
since
iexamine::liquid_sourcecan handle any liquid, it'd be great to be able to replaceiexamine::water_sourceandiexamine::clean_water_sourcewith it someday to cleanup more code.
but wont it break the older mods which has its own water sources? these two old functions should last until 0.5 at least.
There was a problem hiding this comment.
we could soft deprecate them by
- making
furn_t::crafting_pseudo_item_typescall&iexamine::liquid_sourcefor bothwater_sourceandclean_water_source - convert existing
"examine_action": "water_source"into"examine_action": "liquid_source"
Merged
via the queue into
cataclysmbnteam:upload
with commit Nov 15, 2023
5cab4a4
14 of 18 checks passed
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.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
SUMMARY: Infrastructure "Make pumps give their own custom liquids in written json, instead of giving hardcoded water variants."
Purpose of change
Describe the solution
By adding a new examine action,
liquid_source; furnitures are now able to dispense liquids specified in new json fieldprovides_liquids.Describe alternatives you've considered
adding more hardcoded pump variety
Testing
used msys on win 10.
added beer pump item for debug purposes.
Additional context