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

Lab json improvements #24402

Merged
merged 1 commit into from Jul 21, 2018

Conversation

Reviewers

@ZhilkinSerg ZhilkinSerg

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@BrianLefler @ZhilkinSerg
@BrianLefler
Copy link
Contributor

commented Jul 21, 2018

  • Small json improvements throughout the lab json.
  • Use weighted place_monster lists.
  • Optional north doors on collapsed hallway.
  • Add another cross layout, give possible 2nd doors into rooms.
  • Require no hacking for the operating theatre emergency evac control.
  • Add utility+random room layout.
  • Add a few rooms and get rid of the idea of monster_rooms.
  • Add a 9x9 library room.
  • More layouts are able to rotate.
  • Move to weighted lists instead of using lists with more common elements repeated.
  • Add 3 cloning vat rooms, some with mutagens & scientists.
  • Get rid of empty random rooms.
@BrianLefler
Lab json improvements 
* Small json lab improvements, use weighted place_monster lists..
* Optional north doors on collapsed hallway.
* Add another cross layout, give possible 2nd doors into rooms.
* Require no hacking for the operating theatre emergency evac control.
* Add utility+random layout, minor json tweaks.
* Add a few rooms and get rid of the idea of monster_rooms.
* Add a 9x9 library room.
* More rotation, minor json improvements.
* Move to weighted list.
* Cloning vat rooms.
* Fix weights.
* Get rid of empty random rooms, readjust weights.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
9a5d5e0
@ZhilkinSerg

ZhilkinSerg reviewed Jul 21, 2018
View changes

data/json/mapgen/lab/lab_floorplans.json
@@ -522,7 +604,7 @@
},
"computers": {
"6": {
"name": "Operating Theatre Access Control", "security": 2, "options": [ { "name": "EMERGENCY EVAC - OPEN ALL DOORS", "action": "open", "security": 0 } ], "failures": [
"name": "Operating Theatre Access Control", "security": 0, "options": [ { "name": "EMERGENCY EVAC - OPEN ALL DOORS", "action": "open", "security": 0 } ], "failures": [

This comment has been minimized.

Sign in to view
Copy link
@ZhilkinSerg

ZhilkinSerg Jul 21, 2018

Contributor

Why 0?

This comment has been minimized.

Sign in to view
Copy link
@ZhilkinSerg

ZhilkinSerg Jul 21, 2018

Contributor

Nevermind.

@ZhilkinSerg ZhilkinSerg merged commit 9b3b05b into CleverRaven:master Jul 21, 2018
4 checks passed

4 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage decreased (-0.1%) to 22.854%
Details
gorgon-ghprb Build finished.
Details
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.