From 67d68e9bb356eb59aab46495c1b17647f245524d Mon Sep 17 00:00:00 2001 From: Neon <10284121+neonspectra@users.noreply.github.com> Date: Tue, 6 Feb 2024 07:10:54 -0800 Subject: [PATCH] Remove AFS Formless Ruins (#17) Summary Content "Remove AFS Formless Ruins" Purpose of change The Aftershock Formless Ruins are one of those bits of content that snuck into Aftershock while seemingly being intended for Exoplanet. They stick out like a sore thumb and are disruptive of intended thematics in Cataclysm 2040. Describe the solution I hate removing content (especially in a fork about content restoration), but these ruins are really designed to represent space habitats and don't transfer over well to the 2040s content that Aftershock originally was a dumping ground for. Describe alternatives you've considered I thought about reworking the designs and item groups, but it would just take a lot of time. On top of the fact that my time is limited and I simply don't have time for it at the moment, I think that time would be better spent building original 2040 POIs rather than trying to rework this content that was never meant to be representative of the original 2040 setpieces in C:DDA. Testing Added this to a save and revealed overmap to ensure these aren't being spawned anymore. I even added it to an existing save to make sure it got rid of the ruins properly. --- data/mods/Aftershock/maps/city_buildings.json | 16 - .../formless_ruins_dynamic.json | 989 ------------------ .../mapgen_pallete/afs_formless_ruins.json | 50 - .../maps/mutable_specials/formless_ruin.json | 44 - .../mods/Aftershock/maps/overmap_terrain.json | 10 - data/mods/Aftershock/region_settings.json | 3 +- 6 files changed, 1 insertion(+), 1111 deletions(-) delete mode 100644 data/mods/Aftershock/maps/mapgen/formless_ruins/formless_ruins_dynamic.json delete mode 100644 data/mods/Aftershock/maps/mapgen_pallete/afs_formless_ruins.json delete mode 100644 data/mods/Aftershock/maps/mutable_specials/formless_ruin.json diff --git a/data/mods/Aftershock/maps/city_buildings.json b/data/mods/Aftershock/maps/city_buildings.json index 433d78bd2a..02aa251cf0 100644 --- a/data/mods/Aftershock/maps/city_buildings.json +++ b/data/mods/Aftershock/maps/city_buildings.json @@ -88,22 +88,6 @@ ], "locations": [ "land" ] }, - { - "id": "afs_city_ruinfield", - "type": "city_building", - "overmaps": [ - { "point": [ 0, 0, 0 ], "overmap": "afs_formless_ruins_dynamic_north" }, - { "point": [ 1, 0, 0 ], "overmap": "afs_formless_ruins_dynamic_north" }, - { "point": [ -1, 0, 0 ], "overmap": "afs_formless_ruins_dynamic_north" }, - { "point": [ 0, 1, 0 ], "overmap": "afs_formless_ruins_dynamic_north" }, - { "point": [ 1, 1, 0 ], "overmap": "afs_formless_ruins_dynamic_north" }, - { "point": [ -1, 1, 0 ], "overmap": "afs_formless_ruins_dynamic_north" }, - { "point": [ 0, 2, 0 ], "overmap": "afs_formless_ruins_dynamic_north" }, - { "point": [ 1, 2, 0 ], "overmap": "afs_formless_ruins_dynamic_north" }, - { "point": [ -1, 2, 0 ], "overmap": "afs_formless_ruins_dynamic_north" } - ], - "locations": [ "land" ] - }, { "id": "afs_house_1", "type": "city_building", diff --git a/data/mods/Aftershock/maps/mapgen/formless_ruins/formless_ruins_dynamic.json b/data/mods/Aftershock/maps/mapgen/formless_ruins/formless_ruins_dynamic.json deleted file mode 100644 index 080c335a25..0000000000 --- a/data/mods/Aftershock/maps/mapgen/formless_ruins/formless_ruins_dynamic.json +++ /dev/null @@ -1,989 +0,0 @@ -[ - { - "id": "afs_formless_ruins_random_loot", - "type": "item_group", - "subtype": "distribution", - "entries": [ - { "group": "afs_machinery_maintenance_scrapgroup", "prob": 50 }, - { "group": "afs_basic_material_scrapgroup", "prob": 20 } - ] - }, - { - "id": "afs_formless_ruins_random_suit", - "type": "item_group", - "subtype": "distribution", - "entries": [ { "group": "afs_wintersuit_civilian_advanced", "prob": 50 } ] - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "afs_formless_ruins_dynamic" ], - "weight": 500, - "object": { - "predecessor_mapgen": "field", - "rows": [ - "1 .1 ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - "1 1 ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ], - "place_nested": [ - { "chunks": [ "formless_forest" ], "x": 0, "y": 0, "neighbors": { "north": "forest" } }, - { "chunks": [ "formless_forest" ], "x": 0, "y": 0, "neighbors": { "east": "forest" } }, - { "chunks": [ "formless_forest" ], "x": 0, "y": 0, "neighbors": { "south": "forest" } }, - { "chunks": [ "formless_forest" ], "x": 0, "y": 0, "neighbors": { "west": "forest" } } - ], - "nested": { - "1": { - "chunks": [ - [ "formless_ruins_ribs1", 20 ], - [ "formless_ruins_ribs2", 20 ], - [ "formless_ruins_room1", 20 ], - [ "formless_ruins_room2", 20 ], - [ "formless_ruins_room3", 20 ], - [ "formless_ruins_room4", 20 ], - [ "formless_ruins_room5", 20 ], - [ "formless_ruins_room6", 20 ], - [ "formless_ruins_twoway1", 20 ], - [ "formless_ruins_twoway2", 20 ], - [ "formless_ruins_twoway3", 20 ], - [ "formless_ruins_pillar1", 20 ], - [ "formless_ruins_pillar2", 20 ], - [ "formless_ruins_orderly1", 10 ], - [ "formless_ruins_orderly2", 10 ], - [ "formless_ruins_orderly3", 10 ], - [ "formless_ruins_orderly4", 10 ], - [ "formless_ruins_empty1", 10 ], - [ "formless_ruins_empty2", 10 ], - [ "formless_ruins_empty3", 10 ], - [ "formless_ruins_empty4", 10 ], - [ "formless_ruins_cryoroom", 10 ], - [ "formless_ruins_armory", 10 ], - [ "formless_ruins_sleeping_room", 10 ], - [ "formless_ruins_telepad", 5 ] - ] - } - }, - "place_loot": [ { "group": "afs_formless_ruins_random_loot", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 50, "repeat": [ 1, 4 ] } ], - "place_monsters": [ { "monster": "AFS_GROUP_MOXIE_LOW_RISK", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 10, "density": 0.1 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "afs_formless_ruins_dynamic" ], - "weight": 100, - "object": { - "predecessor_mapgen": "field", - "rows": [ - " .1 ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " 1 ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ], - "place_nested": [ - { "chunks": [ "formless_forest" ], "x": 0, "y": 0, "neighbors": { "north": "forest" } }, - { "chunks": [ "formless_forest" ], "x": 0, "y": 0, "neighbors": { "east": "forest" } }, - { "chunks": [ "formless_forest" ], "x": 0, "y": 0, "neighbors": { "south": "forest" } }, - { "chunks": [ "formless_forest" ], "x": 0, "y": 0, "neighbors": { "west": "forest" } } - ], - "nested": { - "1": { - "chunks": [ - [ "formless_ruins_ribs1", 20 ], - [ "formless_ruins_ribs2", 20 ], - [ "formless_ruins_room1", 20 ], - [ "formless_ruins_room2", 20 ], - [ "formless_ruins_room3", 20 ], - [ "formless_ruins_room4", 20 ], - [ "formless_ruins_room5", 20 ], - [ "formless_ruins_room6", 20 ], - [ "formless_ruins_twoway1", 20 ], - [ "formless_ruins_twoway2", 20 ], - [ "formless_ruins_twoway3", 20 ], - [ "formless_ruins_pillar1", 20 ], - [ "formless_ruins_pillar2", 20 ], - [ "formless_ruins_orderly1", 10 ], - [ "formless_ruins_orderly2", 10 ], - [ "formless_ruins_orderly3", 10 ], - [ "formless_ruins_orderly4", 10 ], - [ "formless_ruins_empty1", 10 ], - [ "formless_ruins_empty2", 10 ], - [ "formless_ruins_empty3", 10 ], - [ "formless_ruins_empty4", 10 ], - [ "formless_ruins_cryoroom", 10 ], - [ "formless_ruins_armory", 10 ], - [ "formless_ruins_sleeping_room", 10 ], - [ "formless_ruins_telepad", 5 ] - ] - } - }, - "place_loot": [ { "group": "afs_formless_ruins_random_loot", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 50, "repeat": [ 1, 4 ] } ], - "place_monsters": [ { "monster": "AFS_GROUP_MOXIE_LOW_RISK", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 10, "density": 0.1 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "afs_formless_ruins_dynamic" ], - "//": "emptier map with a droneswarm, very rare", - "weight": 10, - "object": { - "predecessor_mapgen": "field", - "rows": [ - " .1 ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " 1 ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ], - "place_nested": [ - { "chunks": [ "formless_forest" ], "x": 0, "y": 0, "neighbors": { "north": "forest" } }, - { "chunks": [ "formless_forest" ], "x": 0, "y": 0, "neighbors": { "east": "forest" } }, - { "chunks": [ "formless_forest" ], "x": 0, "y": 0, "neighbors": { "south": "forest" } }, - { "chunks": [ "formless_forest" ], "x": 0, "y": 0, "neighbors": { "west": "forest" } } - ], - "nested": { - "1": { - "chunks": [ - [ "formless_ruins_ribs1", 20 ], - [ "formless_ruins_ribs2", 20 ], - [ "formless_ruins_twoway1", 20 ], - [ "formless_ruins_twoway2", 20 ], - [ "formless_ruins_twoway3", 20 ], - [ "formless_ruins_pillar1", 20 ], - [ "formless_ruins_pillar2", 20 ], - [ "formless_ruins_orderly1", 10 ], - [ "formless_ruins_orderly2", 10 ], - [ "formless_ruins_orderly3", 10 ], - [ "formless_ruins_orderly4", 10 ], - [ "formless_ruins_empty1", 10 ], - [ "formless_ruins_empty2", 10 ], - [ "formless_ruins_empty3", 10 ], - [ "formless_ruins_empty4", 10 ] - ] - } - }, - "place_loot": [ { "group": "afs_formless_ruins_random_loot", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 50, "repeat": [ 1, 4 ] } ], - "place_monster": [ - { "monster": "mon_wraitheon_isohypsa", "x": 12, "y": 12, "spawn_data": { "patrol": [ { "x": 12, "y": 12 } ] } }, - { - "monster": "mon_wraitheon_irradiant", - "x": 8, - "y": 8, - "spawn_data": { "patrol": [ { "x": 8, "y": 8 }, { "x": 8, "y": 16 }, { "x": 16, "y": 16 }, { "x": 16, "y": 8 } ] } - }, - { "monster": "mon_wraitheon_kaburaya", "x": 4, "y": 4, "repeat": [ 6, 10 ] } - ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_ribs1", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "// .../..", - "/.. .../..", - "/.. .//.", - "/ / .. .", - " . ....//", - " / ...../", - "/// / /.", - "/.. ...///", - "/// . ...", - "/.. . //", - "/ // ./", - "/.. ../" - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_ribs2", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "///// .////.", - "/.. //..//.", - "/.. .//.", - "/ / .. .", - " . .... ", - " / . . ", - " / ", - "/.. .. ", - " . ...", - "/.. / . /", - " // /.. ./", - "//// //////" - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_room1", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "// .../..", - "/.. /ó/////", - "/./X//1..../", - "/// . . /", - " /. ...//", - " // ..../", - " // ...../", - "///.../...//", - "/// ./////", - "/// .ó...ó", - "/.//////////", - "/ // ./" - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ], - "nested": { "1": { "chunks": [ [ "null", 200 ], [ "formless_ruins_smallcryoroom", 20 ], [ "formless_ruins_smallasrg", 20 ] ] } } - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_room2", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "// .../..", - "/.. .../..", - "/./X//.//.//", - "/// 1. ../", - " 3. ...../", - " // ....../", - "///.../...//", - "/ 3 ... /", - "/ / . ....", - " .//3///////", - "/ //.. ..../", - "/./. /// ./" - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ], - "nested": { "1": { "chunks": [ [ "null", 200 ], [ "formless_ruins_smallcryoroom", 20 ], [ "formless_ruins_smallasrg", 20 ] ] } } - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_room3", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "/////#####..", - "/.X ///./..", - "/./ ...", - "/// ./ ...", - " 1.////", - " ....../", - " /..//... ", - " o o... ", - "/ o o. ....", - " .// ///////", - " o..o ... ", - " /#3/ " - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ], - "nested": { "1": { "chunks": [ [ "null", 200 ], [ "formless_ruins_smallcryoroom", 20 ], [ "formless_ruins_smallasrg", 20 ] ] } } - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_room4", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "//. ..#..", - "/.. ///./..", - "/. ./.", - " / ./////", - " o .... /", - " o ....../", - " ////./... /", - " ..###3.. ", - " ....3 ....", - " /..///////", - " ... ... ", - " .. " - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_room5", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "////....///.", - "/.. ///./..", - "/.. .. ./.", - "/// / .////.", - " / ....//", - " / ....../", - "///.../..../", - " o o../. ", - "/ # # ./..", - "#/// ////3 ", - "## 3.. ... ", - "# / . " - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_room6", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "//33//..///.", - "/... ///./#.", - "ó...... .3.", - "///.. ./////", - "#.. ...../", - "#... ......ó", - "///../ .ooo/", - " / .. ./", - "/ / ././", - "//// ///////", - "## .. /.. ", - "# /// . / " - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_twoway1", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "/ //..///.", - "/... / #.", - "ó...... ...", - "///|||./33//", - "#.. #|#..../", - "#...#|||...ó", - " /../.. /", - " .../... ", - " .|.... ", - "// |||////", - "## .. /.. ", - "# /// . / " - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_twoway2", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "/ /|../ //", - "/... | / #/", - "/....|. ../", - "// |./ //", - "#.. #|#..../", - "|...#|||...ó", - "/ /../.. /", - "/ .../... /", - "| .|.... |", - "// |||/ /", - "## .. /33/", - "# /// . / " - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_twoway3", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "/ ///#../ //", - " ... # ///#/", - " ....3...../", - "// #./. //", - "#.. #|#.... ", - "|////|||....", - "/.###/./////", - "...........3", - " ......./", - "// ||||../", - "## .||||33/", - "#////||||.. " - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_pillar1", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "////... ///.", - "/.... ..", - "/.. .. ./.", - "// .", - " / ####.....", - " / #||# ../", - "// ##||## ./", - " ###. . ", - "/ . .", - " / ", - "## 3.. / ", - "# / . / " - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_pillar2", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "////... ////", - "/.... /// ./", - "/.. .. . /", - "// .", - " .....", - " #||./../", - " ##||./ ./", - " # . . ", - "/ . .", - " ////", - "## .. 3...", - "# / . /. " - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_orderly1", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "/ ## .", - "/ .|#| | .", - " .|#|.|.. .", - " .", - " ## . /", - " | | | . /", - "// |#| | /", - " . ", - " ## . .", - " | |#| ", - "# |.| | /", - "/ //" - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_orderly2", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "//////.. .", - "/ . |||| .", - "/ . |##| .", - " /|||| .", - " #/.... /", - " ../.|.| . /", - "//./.|. /", - " ../.|. . ", - " ||||/// .", - " |##|#| ", - "# |||| | /", - "/ /////" - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_orderly3", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "/ ## .", - "/ .||||| .", - " .|#|.|.. .", - ".... .", - ".3 ## . /", - "./ . /", - "// /", - " . . ", - " / .. . .", - " | |.| ", - "# ||||| /", - "/ / /////" - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_orderly4", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "/ ## .", - "/ .| .", - " .| .. .", - " ///", - " ## ./ ", - " | ///", - "// | /", - " . ", - " // .///", - " |. / ", - "#/ |. ////", - "/.. //" - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_empty1", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "/ ..", - "/. /.", - ".. / /.", - "/ // ", - "/ 1 ", - "/ ", - " / . /", - " / . ", - " /", - " ", - " ", - " // " - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ], - "nested": { "1": { "chunks": [ [ "null", 200 ], [ "formless_ruins_escapepod", 1 ] ] } } - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_empty2", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "/ # //.", - "/ . .", - " /.. .. .", - " 1/ ", - " ", - " ", - " /// /", - " .. . ", - " ../ /", - ". / #", - ".. #", - "/./. " - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ], - "nested": { "1": { "chunks": [ [ "null", 200 ], [ "formless_ruins_escapepod", 1 ] ] } } - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_empty3", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "/ # //.", - "/ ...", - " .. .", - " ", - " ", - " 1 ", - " /", - " ..", - ". ../", - ".. .#", - "#. #", - "/ " - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ], - "nested": { "1": { "chunks": [ [ "null", 200 ], [ "formless_ruins_escapepod", 1 ] ] } } - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_empty4", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "/.. # .", - "/ .", - " .| .. .", - " ///", - " ", - ". ///", - "// /", - " . . ", - "... ", - " . /... ", - "# /.//..", - "/ .." - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "palettes": [ "afs_formless_ruins" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_cryoroom", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "///33/..///.", - "/P.. ///////", - "óP.....CCCC/", - "///.. ...../", - "/C. .CC.#/", - "/C.. ....../", - "///../33ooo/", - "/W / ...W/", - "/W /P.C.W/", - "///33///////", - "##/ .. .. ", - "///////ó////" - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "terrain": { "P": "t_metal_floor", "C": "t_metal_floor", "W": "t_metal_floor" }, - "furniture": { "P": "f_cooling_pylon", "C": "f_cryo_pod", "W": "f_workbench" }, - "items": { - "W": [ - { "item": "tools_science", "chance": 80, "repeat": [ 1, 3 ] }, - { "item": "afs_biomedical_scrapgroup", "chance": 100, "repeat": [ 1, 2 ] }, - { "item": "supplies_reagents_lab", "chance": 80, "repeat": [ 1, 3 ] } - ] - }, - "place_monsters": [ { "monster": "GROUP_CRYO_LAB", "x": [ 1, 5 ], "y": [ 1, 2 ], "density": 0.1, "repeat": [ 1, 3 ] } ], - "palettes": [ "afs_formless_ruins" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_telepad", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "/ ..////", - "/. ......../", - "/.///3////C/", - "///.........", - "/C. ooo#/", - "/ .. ....--", - "/W .......1-", - "/W ......T-", - "/W. ......1-", - "//C.......--", - "##/ooooo///.", - "///.. // " - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "terrain": { "C": "t_metal_floor", "W": "t_metal_floor", "T": "t_metal_floor", "1": "t_machinery_heavy" }, - "furniture": { "C": "f_counter", "W": "f_rack", "T": "f_afs_telepad" }, - "items": { - "W": [ - { "item": "afs_experimental_combat_gear", "chance": 10, "repeat": [ 1, 2 ] }, - { "item": "afs_general_armory", "chance": 50, "repeat": [ 1, 2 ] } - ], - "C": [ - { "item": "afs_robotics_scrapgroup", "chance": 20, "repeat": [ 1, 2 ] }, - { "item": "afs_machinery_maintenance_scrapgroup", "chance": 10, "repeat": [ 1, 2 ] } - ] - }, - "palettes": [ "afs_formless_ruins" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_armory", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "/ ..////", - "/. . ///////", - "/....3.CCCC/", - "// ///...../", - "/C. / .CC.#/", - "/ ../M...../", - ". .//33ooo/", - ". ...... M/", - "/.. /WWWWWW/", - "//..///..../", - "##/... ... ", - "///.. // " - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "terrain": { "C": "t_metal_floor", "W": "t_metal_floor" }, - "furniture": { "C": "f_counter", "W": "f_rack" }, - "items": { - "W": [ - { "item": "afs_general_armory", "chance": 80, "repeat": [ 1, 2 ] }, - { "item": "afs_any_energy_mag", "chance": 50, "repeat": [ 1, 2 ] } - ], - "C": [ - { "item": "afs_energy_weapon_armory", "chance": 20, "repeat": [ 1, 2 ] }, - { "item": "afs_any_energy_mag", "chance": 10, "repeat": [ 1, 2 ] } - ] - }, - "place_monsters": [ { "monster": "AFS_GROUP_ROBOT_LOW_RISK", "x": [ 0, 11 ], "y": [ 0, 11 ], "density": 0.1 } ], - "monster": { "M": { "monster": "mon_skitterbot" } }, - "palettes": [ "afs_formless_ruins" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_sleeping_room", - "object": { - "mapgensize": [ 12, 12 ], - "rows": [ - "/ .. //", - "/. . ///33//", - "/.... ...P/", - "// / ....P/", - "/C. P....P/", - " ../P...///", - "/. .// .../", - "/s /P.. P/", - "/s. /P P/", - "//33// ///", - "##/... .. ", - "///.. // " - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "terrain": { "C": "t_metal_floor", "s": "t_metal_floor" }, - "items": { "P": [ { "item": "afs_formless_ruins_random_suit", "chance": 80, "repeat": [ 1, 2 ] } ] }, - "furniture": { "P": "f_sleep_pod", "s": "f_sink" }, - "place_monsters": [ { "monster": "AFS_GROUP_MOXIE_LOW_RISK", "x": [ 0, 11 ], "y": [ 0, 11 ], "density": 0.1 } ], - "palettes": [ "afs_formless_ruins" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_smallasrg", - "object": { - "mapgensize": [ 6, 6 ], - "rows": [ - " ///", - "/W.../", - "/W.C./", - " .../", - " /66/", - " ////" - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "terrain": { "6": "t_metal_floor", "C": "t_metal_floor", "W": "t_metal_floor" }, - "furniture": { "6": "f_console_broken", "C": "f_compact_ASRG_containment", "W": "f_workbench" }, - "items": { - "W": [ - { "item": "tools_robotics", "chance": 80, "repeat": [ 1, 3 ] }, - { "item": "afs_machinery_maintenance_scrapgroup", "chance": 100, "repeat": [ 1, 3 ] }, - { "item": "supplies_electronics", "chance": 80, "repeat": [ 1, 3 ] } - ] - }, - "place_monsters": [ { "monster": "AFS_GROUP_ROBOT_NEUTRAL_OLD", "x": [ 0, 5 ], "y": [ 0, 5 ], "density": 0.05 } ], - "palettes": [ "afs_formless_ruins" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_escapepod", - "object": { - "mapgensize": [ 6, 6 ], - "rows": [ - " #### ", - "/#-+-#", - "##q!-#", - "##---#", - " #####", - " ####/" - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "terrain": { - "-": "t_afs_space_ship_hull_wall", - "+": "t_afs_space_ship_hatch_c", - "q": "t_afs_escapepod_g", - "!": "t_metal_floor", - "#": "t_dirtmound" - }, - "furniture": { "!": "f_afs_escape_pod_seat" }, - "items": { "!": { "item": "afs_escape_pod_suppliesII", "chance": 100 } }, - "palettes": [ "afs_formless_ruins" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_ruins_smallcryoroom", - "object": { - "mapgensize": [ 6, 6 ], - "rows": [ - " ///", - "/P.W./", - "/#.../", - " 3 C/", - " / C/", - " ////" - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], - "terrain": { "P": "t_metal_floor", "C": "t_metal_floor", "W": "t_metal_floor" }, - "furniture": { "P": "f_cooling_pylon", "C": "f_cryo_pod", "W": "f_workbench" }, - "items": { - "W": [ - { "item": "tools_science", "chance": 80, "repeat": [ 1, 3 ] }, - { "item": "afs_biomedical_scrapgroup", "chance": 100, "repeat": [ 1, 2 ] }, - { "item": "supplies_reagents_lab", "chance": 80, "repeat": [ 1, 3 ] } - ] - }, - "place_monsters": [ { "monster": "GROUP_CRYO_LAB", "x": [ 1, 5 ], "y": [ 1, 2 ], "density": 0.01, "repeat": [ 1, 3 ] } ], - "palettes": [ "afs_formless_ruins" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "formless_forest", - "//": "forest map for when adjacent forests exists", - "object": { - "mapgensize": [ 24, 24 ], - "set": [ - { "point": "terrain", "id": "t_region_groundcover_forest", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 50, 200 ] }, - { "point": "terrain", "id": "t_region_shrub", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 50, 100 ] }, - { "point": "terrain", "id": "t_region_tree", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 20, 50 ] } - ], - "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ] - } - } -] diff --git a/data/mods/Aftershock/maps/mapgen_pallete/afs_formless_ruins.json b/data/mods/Aftershock/maps/mapgen_pallete/afs_formless_ruins.json deleted file mode 100644 index 393256c2ea..0000000000 --- a/data/mods/Aftershock/maps/mapgen_pallete/afs_formless_ruins.json +++ /dev/null @@ -1,50 +0,0 @@ -[ - { - "type": "palette", - "id": "afs_formless_ruins", - "terrain": { - ".": "t_metal_floor", - "!": "t_door_locked_interior", - "-": "t_wall_metal", - "|": "t_concrete_wall", - "/": "t_wall_prefab_metal", - "#": "t_broken_prefab", - "Q": "t_wall_prefab_glass_shutters", - ":": "t_door_glass_c", - ";": "t_door_locked", - "o": "t_wall_prefab_glass", - "(": "t_reinforced_glass", - "X": "t_door_metal_locked", - "3": "t_door_metal_c", - "4": "t_door_metal_pickable", - "ó": "t_metal_ventilation_shutter", - "R": "t_railing", - ">": "t_stairs_down", - "<": "t_stairs_up" - }, - "furniture": { - "$": "f_safe_l", - "A": "f_neuralnet_inserter", - "0": "f_cryo_pod", - "&": "f_toilet", - "%": "f_console_broken", - "5": "f_console", - "B": "f_bed", - "?": "f_sofa", - "S": "f_sink", - "b": "f_bench", - "c": "f_counter", - "d": "f_desk", - "h": "f_chair", - "H": "f_utility_shelf", - "l": "f_locker", - "k": "f_bookcase", - "r": "f_trashcan", - "s": "f_sink", - "t": "f_table", - "f": "f_filing_cabinet", - "^": "f_indoor_plant" - }, - "toilets": { "&": { } } - } -] diff --git a/data/mods/Aftershock/maps/mutable_specials/formless_ruin.json b/data/mods/Aftershock/maps/mutable_specials/formless_ruin.json deleted file mode 100644 index e778693bc6..0000000000 --- a/data/mods/Aftershock/maps/mutable_specials/formless_ruin.json +++ /dev/null @@ -1,44 +0,0 @@ -[ - { - "type": "overmap_special", - "id": "mutable_ruinfield", - "subtype": "mutable", - "locations": [ "land" ], - "city_distance": [ 10, -1 ], - "city_sizes": [ 0, 20 ], - "occurrences": [ 0, 2 ], - "check_for_locations": [ - [ [ 0, 0, 0 ], [ "land" ] ], - [ [ 0, 1, 0 ], [ "land" ] ], - [ [ 1, 0, 0 ], [ "land" ] ], - [ [ 0, -1, 0 ], [ "land" ] ], - [ [ -1, 0, 0 ], [ "land" ] ] - ], - "flags": [ "EXOPLANET" ], - "joins": [ "ruin_to_ruin" ], - "overmaps": { - "ruin_core": { - "overmap": "afs_formless_ruins_dynamic_north", - "north": "ruin_to_ruin", - "east": "ruin_to_ruin", - "south": "ruin_to_ruin", - "west": "ruin_to_ruin" - }, - "ruin_line": { "overmap": "afs_formless_ruins_dynamic_north", "north": "ruin_to_ruin", "south": "ruin_to_ruin" }, - "ruin_termination": { - "overmap": "afs_formless_ruins_dynamic_north", - "north": { "id": "ruin_to_ruin", "type": "available" }, - "east": { "id": "ruin_to_ruin", "type": "available" }, - "south": { "id": "ruin_to_ruin", "type": "available" }, - "west": { "id": "ruin_to_ruin", "type": "available" } - } - }, - "root": "ruin_core", - "phases": [ - [ { "overmap": "ruin_core", "max": 1 } ], - [ { "overmap": "ruin_core", "max": 2 }, { "overmap": "ruin_line", "max": 10 } ], - [ { "overmap": "ruin_core", "max": 5 }, { "overmap": "ruin_line", "max": 10 } ], - [ { "overmap": "ruin_termination", "weight": 1000 } ] - ] - } -] diff --git a/data/mods/Aftershock/maps/overmap_terrain.json b/data/mods/Aftershock/maps/overmap_terrain.json index 1c66b6f0f4..72ecf1da96 100644 --- a/data/mods/Aftershock/maps/overmap_terrain.json +++ b/data/mods/Aftershock/maps/overmap_terrain.json @@ -83,16 +83,6 @@ "extras": "marloss", "flags": [ "NO_ROTATE", "RISK_HIGH" ] }, - { - "type": "overmap_terrain", - "id": [ "afs_formless_ruins_dynamic" ], - "name": "formless ruins", - "spawns": { "group": "GROUP_ZOMBIE", "population": [ 1, 4 ], "chance": 50 }, - "sym": "r", - "color": "light_gray", - "flags": [ "SIDEWALK" ], - "see_cost": 3 - }, { "type": "overmap_terrain", "id": [ diff --git a/data/mods/Aftershock/region_settings.json b/data/mods/Aftershock/region_settings.json index 35f0570f43..a6ebcaef68 100644 --- a/data/mods/Aftershock/region_settings.json +++ b/data/mods/Aftershock/region_settings.json @@ -13,8 +13,7 @@ "office_tower_hiddenlab": 800, "afs_astrobiology_lab": 300, "mall": 700 - }, - "houses": { "afs_city_ruinfield": 200, "afs_formless_ruins_dynamic": 300, "afs_house_1": 100 } + } }, "map_extras": { "road": {