-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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
more variety in shelter_supplies #36282
Merged
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
Note that some of Erk's suggestions at #36284 could also apply here. I would (of course) rather this PR just sail through, but I figured it was worth mentioning. |
curstwist
added
[JSON]
Changes (can be) made in JSON
Spawn
Creatures, items, vehicles, locations appearing on map
labels
Dec 20, 2019
I-am-Erk
requested changes
Dec 20, 2019
Vinegar is distributed by fema to help with mold and bad smells. (First
hand experience responding to recent hurricanes in eastern nc)
But yeah, the jug is possibly too large and I left it full
…On Fri, Dec 20, 2019, 1:01 PM I-am-Erk ***@***.***> wrote:
***@***.**** requested changes on this pull request.
------------------------------
In data/json/itemgroups/item_groups.json
<#36282 (comment)>
:
> @@ -1942,13 +1942,14 @@
[ "decoy_elfa", 10 ],
[ "recipe_elfa", 1 ],
[ "jug_plastic", 10 ],
- [ "spray_can", 50 ],
+ [ "spray_can", 40 ],
⬇️ Suggested change
- [ "spray_can", 40 ],
+ [ "spray_can", 50 ],
As you noted yourself, there's no call to change this.
------------------------------
In data/json/mapgen/shelter.json
<#36282 (comment)>
:
> [ "bottle_plastic", 30 ],
- [ "plastic_knife", 20 ],
- [ "plastic_spoon", 20 ],
- [ "plastic_fork", 20 ],
- [ "bowl_plastic", 10 ],
- [ "evac_pamphlet", 80 ],
As before, there's no reason to adjust the spawn rates of other things,
especially not by trivial amounts.
------------------------------
In data/json/mapgen/shelter.json
<#36282 (comment)>
:
> - [ "plastic_spoon", 20 ],
- [ "plastic_fork", 20 ],
- [ "bowl_plastic", 10 ],
- [ "evac_pamphlet", 80 ],
+ [ "plastic_knife", 25 ],
+ [ "plastic_spoon", 25 ],
+ [ "plastic_fork", 25 ],
+ [ "bowl_plastic", 15 ],
+ [ "jacket_evac", 15 ],
+ [ "folding_poncho", 10 ],
+ [ "sponge", 10 ],
+ [ "mask_dust", 9 ],
+ [ "handflare_dead", 9 ],
+ [ "whistle", 7 ],
+ [ "teddy_bear", 7 ],
+ [ "vinegar", 6 ],
This will create a large, full, unopened bottle of vinegar. Why were
people evacuating with that and then leaving it scattered in the shelter
garbage?
------------------------------
In data/json/mapgen/shelter.json
<#36282 (comment)>
:
> + [ "plastic_fork", 25 ],
+ [ "bowl_plastic", 15 ],
+ [ "jacket_evac", 15 ],
+ [ "folding_poncho", 10 ],
+ [ "sponge", 10 ],
+ [ "mask_dust", 9 ],
+ [ "handflare_dead", 9 ],
+ [ "whistle", 7 ],
+ [ "teddy_bear", 7 ],
+ [ "vinegar", 6 ],
+ [ "candle", 5 ],
+ [ "pliers", 4 ],
+ [ "mirror", 4 ],
+ [ "wearable_light", 2 ],
+ [ "calcium_tablet", 1 ],
+ [ "vitamins", 1 ],
The shelter_supplies item group is for trash that people didn't take with
them because it was too large or not perceived as useful in a FEMA camp,
I'm not sure vitamins and head lamps and candles would fall into that;
those are more likely to be the exact sort of items people would stuff
their pockets with on the way out.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#36282?email_source=notifications&email_token=AAU2VNJ5VEAPOXETP4QF5LLQZUB6DA5CNFSM4J5V5X2KYY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCP7CFKY#pullrequestreview-335422123>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAU2VNKCGCL5X5HLUJ6M5S3QZUB6DANCNFSM4J5V5X2A>
.
|
Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
I-am-Erk
reviewed
Dec 24, 2019
Thanks!
…On Tue, Dec 24, 2019, 12:25 PM I-am-Erk ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In data/json/mapgen/shelter.json
<#36282 (comment)>
:
> [ "bottle_plastic", 30 ],
[ "plastic_knife", 20 ],
[ "plastic_spoon", 20 ],
[ "plastic_fork", 20 ],
[ "bowl_plastic", 10 ],
- [ "evac_pamphlet", 80 ],
+ [ "jacket_evac", 15 ],
+ [ "folding_poncho", 10 ],
+ [ "sponge", 10 ],
+ [ "mask_dust", 9 ],
+ [ "handflare_dead", 9 ],
+ [ "whistle", 7 ],
+ [ "teddy_bear", 7 ],
+ [ "vinegar", 6 ],
⬇️ Suggested change
- [ "vinegar", 6 ],
+ { "item": "vitamins", "prob": 6, "charges-min": 1 },
That's all you need to do to fix it.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#36282?email_source=notifications&email_token=AAU2VNP3HFPRJDNA2F7TLLDQ2JAY5A5CNFSM4J5V5X2KYY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCQFMM5A#pullrequestreview-336250484>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAU2VNJVJHISTE3PT6IOHBTQ2JAY5ANCNFSM4J5V5X2A>
.
|
Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
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
Added more stuff (most of it with low probability) to shelter_supplies item group
Describe the solution
Now much likely to find a folding_poncho or a sponge in the default game start shelter. Smaller likelihoods of finding a clean teddy bear, a candle, or a burnt out flare.
Testing
Tested locally with "Test Item Group" debug tool.
Additional context
I'm going to submit a separate PR for similar changes to evac_shelter.