From 14a4ece639c1fc6db67c712036b177b7e31d03f9 Mon Sep 17 00:00:00 2001 From: Marc Date: Sat, 11 Jan 2025 10:49:18 -0700 Subject: [PATCH] [Aftershock] Small mapgen fixes. (#79060) * Fix various roof related issues around maps and enable moxie spawning in habitat block 1 * Kick Tests --- .../mods/Aftershock/maps/mapgen/freight_transport.json | 3 ++- data/mods/Aftershock/maps/mapgen/general_store.json | 6 +++--- .../maps/mapgen/habitat_blocks/habitat_block_1.json | 8 ++++++++ .../maps/mapgen/habitat_blocks/habitat_block_2.json | 4 ++-- .../maps/mapgen/habitat_blocks/habitat_block_3.json | 10 +++++----- data/mods/Aftershock/maps/mapgen/solar_array.json | 2 +- 6 files changed, 21 insertions(+), 12 deletions(-) diff --git a/data/mods/Aftershock/maps/mapgen/freight_transport.json b/data/mods/Aftershock/maps/mapgen/freight_transport.json index 9949a85d6531a..b45bdf928ec2e 100644 --- a/data/mods/Aftershock/maps/mapgen/freight_transport.json +++ b/data/mods/Aftershock/maps/mapgen/freight_transport.json @@ -110,7 +110,8 @@ " ", " " ], - "palettes": [ "roof_palette" ] + "palettes": [ "roof_palette" ], + "terrain": { ".": "t_metal_floor" } } } ] diff --git a/data/mods/Aftershock/maps/mapgen/general_store.json b/data/mods/Aftershock/maps/mapgen/general_store.json index c6b95056ccf4d..5372effddfb88 100644 --- a/data/mods/Aftershock/maps/mapgen/general_store.json +++ b/data/mods/Aftershock/maps/mapgen/general_store.json @@ -88,8 +88,8 @@ " £/..h/.11111.////// ", " £//kk/..eee..+'.>// ", " ££//=//!////////// ", - " £££££/.'❺❶/£ ", - " ££//#///£ ", + " £££££/.'❺❶/££ ", + " ££//#//££ ", " ", " ", " ", @@ -115,7 +115,7 @@ "method": "json", "om_terrain": "afs_general_store_n3", "object": { - "fill_ter": "t_metal_floor", + "fill_ter": "t_flat_roof", "rows": [ " ", " ", diff --git a/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_1.json b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_1.json index 4c46bd008f455..003941b8913df 100644 --- a/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_1.json +++ b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_1.json @@ -39,6 +39,10 @@ ], "furniture": { "1": "f_washer", "2": "f_dryer", "3": "f_atm" }, "vendingmachines": { "V": { "item_group": "afs_vending_false_meals", "reinforced": true, "powered": true } }, + "place_monster": [ + { "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "pack_size": [ 1, 3 ], "chance": 20 }, + { "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 24, 47 ], "y": [ 0, 23 ], "pack_size": [ 1, 3 ], "chance": 20 } + ], "place_nested": [ { "chunks": [ { "param": "variant", "fallback": "afs_habblock_1_slot1_cafe_a1" } ], "x": 0, "y": 0 }, { @@ -123,6 +127,10 @@ "afs_habblock_1_paramter_palette" ], "terrain": { " ": "t_open_air", "1": "t_afs_door_metal_elocked" }, + "place_monster": [ + { "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 2, 23 ], "y": [ 12, 20 ], "pack_size": [ 1, 3 ], "chance": 20 }, + { "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 24, 45 ], "y": [ 5, 23 ], "pack_size": [ 1, 3 ], "chance": 20 } + ], "place_nested": [ { "chunks": [ diff --git a/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_2.json b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_2.json index 482c90b10e2a3..f95a11b86321f 100644 --- a/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_2.json +++ b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_2.json @@ -279,7 +279,7 @@ " ={*{&/../{;{{= ={;{{/../&{*{= ", " /:////../{*{&/ /{*{&/..////:/ ", " /.Foj/../://// /:////../Foj./ ", - " /.'../../.Foj/ /.Foj/..:..../ ", + " /.'..:../.Foj/ /.Foj/..:..../ ", " =hyh./../..'./ /h'../../..'.= ", " =hhh./..:..hh/ /y..á/../hh..= ", " /á'../../á.yy/ /h...:../yy.á/ ", @@ -376,7 +376,7 @@ " ={*{&/../{;{{= ={;{{/../&{*{= ", " /:////../{*{&/ /{*{&/..////:/ ", " /.Foj/../://// /:////../Foj./ ", - " /.'../../.Foj/ /.Foj/..:..../ ", + " /.'..:../.Foj/ /.Foj/..:..../ ", " =hyh./../....= =h.../../....= ", " =hhh./..:.'hh= =y'.á/../hh'.= ", " /á'../../á.yy/ /h...:../yy.á/ ", diff --git a/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_3.json b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_3.json index f13a52a4a7531..a73839d02b6c8 100644 --- a/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_3.json +++ b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_3.json @@ -68,8 +68,8 @@ "fill_ter": "t_metal_floor", "rows": [ " ", - " ", - " /////==// //==///// ", + " ...... ", + " /////==//....//==///// ", " /&*{/Foj//==//joF/&{1/ ", " /{;1/.../%.../.../*;{/ ", " /:///.'.:....:.'.///:/ ", @@ -149,10 +149,10 @@ " ", " [[[[[[[[[ [[[[[[[[[ ", " [™™££££™[[[[[[££££™™™[ ", - " [™™33££™™™™™££££™33™™[ ", + " [™™££££™™™™™££££™££™™[ ", " [™™33™££££™™££™™™33™™[ ", - " [™£33™™£333333£™™33£™[ ", - " [™£33™™™333333££™33™™[ ", + " [™£33™™££3333££™™33£™[ ", + " [™£33™™™£3333£££™33™™[ ", " [££33™£™™££™™™££™33££[ ", " [££33£££££™™™££££33™™[ ", " [[™™™££££££™££££££™™[[ ", diff --git a/data/mods/Aftershock/maps/mapgen/solar_array.json b/data/mods/Aftershock/maps/mapgen/solar_array.json index 85d55765c8502..2f19c3e26f869 100644 --- a/data/mods/Aftershock/maps/mapgen/solar_array.json +++ b/data/mods/Aftershock/maps/mapgen/solar_array.json @@ -54,7 +54,7 @@ "method": "json", "om_terrain": [ [ "afs_solar_arrary_a1_roof", "afs_solar_array_a2_roof" ] ], "object": { - "fill_ter": "t_metal_floor", + "fill_ter": "t_flat_roof", "rows": [ " ", " ",