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

Adds two new evac shelter basements and vandalize them #57061

Merged
merged 12 commits into from
May 2, 2022

Conversation

haveric
Copy link
Contributor

@haveric haveric commented Apr 23, 2022

Summary

Content "Adds two new evac shelter basements and vandalize them"

Purpose of change

  • Add two new evac shelter basements
  • Make basements vandalized as well as the main floor
  • Made zombies spawning in vandalized basements consistently dangerous
  • Cleanup/Organize the shelter json

Describe the solution

  • Utilize palettes better to keep shelter spawning consistent.
  • Changed zombie spawns to force intensity, which guarantees they spawn when they should. (It's only 10% of used/vandalized evac shelters and only in the basements)

Describe alternatives you've considered

None

Testing

Spawned in several evac shelters of each variant and in each damage state. Verified they looked good. Teleported around to a few shelters to make sure they are generating correctly in the wild, which they are. Also verified the evac computer still operates since I moved that to a nested mapgen.

Also tested that No Hope and Dark Skies Above shelters are spawning correctly. I did my best to keep these as intended by the mod authors, but will update anything for either as necessary.

Additional context

Basement Screenshots (There are two copies of each one vertically):
Default:

Evac 1 - Evac 2 (Inglonias)

image

Evac 3 - Evac 4 (Both mine)

image

Used:
Evac 1 - Evac 2 (Inglonias)

image

Evac 3 - Evac 4 (Both mine)

image

Vandalized:
Evac 1 - Evac 2 (Inglonias)

image

Evac 3 - Evac 4 (Both mine)

image

Main floor (Making sure I didn't break anything)

Default:

image
image

Used:

image
image

Vandalized:

image
image

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Map / Mapgen Overmap, Mapgen, Map extras, Map display Spawn Creatures, items, vehicles, locations appearing on map labels Apr 23, 2022
@haveric haveric changed the title Evac shelter cleanup Adds two new evac shelter basements and vandalize them Apr 23, 2022
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Apr 23, 2022
@NetSysFire NetSysFire added the <Enhancement / Feature> New features, or enhancements on existing label Apr 23, 2022
@Inglonias
Copy link
Contributor

Inglonias commented Apr 23, 2022

running tests (existing game install from me, replaced the whole data folder with yours), I'm getting an error message on starting a new game:

DEBUG : shelter_under_1 (struct oter_type_t) has two definitions from the same source (dda)!

FUNCTION : check_duplicate_entries
FILE : D:\a\Cataclysm-DDA\Cataclysm-DDA\src\mod_tracker.h
LINE : 76
VERSION : 2eef1a1

@haveric
Copy link
Contributor Author

haveric commented Apr 23, 2022

@Inglonias I'm already working on it. It takes a while to compile sometimes.

@haveric
Copy link
Contributor Author

haveric commented Apr 23, 2022

We put our definitions in different orders, so the merge just accepted them at first. I just had to move my changes on top of yours to preserve your history. Also here's a 10x zombie spawn screenshot:
image

@haveric haveric marked this pull request as ready for review April 23, 2022 15:45
@Inglonias
Copy link
Contributor

Inglonias commented Apr 23, 2022

I still have concerns about spawn behavior. I spawned into a vandalized shelter in a world with a spawn rate of 1 and went to the basement. Then I used the debug menu's "spawn nested overmap" function for shelter_under_2_nest_zombies until it spawned something. It took eight to ten tries for it to spawn a single feral human. All of this is to say that I think those super-low densities are to blame for this behavior. Looking through the code shows that this is how spawn numbers are decided:

    if( MonsterGroupManager::is_animal( group ) ) {
        spawn_density = get_option< float >( "SPAWN_ANIMAL_DENSITY" );
    } else {
        spawn_density = get_option< float >( "SPAWN_DENSITY" );
    }

    float multiplier = density * spawn_density;
    // Only spawn 1 creature if individual flag set, else scale by density
    float thenum = individual ? 1 : ( multiplier * rng_float( 10.0f, 50.0f ) );
    int num = roll_remainder( thenum );

This suggests to me that densities of 0.0005 and 0.0001 are far, far, far too low for a good chance of getting monsters. Now, if that's what you were going for, that's fine. I'll stop bothering you about it if that's what you're going for, but considering that there's only a 10% chance of getting those dice to roll in the first place, getting a monster in the basement is supremely unlikely.

If you don't mind not having precise placement control of your monsters, I suggest using the place_monster flag instead of monsters in the palette. That allows you to specify a range for the number of monsters to spawn, and that range is affected by the world's spawn density. If you need that precise control, I suggest a new palette entry that pops up in only a few tiles and has a density between 0.05 and 0.1.

@haveric
Copy link
Contributor Author

haveric commented Apr 23, 2022

The previous behavior relied on the world's intensity, which from what I understand relates to how close you are to a city. This being a building that doesn't spawn in cities makes that never spawn any zombies, even though it was supposed to. I am happy with the low numbers of zombies spawning because I don't want these to become overwhelmed or full of zombies. This should be a light threat and I am happy with the behavior it is showing right now.

@Inglonias
Copy link
Contributor

In that case, I'll drop my objections. I was trying to avoid a situation where not understanding the nonsense that these numbers go through before they spawn anything resulted in undesired behavior (see parks and hospitals in 0.F for an example)

@haveric
Copy link
Contributor Author

haveric commented Apr 23, 2022

In that case, I'll drop my objections. I was trying to avoid a situation where not understanding the nonsense that these numbers go through before they spawn anything resulted in undesired behavior (see parks and hospitals in 0.F for an example)

I'm not going to pretend I fully understand them, but I referenced other locations' values and adjusted it a few times because there were too many with higher intensities and have tested it enough times that I'm fairly confident it's working as intended. Even with 10x scaling, it isn't too excessive. It can always be balanced in the future if there's some edge case that I'm not taking account of though.

@Inglonias
Copy link
Contributor

any idea what's going on with the automated tests? It looks like they're being cancelled after six hours. I guess they're hanging?

@BrettDong
Copy link
Member

This is the error message in the failed MODs loading test:

 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:634:15: format: rows: row 17 column 6: 'B' has no terrain, furniture, or other definition

        "####;S_%|b________b;####",
        "####;|+||b________b;####",
        "####;B
              ^
               ____________b;####",
        "####;|+||b________b;####",
        "####;S_%|b________b;####",

21:49:53.269 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:480:23: format: rows: row 9 column 14: 'U' has no terrain, furniture, or other definition

        "########################",
        "#######;;;;;;;;;;#######",
        "#######;lll||U
                      ^
                       UU;#######",
        "####;;;;|+||||+|;#######",
        "####;b__________;;;;####",

21:49:53.269 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:480:24: format: rows: row 9 column 15: 'U' has no terrain, furniture, or other definition

        "########################",
        "#######;;;;;;;;;;#######",
        "#######;lll||UU
                       ^
                        U;#######",
        "####;;;;|+||||+|;#######",
        "####;b__________;;;;####",

21:49:53.269 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:480:25: format: rows: row 9 column 16: 'U' has no terrain, furniture, or other definition

        "########################",
        "#######;;;;;;;;;;#######",
        "#######;lll||UUU
                        ^
                         ;#######",
        "####;;;;|+||||+|;#######",
        "####;b__________;;;;####",

21:49:53.270 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:483:26: format: rows: row 12 column 17: 't' has no terrain, furniture, or other definition

        "####;;;;|+||||+|;#######",
        "####;b__________;;;;####",
        "####;b_bb_bb____t
                         ^
                          tt;####",
        "####;b_bb_bb____bbb;####",
        "####;b_bb_bb_______;####",

21:49:53.270 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:483:27: format: rows: row 12 column 18: 't' has no terrain, furniture, or other definition

        "####;;;;|+||||+|;#######",
        "####;b__________;;;;####",
        "####;b_bb_bb____tt
                          ^
                           t;####",
        "####;b_bb_bb____bbb;####",
        "####;b_bb_bb_______;####",

21:49:53.270 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:483:28: format: rows: row 12 column 19: 't' has no terrain, furniture, or other definition

        "####;;;;|+||||+|;#######",
        "####;b__________;;;;####",
        "####;b_bb_bb____ttt
                           ^
                            ;####",
        "####;b_bb_bb____bbb;####",
        "####;b_bb_bb_______;####",

21:49:53.271 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:487:26: format: rows: row 16 column 17: 't' has no terrain, furniture, or other definition

        "####;b_bb_bb_______;####",
        "####;b_bb_bb____bbb;####",
        "####;b_bb_bb____t
                         ^
                          tt;####",
        "####;b_bb_bb____bbb;####",
        "####;||||||||______;####",

21:49:53.271 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:487:27: format: rows: row 16 column 18: 't' has no terrain, furniture, or other definition

        "####;b_bb_bb_______;####",
        "####;b_bb_bb____bbb;####",
        "####;b_bb_bb____tt
                          ^
                           t;####",
        "####;b_bb_bb____bbb;####",
        "####;||||||||______;####",

21:49:53.271 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:487:28: format: rows: row 16 column 19: 't' has no terrain, furniture, or other definition

        "####;b_bb_bb_______;####",
        "####;b_bb_bb____bbb;####",
        "####;b_bb_bb____ttt
                           ^
                            ;####",
        "####;b_bb_bb____bbb;####",
        "####;||||||||______;####",

21:49:53.272 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:490:15: format: rows: row 19 column 6: 'B' has no terrain, furniture, or other definition

        "####;b_bb_bb____bbb;####",
        "####;||||||||______;####",
        "####;B
              ^
               ______+___bbb;####",
        "####;|+|||+||___ttt;####",
        "####;T_%|%_T|___|||;####",

21:49:53.272 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:491:26: format: rows: row 20 column 17: 't' has no terrain, furniture, or other definition

        "####;||||||||______;####",
        "####;B______+___bbb;####",
        "####;|+|||+||___t
                         ^
                          tt;####",
        "####;T_%|%_T|___|||;####",
        "####;|_S|S_||___<///####",

21:49:53.272 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:491:27: format: rows: row 20 column 18: 't' has no terrain, furniture, or other definition

        "####;||||||||______;####",
        "####;B______+___bbb;####",
        "####;|+|||+||___tt
                          ^
                           t;####",
        "####;T_%|%_T|___|||;####",
        "####;|_S|S_||___<///####",

21:49:53.272 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:491:28: format: rows: row 20 column 19: 't' has no terrain, furniture, or other definition

        "####;||||||||______;####",
        "####;B______+___bbb;####",
        "####;|+|||+||___ttt
                           ^
                            ;####",
        "####;T_%|%_T|___|||;####",
        "####;|_S|S_||___<///####",

21:49:53.273 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:493:27: format: rows: row 22 column 18: '/' has no terrain, furniture, or other definition

        "####;|+|||+||___ttt;####",
        "####;T_%|%_T|___|||;####",
        "####;|_S|S_||___</
                          ^
                           //####",
        "####;T_S|S_T|___<///####",
        "####;;;;;;;;;;;;////####"

21:49:53.273 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:493:28: format: rows: row 22 column 19: '/' has no terrain, furniture, or other definition

        "####;|+|||+||___ttt;####",
        "####;T_%|%_T|___|||;####",
        "####;|_S|S_||___<//
                           ^
                            /####",
        "####;T_S|S_T|___<///####",
        "####;;;;;;;;;;;;////####"

21:49:53.273 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:493:29: format: rows: row 22 column 20: '/' has no terrain, furniture, or other definition

        "####;|+|||+||___ttt;####",
        "####;T_%|%_T|___|||;####",
        "####;|_S|S_||___<///
                            ^
                             ####",
        "####;T_S|S_T|___<///####",
        "####;;;;;;;;;;;;////####"

21:49:53.274 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:494:27: format: rows: row 23 column 18: '/' has no terrain, furniture, or other definition

        "####;T_%|%_T|___|||;####",
        "####;|_S|S_||___<///####",
        "####;T_S|S_T|___</
                          ^
                           //####",
        "####;;;;;;;;;;;;////####"
      ],

21:49:53.274 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:494:28: format: rows: row 23 column 19: '/' has no terrain, furniture, or other definition

        "####;T_%|%_T|___|||;####",
        "####;|_S|S_||___<///####",
        "####;T_S|S_T|___<//
                           ^
                            /####",
        "####;;;;;;;;;;;;////####"
      ],

