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

2StoryModern03 #61174

Merged
merged 4 commits into from
Sep 29, 2022
Merged

2StoryModern03 #61174

merged 4 commits into from
Sep 29, 2022

Conversation

LilShiningMan
Copy link
Contributor

Add 2StoryModern03 house

Summary

Content "Add House - 2StoryModern03"

Purpose of change

Add to house spawn variety

Describe the solution

created new house and added entries to spawn files

Describe alternatives you've considered

Adding nothing.

Testing

Checked house in-game, spawns just fine. Linted.

Additional context

base

gr

2
roof

Add 2StoryModern03 house
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Sep 21, 2022
@Maleclypse
Copy link
Member

@anothersimulacrum Am I missing something here? The errors in this can be fixed by adding "¶": "t_door_glass_c", in the terrain section of mapgen, but "¶": "t_door_glass_c", is already defined in the palette and works fine defined that way in multiple already extant houses in game.

@LilShiningMan
Copy link
Contributor Author

oops. Tried to fix this, but added the symbol to basement instead of ground and 2nd floor, which will fix the issue if it comes to that. Before I do that though, it would be interesting to know if the reason this throws an error can be deduced by someone.

@LilShiningMan
Copy link
Contributor Author

LilShiningMan commented Sep 21, 2022

And, to add context for anyone looking at this problem for the first time, I tried adding this without defining that symbol to see if the error repeated as it did when I submitted 2storymodern02, and of course it did. However, it only seems to be an error in git. The screenshots show the glass door spawning successfully by calling the palette and they work as expected in-game.

@dseguin
Copy link
Member

dseguin commented Sep 27, 2022

The test fails when it tries to load this with mods (most likely No Hope, since it redefines the palette and it's missing the terrain symbol).

Try adding the terrain symbol to standard_domestic_palette in data/mods/No_Hope/palettes.json and see if that fixes the tests

@LilShiningMan
Copy link
Contributor Author

Funnily enough, I had this exact scenario over in a PR in Bright Nights and someone else just mentioned the same thing. Thanks, I'll add the symbol to the No Hope palette as well.

@github-actions github-actions bot added Mods Issues related to mods or modding Mods: No Hope Relating to the mod No Hope and removed json-styled JSON lint passed, label assigned by github actions labels Sep 28, 2022
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Sep 28, 2022
@Fris0uman Fris0uman merged commit 44a9be9 into CleverRaven:master Sep 29, 2022
captainego pushed a commit to captainego/Cataclysm-DDA that referenced this pull request Oct 9, 2022
* 2StoryModern03

Add 2StoryModern03 house

* Update 2storymodern03.json

* Update palettes.json

* Update palettes.json
captainego pushed a commit to captainego/Cataclysm-DDA that referenced this pull request Oct 9, 2022
* 2StoryModern03

Add 2StoryModern03 house

* Update 2storymodern03.json

* Update palettes.json

* Update palettes.json
sparr pushed a commit to sparr/Cataclysm-DDA that referenced this pull request Dec 10, 2022
* 2StoryModern03

Add 2StoryModern03 house

* Update 2storymodern03.json

* Update palettes.json

* Update palettes.json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display Mods: No Hope Relating to the mod No Hope Mods Issues related to mods or modding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants