JSONize detergent used for vehicle washing machine #35670
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
|
Something tells me that adding a new "DETERGENT" flag and checking for this flag is a more proper way than using an itemgroup. |
BevapDin
reviewed
Nov 23, 2019
ZhilkinSerg
added
[C++]
anothersimulacrum
force-pushed
the
veh-wash
branch
from
f7d0657 to
ca27d2f
Compare
|
Okay, changes made, using a flag now. |
This commit is meant to add support for a later PR that adds the ability to make shaved soap and use that for vehicle washing machines.
anothersimulacrum
force-pushed
the
veh-wash
branch
2 times, most recently
from
045517b to
f0074b8
Compare
BevapDin
reviewed
Nov 24, 2019
anothersimulacrum
force-pushed
the
veh-wash
branch
from
f0074b8 to
baf4140
Compare
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: None
Purpose of change
Adds support for #35624
Describe the solution
Add a new
washing_detergentsitemgroup. Items added to this group will be allowed to be used as detergents.In
vehicle::use_washing_machine(), get the items from that group, and then check if the player has enough of those to use as detergent.If the player does not, they cannot use the washing machine.
If they only have one, it is automatically used.
If they have more than one, a menu asks which one they would like to use.
Testing
Add some items to the aforementioned itemgroup, play around with the washing machine.
Notice that charges are properly used when I select an item from the menu,
Notice that it works properly if I only have one detergent.