21:49:53.274 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:494:29: format: rows: row 23 column 20: '/' has no terrain, furniture, or other definition

        "####;T_%|%_T|___|||;####",
        "####;|_S|S_||___<///####",
        "####;T_S|S_T|___<///
                            ^
                             ####",
        "####;;;;;;;;;;;;////####"
      ],

21:49:53.274 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:495:26: format: rows: row 24 column 17: '/' has no terrain, furniture, or other definition

        "####;|_S|S_||___<///####",
        "####;T_S|S_T|___<///####",
        "####;;;;;;;;;;;;/
                         ^
                          ///####"
      ],
      "palettes": [ "shelter" ]

21:49:53.275 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:495:27: format: rows: row 24 column 18: '/' has no terrain, furniture, or other definition

        "####;|_S|S_||___<///####",
        "####;T_S|S_T|___<///####",
        "####;;;;;;;;;;;;//
                          ^
                           //####"
      ],
      "palettes": [ "shelter" ]

21:49:53.275 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:495:28: format: rows: row 24 column 19: '/' has no terrain, furniture, or other definition

        "####;|_S|S_||___<///####",
        "####;T_S|S_T|___<///####",
        "####;;;;;;;;;;;;///
                           ^
                            /####"
      ],
      "palettes": [ "shelter" ]

