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

2StoryModern01 - rare house #39504

Merged
merged 4 commits into from
Apr 25, 2020

Conversation

LilShiningMan
Copy link
Contributor

@LilShiningMan LilShiningMan commented Apr 12, 2020

Summary

SUMMARY: Content "New multi story concrete house and palette addition for optional linoleum terrain spawn under kitchen and bathroom furniture"

Purpose of change

Adding to variety of house spawns.

Describe the solution

Created and tested new multi-level house. Each level (basement, ground, second floor) comes with 3 different cosmetic variants. The only out of the ordinary variant would be on the second floor -- I added a "last stand" variant with some survivor loot. This is a rare spawn though (100 for other 2 second floor variants, 10 for this one).

I also added a few optional "tags" to the standard house palette for ease of adding linoleum terrain underneath kitchen and bathroom furniture, which this house uses. In the future I think a lot of my houses will use these tags to cut down on needless terrain entries.

Describe alternatives you've considered

Not adding new houses.

Testing

After linting all files, booted up game and debug spawned the house. No problems

Additional context

I have another PR up at the moment (#39260) that edits the house palette, but none of those changes are necessary for this house. Once that pull request is merged I'll update this one to reflect the additions.
2storymodern01-bsmt-1
2storymodern01-bsmt-2
2storymodern01-bsmt-3
2storymodern01-ground-1
2storymodern01-ground-2
2storymodern01-ground-3

2storymodern01-second-1
2storymodern01-second-2
2storymodern01-second-3
2storymodern01-roof

New multi story concrete house and palette addition for optional linoleum terrain spawn under kitchen and bathroom furniture
@ZhilkinSerg ZhilkinSerg added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display labels Apr 17, 2020
@LilShiningMan
Copy link
Contributor Author

So, I updated the house palette to reflect merged changes from another of my PRs, and it lints successfully. However, when github checks run after my update, the JSON Validation (and thus Travis) fail because it says the file needs to be linted. I'm not sure what's going on.

@ralreegorganon
Copy link
Contributor

It's not actually linted.

diff --git a/data/json/mapgen_palettes/house_general_palette.json b/data/json/mapgen_palettes/house_general_palette.json
index 7d940147d0..89470b6760 100644
--- a/data/json/mapgen_palettes/house_general_palette.json
+++ b/data/json/mapgen_palettes/house_general_palette.json
@@ -218,7 +218,7 @@
       ".": [ { "monster": "GROUP_ROACH", "chance": 80 }, { "monster": "GROUP_ZOMBIE", "chance": 60 } ]
     }
   },
-    {
+  {
     "type": "palette",
     "id": "standard_domestic_lino_kitchen",
     "//": "Intended to be used in conjunction with standard_domestic_palette. Load the domestic palette first, then this one to add gray linoleum flooring under kitchen furniture",

Also note that it failed in the tests. You have an errant comma in the indicated line, which has no definition in the palettes and thus the game complains.

Terminated: line 24:36: format: rows: row 20 column 17: ',' has no terrain, furniture, or other definition

        "....?----*    R|S_Q|o||.",
        "....?----:L$  ||||||??-.",
        "....?----|||  + ,r|?---.",
                                   ^
        "....?----??|RR|  r|----.",
        "....?-----?||||oo||----.",
        "....?------------------.",

@LilShiningMan
Copy link
Contributor Author

Oh man, I got this twisted somehow. Thanks for the catches. Here goes again.

@ralreegorganon ralreegorganon merged commit bf42e34 into CleverRaven:master Apr 25, 2020
@LilShiningMan LilShiningMan deleted the LSM---2StoryModern01 branch April 25, 2020 20:25
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