Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[RDY] Move hardcoded hospital mapgen to json #22543

Merged
merged 5 commits into from
Jan 4, 2018
Merged

[RDY] Move hardcoded hospital mapgen to json #22543

merged 5 commits into from
Jan 4, 2018

Conversation

ZhilkinSerg
Copy link
Contributor

@ZhilkinSerg ZhilkinSerg commented Dec 2, 2017 •
edited
Loading

Description

Moved hospital mapgen to json.

It is not the same hospital as hardcoded one, but this one at least has toilets (fixes #18924) ;)

Please give your feedback for new layout!

To-do

  • - Handle legacy hospital ids in savegames
  • - Removed hardcoded mapgen
  • - Add json mapgen
  • - Add GROUP_HOSPITAL monster group (same as GROUP_ZOMBIE, but without dogs)
  • - Add computers
  • - Add patient corpses
  • - Add loot
  • - Decided not to add basement this time

Screenshots

default

default

default

@ZhilkinSerg ZhilkinSerg mentioned this pull request Dec 2, 2017
Closed
@ZhilkinSerg ZhilkinSerg changed the title Moved hospital mapgen to json Move hardcoded hospital mapgen to json Dec 2, 2017
@ZhilkinSerg ZhilkinSerg changed the title Move hardcoded hospital mapgen to json [CR] Move hardcoded hospital mapgen to json Dec 2, 2017
@rm-code
Copy link
Contributor

rm-code commented Dec 3, 2017

I really like it though in one of your screenshot there seems to be an error with the mapgen:

33524740-69cbd12c-d833-11e7-9e6b-d43d4c3c8db4

rm-code
rm-code reviewed Dec 3, 2017
View reviewed changes
data/json/mapgen/hospital/hospital.json Outdated
"###########........#...x...........r#BB...+...+...BB#``#BB...+...+...BB#",
"###########r..BB...#.../......BB...r#BB...+...+...BB#``#BB...+...+...BB#",
"###########r.TBBT..#.../.....TBBT...#....l#...#l....#``#....l#...#l....#",
"###########.......l#...x...........l########...#######``#######...#######",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the lines in question are number 61 and 62 here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I've fixed that.

@codemime
Copy link
Contributor

This has a trivial merge conflict. Otherwise it looks good to go.

@ZhilkinSerg
Copy link
Contributor Author

This has a trivial merge conflict. Otherwise it looks good to go.

Good, but there is also no loot yet.

@codemime
Copy link
Contributor

I suppose it's a fair trade-off for the missing toilets. Why don't you put the WIP tag then?

@ZhilkinSerg ZhilkinSerg changed the title [CR] Move hardcoded hospital mapgen to json [RDY] Move hardcoded hospital mapgen to json Dec 20, 2017
@ZhilkinSerg
Copy link
Contributor Author

I suppose it's a fair trade-off for the missing toilets. Why don't you put the WIP tag then?

I guess someone told me not to put both tags (CR and WIP). Anyway loot (and probably corpses too) was added.

@kevingranade kevingranade merged commit c9ef1b6 into CleverRaven:master Jan 4, 2018
@ZhilkinSerg ZhilkinSerg deleted the mapgen-hospital branch January 4, 2018 22:20
@ZhilkinSerg ZhilkinSerg mentioned this pull request Jul 31, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rm-code rm-code rm-code left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

No toilets in a hospital
4 participants
@ZhilkinSerg @rm-code @codemime @kevingranade