21:49:53.275 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:495:29: format: rows: row 24 column 20: '/' has no terrain, furniture, or other definition

        "####;|_S|S_||___<///####",
        "####;T_S|S_T|___<///####",
        "####;;;;;;;;;;;;////
                            ^
                             ####"
      ],
      "palettes": [ "shelter" ]

21:49:53.277 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:551:21: format: rows: row 7 column 12: '/' has no terrain, furniture, or other definition

        "########################",
        "########################",
        "###########/
                    ^
                     ;;;;;;;;;###",
        "###;;;;;;;;;|T|T|T|T;###",
        "###;bbbbb|UU|_______;###",

21:49:53.277 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:553:20: format: rows: row 9 column 11: 'U' has no terrain, furniture, or other definition

        "###########/;;;;;;;;;###",
        "###;;;;;;;;;|T|T|T|T;###",
        "###;bbbbb|U
                   ^
                    U|_______;###",
        "###;_____||+|BCSCS_%;###",
        "##;;_bb_____||||||+|;;##",

21:49:53.277 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:553:21: format: rows: row 9 column 12: 'U' has no terrain, furniture, or other definition

        "###########/;;;;;;;;;###",
        "###;;;;;;;;;|T|T|T|T;###",
        "###;bbbbb|UU
                    ^
                     |_______;###",
        "###;_____||+|BCSCS_%;###",
        "##;;_bb_____||||||+|;;##",

