From 22ed27c57eafae418aff1a2304fc94f1024b9031 Mon Sep 17 00:00:00 2001 From: Marc Date: Wed, 29 May 2024 01:23:16 -0600 Subject: [PATCH 01/14] Begin implementation. Add Reinforced Display Cases. Add Domestic Robot Itemgroup. Start to Add Habblock palette and mapgen --- .../Aftershock/itemgroups/robot_storage.json | 13 + .../furniture_habitat.json | 92 +++ .../habbitat_blocks/habbitat_block_1.json | 588 ++++++++++++++++++ .../mapgen_pallete/afs_habbitat_block.json | 89 +++ data/mods/Aftershock/ter_fur_transform.json | 8 +- 5 files changed, 789 insertions(+), 1 deletion(-) create mode 100644 data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json create mode 100644 data/mods/Aftershock/maps/mapgen_pallete/afs_habbitat_block.json diff --git a/data/mods/Aftershock/itemgroups/robot_storage.json b/data/mods/Aftershock/itemgroups/robot_storage.json index d8ea0d316905d..aa071f7a8c59f 100644 --- a/data/mods/Aftershock/itemgroups/robot_storage.json +++ b/data/mods/Aftershock/itemgroups/robot_storage.json @@ -5,5 +5,18 @@ "//": "Old and mostly broken industrial bots, its meant to spawn in recharging stations, so it only places a single bot.", "subtype": "distribution", "items": [ [ "bot_light_hack", 10 ], [ "broken_hazmatbot", 60 ], [ "broken_utilibot_const", 120 ] ] + }, + { + "id": "domestic_bot_storage", + "type": "item_group", + "//": "Small Consumer and commercial grade robots that can (probably) fit in the reinforced display cases." + "subtype": "distribution", + "items": [ + [ "bot_light_hack", 20 ], + [ "bot_skitterbot_rat", 10 ], + [ "bot_eyebot_heater", 5 ], + [ "bot_eyebot", 20] , + [ "bot_skitterbot_hunter", 5] + ] } ] diff --git a/data/mods/Aftershock/maps/furniture_and_terrain/furniture_habitat.json b/data/mods/Aftershock/maps/furniture_and_terrain/furniture_habitat.json index 32095b43deac5..3b3f6475c0f0e 100644 --- a/data/mods/Aftershock/maps/furniture_and_terrain/furniture_habitat.json +++ b/data/mods/Aftershock/maps/furniture_and_terrain/furniture_habitat.json @@ -248,5 +248,97 @@ { "item": "afs_circuitry_1", "count": [ 1, 2 ] } ] } + }, + { + "type": "furniture", + "id": "f_reinforced_displaycase", + "name": "reinforced display case", + "looks_like": "f_rack", + "description": "A secure metal case at about waist-height, with reinforced glass panelling on top. Useful for storing valuable things while still showing them off. Secured with an electronic lock.", + "symbol": "#", + "color": "light_cyan", + "move_cost_mod": 2, + "coverage": 80, + "required_str": 10, + "flags": [ "TRANSPARENT", "SEALED", "PLACE_ITEM" ], + "rotates_to": "INDOORFLOOR", + "examine_action": { + "type": "effect_on_condition", + "effect_on_conditions": [ + { + "id": "EOC_unlock_afs_display_case", + "effect": [ + { "math": [ "_t_delay", "=", "time('20 m')" ] }, + { + "run_eoc_with": "EOC_start_lock_hack", + "variables": { "furn_pos": { "context_val": "pos" }, "t_delay": { "context_val": "t_delay" }, "difficulty": "12" }, + "alpha_talker": "avatar" + } + ] + } + ] + }, + "bash": { + "str_min": 80, + "str_max": 180, + "sound": "glass breaking!", + "sound_fail": "whack!", + "sound_vol": 16, + "sound_fail_vol": 12, + "furn_set": "f_displaycase_b", + "items": [ { "item": "glass_shard", "count": [ 25, 50 ] } ] + }, + "shoot": { "reduce_damage": [ 2, 12 ], "reduce_damage_laser": [ 0, 7 ], "destroy_damage": [ 40, 120 ], "no_laser_destroy": true } + }, + { + "type": "furniture", + "id": "f_reinforced_displaycase_o", + "name": "reinforced display case", + "looks_like": "f_rack", + "description": "A secure metal case at about waist-height, with reinforced glass panelling on top. Useful for storing valuable things while still showing them off. This one had its lock hacked and is open.", + "symbol": "#", + "color": "light_cyan", + "move_cost_mod": 2, + "coverage": 80, + "required_str": 10, + "flags": [ "TRANSPARENT", "PLACE_ITEM" ], + "rotates_to": "INDOORFLOOR", + "bash": { + "str_min": 80, + "str_max": 180, + "sound": "glass breaking!", + "sound_fail": "whack!", + "sound_vol": 16, + "sound_fail_vol": 12, + "furn_set": "f_displaycase_b", + "items": [ { "item": "glass_shard", "count": [ 25, 50 ] } ] + }, + "shoot": { "reduce_damage": [ 2, 12 ], "reduce_damage_laser": [ 0, 7 ], "destroy_damage": [ 40, 120 ], "no_laser_destroy": true } + }, + { + "type": "furniture", + "id": "f_reinforced_displaycase_b", + "name": "broken display case", + "looks_like": "f_rack", + "description": "A secure metal case at about waist-height, with reinforced glass panelling on top. Would be useful for storing valuable things while still showing them off, if the glass hadn't been shattered.", + "symbol": "#", + "color": "light_cyan", + "move_cost_mod": 2, + "coverage": 80, + "required_str": 10, + "flags": [ "TRANSPARENT", "PLACE_ITEM" ], + "rotates_to": "INDOORFLOOR", + "bash": { + "str_min": 30, + "str_max": 150, + "sound": "metal screeching!", + "sound_fail": "clang!", + "items": [ + { "item": "scrap", "count": [ 8, 12 ] }, + { "item": "pipe", "count": [ 0, 3 ] }, + { "item": "sheet_metal", "count": [ 0, 3 ] }, + { "item": "sheet_metal_small", "count": [ 2, 10 ] } + ] + } } ] diff --git a/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json b/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json new file mode 100644 index 0000000000000..d068453f5efb2 --- /dev/null +++ b/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json @@ -0,0 +1,588 @@ +[ + { + "type": "mapgen", + "method": "json", + "om_terrain": [ [ "afs_habblock_1_a1", "afs_hablock_1_a2" ] ], + "object": { + "fill_ter": "t_metal_floor", + "rows": [ + " %%%%%%%%%%%%%''''''''''''''''''''''''''''''''' ", + " %%%%%%%%%%%%%'__'///______///_/'''/_///____/// ", + " %%%%%%%%%%%%%'__'/./======/y/__'''__/./====/./ ", + " %%%*%%%%*%%%%'__'/.hyh.hyh.h////!////......../ ", + " %%%*%%%%*%%%%''''=.hyh.hyh...h/.../..........= ", + " %%%*%%%%*%%%%'__'=...........y/.../..........= ", + " %%%*%%%%*%%%%'__'/...........h//!//........../ ", + " %%%*%%%%*%%%%'__'/..h.h.hyh.../...!........../ ", + " %%%*%%%%*%%%%''''/gCCCC/////!!/.../////////!// ", + " '''''''''''''''''/...../GGG/....../^&/^&/..../ ", + " ''''''''''''''''+...........................+ ", + " ///=/////=/////=/////////!//.................+ ", + " /@@..:~/f.@@/@@..:~/f.@@/../.................+ ", + " #...f///o.../...o///o.../!//#//..............+ ", + " /yh.o/~:..hy/yh.f/~:..hy/../ca/..............+ ", + " ///://///://///://///:///../../..............+ ", + " =>........................./../..............+ ", + " =>.........................!..#..............+ ", + " ///://///://///://///://////.c/..............+ ", + " /yh.f/~:..hy/hy.o/~:..hy/....w/..............+ ", + " #...o///o.../...f///f.../EA.W//..............+ ", + " /@@..:~/f.@@/@@..:~/o.@@///#//++++++++++++++++ ", + " ///=/////=/////=/////=///>[[ ", + " [[[[[[[[[[[[[[[[[[[[[[[[[[[ " + ] + "palettes": [ "afs_habitat_structure", "afs_habitat_block" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ [ "afs_habblock_1_roof_a1", "afs_hablock_1roof__a2" ] ], + "object": { + "fill_ter": "t_metal_floor", + "rows": [ + " ", + " ", + " ", + " ", + " ..... ", + " ..... ", + " ..... ", + " ..... ", + " ..... ", + " ", + " ", + " ............................ ", + " ............................ ", + " ............................... ", + " ............................... ", + " ............................... ", + " ............................... ", + " ............................... ", + " ............................... ", + " ............................... ", + " ............................... ", + " .............................. ", + " ......................... ", + " " + ], + "palettes": [ "roof_palette" ] + } + }, + +Slot 2 Grocer +" ", +" ", +" n n ", +" ", +" ááá á CgC ", +" á C n ", +" ááá n Châ ", +" C â ", +" ", +" á á ", +" á á ", +" ", +" h ", +" $kc ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" " + +Slot 2 Library +" ", +" ", +" H H ", +" ", +" éé éé ää A ", +" é éé ää y ", +" é éé ää A ", +" 5 ", +" ", +" ch c ", +" k k ", +" ", +" h ", +" kkc ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" " + +Slot 2 Home Robotics Store +" ", +" ", +" n n ", +" ënë ë ", +" ë n ", +" n êêê ë ", +" ë êêê CCcC ", +" g h ", +" ", +" kk ê ", +" kh ê ", +" ", +" h ", +" $kc ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" " + +Slot 2 Self Defense Store +" ", +" ", +" n n ", +" ï î C ", +" ñ í C ", +" ñ í ï î Cg ", +" ñ í ", +" AAAA n ", +" ", +" ñ í ", +" ñ í ", +" ", +" h ", +" ck$ ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" " + +Slot 2 Clothes Store +" ", +" ", +" m n ", +" mnm CC ", +" b/ Ch ", +" : nrrr C ", +" // nrrr Cg ", +" ", +" ", +" rr r ", +" r r ", +" ", +" h ", +" ck$ ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" " + +Slot 2 Hardware Store +" ", +" ", +" n n ", +" ó ó ó ", +" hC ó ó ó ", +" C ó n ó ", +" gC ", +" óóóó n ", +" ", +" ó y ", +" ó y ", +" ", +" h ", +" ck$ ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" " + +Slot 2 Pharmacy +" ", +" ", +" n c ", +" c yyy ", +" bb g ", +" b n/ õ õ ", +" n C õ õ ", +" c õ õ ", +" ", +" ö ö ", +" ö ö ", +" ", +" h ", +" ck$ ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" " + +Slot 3 Indoor Garden +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" == == ", +" =p ppp ", +" =p ", +" p pp ", +" pp pp ", +" úúú/c ", +" : pppp ", +" ", +" ", +" " + +Slot 3 Arcade +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" == ", +" =d chR ", +" = C R ", +" d CgC ", +" d ", +" ^ / 5 ", +" & : d5d dvd ", +" ", +" ", +" " + +Slot 3 Suana +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" =5 /bb ", +" =b : ", +" b /bb ", +" = /// ", +" l : Cc/ l ", +" b /ûû : b ", +" ", +" ", +" " + +Slot 3 Resident Storage Lockers +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" c c l ", +" l ", +" yy / ", +" 5 yy l ", +" l ", +" ll/lll/lll/ ", +" ", +" ", +" " + +Slot 3 Gym +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" === ", +" = T T ", +" = ", +" P P ", +" ", +" ^ /rr ", +" & : E E E ", +" ", +" ", +" " +E excersive +T treadmill +P punching bag +r Rack + +Near Barren Roof +" ", +" ", +" ", +" X X ", +"h hyyh ", +"y ", +"h ", +" ", +" ", +" ", +" ", +" ", +" hyh ", +" ", +" A == & ", +" ", +" ", +" & ", +" ", +" A == ", +" ", +" ", +" ", +" " +h chair +y table +"X": "f_small_satelitte_dish", +A Air Conditioner +"=": "f_vent_pipe", +"&": "f_roof_turbine_vent", + + +Solar Roof +" ", +" ", +" ", +" X ", +"A == ", +" MMMM MMMM MMMM ", +"A == MMMM MMMM MMMM ", +" ", +" MMMM MMMM MMMM ", +" MMMM MMMM MMMM ", +" ", +" ", +" ", +" ///!/////////// ", +" '''' ' ''''/ ", +" ' ' ' / ", +" '' ' ' ' ''/ ", +" ' ' ' ' ' / ", +" '' ' ' ' ''/ ", +" ' ' ' / ", +" '''' ' ''''/ ", +" /////////////// ", +" ", +" " +A Air Conditioner +/ prefab wall +' sidewalk +! metal door +"=": "f_vent_pipe", +"M": "f_solar_unit", +"X": "f_small_satelitte_dish", + +Xeno Garden Roof +" ", +" ", +" 6 6 ", +" 666 666666 ", +" 66666 6666666 ", +" 666 666 ", +" 666 bbb 6 ", +" 66666 66666 66 ", +" 66666 666666 66666 ", +" bbb 6666 666666 ", +" 666 666666 ", +" b666 66 66 ", +" b666 6 6 ", +" b666 6 ", +" 666 6 ", +" 666 66 ", +" 666 6666 ", +" 66 66666 ", +" 66 666666 ", +" 66666bbb ", +" 6666666 ", +" ", +" ", +" " + +b Bench +6 Alien Plants + + +Community Garden Roof +" ", +" ", +" ", +" ", +" 666666 66 777777777 ", +" 666666 66 777787777 ", +" ", +" 666666 66 777777777 ", +" 666666 66 777787777 ", +" ", +" ", +" 77 77 77 66 ", +" W 77 77 77 66 ", +" W 77 77 77 66 ", +" 87 87 87 66 ", +" 77 77 77 66 ", +" y 77 77 77 66 ", +" y 77 77 77 66 ", +" y ", +" ", +" ", +" ", +" ", +" " + +6 Alien Plant +7 Planter Box +8 Microterraforming Mill +y Table (Gardening SUpplies) +W Water Tanks (Dirty) + +Helipad Roof +" ", +" ", +" i I ", +" ", +" 7i Ii ", +" MM AA 7I i i ", +" MM 777777 7777 ", +" MM ", +" ", +" 7777 77777 ", +" 7 ", +" 7 66666666 ", +" X 7 6 6 ", +" 7 6 6 6 6 ", +" 7 6 6 6 6 ", +" = 7 6 6666 6 ", +" = 7 6 6 6 6 ", +" 7 6 6 6 6 ", +" 7 6 6 ", +" 7 66666666 ", + 7 ", +" ", +" ", +" " + +7 Metal Railing +6 Sidewalk +I Sealed Intermodal Crate +i Open Intermodal Crate +A f_air_conditioner +M f_solar_unit +"X": "f_small_satelitte_dish", +"=": "f_vent_pipe", + + +] \ No newline at end of file diff --git a/data/mods/Aftershock/maps/mapgen_pallete/afs_habbitat_block.json b/data/mods/Aftershock/maps/mapgen_pallete/afs_habbitat_block.json new file mode 100644 index 0000000000000..7541ad8da40c9 --- /dev/null +++ b/data/mods/Aftershock/maps/mapgen_pallete/afs_habbitat_block.json @@ -0,0 +1,89 @@ +[ + { + "type": "palette", + "id": "afs_habitat_block", + "terrain": { + ",": "t_metal_floor_olight_inactive", + "'": "t_sidewalk", + "%": "t_pavement", + "*": "t_pavement_y", + "_": "t_region_shrub_decorative" + "+": "t_metal_railing" + "[": "t_floor_metal_gangway" + "A": "t_atm" + }, + "furniture": { + "á": "f_rack", + "â": "f_rack", + "ä": "f_bookcase", + "é": "f_bookcase", + "ê": "f_rack", + "ë": "f_reinforced_displaycase", + "í": "f_rack", + "î": "f_reinforced_displaycase", + "ï": "f_reinforced_displaycase", + "ñ": "f_rack", + "ś": "f_rack", + "ó": "f_rack", + "õ": "f_rack", + "ö": "f_rack", + "ú": "f_rack", + "û": "f_rack", + "r": "f_clothing_rail", + "R": "f_rack", + "m": "f_mannequin", + "5": "f_indoor_plant" + "g": "f_counter_gate_c" + "o": "afs_kitchenette", + "p": "f_planter", + "f": "f_fridge", + "C": "f_counter", + "c": [ ["f_console_broken", 1], ["f_console", 3] ], + "@": "f_sleep_pod", + "y": "f_table", + "h": "f_chair", + "H": "f_armchair", + "b": "f_bench", + "s": "f_washer", + "D": "f_dryer", + "E": "f_ECU", + "A": "f_atmospheric_control", + "a": "f_air_filter", + "W": "f_water_heater", + "w": "f_water_purifier", + "n": "f_screen_mirror", + "k": "f_desk", + "$": "f_safe", + "v": "f_trashcan", + "d": "f_arcade_machine", + "l": "f_locker", + "L": "f_locker" + }, + "liquids": { "W": { "liquid": "water_clean", "amount": [ 0, 100 ] } }, + "items": { + { "á": { "item": "afs_old_food_storage", "chance": 60, "repeat": [ 2, 5 ] } }, + { "â": { "item": "afs_tools_electric_repair", "chance": 60, "repeat": [1, 3] } }, + { "ä": { "item": "manuals", "chance": 60, "repeat": [1,4] } }, + { "é": { "item": "literature", "chance": 80, "repeat": [5,12] } }, + { "ê": { "item": "afs_tools_robot_maintenance", "chance": 60, "repeat": [ 1, 3 ] } }, + { "ë": { "item": "domestic_bot_storage", "chance": 30} }, + { "í": { "item": "afs_any_ballistic_ammo", "chance": 60, "repeat": [ 3,6 ] } }, + { "î": { "item": "afs_any_ballistic_gun", "chance": 80} }, + { "ï": { "item": "afs_civilian_energy_gun", "chance": 80} }, + { "ñ": { "item": "afs_civilian_energy_mag", "chance": 60, "repeat": [ 1,4 ] } }, + { "ś": { "item": "afs_armor_spaceship_crew_g", "chance": 60 } }, + { "ó": { "item": "afs_tools_structural_repair", "chance": 60, "repeat": [1,3] } }, + { "õ": { "item": "softdrugs", "chance": 80, "repeat": [2,6] } }, + { "ö": { "item": "drugs_rare", "chance": 80, "repeat": [1,4] } }, + { "ú": { "item": "tools_earthworking", "chance": 40, "repeat": [1,2] } }, + { "û": { "item": "sauna", "chance": 80, "repeat": [3,7 } }, + { "f": { "item": "afs_old_food_storage", "chance": 60 } }, + { "o": { "item": "afs_kitchenette", "chance": 60 } }, + { "$": { "item": "afs_cash_safe" } }, + { "m": { "item": "afs_colonist_outfit" } }, + { "l": { "item": "afs_colonist_outfit" } }, + { "r": { "item": "afs_colonist_outfit", "chance": 60, "repeat": [ 1,2 ] } }, + }, + "vendingmachines": { "V": { "item_group": "afs_vending_false_meals", "reinforced": true } } + } +] \ No newline at end of file diff --git a/data/mods/Aftershock/ter_fur_transform.json b/data/mods/Aftershock/ter_fur_transform.json index d8c025d2f9a77..464ed6231881e 100644 --- a/data/mods/Aftershock/ter_fur_transform.json +++ b/data/mods/Aftershock/ter_fur_transform.json @@ -9,7 +9,13 @@ "valid_furniture": [ "f_sealed_intermodal_crate" ], "message": "The shipping crate bolts slide back and the lid pops open.", "message_good": true - } + }, + { + "result": "f_reinforced_displaycase_o", + "valid_furniture": [ "f_reinforced_displaycase" ], + "message": "A panel of reinforced glass receeds into the case.", + "message_good": true + } ] }, { From 29fe57bc27b9d4e267a12a98587116a9630b602d Mon Sep 17 00:00:00 2001 From: Marc Date: Wed, 29 May 2024 10:58:35 -0600 Subject: [PATCH 02/14] Fix Robotics Shops spawning broken lab defense bot. Hab Block 1 now spawns in Exoplanet. Complete Core implementation of Hab block 1. Adjust Hacking difficulty on Reinforced Glass Case. Lint Json. --- .../Aftershock/itemgroups/robot_storage.json | 16 +- data/mods/Aftershock/maps/city_buildings.json | 13 + .../furniture_habitat.json | 8 +- .../habbitat_blocks/habbitat_block_1.json | 1345 ++++++++++------- .../mapgen_pallete/afs_habbitat_block.json | 188 +-- .../mods/Aftershock/maps/overmap_terrain.json | 18 + .../aftershock_exoplanet/region_settings.json | 2 +- 7 files changed, 899 insertions(+), 691 deletions(-) diff --git a/data/mods/Aftershock/itemgroups/robot_storage.json b/data/mods/Aftershock/itemgroups/robot_storage.json index aa071f7a8c59f..a185cb44e324a 100644 --- a/data/mods/Aftershock/itemgroups/robot_storage.json +++ b/data/mods/Aftershock/itemgroups/robot_storage.json @@ -7,16 +7,10 @@ "items": [ [ "bot_light_hack", 10 ], [ "broken_hazmatbot", 60 ], [ "broken_utilibot_const", 120 ] ] }, { - "id": "domestic_bot_storage", - "type": "item_group", - "//": "Small Consumer and commercial grade robots that can (probably) fit in the reinforced display cases." - "subtype": "distribution", - "items": [ - [ "bot_light_hack", 20 ], - [ "bot_skitterbot_rat", 10 ], - [ "bot_eyebot_heater", 5 ], - [ "bot_eyebot", 20] , - [ "bot_skitterbot_hunter", 5] - ] + "id": "domestic_bot_storage", + "type": "item_group", + "//": "Small Consumer and commercial grade robots that can (probably) fit in the reinforced display cases.", + "subtype": "distribution", + "items": [ [ "bot_light_hack", 20 ], [ "bot_skitterbot_rat", 10 ], [ "bot_eyebot_heater", 5 ], [ "bot_skitterbot_hunter", 5 ] ] } ] diff --git a/data/mods/Aftershock/maps/city_buildings.json b/data/mods/Aftershock/maps/city_buildings.json index 4a90a924d8324..aa6b1716dc25a 100644 --- a/data/mods/Aftershock/maps/city_buildings.json +++ b/data/mods/Aftershock/maps/city_buildings.json @@ -133,6 +133,19 @@ ], "locations": [ "land" ] }, + { + "id": "afs_habbitat_block_1", + "type": "city_building", + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "afs_habblock_1_a1_north" }, + { "point": [ 1, 0, 0 ], "overmap": "afs_hablock_1_a2_north" }, + { "point": [ 0, 0, 1 ], "overmap": "afs_habblock_1_floor2_a1_north" }, + { "point": [ 1, 0, 1 ], "overmap": "afs_hablock_1_floor2_a2_north" }, + { "point": [ 0, 0, 2 ], "overmap": "afs_habblock_1_roof_a1_north" }, + { "point": [ 1, 0, 2 ], "overmap": "afs_hablock_1_roof_a2_north" } + ], + "locations": [ "land" ] + }, { "id": "afs_shuttle_pad", "type": "city_building", diff --git a/data/mods/Aftershock/maps/furniture_and_terrain/furniture_habitat.json b/data/mods/Aftershock/maps/furniture_and_terrain/furniture_habitat.json index 3b3f6475c0f0e..de20b5870cceb 100644 --- a/data/mods/Aftershock/maps/furniture_and_terrain/furniture_habitat.json +++ b/data/mods/Aftershock/maps/furniture_and_terrain/furniture_habitat.json @@ -262,7 +262,7 @@ "required_str": 10, "flags": [ "TRANSPARENT", "SEALED", "PLACE_ITEM" ], "rotates_to": "INDOORFLOOR", - "examine_action": { + "examine_action": { "type": "effect_on_condition", "effect_on_conditions": [ { @@ -271,7 +271,7 @@ { "math": [ "_t_delay", "=", "time('20 m')" ] }, { "run_eoc_with": "EOC_start_lock_hack", - "variables": { "furn_pos": { "context_val": "pos" }, "t_delay": { "context_val": "t_delay" }, "difficulty": "12" }, + "variables": { "furn_pos": { "context_val": "pos" }, "t_delay": { "context_val": "t_delay" }, "difficulty": "10" }, "alpha_talker": "avatar" } ] @@ -288,7 +288,7 @@ "furn_set": "f_displaycase_b", "items": [ { "item": "glass_shard", "count": [ 25, 50 ] } ] }, - "shoot": { "reduce_damage": [ 2, 12 ], "reduce_damage_laser": [ 0, 7 ], "destroy_damage": [ 40, 120 ], "no_laser_destroy": true } + "shoot": { "reduce_damage": [ 2, 12 ], "reduce_damage_laser": [ 0, 7 ], "destroy_damage": [ 40, 120 ], "no_laser_destroy": true } }, { "type": "furniture", @@ -313,7 +313,7 @@ "furn_set": "f_displaycase_b", "items": [ { "item": "glass_shard", "count": [ 25, 50 ] } ] }, - "shoot": { "reduce_damage": [ 2, 12 ], "reduce_damage_laser": [ 0, 7 ], "destroy_damage": [ 40, 120 ], "no_laser_destroy": true } + "shoot": { "reduce_damage": [ 2, 12 ], "reduce_damage_laser": [ 0, 7 ], "destroy_damage": [ 40, 120 ], "no_laser_destroy": true } }, { "type": "furniture", diff --git a/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json b/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json index d068453f5efb2..112039aed71d1 100644 --- a/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json +++ b/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json @@ -1,588 +1,759 @@ [ - { - "type": "mapgen", - "method": "json", - "om_terrain": [ [ "afs_habblock_1_a1", "afs_hablock_1_a2" ] ], - "object": { - "fill_ter": "t_metal_floor", - "rows": [ - " %%%%%%%%%%%%%''''''''''''''''''''''''''''''''' ", - " %%%%%%%%%%%%%'__'///______///_/'''/_///____/// ", - " %%%%%%%%%%%%%'__'/./======/y/__'''__/./====/./ ", - " %%%*%%%%*%%%%'__'/.hyh.hyh.h////!////......../ ", - " %%%*%%%%*%%%%''''=.hyh.hyh...h/.../..........= ", - " %%%*%%%%*%%%%'__'=...........y/.../..........= ", - " %%%*%%%%*%%%%'__'/...........h//!//........../ ", - " %%%*%%%%*%%%%'__'/..h.h.hyh.../...!........../ ", - " %%%*%%%%*%%%%''''/gCCCC/////!!/.../////////!// ", - " '''''''''''''''''/...../GGG/....../^&/^&/..../ ", - " ''''''''''''''''+...........................+ ", - " ///=/////=/////=/////////!//.................+ ", - " /@@..:~/f.@@/@@..:~/f.@@/../.................+ ", - " #...f///o.../...o///o.../!//#//..............+ ", - " /yh.o/~:..hy/yh.f/~:..hy/../ca/..............+ ", - " ///://///://///://///:///../../..............+ ", - " =>........................./../..............+ ", - " =>.........................!..#..............+ ", - " ///://///://///://///://////.c/..............+ ", - " /yh.f/~:..hy/hy.o/~:..hy/....w/..............+ ", - " #...o///o.../...f///f.../EA.W//..............+ ", - " /@@..:~/f.@@/@@..:~/o.@@///#//++++++++++++++++ ", - " ///=/////=/////=/////=///>[[ ", - " [[[[[[[[[[[[[[[[[[[[[[[[[[[ " - ] - "palettes": [ "afs_habitat_structure", "afs_habitat_block" ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ [ "afs_habblock_1_roof_a1", "afs_hablock_1roof__a2" ] ], - "object": { - "fill_ter": "t_metal_floor", - "rows": [ - " ", - " ", - " ", - " ", - " ..... ", - " ..... ", - " ..... ", - " ..... ", - " ..... ", - " ", - " ", - " ............................ ", - " ............................ ", - " ............................... ", - " ............................... ", - " ............................... ", - " ............................... ", - " ............................... ", - " ............................... ", - " ............................... ", - " ............................... ", - " .............................. ", - " ......................... ", - " " - ], - "palettes": [ "roof_palette" ] - } - }, - -Slot 2 Grocer -" ", -" ", -" n n ", -" ", -" ááá á CgC ", -" á C n ", -" ááá n Châ ", -" C â ", -" ", -" á á ", -" á á ", -" ", -" h ", -" $kc ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" " - -Slot 2 Library -" ", -" ", -" H H ", -" ", -" éé éé ää A ", -" é éé ää y ", -" é éé ää A ", -" 5 ", -" ", -" ch c ", -" k k ", -" ", -" h ", -" kkc ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" " - -Slot 2 Home Robotics Store -" ", -" ", -" n n ", -" ënë ë ", -" ë n ", -" n êêê ë ", -" ë êêê CCcC ", -" g h ", -" ", -" kk ê ", -" kh ê ", -" ", -" h ", -" $kc ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" " - -Slot 2 Self Defense Store -" ", -" ", -" n n ", -" ï î C ", -" ñ í C ", -" ñ í ï î Cg ", -" ñ í ", -" AAAA n ", -" ", -" ñ í ", -" ñ í ", -" ", -" h ", -" ck$ ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" " - -Slot 2 Clothes Store -" ", -" ", -" m n ", -" mnm CC ", -" b/ Ch ", -" : nrrr C ", -" // nrrr Cg ", -" ", -" ", -" rr r ", -" r r ", -" ", -" h ", -" ck$ ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" " - -Slot 2 Hardware Store -" ", -" ", -" n n ", -" ó ó ó ", -" hC ó ó ó ", -" C ó n ó ", -" gC ", -" óóóó n ", -" ", -" ó y ", -" ó y ", -" ", -" h ", -" ck$ ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" " - -Slot 2 Pharmacy -" ", -" ", -" n c ", -" c yyy ", -" bb g ", -" b n/ õ õ ", -" n C õ õ ", -" c õ õ ", -" ", -" ö ö ", -" ö ö ", -" ", -" h ", -" ck$ ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" " - -Slot 3 Indoor Garden -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" == == ", -" =p ppp ", -" =p ", -" p pp ", -" pp pp ", -" úúú/c ", -" : pppp ", -" ", -" ", -" " - -Slot 3 Arcade -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" == ", -" =d chR ", -" = C R ", -" d CgC ", -" d ", -" ^ / 5 ", -" & : d5d dvd ", -" ", -" ", -" " - -Slot 3 Suana -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" =5 /bb ", -" =b : ", -" b /bb ", -" = /// ", -" l : Cc/ l ", -" b /ûû : b ", -" ", -" ", -" " - -Slot 3 Resident Storage Lockers -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" c c l ", -" l ", -" yy / ", -" 5 yy l ", -" l ", -" ll/lll/lll/ ", -" ", -" ", -" " - -Slot 3 Gym -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" === ", -" = T T ", -" = ", -" P P ", -" ", -" ^ /rr ", -" & : E E E ", -" ", -" ", -" " -E excersive -T treadmill -P punching bag -r Rack - -Near Barren Roof -" ", -" ", -" ", -" X X ", -"h hyyh ", -"y ", -"h ", -" ", -" ", -" ", -" ", -" ", -" hyh ", -" ", -" A == & ", -" ", -" ", -" & ", -" ", -" A == ", -" ", -" ", -" ", -" " -h chair -y table -"X": "f_small_satelitte_dish", -A Air Conditioner -"=": "f_vent_pipe", -"&": "f_roof_turbine_vent", - - -Solar Roof -" ", -" ", -" ", -" X ", -"A == ", -" MMMM MMMM MMMM ", -"A == MMMM MMMM MMMM ", -" ", -" MMMM MMMM MMMM ", -" MMMM MMMM MMMM ", -" ", -" ", -" ", -" ///!/////////// ", -" '''' ' ''''/ ", -" ' ' ' / ", -" '' ' ' ' ''/ ", -" ' ' ' ' ' / ", -" '' ' ' ' ''/ ", -" ' ' ' / ", -" '''' ' ''''/ ", -" /////////////// ", -" ", -" " -A Air Conditioner -/ prefab wall -' sidewalk -! metal door -"=": "f_vent_pipe", -"M": "f_solar_unit", -"X": "f_small_satelitte_dish", - -Xeno Garden Roof -" ", -" ", -" 6 6 ", -" 666 666666 ", -" 66666 6666666 ", -" 666 666 ", -" 666 bbb 6 ", -" 66666 66666 66 ", -" 66666 666666 66666 ", -" bbb 6666 666666 ", -" 666 666666 ", -" b666 66 66 ", -" b666 6 6 ", -" b666 6 ", -" 666 6 ", -" 666 66 ", -" 666 6666 ", -" 66 66666 ", -" 66 666666 ", -" 66666bbb ", -" 6666666 ", -" ", -" ", -" " - -b Bench -6 Alien Plants - - -Community Garden Roof -" ", -" ", -" ", -" ", -" 666666 66 777777777 ", -" 666666 66 777787777 ", -" ", -" 666666 66 777777777 ", -" 666666 66 777787777 ", -" ", -" ", -" 77 77 77 66 ", -" W 77 77 77 66 ", -" W 77 77 77 66 ", -" 87 87 87 66 ", -" 77 77 77 66 ", -" y 77 77 77 66 ", -" y 77 77 77 66 ", -" y ", -" ", -" ", -" ", -" ", -" " - -6 Alien Plant -7 Planter Box -8 Microterraforming Mill -y Table (Gardening SUpplies) -W Water Tanks (Dirty) - -Helipad Roof -" ", -" ", -" i I ", -" ", -" 7i Ii ", -" MM AA 7I i i ", -" MM 777777 7777 ", -" MM ", -" ", -" 7777 77777 ", -" 7 ", -" 7 66666666 ", -" X 7 6 6 ", -" 7 6 6 6 6 ", -" 7 6 6 6 6 ", -" = 7 6 6666 6 ", -" = 7 6 6 6 6 ", -" 7 6 6 6 6 ", -" 7 6 6 ", -" 7 66666666 ", - 7 ", -" ", -" ", -" " - -7 Metal Railing -6 Sidewalk -I Sealed Intermodal Crate -i Open Intermodal Crate -A f_air_conditioner -M f_solar_unit -"X": "f_small_satelitte_dish", -"=": "f_vent_pipe", - - -] \ No newline at end of file + { + "type": "mapgen", + "method": "json", + "om_terrain": [ [ "afs_habblock_1_a1", "afs_hablock_1_a2" ] ], + "object": { + "fill_ter": "t_metal_floor", + "rows": [ + " ¢¢¢¢ ¢ ¢¢¢ '' ''' ''''''' ''' ''' '''' ' ", + " ¢ ¢ ¢¢¢ ¢¢ '__'///______///_/' '/_///____/// ", + " ¢¢ ¢¢ ¢¢ ¢¢'__'/./======/y/__'''__/±/====/±/ ", + " ¢¢£¢¢ ¢£¢ ¢¢'__'/.hyh.hyh.h////!////±±±±±±±±/ ", + " ¢ ¢£¢ ¢ £¢¢ ¢' ''=.hyh.hyh...h/.../±±±±±±±±±±= ", + " ¢ ¢£ ¢¢ ¢'__'=...........y/.../±±±±±±±±±±= ", + " ¢ £¢¢ ¢£¢ ¢¢'__'/...........h//!//±±±±±±±±±±/ ", + " ¢ ¢£¢ ¢ ¢¢¢ '__'/..h.h.hyh.../...!±±±±±±±±±±/ ", + " ¢¢¢£¢¢ ¢£¢ ¢¢' '/gCCCC/////!!/.../////////!// ", + " ''' ' '' '''' ' '/...../ááá/....../^&/^&/±±±±/ ", + " '''' ' ' ' '''+°°°°°™°°°°™™°°°™°°°°™°°°™°°+ ", + " ///=/////=/////=/////////!//°°°°°°™°°°°°°°°°°+ ", + " /@@..:~/f.@@/@@..:~/f.@@/../°°°°°™™™°°™°°°™°°+ ", + " #j..f///o..j/j..o///o..j/!//#//™°°™™°°°°°™™°°+ ", + " /yh.o/~:..hy/yh.f/~:..hy/.5/ca/™°°°™°°°°™™™°°+ ", + " ///://///://///://///:///../../°°°°°™°°°°°™°°+ ", + " =>........................./../°°°™™™™°°°°°°°+ ", + " =>....5....................!..#°™°°™°°°°°™°°°+ ", + " ///://///://///://///://////.c/™™™°°°°™°™™™™™+ ", + " /yh.f/~:..hy/hy.o/~:..hy/....w/°™™™°°™™°°°™°°+ ", + " #j..o///o..j/j..f///f..j/EA.W//°™°°°°°™°°°™°°+ ", + " /@@..:~/f.@@/@@..:~/o.@@///#//++++++++++++++++ ", + " ///=/////=/////=/////=///>[[ ", + " [[[[[[[[[[[[[[[[[[[[[[[[[[[ " + ], + "palettes": [ "afs_habitat_structure", "afs_habitat_block" ], + "terrain": { " ": "t_open_air" }, + "place_nested": [ + { + "chunks": [ + [ "afs_habblock_1_roof_barren", 20 ], + [ "afs_habblock_1_roof_solar", 20 ], + [ "afs_habblock_1_roof_xeno_garden", 20 ], + [ "afs_habblock_1_roof_garden", 20 ], + [ "afs_habblock_1_roof_helipad", 20 ] + ], + "x": 24, + "y": 0 + } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ [ "afs_habblock_1_roof_a1", "afs_hablock_1_roof_a2" ] ], + "object": { + "fill_ter": "t_metal_floor", + "rows": [ + " ", + " ", + " ", + " ", + " ..... ", + " ..... ", + " ..... ", + " ..... ", + " ..... ", + " ", + " ", + " ............................ ", + " ............................ ", + " ............................... ", + " ............................... ", + " ............................... ", + " ............................... ", + " ............................... ", + " ............................... ", + " ............................... ", + " ............................... ", + " .............................. ", + " ......................... ", + " " + ], + "palettes": [ "roof_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "afs_habblock_1_slot2_grocer", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " n n ", + " ", + " ááá á CgC ", + " á C n ", + " ááá n Châ ", + " C â ", + " ", + " á á ", + " á á ", + " ", + " h ", + " $kc ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "afs_habitat_block" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "afs_habblock_1_slot2_library", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " H H ", + " ", + " éé éé ää A ", + " é éé ää y ", + " é éé ää A ", + " 5 ", + " ", + " ch c ", + " k k ", + " ", + " h ", + " kkc ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "afs_habitat_block" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "afs_habblock_1_slot2_robotics_shop", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " n n ", + " ënë ë ", + " ë n ", + " n êêê ë ", + " ë êêê CCcC ", + " g h ", + " ", + " kk ê ", + " kh ê ", + " ", + " h ", + " $kc ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "afs_habitat_block" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "afs_habblock_1_slot2_civ_gun_shop", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " n n ", + " ï î C ", + " ñ í C ", + " ñ í ï î Cg ", + " ñ í ", + " AAAA n ", + " ", + " ñ í ", + " ñ í ", + " ", + " h ", + " ck$ ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "afs_habitat_block" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "afs_habblock_1_slot2_clothes_shop", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " m n ", + " mnm CC ", + " b/ Ch ", + " : nrrr C ", + " // nrrr Cg ", + " ", + " ", + " rr r ", + " r r ", + " ", + " h ", + " ck$ ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "afs_habitat_block" ], + "terrain": { "/": "t_wall_prefab_metal", ":": "t_door_c" } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "afs_habblock_1_slot2_hardware_shop", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " n n ", + " ó ó ó ", + " hC ó ó ó ", + " C ó n ó ", + " gC ", + " óóóó n ", + " ", + " ó y ", + " ó y ", + " ", + " h ", + " ck$ ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "afs_habitat_block" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "afs_habblock_1_slot2_pharmacy", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " n c ", + " c yyy ", + " bb g ", + " b n/ õ õ ", + " n C õ õ ", + " c õ õ ", + " ", + " ö ö ", + " ö ö ", + " ", + " h ", + " ck$ ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "afs_habitat_block" ], + "terrain": { "/": "t_wall_prefab_metal" } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "afs_habblock_1_slot3_indoor_garden", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " == == ", + " =p ppp ", + " =p ", + " p pp ", + " pp pp ", + " úúú/c ", + " : pppp ", + " ", + " ", + " " + ], + "palettes": [ "afs_habitat_block" ], + "terrain": { "=": "t_wall_prefab_glass", "/": "t_wall_prefab_metal", ":": "t_door_c" } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "afs_habblock_1_slot3_arcade", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " == ", + " =d chR ", + " = C R ", + " d CgC ", + " d ", + " ^ / 5 ", + " & : d5d dvd ", + " ", + " ", + " " + ], + "palettes": [ "afs_habitat_block" ], + "terrain": { "=": "t_wall_prefab_glass", "/": "t_wall_prefab_metal", ":": "t_door_c" }, + "furniture": { "^": "f_sink" }, + "toilets": { "&": { } } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "afs_habblock_1_slot3_sauna", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " =5 /bb ", + " =b : ", + " b /bb ", + " = /// ", + " l : Cc/ l ", + " b /ûû : b ", + " ", + " ", + " " + ], + "palettes": [ "afs_habitat_block" ], + "terrain": { "=": "t_wall_prefab_glass", "/": "t_wall_prefab_metal", ":": "t_door_c" } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "afs_habblock_1_slot3_resident_storage", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " c c l ", + " l ", + " yy / ", + " 5 yy l ", + " l ", + " ll/lll/lll/ ", + " ", + " ", + " " + ], + "palettes": [ "afs_habitat_block" ], + "terrain": { "/": "t_wall_prefab_metal" } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "afs_habblock_1_slot3_gym", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " === ", + " = T T ", + " = ", + " P P ", + " ", + " ^ /RR ", + " & : e e e ", + " ", + " ", + " " + ], + "palettes": [ "afs_habitat_block" ], + "terrain": { "=": "t_wall_prefab_glass", "/": "t_wall_prefab_metal", ":": "t_door_c" }, + "furniture": { "^": "f_sink" }, + "toilets": { "&": { } } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "afs_habblock_1_roof_barren", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " X X ", + "h hyyh ", + "y ", + "h ", + " ", + " ", + " ", + " ", + " ", + " hyh ", + " ", + " A == & ", + " ", + " ", + " & ", + " ", + " A == ", + " ", + " ", + " ", + " " + ], + "palettes": [ "afs_habitat_block" ], + "furniture": { "A": "f_air_conditioner", "=": "f_vent_pipe", "&": "f_roof_turbine_vent", "X": "f_small_satelitte_dish" } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "afs_habblock_1_roof_solar", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " X ", + "A == ", + " MMMM MMMM MMMM ", + "A == MMMM MMMM MMMM ", + " ", + " MMMM MMMM MMMM ", + " MMMM MMMM MMMM ", + " ", + " ", + " ", + " ///!/////////// ", + " '''' ' ''''/ ", + " ' ' ' / ", + " '' ' ' ' ''/ ", + " ' ' ' ' ' / ", + " '' ' ' ' ''/ ", + " ' ' ' / ", + " '''' ' ''''/ ", + " /////////////// ", + " ", + " " + ], + "palettes": [ "afs_habitat_block" ], + "terrain": { "/": "t_wall_prefab_metal", "!": "t_door_metal_c" }, + "furniture": { "A": "f_air_conditioner", "=": "f_vent_pipe", "M": "f_solar_unit", "X": "f_small_satelitte_dish" } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "afs_habblock_1_roof_xeno_garden", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " _ _ ", + " ___ ______ ", + " _____ _______ ", + " ___ ___ ", + " ___ bbb _ ", + " _____ _____ __ ", + " _____ ______ _____ ", + " bbb ____ ______ ", + " ___ ______ ", + " b___ __ __ ", + " b___ _ _ ", + " b___ _ ", + " ___ _ ", + " ___ __ ", + " ___ ____ ", + " __ _____ ", + " __ ______ ", + " _____bbb ", + " _______ ", + " ", + " ", + " " + ], + "palettes": [ "afs_habitat_block" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "afs_habblock_1_roof_garden", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " ______ __ ppppppppp ", + " ______ __ pppp8pppp ", + " ", + " ______ __ ppppppppp ", + " ______ __ pppp8pppp ", + " ", + " ", + " pp pp pp __ ", + " w pp pp pp __ ", + " w pp pp pp __ ", + " 8p 8p 8p __ ", + " pp pp pp __ ", + " ú pp pp pp __ ", + " ú pp pp pp __ ", + " ú ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "afs_habitat_block" ], + "furniture": { "w": "f_standing_tank" }, + "liquids": { "w": { "liquid": "water", "amount": [ 0, 100 ] } } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "afs_habblock_1_roof_helipad", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " i I ", + " ", + " +i Ii ", + " MM AA +I i i ", + " MM ++++++ ++++ ", + " MM ", + " ", + " ++++ +++++ ", + " + ", + " + '''''''' ", + " X + ' ' ", + " + ' ' ' ' ", + " + ' ' ' ' ", + " = + ' '''' ' ", + " = + ' ' ' ' ", + " + ' ' ' ' ", + " + ' ' ", + " + '''''''' ", + " + ", + " ", + " ", + " " + ], + "palettes": [ "afs_habitat_block" ], + "furniture": { "A": "f_air_conditioner", "M": "f_solar_unit", "=": "f_vent_pipe", "X": "f_small_satelitte_dish" } + } + } +] diff --git a/data/mods/Aftershock/maps/mapgen_pallete/afs_habbitat_block.json b/data/mods/Aftershock/maps/mapgen_pallete/afs_habbitat_block.json index 7541ad8da40c9..5e666a9abd4af 100644 --- a/data/mods/Aftershock/maps/mapgen_pallete/afs_habbitat_block.json +++ b/data/mods/Aftershock/maps/mapgen_pallete/afs_habbitat_block.json @@ -1,89 +1,101 @@ [ - { - "type": "palette", - "id": "afs_habitat_block", - "terrain": { - ",": "t_metal_floor_olight_inactive", - "'": "t_sidewalk", - "%": "t_pavement", - "*": "t_pavement_y", - "_": "t_region_shrub_decorative" - "+": "t_metal_railing" - "[": "t_floor_metal_gangway" - "A": "t_atm" - }, - "furniture": { - "á": "f_rack", - "â": "f_rack", - "ä": "f_bookcase", - "é": "f_bookcase", - "ê": "f_rack", - "ë": "f_reinforced_displaycase", - "í": "f_rack", - "î": "f_reinforced_displaycase", - "ï": "f_reinforced_displaycase", - "ñ": "f_rack", - "ś": "f_rack", - "ó": "f_rack", - "õ": "f_rack", - "ö": "f_rack", - "ú": "f_rack", - "û": "f_rack", - "r": "f_clothing_rail", - "R": "f_rack", - "m": "f_mannequin", - "5": "f_indoor_plant" - "g": "f_counter_gate_c" - "o": "afs_kitchenette", - "p": "f_planter", - "f": "f_fridge", - "C": "f_counter", - "c": [ ["f_console_broken", 1], ["f_console", 3] ], - "@": "f_sleep_pod", - "y": "f_table", - "h": "f_chair", - "H": "f_armchair", - "b": "f_bench", - "s": "f_washer", - "D": "f_dryer", - "E": "f_ECU", - "A": "f_atmospheric_control", - "a": "f_air_filter", - "W": "f_water_heater", - "w": "f_water_purifier", - "n": "f_screen_mirror", - "k": "f_desk", - "$": "f_safe", - "v": "f_trashcan", - "d": "f_arcade_machine", - "l": "f_locker", - "L": "f_locker" - }, - "liquids": { "W": { "liquid": "water_clean", "amount": [ 0, 100 ] } }, - "items": { - { "á": { "item": "afs_old_food_storage", "chance": 60, "repeat": [ 2, 5 ] } }, - { "â": { "item": "afs_tools_electric_repair", "chance": 60, "repeat": [1, 3] } }, - { "ä": { "item": "manuals", "chance": 60, "repeat": [1,4] } }, - { "é": { "item": "literature", "chance": 80, "repeat": [5,12] } }, - { "ê": { "item": "afs_tools_robot_maintenance", "chance": 60, "repeat": [ 1, 3 ] } }, - { "ë": { "item": "domestic_bot_storage", "chance": 30} }, - { "í": { "item": "afs_any_ballistic_ammo", "chance": 60, "repeat": [ 3,6 ] } }, - { "î": { "item": "afs_any_ballistic_gun", "chance": 80} }, - { "ï": { "item": "afs_civilian_energy_gun", "chance": 80} }, - { "ñ": { "item": "afs_civilian_energy_mag", "chance": 60, "repeat": [ 1,4 ] } }, - { "ś": { "item": "afs_armor_spaceship_crew_g", "chance": 60 } }, - { "ó": { "item": "afs_tools_structural_repair", "chance": 60, "repeat": [1,3] } }, - { "õ": { "item": "softdrugs", "chance": 80, "repeat": [2,6] } }, - { "ö": { "item": "drugs_rare", "chance": 80, "repeat": [1,4] } }, - { "ú": { "item": "tools_earthworking", "chance": 40, "repeat": [1,2] } }, - { "û": { "item": "sauna", "chance": 80, "repeat": [3,7 } }, - { "f": { "item": "afs_old_food_storage", "chance": 60 } }, - { "o": { "item": "afs_kitchenette", "chance": 60 } }, - { "$": { "item": "afs_cash_safe" } }, - { "m": { "item": "afs_colonist_outfit" } }, - { "l": { "item": "afs_colonist_outfit" } }, - { "r": { "item": "afs_colonist_outfit", "chance": 60, "repeat": [ 1,2 ] } }, - }, - "vendingmachines": { "V": { "item_group": "afs_vending_false_meals", "reinforced": true } } - } -] \ No newline at end of file + { + "type": "palette", + "id": "afs_habitat_block", + "terrain": { + ",": "t_metal_floor_olight_inactive", + "'": "t_sidewalk", + "¢": "t_pavement", + "£": "t_pavement_y", + "_": "t_region_shrub_decorative", + "+": "t_metal_railing", + "[": "t_floor_metal_gangway", + "©": "t_atm", + "°": "t_thconc_floor_no_roof", + "±": "t_linoleum_white", + "™": "t_region_groundcover_urban" + }, + "furniture": { + "á": "f_rack", + "â": "f_rack", + "ä": "f_bookcase", + "é": "f_bookcase", + "ê": "f_rack", + "ë": "f_reinforced_displaycase", + "í": "f_rack", + "î": "f_reinforced_displaycase", + "ï": "f_reinforced_displaycase", + "ñ": "f_rack", + "ś": "f_rack", + "ó": "f_rack", + "õ": "f_rack", + "ö": "f_rack", + "ú": "f_rack", + "û": "f_rack", + "r": "f_clothing_rail", + "R": "f_rack", + "m": "f_mannequin", + "5": "f_indoor_plant", + "g": "f_counter_gate_c", + "o": "f_habitat_kitchenette", + "p": "f_planter", + "P": "f_punching_bag", + "f": "f_fridge", + "C": "f_counter", + "c": [ [ "f_console_broken", 1 ], [ "f_console", 3 ] ], + "@": "f_sleep_pod", + "y": "f_table", + "h": "f_chair", + "H": "f_armchair", + "b": "f_bench", + "s": "f_washer", + "D": "f_dryer", + "E": "f_ECU", + "e": "f_exercise", + "A": "f_atmospheric_control", + "a": "f_air_filter", + "W": "f_water_heater", + "w": "f_water_purifier", + "j": "f_habitat_storage_board", + "n": "f_screenmirror", + "k": "f_desk", + "$": "f_safe_l", + "v": "f_trashcan", + "d": "f_arcade_machine", + "l": "f_locker", + "L": "f_locker", + "T": "f_treadmill", + "i": "f_intermodal_crate_open", + "I": "f_sealed_intermodal_crate", + "8": [ [ "f_micro_terraforming_mill_active", 1 ], [ "f_micro_terraforming_mill_broken", 9 ] ] + }, + "liquids": { "W": { "liquid": "water_clean", "amount": [ 0, 100 ] } }, + "items": { + "á": { "item": "afs_old_food_storage", "chance": 40, "repeat": [ 1, 3 ] }, + "â": { "item": "afs_tools_electric_repair", "chance": 60, "repeat": [ 1, 3 ] }, + "ä": { "item": "manuals", "chance": 60, "repeat": [ 1, 4 ] }, + "é": { "item": "literature", "chance": 80, "repeat": [ 5, 12 ] }, + "ê": { "item": "afs_tools_robot_maintenance", "chance": 40, "repeat": [ 1, 2 ] }, + "ë": { "item": "domestic_bot_storage", "chance": 30 }, + "í": { "item": "afs_any_ballistic_ammo", "chance": 60, "repeat": [ 3, 6 ] }, + "î": { "item": "afs_any_ballistic_gun", "chance": 80 }, + "ï": { "item": "afs_civilian_energy_gun", "chance": 80 }, + "ñ": { "item": "afs_civilian_energy_mag", "chance": 60, "repeat": [ 1, 4 ] }, + "ś": { "item": "afs_armor_spaceship_crew_g", "chance": 60 }, + "ó": { "item": "afs_tools_structural_repair", "chance": 60, "repeat": [ 1, 3 ] }, + "õ": { "item": "softdrugs", "chance": 80, "repeat": [ 2, 6 ] }, + "ö": { "item": "drugs_rare", "chance": 80, "repeat": [ 1, 4 ] }, + "ú": { "item": "tools_earthworking", "chance": 40, "repeat": [ 1, 2 ] }, + "û": { "item": "sauna", "chance": 80, "repeat": [ 3, 7 ] }, + "f": { "item": "afs_old_food_storage", "chance": 60 }, + "o": { "item": "afs_kitchenette", "chance": 60 }, + "$": { "item": "afs_cash_safe" }, + "m": { "item": "afs_colonist_outfit" }, + "l": { "item": "afs_colonist_outfit" }, + "r": { "item": "afs_colonist_outfit", "chance": 60, "repeat": [ 1, 2 ] }, + "j": { "item": "afs_colonist_outfit", "chance": 60 }, + "I": { "item": "afs_crate_civ_rand" } + }, + "vendingmachines": { "V": { "item_group": "afs_vending_false_meals", "reinforced": true } } + } +] diff --git a/data/mods/Aftershock/maps/overmap_terrain.json b/data/mods/Aftershock/maps/overmap_terrain.json index f2d49e6a3894d..fafeaa1e3eb8a 100644 --- a/data/mods/Aftershock/maps/overmap_terrain.json +++ b/data/mods/Aftershock/maps/overmap_terrain.json @@ -436,6 +436,24 @@ "mondensity": 2, "flags": [ "SIDEWALK" ] }, + { + "type": "overmap_terrain", + "name": "Habbitat Block", + "spawns": { "group": "AFS_GROUP_RUIN_MOXIE", "population": [ 1, 5 ], "chance": 80 }, + "id": [ + "afs_habblock_1_a1", + "afs_hablock_1_a2", + "afs_habblock_1_floor2_a1", + "afs_hablock_1_floor2_a2", + "afs_habblock_1_roof_a1", + "afs_hablock_1_roof_a2" + ], + "sym": "H", + "color": "light_green", + "see_cost": 4, + "mondensity": 2, + "flags": [ "SIDEWALK" ] + }, { "type": "overmap_terrain", "name": "General Store", diff --git a/data/mods/aftershock_exoplanet/region_settings.json b/data/mods/aftershock_exoplanet/region_settings.json index 273b439f2cc15..7f1c92a628923 100644 --- a/data/mods/aftershock_exoplanet/region_settings.json +++ b/data/mods/aftershock_exoplanet/region_settings.json @@ -33,7 +33,7 @@ "shop_sigma": 80, "park_radius": 20, "park_sigma": 80, - "houses": { "afs_city_ruinfield": 400, "afs_formless_ruins_dynamic": 600, "afs_house_1": 300 }, + "houses": { "afs_city_ruinfield": 400, "afs_formless_ruins_dynamic": 600, "afs_house_1": 300, "afs_habbitat_block_1": 200 }, "parks": { "afs_city_ruinfield": 100, "afs_shuttle_pad": 10 }, "shops": { "afs_augmentation_clinic_1": 400, "afs_astrobiology_lab": 400, "afs_general_store_1": 400 } }, From e7df55ec43f48cf4c82331752f5f83bca0f263f5 Mon Sep 17 00:00:00 2001 From: Marc Date: Wed, 29 May 2024 11:03:59 -0600 Subject: [PATCH 03/14] Add more variety to library books --- .../maps/mapgen/habbitat_blocks/habbitat_block_1.json | 6 +++--- .../Aftershock/maps/mapgen_pallete/afs_habbitat_block.json | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json b/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json index 112039aed71d1..a50e00cc44459 100644 --- a/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json +++ b/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json @@ -190,9 +190,9 @@ " ", " H H ", " ", - " éé éé ää A ", - " é éé ää y ", - " é éé ää A ", + " üü üé ää A ", + " ü üé ää y ", + " ü üé ää A ", " 5 ", " ", " ch c ", diff --git a/data/mods/Aftershock/maps/mapgen_pallete/afs_habbitat_block.json b/data/mods/Aftershock/maps/mapgen_pallete/afs_habbitat_block.json index 5e666a9abd4af..431dd07d10d45 100644 --- a/data/mods/Aftershock/maps/mapgen_pallete/afs_habbitat_block.json +++ b/data/mods/Aftershock/maps/mapgen_pallete/afs_habbitat_block.json @@ -32,6 +32,7 @@ "ö": "f_rack", "ú": "f_rack", "û": "f_rack", + "ü": "f_bookcase", "r": "f_clothing_rail", "R": "f_rack", "m": "f_mannequin", @@ -87,7 +88,8 @@ "ö": { "item": "drugs_rare", "chance": 80, "repeat": [ 1, 4 ] }, "ú": { "item": "tools_earthworking", "chance": 40, "repeat": [ 1, 2 ] }, "û": { "item": "sauna", "chance": 80, "repeat": [ 3, 7 ] }, - "f": { "item": "afs_old_food_storage", "chance": 60 }, + "ü": { "item": "novels", "chance": 80, "repeat": [ 5, 12 ] }, + "f": { "item": "afs_old_food_storage", "chance": 60 }, "o": { "item": "afs_kitchenette", "chance": 60 }, "$": { "item": "afs_cash_safe" }, "m": { "item": "afs_colonist_outfit" }, From efce8d2a9ea2b2703d4fe5a74ce30224ec20eaac Mon Sep 17 00:00:00 2001 From: Marc Date: Wed, 29 May 2024 11:33:04 -0600 Subject: [PATCH 04/14] Implement hackable metal doors. Add Hackable to doors Pharmacy, Robotics, and Gunstore mapgen. The Life Support room is now locked by a hackable door. --- .../terrain_habitat_doors.json | 50 +++++++++++++++++++ .../habbitat_blocks/habbitat_block_1.json | 12 ++--- .../mapgen_pallete/afs_habbitat_block.json | 7 +-- data/mods/Aftershock/ter_fur_transform.json | 20 +++++--- 4 files changed, 74 insertions(+), 15 deletions(-) create mode 100644 data/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_doors.json diff --git a/data/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_doors.json b/data/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_doors.json new file mode 100644 index 0000000000000..5f8186e1aa0c3 --- /dev/null +++ b/data/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_doors.json @@ -0,0 +1,50 @@ +[ + { + "type": "terrain", + "id": "t_afs_door_metal_elocked", + "name": "closed metal door", + "description": "A galvanized steel door, forged to withstand punishment and impede anyone or anything. This one is secured with an electronic lock.", + "symbol": "+", + "looks_like": "t_door_metal_c", + "color": "cyan", + "move_cost": 0, + "coverage": 95, + "roof": "t_metal_roof", + "connect_groups": "WALL", + "connects_to": "WALL", + "flags": [ "NOITEM", "REDUCE_SCENT", "LOCKED", "BLOCK_WIND", "SUPPORTS_ROOF" ], + "oxytorch": { + "result": "t_mdoor_frame", + "duration": "14 seconds", + "byproducts": [ { "item": "steel_plate", "count": [ 0, 1 ] }, { "item": "steel_chunk", "count": [ 3, 8 ] } ] + }, + "examine_action": { + "type": "effect_on_condition", + "effect_on_conditions": [ + { + "id": "EOC_unlock_afs_metal_door", + "effect": [ + { "math": [ "_t_delay", "=", "time('20 m')" ] }, + { + "run_eoc_with": "EOC_start_lock_hack", + "variables": { "furn_pos": { "context_val": "pos" }, "t_delay": { "context_val": "t_delay" }, "difficulty": "9" }, + "alpha_talker": "avatar" + } + ] + } + ] + }, + "bash": { + "str_min": 80, + "str_max": 250, + "sound": "metal screeching!", + "sound_fail": "clang!", + "ter_set": "t_mdoor_frame", + "items": [ + { "item": "scrap", "count": [ 12, 24 ] }, + { "item": "steel_plate", "prob": 75 }, + { "item": "hinge", "count": [ 1, 3 ] } + ] + } + } +] \ No newline at end of file diff --git a/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json b/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json index a50e00cc44459..4f4e06b1168f1 100644 --- a/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json +++ b/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json @@ -84,7 +84,7 @@ " /yh.o/~:..hy/yh.f/~:..hy/.5/ca/™°°°™°°°°™™™°°+ ", " ///://///://///://///:///../../°°°°°™°°°°°™°°+ ", " =>........................./../°°°™™™™°°°°°°°+ ", - " =>....5....................!..#°™°°™°°°°°™°°°+ ", + " =>....5....................†..#°™°°™°°°°°™°°°+ ", " ///://///://///://///://////.c/™™™°°°°™°™™™™™+ ", " /yh.f/~:..hy/hy.o/~:..hy/....w/°™™™°°™™°°°™°°+ ", " #j..o///o..j/j..f///f..j/EA.W//°™°°°°°™°°°™°°+ ", @@ -228,8 +228,8 @@ " ë n ", " n êêê ë ", " ë êêê CCcC ", - " g h ", - " ", + " † g h ", + " † ", " kk ê ", " kh ê ", " ", @@ -263,8 +263,8 @@ " ñ í C ", " ñ í ï î Cg ", " ñ í ", - " AAAA n ", - " ", + " † AAAA n ", + " † ", " ñ í ", " ñ í ", " ", @@ -370,7 +370,7 @@ " b n/ õ õ ", " n C õ õ ", " c õ õ ", - " ", + " † ", " ö ö ", " ö ö ", " ", diff --git a/data/mods/Aftershock/maps/mapgen_pallete/afs_habbitat_block.json b/data/mods/Aftershock/maps/mapgen_pallete/afs_habbitat_block.json index 431dd07d10d45..d57c539ace77e 100644 --- a/data/mods/Aftershock/maps/mapgen_pallete/afs_habbitat_block.json +++ b/data/mods/Aftershock/maps/mapgen_pallete/afs_habbitat_block.json @@ -13,7 +13,8 @@ "©": "t_atm", "°": "t_thconc_floor_no_roof", "±": "t_linoleum_white", - "™": "t_region_groundcover_urban" + "™": "t_region_groundcover_urban", + "†": "t_afs_door_metal_elocked" }, "furniture": { "á": "f_rack", @@ -32,7 +33,7 @@ "ö": "f_rack", "ú": "f_rack", "û": "f_rack", - "ü": "f_bookcase", + "ü": "f_bookcase", "r": "f_clothing_rail", "R": "f_rack", "m": "f_mannequin", @@ -89,7 +90,7 @@ "ú": { "item": "tools_earthworking", "chance": 40, "repeat": [ 1, 2 ] }, "û": { "item": "sauna", "chance": 80, "repeat": [ 3, 7 ] }, "ü": { "item": "novels", "chance": 80, "repeat": [ 5, 12 ] }, - "f": { "item": "afs_old_food_storage", "chance": 60 }, + "f": { "item": "afs_old_food_storage", "chance": 60 }, "o": { "item": "afs_kitchenette", "chance": 60 }, "$": { "item": "afs_cash_safe" }, "m": { "item": "afs_colonist_outfit" }, diff --git a/data/mods/Aftershock/ter_fur_transform.json b/data/mods/Aftershock/ter_fur_transform.json index 464ed6231881e..2366af8d8708e 100644 --- a/data/mods/Aftershock/ter_fur_transform.json +++ b/data/mods/Aftershock/ter_fur_transform.json @@ -10,12 +10,20 @@ "message": "The shipping crate bolts slide back and the lid pops open.", "message_good": true }, - { - "result": "f_reinforced_displaycase_o", - "valid_furniture": [ "f_reinforced_displaycase" ], - "message": "A panel of reinforced glass receeds into the case.", - "message_good": true - } + { + "result": "f_reinforced_displaycase_o", + "valid_furniture": [ "f_reinforced_displaycase" ], + "message": "A panel of reinforced glass receeds into the case.", + "message_good": true + } + ], + "terrain": [ + { + "result": "t_door_metal_c", + "valid_terrain": [ "t_afs_door_metal_elocked" ], + "message": "The door's pinpad chimes happily as the locking mechanism releases.", + "message_good": true + } ] }, { From 63ba8436f8f5eb19e6dc90e3a66c09d3a71d8809 Mon Sep 17 00:00:00 2001 From: Marc Date: Wed, 29 May 2024 13:19:08 -0600 Subject: [PATCH 05/14] Implement Slot 1 to Hab Block 1. The resident meal service can now be either a cafe or a dinner. --- .../habbitat_blocks/habbitat_block_1.json | 199 +++++++++++++++++- 1 file changed, 188 insertions(+), 11 deletions(-) diff --git a/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json b/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json index 4f4e06b1168f1..cf7800b93dabb 100644 --- a/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json +++ b/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json @@ -8,15 +8,15 @@ "rows": [ " ¢¢¢¢ ¢ ¢¢¢ '' ''' ''''''' ''' ''' '''' ' ", " ¢ ¢ ¢¢¢ ¢¢ '__'///______///_/' '/_///____/// ", - " ¢¢ ¢¢ ¢¢ ¢¢'__'/./======/y/__'''__/±/====/±/ ", - " ¢¢£¢¢ ¢£¢ ¢¢'__'/.hyh.hyh.h////!////±±±±±±±±/ ", - " ¢ ¢£¢ ¢ £¢¢ ¢' ''=.hyh.hyh...h/.../±±±±±±±±±±= ", - " ¢ ¢£ ¢¢ ¢'__'=...........y/.../±±±±±±±±±±= ", - " ¢ £¢¢ ¢£¢ ¢¢'__'/...........h//!//±±±±±±±±±±/ ", - " ¢ ¢£¢ ¢ ¢¢¢ '__'/..h.h.hyh.../...!±±±±±±±±±±/ ", - " ¢¢¢£¢¢ ¢£¢ ¢¢' '/gCCCC/////!!/.../////////!// ", - " ''' ' '' '''' ' '/...../ááá/....../^&/^&/±±±±/ ", - " '''' ' ' ' ''' Date: Wed, 29 May 2024 13:48:52 -0600 Subject: [PATCH 06/14] Add Inactive Linoleum overhead light. Add Lights to Habbitat Block 1 and nested map gen. --- .../terrain_habitat_floor.json | 24 +++ .../habbitat_blocks/habbitat_block_1.json | 164 +++++++++--------- .../mapgen_pallete/afs_habbitat_block.json | 1 + data/mods/Aftershock/ter_fur_transform.json | 10 +- 4 files changed, 112 insertions(+), 87 deletions(-) diff --git a/data/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_floor.json b/data/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_floor.json index 29e770b16d339..480d9ddc93c03 100644 --- a/data/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_floor.json +++ b/data/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_floor.json @@ -49,5 +49,29 @@ "items": [ { "item": "glass_shard", "count": [ 8, 16 ] } ] }, "shoot": { "chance_to_hit": 0, "reduce_damage": [ 0, 0 ], "reduce_damage_laser": [ 0, 0 ], "destroy_damage": [ 2, 8 ] } + }, + { + "type": "terrain", + "id": "t_linoleum_white_olight_inactive", + "name": "linoleum tile", + "description": "A section of flooring made out of a tough, rubbery material. Colored a simple white. There is a still-functioning inactive light attached to the ceiling above.", + "looks_like": "t_linoleum_whitefloor_olight", + "symbol": ".", + "color": "white", + "connect_groups": [ "INDOORFLOOR", "LINOLEUM" ], + "connects_to": "LINOLEUM", + "move_cost": 2, + "roof": "t_flat_roof", + "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD" ], + "bash": { + "str_min": 4, + "str_max": 12, + "sound": "glass breaking!", + "sound_fail": "whack!", + "sound_vol": 16, + "sound_fail_vol": 10, + "ter_set": "t_linoleum_white", + "items": [ { "item": "glass_shard", "count": [ 8, 16 ] } ] + } } ] diff --git a/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json b/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json index cf7800b93dabb..37c108a2ba325 100644 --- a/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json +++ b/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json @@ -10,50 +10,44 @@ " ¢ ¢ ¢¢¢ ¢¢ '__'///______///_/' '/_///____/// ", " ¢¢ ¢¢ ¢¢ ¢¢'__'/±/======/±/__'''__/±/====/±/ ", " ¢¢£¢¢ ¢£¢ ¢¢'__'/±±±±±±±±±±////!////±±±±±±±±/ ", - " ¢ ¢£¢ ¢ £¢¢ ¢' ''=±±±±±±±±±±±±/.../±±±±±±±±±±= ", + " ¢ ¢£¢ ¢ £¢¢ ¢' ''=±±±±±±±±±±±±/.,./±±±±±±±±±±= ", " ¢ ¢£ ¢¢ ¢'__'=±±±±±±±±±±±±/.../±±±±±±±±±±= ", " ¢ £¢¢ ¢£¢ ¢¢'__'/±±±±±±±±±±±±//!//±±±±±±±±±±/ ", " ¢ ¢£¢ ¢ ¢¢¢ '__'/±±±±±±±±±±±±/...!±±±±±±±±±±/ ", " ¢¢¢£¢¢ ¢£¢ ¢¢' '/±±±±±/////!!/.../////////!// ", - " ''' ' '' '''' ' '/±±±±±!±±±/....../^&/^&/±±±±/ ", - " '''' ' ' ' '''+°°°°°™°°°°™™°°°™°°°°™°°°™°°+ ", " ///=/////=/////=/////////!//°°°°°°™°°°°°°°°°°+ ", - " /@@..:~/f.@@/@@..:~/f.@@/../°°°°°™™™°°™°°°™°°+ ", - " #j..f///o..j/j..o///o..j/!//#//™°°™™°°°°°™™°°+ ", + " /@@..:~/f.@@/@@..:~/f.@@/,./°°°°°™™™°°™°°°™°°+ ", + " #j.,f///o,.j/j.,o///o,.j/!//#//™°°™™°°°°°™™°°+ ", " /yh.o/~:..hy/yh.f/~:..hy/.5/ca/™°°°™°°°°™™™°°+ ", - " ///://///://///://///:///../../°°°°°™°°°°°™°°+ ", - " =>........................./../°°°™™™™°°°°°°°+ ", - " =>....5....................†..#°™°°™°°°°°™°°°+ ", + " ///://///://///://///:///,./../°°°°°™°°°°°™°°+ ", + " =>.....,...........,......./,./°°°™™™™°°°°°°°+ ", + " =>....5,...........,.......†..#°™°°™°°°°°™°°°+ ", " ///://///://///://///://////.c/™™™°°°°™°™™™™™+ ", - " /yh.f/~:..hy/hy.o/~:..hy/....w/°™™™°°™™°°°™°°+ ", - " #j..o///o..j/j..f///f..j/EA.W//°™°°°°°™°°°™°°+ ", + " /yh.f/~:..hy/hy.o/~:..hy/.,..w/°™™™°°™™°°°™°°+ ", + " #j.,o///o,.j/j.,f///f,.j/EA.W//°™°°°°°™°°°™°°+ ", " /@@..:~/f.@@/@@..:~/o.@@///#//++++++++++++++++ ", " ///=/////=/////=/////=///>[[ ", " [[[[[[[[[[[[[[[[[[[[[[[[[[[ " ], - "palettes": [ "afs_habitat_structure", "afs_habitat_block" ], + "palettes": [ "afs_habitat_structure", "afs_habitat_block", "afs_habblock_1_paramter_palette" ], "terrain": { " ": "t_open_air" }, "place_nested": [ { @@ -125,7 +121,9 @@ ], "x": 24, "y": 0 - } + }, + { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 }, + { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 24, "y": 0 } ] } }, @@ -170,13 +168,9 @@ "parameters": { "variant": { "type": "nested_mapgen_id", - "default": { - "distribution": [ - "afs_habbitat_block_1_slot1_cafe_a1", - "afs_habbitat_block_1_slot1_diner_a1" - ] - } - } + "default": { "distribution": [ "afs_habbitat_block_1_slot1_cafe_a1", "afs_habbitat_block_1_slot1_diner_a1" ] } + }, + "lightstatus": { "type": "nested_mapgen_id", "default": { "distribution": [ "afs_map_lights_on", "null" ] } } } }, { @@ -191,11 +185,11 @@ " ", " hyh ", " hyh ", - " ", + " ★ ", " ", " h h", " cCCCC", - " ", + " ★ ", " ffoCC", " ", " ", @@ -226,11 +220,11 @@ " ", " hyh ", " hyh ", - " ", + " ★ ", " hyh", " hyh", " :////", - " ", + " ★ ", " ffooC", " ", " ", @@ -247,7 +241,7 @@ " " ], "palettes": [ "afs_habitat_block" ], - "terrain": { "/": "t_wall_prefab_metal", ":": "t_door_c" } + "terrain": { "/": "t_wall_prefab_metal", ":": "t_door_c" } } }, { @@ -262,11 +256,11 @@ " ", "hyh ", "hyh h ", - " / c ", + " /★c ", " hyh/ ", " hyh/ ", " ", - " ", + " ★ ", " ááá ", " ", " ", @@ -283,7 +277,7 @@ " " ], "palettes": [ "afs_habitat_block" ], - "terrain": { "/": "t_wall_prefab_metal" } + "terrain": { "/": "t_wall_prefab_metal" } } }, { @@ -298,11 +292,11 @@ " y ", "hyh h ", "hyh h ", - " y ", + " ★y ", " h ", " hyh ", " ", - " ", + " ★ ", " ááá ", " ", " ", @@ -333,14 +327,14 @@ " n n ", " ", " ááá á CgC ", - " á C n ", + " ★ á ★C n ", " ááá n Châ ", " C â ", " ", - " á á ", + " á ★á ", " á á ", " ", - " h ", + " ★h ", " $kc ", " ", " ", @@ -368,14 +362,14 @@ " H H ", " ", " üü üé ää A ", - " ü üé ää y ", + " ü ★üé ää★y ", " ü üé ää A ", " 5 ", " ", " ch c ", " k k ", " ", - " h ", + " ★h ", " kkc ", " ", " ", @@ -402,15 +396,15 @@ " ", " n n ", " ënë ë ", - " ë n ", + " ë★ ★ n ", " n êêê ë ", " ë êêê CCcC ", " † g h ", " † ", - " kk ê ", + " kk★ê ", " kh ê ", " ", - " h ", + " ★h ", " $kc ", " ", " ", @@ -437,15 +431,15 @@ " ", " n n ", " ï î C ", - " ñ í C ", + " ñ í★ C★ ", " ñ í ï î Cg ", " ñ í ", " † AAAA n ", " † ", - " ñ í ", + " ñ ★í ", " ñ í ", " ", - " h ", + " h★ ", " ck$ ", " ", " ", @@ -472,15 +466,15 @@ " ", " m n ", " mnm CC ", - " b/ Ch ", - " : nrrr C ", + " b/ ★ Ch ", + " ★: nrrr C ", " // nrrr Cg ", - " ", + " ★ ", " ", " rr r ", - " r r ", + " r★ r ", " ", - " h ", + " h★ ", " ck$ ", " ", " ", @@ -508,15 +502,15 @@ " ", " n n ", " ó ó ó ", - " hC ó ó ó ", + " hC ★ó ó ó★ ", " C ó n ó ", " gC ", " óóóó n ", " ", - " ó y ", + " ó ★y ", " ó y ", " ", - " h ", + " h★ ", " ck$ ", " ", " ", @@ -544,14 +538,14 @@ " n c ", " c yyy ", " bb g ", - " b n/ õ õ ", + " b ★n/ õ★õ ", " n C õ õ ", " c õ õ ", " † ", - " ö ö ", + " ö ★ö ", " ö ö ", " ", - " h ", + " h★ ", " ck$ ", " ", " ", @@ -591,11 +585,11 @@ " ", " == == ", " =p ppp ", - " =p ", + " =p, ", " p pp ", " pp pp ", " úúú/c ", - " : pppp ", + " , : , pppp ", " ", " ", " " @@ -627,10 +621,10 @@ " ", " == ", " =d chR ", - " = C R ", + " = ,C R ", " d CgC ", " d ", - " ^ / 5 ", + " ^,/ , 5 ", " & : d5d dvd ", " ", " ", @@ -665,10 +659,10 @@ " ", " ", " =5 /bb ", - " =b : ", + " =b,: , ", " b /bb ", " = /// ", - " l : Cc/ l ", + " l,: ,Cc/,l ", " b /ûû : b ", " ", " ", @@ -701,10 +695,10 @@ " ", " ", " c c l ", - " l ", + " ,, l ", " yy / ", " 5 yy l ", - " l ", + " , l ", " ll/lll/lll/ ", " ", " ", @@ -737,10 +731,10 @@ " ", " === ", " = T T ", - " = ", + " = , ", " P P ", " ", - " ^ /RR ", + " ^,/RR , ", " & : e e e ", " ", " ", diff --git a/data/mods/Aftershock/maps/mapgen_pallete/afs_habbitat_block.json b/data/mods/Aftershock/maps/mapgen_pallete/afs_habbitat_block.json index d57c539ace77e..1dcb74b9ad435 100644 --- a/data/mods/Aftershock/maps/mapgen_pallete/afs_habbitat_block.json +++ b/data/mods/Aftershock/maps/mapgen_pallete/afs_habbitat_block.json @@ -4,6 +4,7 @@ "id": "afs_habitat_block", "terrain": { ",": "t_metal_floor_olight_inactive", + "★": "t_linoleum_white_olight_inactive", "'": "t_sidewalk", "¢": "t_pavement", "£": "t_pavement_y", diff --git a/data/mods/Aftershock/ter_fur_transform.json b/data/mods/Aftershock/ter_fur_transform.json index 2366af8d8708e..eaac2c504f776 100644 --- a/data/mods/Aftershock/ter_fur_transform.json +++ b/data/mods/Aftershock/ter_fur_transform.json @@ -45,11 +45,17 @@ { "type": "ter_furn_transform", "id": "afs_lights_on", - "terrain": [ { "result": "t_metal_floor_olight", "valid_terrain": [ "t_metal_floor_olight_inactive" ] } ] + "terrain": [ + { "result": "t_metal_floor_olight", "valid_terrain": [ "t_metal_floor_olight_inactive" ] }, + { "result": "t_linoleum_whitefloor_olight", "valid_terrain": [ "t_linoleum_white_olight_inactive" ] } + ] }, { "type": "ter_furn_transform", "id": "afs_lights_off", - "terrain": [ { "result": "t_metal_floor_olight_inactive", "valid_terrain": [ "t_metal_floor_olight" ] } ] + "terrain": [ + { "result": "t_metal_floor_olight_inactive", "valid_terrain": [ "t_metal_floor_olight" ] }, + { "result": "t_linoleum_white_olight_inactive", "valid_terrain": [ "t_linoleum_whitefloor_olight" ] } + ] } ] From 21325adf801452789a0879daf1055978620be545 Mon Sep 17 00:00:00 2001 From: Marc Date: Wed, 29 May 2024 13:57:14 -0600 Subject: [PATCH 07/14] Manually linting every file I edited so the tests don't yell at me. Probably --- .../maps/furniture_and_terrain/terrain_habitat_doors.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_doors.json b/data/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_doors.json index 5f8186e1aa0c3..9b3e80cb72af3 100644 --- a/data/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_doors.json +++ b/data/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_doors.json @@ -47,4 +47,4 @@ ] } } -] \ No newline at end of file +] From a0d5112d59565c5d5401c7a31ccf4c09c86729c1 Mon Sep 17 00:00:00 2001 From: Marc Date: Wed, 29 May 2024 14:08:15 -0600 Subject: [PATCH 08/14] Correct habbitat spelling to habitat --- .../habitat_block_1.json} | 18 +++++++++--------- ...bitat_block.json => afs_habitat_block.json} | 0 2 files changed, 9 insertions(+), 9 deletions(-) rename data/mods/Aftershock/maps/mapgen/{habbitat_blocks/habbitat_block_1.json => habitat_blocks/habitat_block_1.json} (98%) rename data/mods/Aftershock/maps/mapgen_pallete/{afs_habbitat_block.json => afs_habitat_block.json} (100%) diff --git a/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_1.json similarity index 98% rename from data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json rename to data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_1.json index 37c108a2ba325..22ef1130c9306 100644 --- a/data/mods/Aftershock/maps/mapgen/habbitat_blocks/habbitat_block_1.json +++ b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_1.json @@ -33,14 +33,14 @@ ], "palettes": [ "afs_habitat_structure", "afs_habitat_block", "afs_habblock_1_paramter_palette" ], "place_nested": [ - { "chunks": [ { "param": "variant", "fallback": "afs_habbitat_block_1_slot1_cafe_a1" } ], "x": 0, "y": 0 }, + { "chunks": [ { "param": "variant", "fallback": "afs_habblock_1_slot1_cafe_a1" } ], "x": 0, "y": 0 }, { "chunks": [ { - "switch": { "param": "variant", "fallback": "afs_habbitat_block_1_slot1_cafe_a2" }, + "switch": { "param": "variant", "fallback": "afs_habblock_1_slot1_cafe_a2" }, "cases": { - "afs_habbitat_block_1_slot1_cafe_a1": "afs_habbitat_block_1_slot1_cafe_a2", - "afs_habbitat_block_1_slot1_diner_a1": "afs_habbitat_block_1_slot1_diner_a2" + "afs_habblock_1_slot1_cafe_a1": "afs_habblock_1_slot1_cafe_a2", + "afs_habblock_1_slot1_diner_a1": "afs_habblock_1_slot1_diner_a2" } } ], @@ -168,7 +168,7 @@ "parameters": { "variant": { "type": "nested_mapgen_id", - "default": { "distribution": [ "afs_habbitat_block_1_slot1_cafe_a1", "afs_habbitat_block_1_slot1_diner_a1" ] } + "default": { "distribution": [ "afs_habblock_1_slot1_cafe_a1", "afs_habblock_1_slot1_diner_a1" ] } }, "lightstatus": { "type": "nested_mapgen_id", "default": { "distribution": [ "afs_map_lights_on", "null" ] } } } @@ -176,7 +176,7 @@ { "type": "mapgen", "method": "json", - "nested_mapgen_id": "afs_habbitat_block_1_slot1_cafe_a1", + "nested_mapgen_id": "afs_habblock_1_slot1_cafe_a1", "object": { "mapgensize": [ 24, 24 ], "rows": [ @@ -211,7 +211,7 @@ { "type": "mapgen", "method": "json", - "nested_mapgen_id": "afs_habbitat_block_1_slot1_diner_a1", + "nested_mapgen_id": "afs_habblock_1_slot1_diner_a1", "object": { "mapgensize": [ 24, 24 ], "rows": [ @@ -247,7 +247,7 @@ { "type": "mapgen", "method": "json", - "nested_mapgen_id": "afs_habbitat_block_1_slot1_diner_a2", + "nested_mapgen_id": "afs_habblock_1_slot1_diner_a2", "object": { "mapgensize": [ 24, 24 ], "rows": [ @@ -283,7 +283,7 @@ { "type": "mapgen", "method": "json", - "nested_mapgen_id": "afs_habbitat_block_1_slot1_cafe_a2", + "nested_mapgen_id": "afs_habblock_1_slot1_cafe_a2", "object": { "mapgensize": [ 24, 24 ], "rows": [ diff --git a/data/mods/Aftershock/maps/mapgen_pallete/afs_habbitat_block.json b/data/mods/Aftershock/maps/mapgen_pallete/afs_habitat_block.json similarity index 100% rename from data/mods/Aftershock/maps/mapgen_pallete/afs_habbitat_block.json rename to data/mods/Aftershock/maps/mapgen_pallete/afs_habitat_block.json From f7c3ea75259548cd86928ead68b11eff9e5e3703 Mon Sep 17 00:00:00 2001 From: Marc Date: Wed, 29 May 2024 14:09:04 -0600 Subject: [PATCH 09/14] Missed one --- data/mods/Aftershock/maps/city_buildings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/maps/city_buildings.json b/data/mods/Aftershock/maps/city_buildings.json index aa6b1716dc25a..c0dca52fc8be9 100644 --- a/data/mods/Aftershock/maps/city_buildings.json +++ b/data/mods/Aftershock/maps/city_buildings.json @@ -134,7 +134,7 @@ "locations": [ "land" ] }, { - "id": "afs_habbitat_block_1", + "id": "afs_habitat_block_1", "type": "city_building", "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "afs_habblock_1_a1_north" }, From eff45bceef864798b4a7feaab38b7238dcbb9c5b Mon Sep 17 00:00:00 2001 From: Marc Date: Wed, 29 May 2024 14:40:03 -0600 Subject: [PATCH 10/14] I have no excuse only shame. Corrects one more spelling mistake --- data/mods/aftershock_exoplanet/region_settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/aftershock_exoplanet/region_settings.json b/data/mods/aftershock_exoplanet/region_settings.json index 7f1c92a628923..e3581d6a45598 100644 --- a/data/mods/aftershock_exoplanet/region_settings.json +++ b/data/mods/aftershock_exoplanet/region_settings.json @@ -33,7 +33,7 @@ "shop_sigma": 80, "park_radius": 20, "park_sigma": 80, - "houses": { "afs_city_ruinfield": 400, "afs_formless_ruins_dynamic": 600, "afs_house_1": 300, "afs_habbitat_block_1": 200 }, + "houses": { "afs_city_ruinfield": 400, "afs_formless_ruins_dynamic": 600, "afs_house_1": 300, "afs_habitat_block_1": 200 }, "parks": { "afs_city_ruinfield": 100, "afs_shuttle_pad": 10 }, "shops": { "afs_augmentation_clinic_1": 400, "afs_astrobiology_lab": 400, "afs_general_store_1": 400 } }, From 39cbc59a2b3f6658327b10a5b90346c0f1b6218e Mon Sep 17 00:00:00 2001 From: Marc Date: Wed, 29 May 2024 15:26:58 -0600 Subject: [PATCH 11/14] Fix Gun store not spawning correct shelf --- .../Aftershock/maps/mapgen/habitat_blocks/habitat_block_1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 22ef1130c9306..56bfc94d99dcc 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 @@ -434,7 +434,7 @@ " ñ í★ C★ ", " ñ í ï î Cg ", " ñ í ", - " † AAAA n ", + " † śśśś n ", " † ", " ñ ★í ", " ñ í ", From ea3c7a7bb71870f11b439fe505fcd6871d0eaf46 Mon Sep 17 00:00:00 2001 From: Marc Date: Wed, 29 May 2024 15:34:38 -0600 Subject: [PATCH 12/14] Quick fix to community garden so water tank doesn't go past wall --- .../maps/mapgen/habitat_blocks/habitat_block_1.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 56bfc94d99dcc..254a0502ad881 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 @@ -873,9 +873,9 @@ " ", " ", " pp pp pp __ ", + " pp pp pp __ ", " w pp pp pp __ ", - " w pp pp pp __ ", - " 8p 8p 8p __ ", + " w 8p 8p 8p __ ", " pp pp pp __ ", " ú pp pp pp __ ", " ú pp pp pp __ ", From a0af6b18b3944d9ddcf51ccdaef6e109af95528f Mon Sep 17 00:00:00 2001 From: Marc Date: Wed, 29 May 2024 15:50:20 -0600 Subject: [PATCH 13/14] Correct PIN Pad spelling to appease the spellchecker. --- data/mods/Aftershock/ter_fur_transform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/ter_fur_transform.json b/data/mods/Aftershock/ter_fur_transform.json index eaac2c504f776..c24029cb23c83 100644 --- a/data/mods/Aftershock/ter_fur_transform.json +++ b/data/mods/Aftershock/ter_fur_transform.json @@ -21,7 +21,7 @@ { "result": "t_door_metal_c", "valid_terrain": [ "t_afs_door_metal_elocked" ], - "message": "The door's pinpad chimes happily as the locking mechanism releases.", + "message": "The door's PIN pad chimes happily as the locking mechanism releases.", "message_good": true } ] From 65510480633bf7e78682b9ad53be59a98d185e37 Mon Sep 17 00:00:00 2001 From: Marc Date: Wed, 29 May 2024 19:18:21 -0600 Subject: [PATCH 14/14] Fix last instance of spelling mistake Co-authored-by: John Candlebury --- data/mods/Aftershock/maps/overmap_terrain.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/maps/overmap_terrain.json b/data/mods/Aftershock/maps/overmap_terrain.json index fafeaa1e3eb8a..8d7a34d7c8c6c 100644 --- a/data/mods/Aftershock/maps/overmap_terrain.json +++ b/data/mods/Aftershock/maps/overmap_terrain.json @@ -438,7 +438,7 @@ }, { "type": "overmap_terrain", - "name": "Habbitat Block", + "name": "Habitat Block", "spawns": { "group": "AFS_GROUP_RUIN_MOXIE", "population": [ 1, 5 ], "chance": 80 }, "id": [ "afs_habblock_1_a1",