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 upAdd JSON mapgen for computer class, jsonize evac shelter #20770
Conversation
Coolthulhu
added some commits
Apr 2, 2017
ZhilkinSerg
added a commit
to ZhilkinSerg/Cataclysm-DDA
that referenced
this pull request
Jun 11, 2017
ZhilkinSerg
referenced this pull request
Jun 11, 2017
Merged
[RDY] Jsonify mapgen (churches and doctor office) #21217
This comment has been minimized.
This comment has been minimized.
|
Will it be merged anytime soon? |
BevapDin
approved these changes
Jun 30, 2017
This comment has been minimized.
This comment has been minimized.
|
Is there anything currently preventing this from being merged? |
This comment has been minimized.
This comment has been minimized.
Conflicting |
This comment has been minimized.
This comment has been minimized.
|
Looks good to go, but needs conflict resolution. I will test-merge this as soon as it's done. |
codemime
self-assigned this
Aug 14, 2017
codemime
merged commit 1faea90
into
CleverRaven:master
Aug 15, 2017
ZhilkinSerg
added this to Done
in Mapgen and overmapgen improvements
Apr 19, 2018
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.
Coolthulhu commentedApr 2, 2017
•
edited
Includes #21336
Added a json binding for mapgen for the
computerclass.Documentation on wiki: https://github.com/CleverRaven/Cataclysm-DDA/wiki/Mapgen:-computers
I couldn't find a good example, so I also jsonized shelter mapgen
This also changes the drops minimally. They aren't hardcoded now so spawn rates matter. You can also sometimes get a spare gas mask.
EDIT: Updated