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

add hotel roof, extra floors #35474

Merged
merged 2 commits into from
Nov 12, 2019

Conversation

curstwist
Copy link
Contributor

Summary

SUMMARY: Content "Adds roof to hotel and makes them 4 stories tall."

Purpose of change

continues roof project.

Describe the solution

Added 3 more floors worth of rooms and a roof to the hotels. I added the extra floors because they should generally be multi-story compared to a motel.

I also adjusted car alignments in the parking lots and added a few more vehicle spawns.

Describe alternatives you've considered

Could easily keep fixing up the interior of the hotels but these were enough changes for a PR. I may come back to it later, or let someone else continue with the improvements.

It could use improvements to floors, landscape and the lobby and basement areas.

Testing

Spawned in world to check additions and changes.

Additional context

Many of these use the same map, so I've concentrated screenshots on the areas that differ.

hotel 1, ground:
hotel 1 ground

hotel 1, 2nd floor:
hotel 1 2nd

all hotels floors 3 & 4:
all hotels flr 3 and 4

all hotels roof:
all hotels roof

all hotels basement:
all hotels basement

hotel 2 variations:
hotel 2 ground
hotel 2 2nd

hotel 3 variations:
hotel 3 entrance
hotel 3 2nd floor

@ZhilkinSerg ZhilkinSerg added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display labels Nov 12, 2019
@ZhilkinSerg ZhilkinSerg merged commit cf218bb into CleverRaven:master Nov 12, 2019
@RDru
Copy link
Contributor

RDru commented Nov 12, 2019

On loading a save I'm getting:

DEBUG    : JSON contains circular dependency.  Discarded 1 objects:
{
   "type": "overmap_terrain",
   "id": "hotel_tower_1_5",
   "copy-from": "hotel_tower_1_5",
   "name": "hotel entrance",
   "sym": "H",
   "color": "i_light_green"
 },

FUNCTION : void DynamicDataLoader::load_deferred(DynamicDataLoader::deferred_json&)
FILE     : src/init.cpp
LINE     : 133

then I got this once:

DEBUG    : Loaded bad ter!  ter hotel_tower_1_5_east

FUNCTION : void overmap::unserialize(std::istream&)
FILE     : src/savegame.cpp
LINE     : 925

@ZhilkinSerg
Copy link
Contributor

You are probably using alt map key mod that needs to be updated.

@RDru
Copy link
Contributor

RDru commented Nov 12, 2019

removing the mod got rid of first error
but second one is still there - it removes the center of existing hotel

@curstwist curstwist mentioned this pull request Nov 12, 2019
AMurkin pushed a commit to AMurkin/Cataclysm-DDA that referenced this pull request Nov 13, 2019
* add hotel roof, extra floors

* Update regional_map_settings.json
AMurkin added a commit to AMurkin/Cataclysm-DDA that referenced this pull request Nov 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants