Skip to content

Commit

Permalink
Merge pull request #74754 from PatrikLundell/exodii_crashes
Browse files Browse the repository at this point in the history
Provided roofs for exodii crash site + debug mx spawn support
Maleclypse authored Jun 25, 2024

Verified

This commit was signed with the committer’s verified signature.
lucacome Luca Comellini
2 parents 6d3d8c3 + f6e2ca9 commit 54e8796
Showing 2 changed files with 67 additions and 10 deletions.
75 changes: 66 additions & 9 deletions data/json/mapgen/map_extras/exodii_crashes.json
Original file line number Diff line number Diff line change
@@ -153,6 +153,23 @@
"place_monster": [ { "monster": "mon_zomborg", "x": [ 0, 2 ], "y": [ 0, 2 ], "repeat": [ 1, 4 ] } ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "nest_exodii_crash_6x6_roof",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
"RRRRRR",
"RRRRRR",
"RRRRRR",
"RRRRRR",
"RRRRRR",
"RRRRRR"
],
"terrain": { "R": "t_metal_roof" }
}
},
{
"type": "mapgen",
"method": "json",
@@ -169,7 +186,8 @@
],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"palettes": [ "exodii_crash_palette" ],
"items": { "_": [ { "item": "SUS_exodii_storage_lowvalue", "chance": 100 } ] }
"items": { "_": [ { "item": "SUS_exodii_storage_lowvalue", "chance": 100 } ] },
"place_nested": [ { "chunks": [ "nest_exodii_crash_6x6_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
},
{
@@ -188,7 +206,25 @@
],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"palettes": [ "exodii_crash_palette" ],
"items": { "_": [ { "item": "SUS_exodii_storage_medvalue", "chance": 100 } ] }
"items": { "_": [ { "item": "SUS_exodii_storage_medvalue", "chance": 100 } ] },
"place_nested": [ { "chunks": [ "nest_exodii_crash_6x6_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "nest_exodii_crash_oval_roof",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" RRRR ",
"RRRRRR",
"RRRRRR",
"RRRRRR",
"RRRRRR",
" RRRR "
],
"terrain": { "R": "t_metal_roof" }
}
},
{
@@ -207,7 +243,8 @@
],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"palettes": [ "exodii_crash_palette" ],
"items": { "_": [ { "item": "SUS_exodii_storage_medvalue", "chance": 100 } ] }
"items": { "_": [ { "item": "SUS_exodii_storage_medvalue", "chance": 100 } ] },
"place_nested": [ { "chunks": [ "nest_exodii_crash_oval_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
},
{
@@ -226,7 +263,8 @@
],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"palettes": [ "exodii_crash_palette" ],
"items": { "_": [ { "item": "SUS_exodii_storage_medvalue", "chance": 100, "repeat": [ 1, 2 ] } ] }
"items": { "_": [ { "item": "SUS_exodii_storage_medvalue", "chance": 100, "repeat": [ 1, 2 ] } ] },
"place_nested": [ { "chunks": [ "nest_exodii_crash_6x6_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
},
{
@@ -244,7 +282,8 @@
],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"palettes": [ "exodii_crash_palette" ],
"items": { "_": [ { "item": "SUS_exodii_storage_highvalue", "chance": 100 } ] }
"items": { "_": [ { "item": "SUS_exodii_storage_highvalue", "chance": 100 } ] },
"place_nested": [ { "chunks": [ "nest_exodii_crash_6x6_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
},
{
@@ -262,7 +301,8 @@
],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"palettes": [ "exodii_crash_palette" ],
"items": { "_": [ { "item": "SUS_exodii_storage_highvalue", "chance": 100 } ] }
"items": { "_": [ { "item": "SUS_exodii_storage_highvalue", "chance": 100 } ] },
"place_nested": [ { "chunks": [ "nest_exodii_crash_6x6_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
},
{
@@ -280,7 +320,22 @@
],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"palettes": [ "exodii_crash_palette" ],
"items": { "_": [ { "item": "SUS_exodii_storage_highvalue", "chance": 100 } ] }
"items": { "_": [ { "item": "SUS_exodii_storage_highvalue", "chance": 100 } ] },
"place_nested": [ { "chunks": [ "nest_exodii_crash_oval_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "nest_exodii_crash_3x3_roof",
"object": {
"mapgensize": [ 3, 3 ],
"rows": [
"RRR",
"RRR",
"RRR"
],
"terrain": { "R": "t_metal_roof" }
}
},
{
@@ -296,7 +351,8 @@
],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"palettes": [ "exodii_crash_palette" ],
"items": { "_": [ { "item": "SUS_exodii_storage_lowvalue", "chance": 100 } ] }
"items": { "_": [ { "item": "SUS_exodii_storage_lowvalue", "chance": 100 } ] },
"place_nested": [ { "chunks": [ "nest_exodii_crash_3x3_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
},
{
@@ -312,7 +368,8 @@
],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"palettes": [ "exodii_crash_palette" ],
"items": { "_": [ { "item": "SUS_exodii_storage_lowvalue", "chance": 100 } ] }
"items": { "_": [ { "item": "SUS_exodii_storage_lowvalue", "chance": 100 } ] },
"place_nested": [ { "chunks": [ "nest_exodii_crash_3x3_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
},
{
2 changes: 1 addition & 1 deletion src/debug_menu.cpp
Original file line number Diff line number Diff line change
@@ -3351,7 +3351,7 @@ static void map_extra()
if( mx_choice >= 0 && mx_choice < static_cast<int>( mx_str.size() ) ) {
const tripoint_abs_omt where_omt( ui::omap::choose_point( true ) );
if( where_omt != overmap::invalid_tripoint ) {
tinymap mx_map;
smallmap mx_map;
mx_map.load( where_omt, false );
MapExtras::apply_function( mx_str[mx_choice], mx_map, where_omt );
g->load_npcs();

0 comments on commit 54e8796

Please sign in to comment.