-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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 is SUS shelter items #36284
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
I-am-Erk
reviewed
Dec 20, 2019
I-am-Erk
requested changes
Dec 20, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I like the additions in general but I'm a bit confused by some of your changes here.
Co-Authored-By: I-am-Erk <[email protected]>
curstwist
added
[JSON]
Changes (can be) made in JSON
Spawn
Creatures, items, vehicles, locations appearing on map
labels
Dec 20, 2019
I must have confused distribution and collection.
I will untweak the numbers.
…On Fri, Dec 20, 2019, 10:29 AM John Candlebury ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In data/json/itemgroups/SUS/evac_shelter.json
<#36284 (comment)>
:
> { "item": "mask_gas", "prob": 2 },
- { "item": "flashlight", "prob": 50 },
+ { "item": "flashlight", "prob": 48 },
Collection spawning probabilities don’t work like that.
The game goes through the whole list. With every entry having an
independent chance/100 probability of being spawned.
Removing the 12 points from the other entries is unnecessary.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#36284?email_source=notifications&email_token=AAU2VNKJPP3OXEDKRQ5EYDDQZTQELA5CNFSM4J5WSTTKYY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCP6JWDQ#discussion_r360421435>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAU2VNIND2LJACCXSG7LTJTQZTQELANCNFSM4J5WSTTA>
.
|
ZS yeah I read that but then I got it twisted.
Erk, yeah that collection's theme was "less likely items," "new stuff
Jerimee just added," or "things more likely to have been looted already" -
not wedded to it
…On Fri, Dec 20, 2019, 1:22 PM ZhilkinSerg ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In data/json/itemgroups/SUS/evac_shelter.json
<#36284 (comment)>
:
> { "item": "mask_gas", "prob": 2 },
- { "item": "flashlight", "prob": 50 },
+ { "item": "flashlight", "prob": 48 },
https://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/ITEM_SPAWN.md#collection-or-distribution
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#36284?email_source=notifications&email_token=AAU2VNP2K7D5VF3NYS4FYETQZUEOPA5CNFSM4J5WSTTKYY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCP7FK2I#discussion_r360509158>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAU2VNICMOZEMMUD6LICGXLQZUEOPANCNFSM4J5WSTTA>
.
|
ZS, nevermind the chart is correct.
On Fri, Dec 20, 2019, 2:40 PM Jerimee Richir <[email protected]>
wrote:
… ZS yeah I read that closely - does the chart match the text? I feel like
the text says one thing and the chart inverts it?
Erk, yeah that collection's theme was "less likely items," "new stuff
Jerimee just added," or "things more likely to have been looted already" -
not wedded to it
On Fri, Dec 20, 2019, 1:22 PM ZhilkinSerg ***@***.***>
wrote:
> ***@***.**** commented on this pull request.
> ------------------------------
>
> In data/json/itemgroups/SUS/evac_shelter.json
> <#36284 (comment)>
> :
>
> > { "item": "mask_gas", "prob": 2 },
> - { "item": "flashlight", "prob": 50 },
> + { "item": "flashlight", "prob": 48 },
>
>
> https://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/ITEM_SPAWN.md#collection-or-distribution
>
> —
> You are receiving this because you authored the thread.
> Reply to this email directly, view it on GitHub
> <#36284?email_source=notifications&email_token=AAU2VNP2K7D5VF3NYS4FYETQZUEOPA5CNFSM4J5WSTTKYY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCP7FK2I#discussion_r360509158>,
> or unsubscribe
> <https://github.com/notifications/unsubscribe-auth/AAU2VNICMOZEMMUD6LICGXLQZUEOPANCNFSM4J5WSTTA>
> .
>
|
I-am-Erk
requested changes
Dec 23, 2019
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
Increase the number of items that spawn in the default start shelter.
Describe the solution
The biggest changes are that FEMA now regularly stocks plastic ponchos and the SUS locker specification now include a whistle. There are rare instances where a head lamp, a mirror, a jug of vinegar, or a barometer might be found.
Testing
Tested locally with "Test Item Group" debug tool
Additional context
This PR is similar to #36282 - however, if modifies the SUS tables, and it's effects are more muted.