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.

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] Move hardcoded hospital mapgen to json #22543

Merged
merged 5 commits into from Jan 4, 2018

Conversation

4 participants
@ZhilkinSerg
Copy link
Contributor

commented Dec 2, 2017

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 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

This comment has been minimized.

Copy link
Contributor

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

"###########........#...x...........r#BB...+...+...BB#``#BB...+...+...BB#",
"###########r..BB...#.../......BB...r#BB...+...+...BB#``#BB...+...+...BB#",
"###########r.TBBT..#.../.....TBBT...#....l#...#l....#``#....l#...#l....#",
"###########.......l#...x...........l########...#######``#######...#######",

This comment has been minimized.

Copy link
@rm-code

rm-code Dec 3, 2017

Contributor

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

This comment has been minimized.

Copy link
@ZhilkinSerg

ZhilkinSerg Dec 3, 2017

Author Contributor

Thanks! I've fixed that.

@codemime

This comment has been minimized.

Copy link
Member

commented Dec 20, 2017

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

@ZhilkinSerg

This comment has been minimized.

Copy link
Contributor Author

commented Dec 20, 2017

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

Good, but there is also no loot yet.

@codemime

This comment has been minimized.

Copy link
Member

commented Dec 20, 2017

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

This comment has been minimized.

Copy link
Contributor Author

commented Dec 20, 2017

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

3 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.3%) to 22.806%
Details
gorgon-ghprb Build finished.
Details

@ZhilkinSerg ZhilkinSerg deleted the ZhilkinSerg:mapgen-hospital branch Jan 4, 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.