21:49:53.278 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:554:23: format: rows: row 10 column 14: 'B' has no terrain, furniture, or other definition

        "###;;;;;;;;;|T|T|T|T;###",
        "###;bbbbb|UU|_______;###",
        "###;_____||+|B
                      ^
                       CSCS_%;###",
        "##;;_bb_____||||||+|;;##",
        "##;b_bb______________;##",

21:49:53.278 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:554:24: format: rows: row 10 column 15: 'C' has no terrain, furniture, or other definition

        "###;;;;;;;;;|T|T|T|T;###",
        "###;bbbbb|UU|_______;###",
        "###;_____||+|BC
                       ^
                        SCS_%;###",
        "##;;_bb_____||||||+|;;##",
        "##;b_bb______________;##",

21:49:53.278 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:554:26: format: rows: row 10 column 17: 'C' has no terrain, furniture, or other definition

        "###;;;;;;;;;|T|T|T|T;###",
        "###;bbbbb|UU|_______;###",
        "###;_____||+|BCSC
                         ^
                          S_%;###",
        "##;;_bb_____||||||+|;;##",
        "##;b_bb______________;##",

21:49:53.279 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:558:28: format: rows: row 14 column 19: 't' has no terrain, furniture, or other definition

        "##;b_bb______________;##",
        "##;b_bb_bb________bbb;##",
        "##;b_bb_b||||||___t
                           ^
                            tt;##",
        "##;b_bb_b|____|___bbb;##",
        "##;b_bb__+_<<_+___bbb;##",

21:49:53.279 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:558:29: format: rows: row 14 column 20: 't' has no terrain, furniture, or other definition

        "##;b_bb______________;##",
        "##;b_bb_bb________bbb;##",
        "##;b_bb_b||||||___tt
                            ^
                             t;##",
        "##;b_bb_b|____|___bbb;##",
        "##;b_bb__+_<<_+___bbb;##",

21:49:53.279 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:558:30: format: rows: row 14 column 21: 't' has no terrain, furniture, or other definition

        "##;b_bb______________;##",
        "##;b_bb_bb________bbb;##",
        "##;b_bb_b||||||___ttt
                             ^
                              ;##",
        "##;b_bb_b|____|___bbb;##",
        "##;b_bb__+_<<_+___bbb;##",

21:49:53.280 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:561:28: format: rows: row 17 column 19: 't' has no terrain, furniture, or other definition

        "##;b_bb_b|____|___bbb;##",
        "##;b_bb__+_<<_+___bbb;##",
        "##;b_bb__+_<<_+___t
                           ^
                            tt;##",
        "##;b_bb_b|____|___bbb;##",
        "##;b_bb_b||||||______;##",

