Skip to content

/Cataclysm-DDA

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

[RDY] Prison mapgen JSONify third try #21211

Merged
merged 16 commits into from Sep 23, 2017

Conversation

Reviewers

@Coolthulhu Coolthulhu

Assignees
No one assigned
Labels
None yet
Projects
  
Done in Mapgen and overmapgen improvements
Milestone
No milestone
5 participants
@ZhilkinSerg @pisskop @Leland @Coolthulhu @kevingranade
@ZhilkinSerg
Copy link
Contributor

commented Jun 9, 2017 •
edited

Conversion of prison mapgen from map::draw_map to JSON. Supersedes #20306 and #20408.

  • Need to implement and test savegame migration.
@ZhilkinSerg
Initial commit 
Jsonize prison mapgen
Loading status checks…
a0d04a4

@ZhilkinSerg ZhilkinSerg referenced this pull request Jun 9, 2017

Closed

[WIP] Prison mapgen JSONify second try #20408

@ZhilkinSerg ZhilkinSerg referenced this pull request Jun 9, 2017

Closed

JSONifying mapgen & Bountysource #21207

@pisskop

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jun 9, 2017

i need to know when this merges.
@Leland

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jun 12, 2017 •
edited

This is weird, but for some reason, starting on the Prison Break scenario with this PR results in a "Can't find suitable location" error, even though prisons do spawn on the overmap.
@Coolthulhu

Coolthulhu reviewed Jun 12, 2017
View changes

src/savegame.cpp Outdated
else if (is_ot_type("prison_8", get_ter(pos.x, pos.y, pos.z + 1))) {
new_id = oter_id("prison_b_8");
}
else if (is_ot_type("prison_9", get_ter(pos.x, pos.y, pos.z + 1))) {

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Jun 12, 2017

Contributor

Styling:

} else if( x ) {

should be on one line.
if parentheses should be padded on the inside, but get no space between if and opening parenthesis.

@Leland Leland referenced this pull request Aug 15, 2017

Merged

[RDY] Jsonify mapgen (churches and doctor office) #21217

1 of 1 task complete

@ZhilkinSerg ZhilkinSerg changed the title [WIP] Prison mapgen JSONify third try [RDY] Prison mapgen JSONify third try Sep 6, 2017

@ZhilkinSerg

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Sep 6, 2017 •
edited

i need to know when this merges.

Please note that prison was renamed to prison_1 in last commits.

This is weird, but for some reason, starting on the Prison Break scenario with this PR results in a "Can't find suitable location" error, even though prisons do spawn on the overmap.

That was fixed.

@ZhilkinSerg ZhilkinSerg referenced this pull request Sep 9, 2017

Closed

List of hard-coded mapgen functions to be moved to JSON #21824

@kevingranade kevingranade merged commit c3e8431 into CleverRaven:master Sep 23, 2017
3 checks passed

3 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage decreased (-0.08%) to 22.317%
Details
gorgon-ghprb Build finished.
Details

@ZhilkinSerg ZhilkinSerg referenced this pull request Sep 25, 2017

Closed

Prison was moved to json #32

@ZhilkinSerg ZhilkinSerg deleted the ZhilkinSerg:mapgen-prison-v3 branch Sep 25, 2017

@ZhilkinSerg 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
You can’t perform that action at this time.