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 up[RDY] Prison mapgen JSONify #20306
Conversation
ZhilkinSerg
changed the title
[RDY] Prison mapgen JSONify
Prison mapgen JSONify
Feb 17, 2017
Reclusive-reptile
reviewed
Feb 17, 2017
| "subtype": "collection", | ||
| "entries" : [ | ||
| { "item": "blanket", "prob": 25 }, | ||
| { "item": "jumpsuit", "prob": 35 } |
This comment has been minimized.
This comment has been minimized.
Reclusive-reptile
Feb 17, 2017
Contributor
Should jumpsuit be replaced with striped_shirt and striped_pants? Prison wardens generally don't like inmates concealing stuff in ample pocket space.
This comment has been minimized.
This comment has been minimized.
ZhilkinSerg
Feb 17, 2017
Author
Contributor
Jumpsuits were in original mapgen - see https://github.com/CleverRaven/Cataclysm-DDA/blob/master/src/mapgen.cpp#L7354.
I believe we better change loot once all mapgen is moved to json from cpp.
This comment has been minimized.
This comment has been minimized.
kevingranade
Feb 18, 2017
Member
I agree, open a PR or issue to track updating the prision definition to use new items if you want (I don't think those existed when the prison layout was added).
ZhilkinSerg
changed the title
Prison mapgen JSONify
[RDY] Prison mapgen JSONify
Feb 17, 2017
Coolthulhu
self-assigned this
Feb 23, 2017
This comment has been minimized.
This comment has been minimized.
|
"Visions of solitude" spawned in wrong place - above the ground Other than that looks good. |
Coolthulhu
removed their assignment
Feb 23, 2017
This comment has been minimized.
This comment has been minimized.
|
This has multiple merge conflicts (with your other PRs that have been already merged). |
This comment has been minimized.
This comment has been minimized.
|
I believe it will be better to jsonize mapgen one at a time. I will create new pull request. Thanks, @codemime. |
This comment has been minimized.
This comment has been minimized.
|
It's easy to mass-test them, the only problem is that they conflict with each other. You could have dependent PRs: create one branch with one jsonized mapgen, then create new one on this branch rather than on master. This ensures no conflicts between those two branches. |
This comment has been minimized.
This comment has been minimized.
|
Thanks, @Coolthulhu. I thought about this, but had some doubts. Branches should be created and merged in certain order, right? Also won't there be conflicts, if I add some changes in parent branch, but won't add these changes to child branches. |
This comment has been minimized.
This comment has been minimized.
|
@ZhilkinSerg You can easily merge parent branch into child branch, though. |
ZhilkinSerg
referenced this pull request
Feb 28, 2017
Closed
[WIP] Prison mapgen JSONify second try #20408
This comment has been minimized.
This comment has been minimized.
|
Superseded by #20408 |
ZhilkinSerg commentedFeb 17, 2017
Conversion of
prisonmapgen frommap::draw_mapto JSON.