21:49:53.280 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:561:29: format: rows: row 17 column 20: 't' has no terrain, furniture, or other definition

        "##;b_bb_b|____|___bbb;##",
        "##;b_bb__+_<<_+___bbb;##",
        "##;b_bb__+_<<_+___tt
                            ^
                             t;##",
        "##;b_bb_b|____|___bbb;##",
        "##;b_bb_b||||||______;##",

21:49:53.281 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:561:30: format: rows: row 17 column 21: 't' has no terrain, furniture, or other definition

        "##;b_bb_b|____|___bbb;##",
        "##;b_bb__+_<<_+___bbb;##",
        "##;b_bb__+_<<_+___ttt
                             ^
                              ;##",
        "##;b_bb_b|____|___bbb;##",
        "##;b_bb_b||||||______;##",

21:49:53.281 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:565:23: format: rows: row 21 column 14: 'B' has no terrain, furniture, or other definition

        "##;b_bb_b||||||______;##",
        "##;b_bb_bb|l||||||+||;##",
        "##;;______+l|B
                      ^
                       CSCS_%|/##",
        "###;bbbbbb|l|_______;/##",
        "###;;;;;;;;;;T|T|T|T;###",

21:49:53.282 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:565:24: format: rows: row 21 column 15: 'C' has no terrain, furniture, or other definition

        "##;b_bb_b||||||______;##",
        "##;b_bb_bb|l||||||+||;##",
        "##;;______+l|BC
                       ^
                        SCS_%|/##",
        "###;bbbbbb|l|_______;/##",
        "###;;;;;;;;;;T|T|T|T;###",

21:49:53.282 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:565:26: format: rows: row 21 column 17: 'C' has no terrain, furniture, or other definition

        "##;b_bb_b||||||______;##",
        "##;b_bb_bb|l||||||+||;##",
        "##;;______+l|BCSC
                         ^
                          S_%|/##",
        "###;bbbbbb|l|_______;/##",
        "###;;;;;;;;;;T|T|T|T;###",

21:49:53.283 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:565:31: format: rows: row 21 column 22: '/' has no terrain, furniture, or other definition

        "##;b_bb_b||||||______;##",
        "##;b_bb_bb|l||||||+||;##",
        "##;;______+l|BCSCS_%|/
                              ^
                               ##",
        "###;bbbbbb|l|_______;/##",
        "###;;;;;;;;;;T|T|T|T;###",

21:49:53.283 ERROR : src/mapgen.cpp:4016 [bool mapgen_function_json_base::setup_common(const JsonObject&)] (json-error)
Json error: data/json/mapgen/shelter.json:566:31: format: rows: row 22 column 22: '/' has no terrain, furniture, or other definition

        "##;b_bb_bb|l||||||+||;##",
        "##;;______+l|BCSCS_%|/##",
        "###;bbbbbb|l|_______;/
                              ^
                               ##",
        "###;;;;;;;;;;T|T|T|T;###",
        "############;;;;;;;;;###"

@haveric
Copy link
Contributor Author

haveric commented May 1, 2022

This is the error message in the failed MODs loading test:

Shoot, I was hoping to avoid updating the No Hope one, but I'll take a look later today hopefully and see if I can get it updated as well.

@haveric haveric requested a review from Night-Pryanik as a code owner May 2, 2022 17:42
@github-actions github-actions bot added Mods Issues related to mods or modding Mods: Dark Skies Anything to do with Dark Skies Above, alien invasion mod with no zombies Mods: No Hope Relating to the mod No Hope labels May 2, 2022
@haveric
Copy link
Contributor Author

haveric commented May 2, 2022

Updated the shelters for No Hope and Dark Skies Above. I did my best to keep them spawning as intended, but am open to modifications if necessary.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label May 2, 2022
@dseguin dseguin merged commit 1dfc9c7 into CleverRaven:master May 2, 2022
@haveric haveric deleted the evac-shelter-cleanup branch May 2, 2022 23:57
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 Crafting / Construction / Recipes Includes: Uncrafting / Disassembling <Enhancement / Feature> New features, or enhancements on existing [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: Dark Skies Anything to do with Dark Skies Above, alien invasion mod with no zombies Mods: No Hope Relating to the mod No Hope Mods Issues related to mods or modding Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants