From 369453123309c75d17e4b160f639b70a684118f3 Mon Sep 17 00:00:00 2001 From: Drew4484 Date: Tue, 7 Nov 2023 23:13:25 -0800 Subject: [PATCH 01/23] Update exosuit_modules.json UPS Update --- .../items/armor/exosuit/exosuit_modules.json | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json index 5c8f108ad53cc..ebf0c779a262a 100644 --- a/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json +++ b/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json @@ -12,7 +12,18 @@ "looks_like": "storage_battery", "color": "light_gray", "ammo": [ "battery" ], - "flags": [ "FRAGILE", "CANT_WEAR", "NO_UNLOAD", "NO_RELOAD", "RECHARGE", "WATERPROOF", "IS_UPS", "EXO_PSU", "ONLY_ONE" ], + "flags": [ + "FRAGILE", + "CANT_WEAR", + "NO_UNLOAD", + "NO_RELOAD", + "RECHARGE", + "WATERPROOF", + "IS_UPS", + "USE_UPS", + "EXO_PSU", + "ONLY_ONE" + ], "armor": [ { "encumbrance": 0, "coverage": 20, "covers": [ "torso" ] } ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 40000 } } ] }, @@ -29,7 +40,7 @@ "looks_like": "1cyl_combustion", "color": "dark_gray", "ammo": "gasoline", - "flags": [ "FRAGILE", "CANT_WEAR", "WATERPROOF", "IS_UPS", "EXO_PSU", "ONLY_ONE" ], + "flags": [ "FRAGILE", "CANT_WEAR", "WATERPROOF", "IS_UPS", "USE_UPS", "EXO_PSU", "ONLY_ONE" ], "armor": [ { "encumbrance": 0, "coverage": 40, "covers": [ "torso" ] } ], "pocket_data": [ { @@ -54,7 +65,7 @@ "looks_like": "1cyl_combustion", "color": "dark_gray", "ammo": [ "gasoline", "diesel", "jp8", "avgas", "lamp_oil", "motor_oil", "propane", "conc_alcohol", "ammonia_liquid" ], - "flags": [ "FRAGILE", "CANT_WEAR", "WATERPROOF", "IS_UPS", "EXO_PSU", "ONLY_ONE" ], + "flags": [ "FRAGILE", "CANT_WEAR", "WATERPROOF", "IS_UPS", "USE_UPS", "EXO_PSU", "ONLY_ONE" ], "armor": [ { "encumbrance": 0, "coverage": 40, "covers": [ "torso" ] } ], "pocket_data": [ { @@ -98,6 +109,7 @@ "RECHARGE", "WATERPROOF", "IS_UPS", + "USE_UPS", "EXO_PSU", "LEAK_DAM", "RADIOACTIVE", @@ -127,6 +139,7 @@ "RECHARGE", "WATERPROOF", "IS_UPS", + "USE_UPS", "EXO_MEDIUM_GADGET", "ONLY_ONE" ], @@ -145,7 +158,7 @@ "looks_like": "storage_battery", "color": "light_gray", "ammo": [ "battery" ], - "flags": [ "FRAGILE", "CANT_WEAR", "NO_UNLOAD", "NO_RELOAD", "RECHARGE", "WATERPROOF", "IS_UPS", "EXO_SMALL_GADGET" ], + "flags": [ "FRAGILE", "CANT_WEAR", "NO_UNLOAD", "NO_RELOAD", "RECHARGE", "WATERPROOF", "IS_UPS", "USE_UPS", "EXO_SMALL_GADGET" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 2500 } } ] }, { From 96c28f41fc38d0cd95ac4904675259c1e98fd7e2 Mon Sep 17 00:00:00 2001 From: Drew4484 Date: Wed, 8 Nov 2023 11:25:24 -0800 Subject: [PATCH 02/23] Update exosuit_frame.json --- .../items/armor/exosuit/exosuit_frame.json | 236 +++++++++++++++++- 1 file changed, 235 insertions(+), 1 deletion(-) diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json index b6e518272f3e2..3d73660d50b13 100644 --- a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json +++ b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json @@ -318,7 +318,8 @@ "material": [ { "type": "titanium", "covered_by_mat": 100, "thickness": 2 } ], "covers": [ "hand_l", "hand_r" ], "coverage": 40, - "encumbrance": 20 + "encumbrance": 20, + "layers": [ "OUTER" ] } ], "ammo": "battery", @@ -387,5 +388,238 @@ "encumbrance": 5 } ] + }, + { + "id": "modular_exosuit_light", + "copy-from": "modular_exosuit", + "type": "TOOL_ARMOR", + "name": { "str": "light exosuit frame" }, + "description": "This is a light duty exosuit frame. this lighter version of the exosuit draws less power but has less capacity for equipment and uses a fixed cage for collision protection instead of modular armor." + "weight": "30 kg", + "volume": "130 L", + "symbol": "t", + "looks_like": "power_armor_basic", + "pocket_data": [ + { + "pocket_type": "CONTAINER", + "name": "Exosuit underlayer", + "description": "A series of connections for an underlayer.", + "ablative": true, + "holster": true, + "rigid": true, + "inherits_flags": true, + "max_contains_volume": "25 L", + "max_contains_weight": "140 kg", + "flag_restriction": [ "EXO_UNDERLAYER" ], + "moves": 200 + }, + { + "pocket_type": "CONTAINER", + "name": "Helmet hardpoint 1", + "description": "This is a series of mounts for helmet equipment.", + "holster": true, + "rigid": true, + "inherits_flags": true, + "max_contains_volume": "25 L", + "max_contains_weight": "140 kg", + "flag_restriction": [ "EXO_HELMET_GADGET" ], + "moves": 60 + }, + { + "pocket_type": "CONTAINER", + "name": "Helmet hardpoint 2", + "description": "This is a series of mounts for helmet equipment.", + "holster": true, + "rigid": true, + "inherits_flags": true, + "max_contains_volume": "25 L", + "max_contains_weight": "140 kg", + "flag_restriction": [ "EXO_HELMET_GADGET" ], + "moves": 60 + }, + { + "pocket_type": "CONTAINER", + "name": "Torso large hardpoint", + "description": "This is a mount for storing items in the torso.", + "holster": true, + "rigid": true, + "inherits_flags": true, + "max_contains_volume": "25 L", + "max_contains_weight": "140 kg", + "flag_restriction": [ "EXO_LARGE_GADGET", "EXO_MEDIUM_GADGET", "EXO_SMALL_GADGET" ], + "moves": 60 + }, + { + "pocket_type": "CONTAINER", + "name": "Torso small hardpoint", + "description": "This is a mount for storing items in the torso.", + "holster": true, + "rigid": true, + "inherits_flags": true, + "max_contains_volume": "25 L", + "max_contains_weight": "140 kg", + "flag_restriction": [ "EXO_SMALL_GADGET" ], + "moves": 60 + }, + { + "pocket_type": "CONTAINER", + "name": "PSU compartment", + "description": "This is a mounting point for power supply units and large modules.", + "holster": true, + "rigid": true, + "inherits_flags": true, + "max_contains_volume": "25 L", + "max_contains_weight": "140 kg", + "flag_restriction": [ "EXO_PSU" ], + "moves": 500 + }, + { + "pocket_type": "CONTAINER", + "name": "Arm medium hardpoint", + "description": "This is a mount for storing items on the arms.", + "holster": true, + "rigid": true, + "inherits_flags": true, + "max_contains_volume": "25 L", + "max_contains_weight": "140 kg", + "flag_restriction": [ "EXO_MEDIUM_GADGET", "EXO_SMALL_GADGET" ], + "moves": 60 + }, + { + "pocket_type": "CONTAINER", + "name": "Arm small hardpoint", + "description": "This is a mount for storing items on the arms.", + "holster": true, + "rigid": true, + "inherits_flags": true, + "max_contains_volume": "25 L", + "max_contains_weight": "140 kg", + "flag_restriction": [ "EXO_SMALL_GADGET" ], + "moves": 60 + }, + { + "pocket_type": "CONTAINER", + "name": "Leg medium hardpoint", + "description": "This is a mount for storing items on the legs.", + "holster": true, + "rigid": true, + "inherits_flags": true, + "max_contains_volume": "25 L", + "max_contains_weight": "140 kg", + "flag_restriction": [ "EXO_MEDIUM_GADGET", "EXO_SMALL_GADGET" ], + "moves": 60 + }, + { + "pocket_type": "CONTAINER", + "name": "Leg small hardpoint", + "description": "This is a mount for storing items on the legs.", + "holster": true, + "rigid": true, + "inherits_flags": true, + "max_contains_volume": "25 L", + "max_contains_weight": "140 kg", + "flag_restriction": [ "EXO_SMALL_GADGET" ], + "moves": 60 + } + ], + "armor": [ + { + "material": [ + { "type": "plastic", "covered_by_mat": 80, "thickness": 2 }, + { "type": "rubber", "covered_by_mat": 20, "thickness": 2 }, + { "type": "lvl4ballisticglass", "covered_by_mat": 100, "thickness": 2 } + ], + "covers": [ "eyes" ], + "coverage": 100, + "encumbrance": 100, + "layers": [ "OUTER" ] + }, + { + "material": [ { "type": "titanium", "covered_by_mat": 100, "thickness": 2 } ], + "covers": [ "head", "mouth", "torso", "arm_l", "arm_r", "leg_l", "leg_r", "foot_l", "foot_r" ], + "coverage": 40, + "encumbrance": 20, + "layers": [ "OUTER" ] + }, + { + "material": [ { "type": "titanium", "covered_by_mat": 100, "thickness": 2 } ], + "covers": [ "hand_l", "hand_r" ], + "coverage": 40, + "encumbrance": 20, + "layers": [ "OUTER" ] + }, + { + "material": [ { "type": "qt_steel", "covered_by_mat": 90, "thickness": 1 } ], + "covers" [ "head", "mouth", "torso", "arm_l", "arm_r", "leg_l", "leg_r", "foot_l", "foot_r" ], + "coverage": 90, + "encumbrance": 10, + "layers": [ "OUTER" ] + } + ], + "ammo": "battery", + "flags": [ "USE_UPS", "STURDY", "WATERPROOF", "ELECTRIC_IMMUNE", "COMBAT_TOGGLEABLE", "OUTER", "MUNDANE", "DEAF", "TARDIS" ], + "relic_data": { "passive_effects": [ { "id": "ench_exo_strength" } ] }, + "use_action": [ + { + "target": "modular_exosuit_on", + "msg": "The %s engages.", + "active": true, + "need_charges": 1, + "need_charges_msg": "The suit does not have enough charge.", + "type": "transform" + }, + "MANAGE_EXOSUIT" + ] + }, + { + "id": "modular_exosuit_light_on", + "copy-from": "modular_exosuit_light", + "repairs_like": "modular_exosuit", + "looks_like": "power_armor_light", + "type": "TOOL_ARMOR", + "name": { "str": "exosuit frame (on)", "str_pl": "exosuit frames (on)" }, + "description": "This is a light duty exosuit frame. this lighter version of the exosuit draws less power but has less capacity for equipment and uses a fixed cage for collision protection instead of modular armor. It is turned on and continually drawing power. Use it to turn it off.", + "flags": [ + "USE_UPS", + "STURDY", + "WATERPROOF", + "ELECTRIC_IMMUNE", + "COMBAT_TOGGLEABLE", + "OUTER", + "PARTIAL_DEAF", + "SUN_GLASSES", + "FLASH_PROTECTION", + "TARDIS" + ], + "weight_capacity_bonus": "20 kg", + "power_draw": "4075 mW", + "revert_to": "modular_exosuit_light", + "use_action": [ { "type": "transform", "menu_text": "Turn off", "msg": "The %s disengages.", "target": "modular_exosuit_light" } ], + "armor": [ + { + "material": [ + { "type": "plastic", "covered_by_mat": 80, "thickness": 2 }, + { "type": "rubber", "covered_by_mat": 20, "thickness": 2 }, + { "type": "lvl4ballisticglass", "covered_by_mat": 100, "thickness": 2 } + ], + "covers": [ "eyes" ], + "coverage": 100, + "encumbrance": 5, + "layers": [ "OUTER" ] + }, + { + "material": [ { "type": "titanium", "covered_by_mat": 100, "thickness": 2 } ], + "covers": [ "head", "mouth", "torso", "arm_l", "arm_r", "leg_l", "leg_r", "foot_l", "foot_r" ], + "coverage": 40, + "encumbrance": 5, + "layers": [ "OUTER" ] + }, + { + "material": [ { "type": "titanium", "covered_by_mat": 100, "thickness": 2 } ], + "covers": [ "hand_l", "hand_r" ], + "coverage": 40, + "encumbrance": 5 + } + ] } ] From 1cf0a84d8aa50b85241736b8f78215beca80a033 Mon Sep 17 00:00:00 2001 From: Drew4484 Date: Wed, 8 Nov 2023 12:05:16 -0800 Subject: [PATCH 03/23] Update exosuit_frame.json --- .../items/armor/exosuit/exosuit_frame.json | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json index 3d73660d50b13..e7c5dccfe56cc 100644 --- a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json +++ b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json @@ -394,7 +394,7 @@ "copy-from": "modular_exosuit", "type": "TOOL_ARMOR", "name": { "str": "light exosuit frame" }, - "description": "This is a light duty exosuit frame. this lighter version of the exosuit draws less power but has less capacity for equipment and uses a fixed cage for collision protection instead of modular armor." + "description": "This is a light duty exosuit frame. this lighter version of the exosuit draws less power but has less capacity for equipment and uses a fixed cage for collision protection instead of modular armor.", "weight": "30 kg", "volume": "130 L", "symbol": "t", @@ -548,13 +548,13 @@ "encumbrance": 20, "layers": [ "OUTER" ] }, - { - "material": [ { "type": "qt_steel", "covered_by_mat": 90, "thickness": 1 } ], - "covers" [ "head", "mouth", "torso", "arm_l", "arm_r", "leg_l", "leg_r", "foot_l", "foot_r" ], - "coverage": 90, - "encumbrance": 10, - "layers": [ "OUTER" ] - } + { + "material": [ { "type": "qt_steel", "covered_by_mat": 90, "thickness": 1 } ], + "covers": [ "head", "mouth", "torso", "arm_l", "arm_r", "leg_l", "leg_r", "foot_l", "foot_r" ], + "coverage": 90, + "encumbrance": 10, + "layers": [ "OUTER" ] + } ], "ammo": "battery", "flags": [ "USE_UPS", "STURDY", "WATERPROOF", "ELECTRIC_IMMUNE", "COMBAT_TOGGLEABLE", "OUTER", "MUNDANE", "DEAF", "TARDIS" ], @@ -619,6 +619,13 @@ "covers": [ "hand_l", "hand_r" ], "coverage": 40, "encumbrance": 5 + }, + { + "material": [ { "type": "qt_steel", "covered_by_mat": 90, "thickness": 1 } ], + "covers": [ "head", "mouth", "torso", "arm_l", "arm_r", "leg_l", "leg_r", "foot_l", "foot_r" ], + "coverage": 90, + "encumbrance": 10, + "layers": [ "OUTER" ] } ] } From 508f021e59e4d7c933b9edcef311472b87cc29e9 Mon Sep 17 00:00:00 2001 From: Drew4484 Date: Wed, 8 Nov 2023 14:34:57 -0800 Subject: [PATCH 04/23] Fix light frame armor --- .../items/armor/exosuit/exosuit_frame.json | 35 ++++++++----------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json index e7c5dccfe56cc..a48ad1a1b956a 100644 --- a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json +++ b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json @@ -535,10 +535,13 @@ "layers": [ "OUTER" ] }, { - "material": [ { "type": "titanium", "covered_by_mat": 100, "thickness": 2 } ], + "material": [ + { "type": "titanium", "covered_by_mat": 40, "thickness": 2 }, + { "type": "qt_steel", "covered_by_mat": 100, "thickness": 1.2 } + ], "covers": [ "head", "mouth", "torso", "arm_l", "arm_r", "leg_l", "leg_r", "foot_l", "foot_r" ], - "coverage": 40, - "encumbrance": 20, + "coverage": 90, + "encumbrance": 25, "layers": [ "OUTER" ] }, { @@ -547,13 +550,6 @@ "coverage": 40, "encumbrance": 20, "layers": [ "OUTER" ] - }, - { - "material": [ { "type": "qt_steel", "covered_by_mat": 90, "thickness": 1 } ], - "covers": [ "head", "mouth", "torso", "arm_l", "arm_r", "leg_l", "leg_r", "foot_l", "foot_r" ], - "coverage": 90, - "encumbrance": 10, - "layers": [ "OUTER" ] } ], "ammo": "battery", @@ -604,27 +600,24 @@ ], "covers": [ "eyes" ], "coverage": 100, - "encumbrance": 5, + "encumbrance": 100, "layers": [ "OUTER" ] }, { - "material": [ { "type": "titanium", "covered_by_mat": 100, "thickness": 2 } ], + "material": [ + { "type": "titanium", "covered_by_mat": 40, "thickness": 2 }, + { "type": "qt_steel", "covered_by_mat": 100, "thickness": 1.2 } + ], "covers": [ "head", "mouth", "torso", "arm_l", "arm_r", "leg_l", "leg_r", "foot_l", "foot_r" ], - "coverage": 40, - "encumbrance": 5, + "coverage": 90, + "encumbrance": 25, "layers": [ "OUTER" ] }, { "material": [ { "type": "titanium", "covered_by_mat": 100, "thickness": 2 } ], "covers": [ "hand_l", "hand_r" ], "coverage": 40, - "encumbrance": 5 - }, - { - "material": [ { "type": "qt_steel", "covered_by_mat": 90, "thickness": 1 } ], - "covers": [ "head", "mouth", "torso", "arm_l", "arm_r", "leg_l", "leg_r", "foot_l", "foot_r" ], - "coverage": 90, - "encumbrance": 10, + "encumbrance": 20, "layers": [ "OUTER" ] } ] From 6b03ced2fe9891193ae44e6495c06fcadd58d974 Mon Sep 17 00:00:00 2001 From: Drew4484 Date: Wed, 8 Nov 2023 16:21:34 -0800 Subject: [PATCH 05/23] Typos --- data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json index a48ad1a1b956a..be1f6e8c825f3 100644 --- a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json +++ b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json @@ -394,7 +394,7 @@ "copy-from": "modular_exosuit", "type": "TOOL_ARMOR", "name": { "str": "light exosuit frame" }, - "description": "This is a light duty exosuit frame. this lighter version of the exosuit draws less power but has less capacity for equipment and uses a fixed cage for collision protection instead of modular armor.", + "description": "This is a light duty exosuit frame. This lighter version of the exosuit draws less power but has less capacity for equipment and uses a fixed cage for collision protection instead of modular armor.", "weight": "30 kg", "volume": "130 L", "symbol": "t", @@ -574,7 +574,7 @@ "looks_like": "power_armor_light", "type": "TOOL_ARMOR", "name": { "str": "exosuit frame (on)", "str_pl": "exosuit frames (on)" }, - "description": "This is a light duty exosuit frame. this lighter version of the exosuit draws less power but has less capacity for equipment and uses a fixed cage for collision protection instead of modular armor. It is turned on and continually drawing power. Use it to turn it off.", + "description": "This is a light duty exosuit frame. This lighter version of the exosuit draws less power but has less capacity for equipment and uses a fixed cage for collision protection instead of modular armor. It is turned on and continually drawing power. Use it to turn it off.", "flags": [ "USE_UPS", "STURDY", From e19d7d99fc98b7a89097e7d2e7aec8d91c8a3278 Mon Sep 17 00:00:00 2001 From: Drew4484 Date: Fri, 10 Nov 2023 10:14:40 -0800 Subject: [PATCH 06/23] Update exosuit_frame.json --- .../items/armor/exosuit/exosuit_frame.json | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json index be1f6e8c825f3..cb241a90044ca 100644 --- a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json +++ b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json @@ -12,19 +12,6 @@ "looks_like": "power_armor_basic", "color": "light_gray", "pocket_data": [ - { - "pocket_type": "CONTAINER", - "name": "Exosuit underlayer", - "description": "A series of connections for an underlayer.", - "ablative": true, - "holster": true, - "rigid": true, - "inherits_flags": true, - "max_contains_volume": "25 L", - "max_contains_weight": "140 kg", - "flag_restriction": [ "EXO_UNDERLAYER" ], - "moves": 200 - }, { "pocket_type": "CONTAINER", "name": "Helmet compartment (Plate)", @@ -400,19 +387,6 @@ "symbol": "t", "looks_like": "power_armor_basic", "pocket_data": [ - { - "pocket_type": "CONTAINER", - "name": "Exosuit underlayer", - "description": "A series of connections for an underlayer.", - "ablative": true, - "holster": true, - "rigid": true, - "inherits_flags": true, - "max_contains_volume": "25 L", - "max_contains_weight": "140 kg", - "flag_restriction": [ "EXO_UNDERLAYER" ], - "moves": 200 - }, { "pocket_type": "CONTAINER", "name": "Helmet hardpoint 1", From 4f880dd20d82f33b3c81c49d563863418bcf2a33 Mon Sep 17 00:00:00 2001 From: Drew4484 Date: Tue, 14 Nov 2023 23:50:48 -0800 Subject: [PATCH 07/23] Adds light exoframe and spawns --- .../mods/Aftershock/itemgroups/item_groups.json | 17 +++++++++++++++++ data/mods/Aftershock/maps/crashing_ship.json | 6 ++++-- .../maps/mapgen/maintenance_outpost.json | 8 +++++--- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/data/mods/Aftershock/itemgroups/item_groups.json b/data/mods/Aftershock/itemgroups/item_groups.json index 2436ce7f222bb..4d7f7c3e1ae19 100644 --- a/data/mods/Aftershock/itemgroups/item_groups.json +++ b/data/mods/Aftershock/itemgroups/item_groups.json @@ -486,6 +486,23 @@ { "item": "exo_imager", "prob": 25 } ] }, + { + "id": "afs_exosuit_light_worker", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "item": "modular_exosuit_light", "prob": 100 }, + { "item": "afs_exo_standard_underlayer", "prob": 90 }, + { "item": "exo_helmet_plastic", "prob": 90 }, + { "item": "exo_torso_plastic", "prob": 90 }, + { "item": "exo_arm_plastic", "prob": 90 }, + { "item": "exo_leg_plastic", "prob": 90 }, + { "group": "afs_exo_basic_power", "prob": 75 }, + { "group": "afs_exo_basic_accessories", "prob": 50 }, + { "group": "afs_exo_basic_accessories", "prob": 50 }, + { "group": "afs_power_tools", "prob": 25 } + ] + }, { "id": "afs_exosuit_worker", "type": "item_group", diff --git a/data/mods/Aftershock/maps/crashing_ship.json b/data/mods/Aftershock/maps/crashing_ship.json index 4e073a73deafd..2e9c8296b8bea 100644 --- a/data/mods/Aftershock/maps/crashing_ship.json +++ b/data/mods/Aftershock/maps/crashing_ship.json @@ -45,7 +45,7 @@ "M.bbbbbbbbb..bbbbbbbbb.MM.MCCM.MCCM..MCCM.MCCM.MM.........J..J..F..F...M", "M.ttttttttt..ttttttttt.MM.MCCM.MCCM..MCCM.MCCM.MM.........j..j.........M", "M.bbbbbbbbb..bbbbbbbbb.MM.MddM.MddM..MddM.MddM.MM.........j..j.........M", - "M.....*..........*.....MM......................MMH.H.H.H.HJ..JH.H.H.H.HM", + "M.....*..........*.....MM......................MMh.h.h.h.hJ..JH.H.H.H.HM", "MMMMMMMMMMMDDMMMMMMMMMMMMddddddddddddddddddddddMMMMMMMMMMM#ddMMMMMMMMMMM", "MPPpv................................................................pPM", "Mpppv.*.....*.....*.....*.....*....**....*.....*.....*.....*.....*...pPM", @@ -118,6 +118,7 @@ "9": "f_heavy_lathe", "K": "f_beverly_shear", "H": "f_exo_gantry", + "h": "f_exo_gantry", "5": "f_machinery_electronic", "6": "f_machinery_light", "7": "f_machinery_heavy", @@ -189,7 +190,8 @@ "w": { "items": [ { "item": "office_mess", "chance": 75 } ] }, "t": { "items": [ { "item": "afs_mess_hall", "chance": 80 } ] }, "V": { "items": [ { "item": "afs_vending_false_meals", "chance": 100 } ] }, - "H": { "items": [ { "item": "afs_exosuit_worker", "chance": 75 } ] } + "H": { "items": [ { "item": "afs_exosuit_worker", "chance": 75 } ] }, + "h": { "items": [ { "item": "afs_exosuit_light_worker", "chance": 75 } ] } }, "place_loot": [ { "item": "crashing_ship_locker_card", "x": [ 16, 22 ], "y": [ 9, 15 ], "chance": 100 }, diff --git a/data/mods/Aftershock/maps/mapgen/maintenance_outpost.json b/data/mods/Aftershock/maps/mapgen/maintenance_outpost.json index f03a33a2ba068..f8cde95868489 100644 --- a/data/mods/Aftershock/maps/mapgen/maintenance_outpost.json +++ b/data/mods/Aftershock/maps/mapgen/maintenance_outpost.json @@ -37,7 +37,7 @@ " 1 ______________________________ /....../ ", " 1 ____________________________ ///!/qqq/ ", " 1 ____________________________ ////.///////// ", - " 1 ____________________________ /../!/..8yy../ ", + " 1 ____________________________ /HH/!/..8yy../ ", " 1 ______________________________............/ ", " 1 ______________________________...........l/ ", " 1 ______________________________.Ó.........q/ ", @@ -74,7 +74,8 @@ "ú": "f_table", "9": "f_hydraulic_press", "0": "f_heavy_lathe", - "8": "f_drill_press" + "8": "f_drill_press", + "H": "f_exo_gantry" }, "items": { "5": { "item": "pool_table", "chance": 80 }, @@ -83,7 +84,8 @@ "Ó": { "item": "afs_dead_survivor", "chance": 5 }, "l": { "item": "afs_colonist_outfit", "chance": 20 }, "3": { "item": "nuclear_reactor" }, - "2": { "item": "old_industrial_bot_storage", "chance": 20 } + "2": { "item": "old_industrial_bot_storage", "chance": 20 }, + "H": { "item": "afs_exosuit_worker", "chance": 75 } }, "place_monster": [ { "group": "AFS_GROUP_ROBOT_LOW_RISK", "x": [ 24, 47 ], "y": [ 0, 23 ], "pack_size": [ 1, 4 ], "chance": 20 }, From 9c0cdfd3fe4703b14663e59e891842aebf3023e5 Mon Sep 17 00:00:00 2001 From: Drew4484 Date: Wed, 15 Nov 2023 10:06:32 -0800 Subject: [PATCH 08/23] Maintenance outpost spawn and frame updates --- .../items/armor/exosuit/exosuit_frame.json | 34 +++++++++++++++---- .../maps/mapgen/maintenance_outpost.json | 2 +- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json index cb241a90044ca..c7600e29b8366 100644 --- a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json +++ b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json @@ -310,10 +310,19 @@ } ], "ammo": "battery", - "flags": [ "USE_UPS", "STURDY", "WATERPROOF", "ELECTRIC_IMMUNE", "COMBAT_TOGGLEABLE", "OUTER", "MUNDANE", "DEAF", "TARDIS" ], - "relic_data": { - "passive_effects": [ { "id": "ench_exo_strength" }, { "condition": "ACTIVE", "values": [ { "value": "CARRY_WEIGHT", "add": 20000 } ] } ] - }, + "flags": [ + "USE_UPS", + "IS_UPS", + "STURDY", + "WATERPROOF", + "ELECTRIC_IMMUNE", + "COMBAT_TOGGLEABLE", + "OUTER", + "MUNDANE", + "DEAF", + "TARDIS" + ], + "relic_data": { "passive_effects": [ { "id": "ench_exo_strength" } ] }, "use_action": [ { "target": "modular_exosuit_on", @@ -336,6 +345,7 @@ "description": "This is a standard exosuit frame. Designed to be modular, it can accept a variety of power supplies, defensive and offensive systems, and utility tools. Slots exist for the torso, back, arms, and legs. It is turned on and continually drawing power. Use it to turn it off.", "flags": [ "USE_UPS", + "IS_UPS", "STURDY", "WATERPROOF", "ELECTRIC_IMMUNE", @@ -527,7 +537,18 @@ } ], "ammo": "battery", - "flags": [ "USE_UPS", "STURDY", "WATERPROOF", "ELECTRIC_IMMUNE", "COMBAT_TOGGLEABLE", "OUTER", "MUNDANE", "DEAF", "TARDIS" ], + "flags": [ + "USE_UPS", + "IS_UPS", + "STURDY", + "WATERPROOF", + "ELECTRIC_IMMUNE", + "COMBAT_TOGGLEABLE", + "OUTER", + "MUNDANE", + "DEAF", + "TARDIS" + ], "relic_data": { "passive_effects": [ { "id": "ench_exo_strength" } ] }, "use_action": [ { @@ -547,10 +568,11 @@ "repairs_like": "modular_exosuit", "looks_like": "power_armor_light", "type": "TOOL_ARMOR", - "name": { "str": "exosuit frame (on)", "str_pl": "exosuit frames (on)" }, + "name": { "str": "light exosuit frame (on)", "str_pl": "light exosuit frames (on)" }, "description": "This is a light duty exosuit frame. This lighter version of the exosuit draws less power but has less capacity for equipment and uses a fixed cage for collision protection instead of modular armor. It is turned on and continually drawing power. Use it to turn it off.", "flags": [ "USE_UPS", + "IS_UPS", "STURDY", "WATERPROOF", "ELECTRIC_IMMUNE", diff --git a/data/mods/Aftershock/maps/mapgen/maintenance_outpost.json b/data/mods/Aftershock/maps/mapgen/maintenance_outpost.json index f8cde95868489..676ab3419db93 100644 --- a/data/mods/Aftershock/maps/mapgen/maintenance_outpost.json +++ b/data/mods/Aftershock/maps/mapgen/maintenance_outpost.json @@ -85,7 +85,7 @@ "l": { "item": "afs_colonist_outfit", "chance": 20 }, "3": { "item": "nuclear_reactor" }, "2": { "item": "old_industrial_bot_storage", "chance": 20 }, - "H": { "item": "afs_exosuit_worker", "chance": 75 } + "H": { "item": "afs_exosuit_light_worker", "chance": 75 } }, "place_monster": [ { "group": "AFS_GROUP_ROBOT_LOW_RISK", "x": [ 24, 47 ], "y": [ 0, 23 ], "pack_size": [ 1, 4 ], "chance": 20 }, From 3634fb91b4c75c30f1391969586883c528a5934c Mon Sep 17 00:00:00 2001 From: Drew4484 Date: Wed, 22 Nov 2023 12:57:22 -0800 Subject: [PATCH 09/23] Dazzle module Also fixes boarding axe weights --- .../items/armor/exosuit/exosuit_melee.json | 4 +-- .../items/armor/exosuit/exosuit_modules.json | 27 ++++++++++++++++++- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_melee.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_melee.json index c6741a58cdcc6..b7dbd23a618ce 100644 --- a/data/mods/Aftershock/items/armor/exosuit/exosuit_melee.json +++ b/data/mods/Aftershock/items/armor/exosuit/exosuit_melee.json @@ -7,7 +7,7 @@ "name": "boarding axe", "ascii_picture": "halberd", "description": "This is a sturdy axe with a pick opposite the blade. A composite titanium/Kevlar handle provides a sturdy grip that protects against electrical shocks and high temperatures. Designed for use by soldiers wearing strength-enhancing exosuits, it's quite heavy. Activate it to fold it into a compact module.", - "weight": "3500 g", + "weight": "7500 g", "volume": "2750 ml", "longest_side": "120 cm", "techniques": [ "WBLOCK_2", "BRUTAL", "SWEEP" ], @@ -36,7 +36,7 @@ "name": "makeshift boarding axe", "ascii_picture": "halberd", "description": "This is an oversized axe made from scraps of salvaged metal. While not as versatile or durable as the boarding axe, it still packs a punch.", - "weight": "4250 g", + "weight": "9250 g", "volume": "2750 ml", "longest_side": "120 cm", "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ], diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json index ebf0c779a262a..dbda16b6bcdc2 100644 --- a/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json +++ b/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json @@ -634,7 +634,7 @@ "color": "light_gray", "name": "collapsed boarding axe", "description": "This is an exosuit-scale boarding axe, folded into a compact module. Activate to extend.", - "weight": "3500 g", + "weight": "7500 g", "volume": "1500 ml", "longest_side": "45 cm", "flags": [ "DURABLE_MELEE", "BELT_CLIP", "NONCONDUCTIVE", "EXO_MEDIUM_GADGET" ], @@ -683,4 +683,29 @@ "type": "transform" } } + { + "id": "exo_dazzle", + "type": "GUN", + "copy-from": "hm12", + "name": { "str": "UCIA Drone Controller" }, + "description": "This is a closely-held military module used by the UCIA to both control their own drones and disable hostile drones. A large phased array fits over the torso and an onboard controller links to the suit's systems. ", + "weight": "4 kg", + "volume": "7 l", + "range": 30, + "ammo": [ "battery" ], + "ammo_to_fire": 0, + "energy_drain": "10 kJ", + "ammo_effects": [ "LASER", "ROBOT_DAZZLE" ], + "flags": [ "NEVER_JAMS", "NON_FOULING", "NEEDS_NO_LUBE", "FRAGILE" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "magazine_well": "75 ml", + "item_restriction": [ "afs_cartridge", "afs_compact_cartridge", "afs_bootleg_cartridge", "afs_archeotech_cartridge" ] + } + ] + }, ] From 74f69b29fa711e2e19a5815c13347366c198c6cf Mon Sep 17 00:00:00 2001 From: Drew4484 Date: Wed, 22 Nov 2023 14:32:04 -0800 Subject: [PATCH 10/23] Improved Dazzle Effect --- data/json/ammo_effects.json | 5 +++++ src/creature.cpp | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json index 150e76345fb51..abaa970a7b92c 100644 --- a/data/json/ammo_effects.json +++ b/data/json/ammo_effects.json @@ -168,6 +168,11 @@ "type": "ammo_effect", "//": "Applies sensor-stunning effect to robots. Hardcoded" }, + { + "id": "ROBOT_DAZZLE_IMPROVED", + "type": "ammo_effect", + "//": "Applies sensor-stunning effect to robots. Improved for use in Aftershock. Hardcoded" + }, { "id": "RECOVER_X", "type": "ammo_effect", diff --git a/src/creature.cpp b/src/creature.cpp index bf5a621eb0110..446cea27e3f3b 100644 --- a/src/creature.cpp +++ b/src/creature.cpp @@ -910,6 +910,18 @@ void projectile::apply_effects_damage( Creature &target, Creature *source, } } + if( proj_effects.count( "ROBOT_DAZZLE_IMPROVED" ) ) { + if( critical && target.in_species( species_ROBOT ) ) { + time_duration duration = rng( 8_turns, 12_turns ); + target.add_effect( effect_source( source ), effect_stunned, duration ); + target.add_effect( effect_source( source ), effect_sensor_stun, duration ); + add_msg( source->is_avatar() ? + _( "The %1$s seems to stagger as the array fires." ) : + _( "The %1$s is stunned!" ), + target.disp_name( true ) ); + } + } + if( dealt_dam.bp_hit->has_type( body_part_type::type::head ) && proj_effects.count( "BLINDS_EYES" ) ) { // TODO: Change this to require bp_eyes From 35c923aa3daf2e97fb5f807ccc347be983732244 Mon Sep 17 00:00:00 2001 From: Drew4484 Date: Wed, 22 Nov 2023 14:35:35 -0800 Subject: [PATCH 11/23] Update exosuit_modules.json --- .../Aftershock/items/armor/exosuit/exosuit_modules.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json index dbda16b6bcdc2..f85ed51fea2cd 100644 --- a/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json +++ b/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json @@ -682,20 +682,20 @@ "menu_text": "Turn off module", "type": "transform" } - } + }, { "id": "exo_dazzle", "type": "GUN", "copy-from": "hm12", "name": { "str": "UCIA Drone Controller" }, - "description": "This is a closely-held military module used by the UCIA to both control their own drones and disable hostile drones. A large phased array fits over the torso and an onboard controller links to the suit's systems. ", + "description": "This is a closely-held military module used by the UCIA to both control their own drones and disable hostile drones. A large phased array fits over the torso and an onboard controller links to the suit's systems. Without the command keys, this will still disable a drone or robot for a few seconds.", "weight": "4 kg", "volume": "7 l", "range": 30, "ammo": [ "battery" ], "ammo_to_fire": 0, "energy_drain": "10 kJ", - "ammo_effects": [ "LASER", "ROBOT_DAZZLE" ], + "ammo_effects": [ "LASER", "IMPROVED_ROBOT_DAZZLE" ], "flags": [ "NEVER_JAMS", "NON_FOULING", "NEEDS_NO_LUBE", "FRAGILE" ], "pocket_data": [ { @@ -707,5 +707,5 @@ "item_restriction": [ "afs_cartridge", "afs_compact_cartridge", "afs_bootleg_cartridge", "afs_archeotech_cartridge" ] } ] - }, + } ] From 4caefe18b8d56d228b4bc58f45e9b3dbd1974179 Mon Sep 17 00:00:00 2001 From: Drew4484 Date: Sun, 26 Nov 2023 23:10:44 -0800 Subject: [PATCH 12/23] Update exosuit_modules.json --- data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json index f85ed51fea2cd..fa40218c7fdf0 100644 --- a/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json +++ b/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json @@ -690,7 +690,7 @@ "name": { "str": "UCIA Drone Controller" }, "description": "This is a closely-held military module used by the UCIA to both control their own drones and disable hostile drones. A large phased array fits over the torso and an onboard controller links to the suit's systems. Without the command keys, this will still disable a drone or robot for a few seconds.", "weight": "4 kg", - "volume": "7 l", + "volume": "7 L", "range": 30, "ammo": [ "battery" ], "ammo_to_fire": 0, From f2665071366174e13e8f1bb7f4edd3e9923cd138 Mon Sep 17 00:00:00 2001 From: D <> Date: Thu, 14 Mar 2024 00:30:11 -0700 Subject: [PATCH 13/23] Remove Dazzle --- data/json/ammo_effects.json | 5 ---- .../items/armor/exosuit/exosuit_modules.json | 25 ------------------- src/creature.cpp | 12 --------- 3 files changed, 42 deletions(-) diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json index abaa970a7b92c..150e76345fb51 100644 --- a/data/json/ammo_effects.json +++ b/data/json/ammo_effects.json @@ -168,11 +168,6 @@ "type": "ammo_effect", "//": "Applies sensor-stunning effect to robots. Hardcoded" }, - { - "id": "ROBOT_DAZZLE_IMPROVED", - "type": "ammo_effect", - "//": "Applies sensor-stunning effect to robots. Improved for use in Aftershock. Hardcoded" - }, { "id": "RECOVER_X", "type": "ammo_effect", diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json index fa40218c7fdf0..301ff0b4d0471 100644 --- a/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json +++ b/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json @@ -682,30 +682,5 @@ "menu_text": "Turn off module", "type": "transform" } - }, - { - "id": "exo_dazzle", - "type": "GUN", - "copy-from": "hm12", - "name": { "str": "UCIA Drone Controller" }, - "description": "This is a closely-held military module used by the UCIA to both control their own drones and disable hostile drones. A large phased array fits over the torso and an onboard controller links to the suit's systems. Without the command keys, this will still disable a drone or robot for a few seconds.", - "weight": "4 kg", - "volume": "7 L", - "range": 30, - "ammo": [ "battery" ], - "ammo_to_fire": 0, - "energy_drain": "10 kJ", - "ammo_effects": [ "LASER", "IMPROVED_ROBOT_DAZZLE" ], - "flags": [ "NEVER_JAMS", "NON_FOULING", "NEEDS_NO_LUBE", "FRAGILE" ], - "pocket_data": [ - { - "pocket_type": "MAGAZINE_WELL", - "holster": true, - "max_contains_volume": "20 L", - "max_contains_weight": "20 kg", - "magazine_well": "75 ml", - "item_restriction": [ "afs_cartridge", "afs_compact_cartridge", "afs_bootleg_cartridge", "afs_archeotech_cartridge" ] - } - ] } ] diff --git a/src/creature.cpp b/src/creature.cpp index 446cea27e3f3b..bf5a621eb0110 100644 --- a/src/creature.cpp +++ b/src/creature.cpp @@ -910,18 +910,6 @@ void projectile::apply_effects_damage( Creature &target, Creature *source, } } - if( proj_effects.count( "ROBOT_DAZZLE_IMPROVED" ) ) { - if( critical && target.in_species( species_ROBOT ) ) { - time_duration duration = rng( 8_turns, 12_turns ); - target.add_effect( effect_source( source ), effect_stunned, duration ); - target.add_effect( effect_source( source ), effect_sensor_stun, duration ); - add_msg( source->is_avatar() ? - _( "The %1$s seems to stagger as the array fires." ) : - _( "The %1$s is stunned!" ), - target.disp_name( true ) ); - } - } - if( dealt_dam.bp_hit->has_type( body_part_type::type::head ) && proj_effects.count( "BLINDS_EYES" ) ) { // TODO: Change this to require bp_eyes From 4e4267b2791646298b55e163fbe3e070a3367d22 Mon Sep 17 00:00:00 2001 From: D <57647637+Drew4484@users.noreply.github.com> Date: Fri, 15 Mar 2024 01:14:00 -0700 Subject: [PATCH 14/23] Underlayer temperature controls --- .../armor/exosuit/exosuit_underlayers.json | 16 ++++----- data/mods/Aftershock/items/item_enchants.json | 34 ++++++++++++++----- 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_underlayers.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_underlayers.json index 8ad85f73c5e28..81b6353ae15ab 100644 --- a/data/mods/Aftershock/items/armor/exosuit/exosuit_underlayers.json +++ b/data/mods/Aftershock/items/armor/exosuit/exosuit_underlayers.json @@ -5,7 +5,7 @@ "copy-from": "jumpsuit", "looks_like": "robofac_enviro_suit", "name": { "str": "exosuit underlayer" }, - "description": "A form-fitting suit meant to be worn by the exosuit pilot. Although not a requirement for the operation of an exosuit, it features haptic feedback systems that offer improved performance and comfort while doing so. The suit is not designed for use outside of armor. This standard model uses a scale mail of overlapping plastic disks for incidental protection.", + "description": "A form-fitting suit meant to be worn by an exosuit pilot. Although not a requirement for the operation of an exosuit, it features haptic feedback systems that offer improved performance and comfort while doing so. The suit is not designed for use outside of armor. This standard model uses a scale mail of overlapping plastic disks for incidental protection.", "weight": "610 g", "volume": "3500 ml", "color": "brown", @@ -28,7 +28,7 @@ ], "warmth": 10, "flags": [ "EXO_UNDERLAYER", "SKINTIGHT", "WATERPROOF", "POWERARMOR_COMPATIBLE", "SOFT" ], - "relic_data": { "passive_effects": [ { "id": "ench_climate_control_exo_underlayer" } ] } + "relic_data": { "passive_effects": [ { "id": "afs_ench_climate_control_1" } ] } }, { "id": "afs_exo_combat_underlayer", @@ -36,7 +36,7 @@ "copy-from": "jumpsuit", "looks_like": "robofac_enviro_suit", "name": { "str": "exosuit combat underlayer" }, - "description": "A form-fitting suit meant to be worn by the exosuit pilot. Although not a requirement for the operation of an exosuit, it features haptic feedback systems that offer improved performance and comfort while doing so. The suit is not designed for use outside of armor. This model offers tough kevlar to protect from spalling.", + "description": "A form-fitting suit meant to be worn by an exosuit pilot. Although not a requirement for the operation of an exosuit, it features haptic feedback systems that offer improved performance and comfort while doing so. The suit is not designed for use outside of armor. This model offers tough kevlar to protect from spalling.", "weight": "610 g", "volume": "3500 ml", "color": "brown", @@ -67,7 +67,7 @@ ], "warmth": 10, "flags": [ "EXO_UNDERLAYER", "SKINTIGHT", "WATERPROOF", "POWERARMOR_COMPATIBLE", "SOFT" ], - "relic_data": { "passive_effects": [ { "id": "ench_climate_control_exo_underlayer" } ] } + "relic_data": { "passive_effects": [ { "id": "afs_ench_climate_control_2" } ] } }, { "id": "afs_exo_eva_underlayer", @@ -75,7 +75,7 @@ "copy-from": "jumpsuit", "looks_like": "robofac_enviro_suit", "name": { "str": "exosuit EVA underlayer" }, - "description": "A form-fitting suit meant to be worn by the exosuit pilot. Although not a requirement for the operation of an exosuit, it features haptic feedback systems that offer improved performance and comfort while doing so. This model is designed for EVA operation, offering protection against breaches.", + "description": "A form-fitting suit meant to be worn by an exosuit pilot. Although not a requirement for the operation of an exosuit, it features haptic feedback systems that offer improved performance and comfort while doing so. This model is designed for EVA operation, offering protection against breaches.", "weight": "610 g", "volume": "3500 ml", "color": "brown", @@ -98,7 +98,7 @@ ], "warmth": 10, "flags": [ "EXO_UNDERLAYER", "SKINTIGHT", "WATERPROOF", "POWERARMOR_COMPATIBLE", "SOFT", "GAS_PROOF", "RAD_RESIST", "RAINPROOF" ], - "relic_data": { "passive_effects": [ { "id": "ench_climate_control_exo_underlayer" } ] } + "relic_data": { "passive_effects": [ { "id": "afs_ench_climate_control_4" } ] } }, { "id": "afs_exo_hazard_underlayer", @@ -106,7 +106,7 @@ "copy-from": "jumpsuit", "looks_like": "robofac_enviro_suit", "name": { "str": "exosuit utility underlayer" }, - "description": "A form-fitting suit meant to be worn by the exosuit pilot. Although not a requirement for the operation of an exosuit, it features haptic feedback systems that offer improved performance and comfort while doing so. This model is designed for hazardous environments and sacrifices mobility for extra protection.", + "description": "A form-fitting suit meant to be worn by an exosuit pilot. Although not a requirement for the operation of an exosuit, it features haptic feedback systems that offer improved performance and comfort while doing so. This model is designed for hazardous environments and sacrifices mobility for extra protection.", "weight": "610 g", "volume": "3500 ml", "color": "brown", @@ -137,6 +137,6 @@ ], "warmth": 10, "flags": [ "EXO_UNDERLAYER", "SKINTIGHT", "WATERPROOF", "POWERARMOR_COMPATIBLE", "SOFT", "GAS_PROOF", "RAD_RESIST", "RAINPROOF" ], - "relic_data": { "passive_effects": [ { "id": "ench_climate_control_exo_underlayer" } ] } + "relic_data": { "passive_effects": [ { "id": "afs_ench_climate_control_3" } ] } } ] diff --git a/data/mods/Aftershock/items/item_enchants.json b/data/mods/Aftershock/items/item_enchants.json index 224ebabd0a503..2fb3b67b4a2cf 100644 --- a/data/mods/Aftershock/items/item_enchants.json +++ b/data/mods/Aftershock/items/item_enchants.json @@ -81,23 +81,41 @@ "description": "Assists with learning and study." }, { - "id": "afs_ench_climate_control_warm", + "id": "afs_ench_climate_control_1", "type": "enchantment", - "name": { "str": "Cold Climate Control" }, - "description": "You are wearing equipment that helps handle harsh climates.", + "name": { "str": "Exosuit Climate Control" }, + "description": "Your active jumpsuit helps maintain your body temperature.", "has": "WORN", "condition": "ACTIVE", - "values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 50 } ] + "values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 50 }, { "value": "CLIMATE_CONTROL_CHILL", "add": 50 } ] ] }, { - "id": "ench_climate_control_exo_underlayer", + "id": "afs_ench_climate_control_2", "type": "enchantment", - "name": { "str": "Cold Climate Control" }, - "description": "You are wearing equipment that helps handle harsh climates.", + "name": { "str": "Exosuit Climate Control" }, + "description": "Your active jumpsuit helps maintain your body temperature.", "has": "WORN", "condition": { "u_is_wearing": "modular_exosuit_on" }, - "values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 150 }, { "value": "CLIMATE_CONTROL_CHILL", "add": 150 } ] + "values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 75 }, { "value": "CLIMATE_CONTROL_CHILL", "add": 75 } ] }, + { + "id": "afs_ench_climate_control_3", + "type": "enchantment", + "name": { "str": "Exosuit Climate Control" }, + "description": "Your active jumpsuit helps maintain your body temperature.", + "has": "WORN", + "condition": { "u_is_wearing": "modular_exosuit_on" }, + "values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 100 }, { "value": "CLIMATE_CONTROL_CHILL", "add": 150 } ] + }, + { + "id": "afs_ench_climate_control_4", + "type": "enchantment", + "name": { "str": "Exosuit Climate Control" }, + "description": "Your active jumpsuit helps maintain your body temperature.", + "has": "WORN", + "condition": { "u_is_wearing": "modular_exosuit_on" }, + "values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 300 }, { "value": "CLIMATE_CONTROL_CHILL", "add": 300 } ] + } { "id": "ench_smart_gun", "name": { "str": "Smart Gun" }, From 09cc53cb835c53ab57353c6ec53dbce5b4a9cb25 Mon Sep 17 00:00:00 2001 From: D <57647637+Drew4484@users.noreply.github.com> Date: Fri, 15 Mar 2024 01:34:37 -0700 Subject: [PATCH 15/23] Update item_enchants.json Missing comma --- data/mods/Aftershock/items/item_enchants.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/items/item_enchants.json b/data/mods/Aftershock/items/item_enchants.json index 2fb3b67b4a2cf..dd3d079288a09 100644 --- a/data/mods/Aftershock/items/item_enchants.json +++ b/data/mods/Aftershock/items/item_enchants.json @@ -87,7 +87,7 @@ "description": "Your active jumpsuit helps maintain your body temperature.", "has": "WORN", "condition": "ACTIVE", - "values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 50 }, { "value": "CLIMATE_CONTROL_CHILL", "add": 50 } ] ] + "values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 50 }, { "value": "CLIMATE_CONTROL_CHILL", "add": 50 } ], ] }, { "id": "afs_ench_climate_control_2", From 1c45bbe85537077d0eaeee5a5ba93e9cb21ba98e Mon Sep 17 00:00:00 2001 From: D <57647637+Drew4484@users.noreply.github.com> Date: Fri, 15 Mar 2024 02:00:39 -0700 Subject: [PATCH 16/23] Update item_enchants.json --- data/mods/Aftershock/items/item_enchants.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/data/mods/Aftershock/items/item_enchants.json b/data/mods/Aftershock/items/item_enchants.json index dd3d079288a09..2d8a3ea759fde 100644 --- a/data/mods/Aftershock/items/item_enchants.json +++ b/data/mods/Aftershock/items/item_enchants.json @@ -80,6 +80,15 @@ "values": [ { "value": "LEARNING_FOCUS", "add": 15 } ], "description": "Assists with learning and study." }, + { + "id": "afs_ench_climate_control_warm", + "type": "enchantment", + "name": { "str": "Cold Climate Control" }, + "description": "You are wearing equipment that helps handle harsh climates.", + "has": "WORN", + "condition": "ACTIVE", + "values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 50 } ] + }, { "id": "afs_ench_climate_control_1", "type": "enchantment", @@ -87,7 +96,7 @@ "description": "Your active jumpsuit helps maintain your body temperature.", "has": "WORN", "condition": "ACTIVE", - "values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 50 }, { "value": "CLIMATE_CONTROL_CHILL", "add": 50 } ], ] + "values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 50 }, { "value": "CLIMATE_CONTROL_CHILL", "add": 50 } ] }, { "id": "afs_ench_climate_control_2", @@ -115,7 +124,7 @@ "has": "WORN", "condition": { "u_is_wearing": "modular_exosuit_on" }, "values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 300 }, { "value": "CLIMATE_CONTROL_CHILL", "add": 300 } ] - } + }, { "id": "ench_smart_gun", "name": { "str": "Smart Gun" }, From 561c699bf7bdcff7b1a70a94e20cf99931804297 Mon Sep 17 00:00:00 2001 From: D <57647637+Drew4484@users.noreply.github.com> Date: Fri, 15 Mar 2024 02:28:30 -0700 Subject: [PATCH 17/23] Update item_enchants.json --- data/mods/Aftershock/items/item_enchants.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/data/mods/Aftershock/items/item_enchants.json b/data/mods/Aftershock/items/item_enchants.json index 2d8a3ea759fde..544ac67a9e686 100644 --- a/data/mods/Aftershock/items/item_enchants.json +++ b/data/mods/Aftershock/items/item_enchants.json @@ -125,6 +125,15 @@ "condition": { "u_is_wearing": "modular_exosuit_on" }, "values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 300 }, { "value": "CLIMATE_CONTROL_CHILL", "add": 300 } ] }, + { + "id": "ench_exo_carry", + "type": "enchantment", + "name": { "str": "EXO Frame Carry" }, + "description": "You are wearing equipment that gives 20kg carry weight.", + "has": "WORN", + "condition": "ACTIVE", + "values": [ { "value": "CARRY_WEIGHT", "add": 20000 } ] + }, { "id": "ench_smart_gun", "name": { "str": "Smart Gun" }, From 74525f5b75940912052607ed0e4868412b07955d Mon Sep 17 00:00:00 2001 From: D <57647637+Drew4484@users.noreply.github.com> Date: Fri, 15 Mar 2024 02:39:08 -0700 Subject: [PATCH 18/23] Clean up enchantments --- .../Aftershock/items/armor/exosuit/exosuit_frame.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json index c7600e29b8366..bcc6ab10033e2 100644 --- a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json +++ b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json @@ -322,7 +322,11 @@ "DEAF", "TARDIS" ], - "relic_data": { "passive_effects": [ { "id": "ench_exo_strength" } ] }, + "relic_data": { + "passive_effects": [ + { "condition": "ACTIVE", "values": [ { "value": "STRENGTH", "add": 10 }, { "value": "CARRY_WEIGHT", "add": 20000 } ] } + ] + }, "use_action": [ { "target": "modular_exosuit_on", @@ -583,7 +587,7 @@ "FLASH_PROTECTION", "TARDIS" ], - "weight_capacity_bonus": "20 kg", + "relic_data": { "passive_effects": [ { "condition": "ACTIVE", "values": [ { "value": "STRENGTH", "add": 5 } ] } ] }, "power_draw": "4075 mW", "revert_to": "modular_exosuit_light", "use_action": [ { "type": "transform", "menu_text": "Turn off", "msg": "The %s disengages.", "target": "modular_exosuit_light" } ], From 94bf99b2f2937fdaeac293d587fd46937f5198b5 Mon Sep 17 00:00:00 2001 From: D <57647637+Drew4484@users.noreply.github.com> Date: Sat, 16 Mar 2024 23:35:19 -0700 Subject: [PATCH 19/23] Update exosuit_frame.json --- data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json index bcc6ab10033e2..dbcf4d621f137 100644 --- a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json +++ b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json @@ -360,7 +360,7 @@ "FLASH_PROTECTION", "TARDIS" ], - "power_draw": "6173 mW", + "power_draw": "8170 mW", "revert_to": "modular_exosuit", "use_action": [ { "type": "transform", "menu_text": "Turn off", "msg": "The %s disengages.", "target": "modular_exosuit" } ], "armor": [ @@ -556,7 +556,7 @@ "relic_data": { "passive_effects": [ { "id": "ench_exo_strength" } ] }, "use_action": [ { - "target": "modular_exosuit_on", + "target": "modular_exosuit_light_on", "msg": "The %s engages.", "active": true, "need_charges": 1, @@ -610,7 +610,7 @@ ], "covers": [ "head", "mouth", "torso", "arm_l", "arm_r", "leg_l", "leg_r", "foot_l", "foot_r" ], "coverage": 90, - "encumbrance": 25, + "encumbrance": 20, "layers": [ "OUTER" ] }, { From a277d70afab2f16925ff5bf073656a026d9f06e8 Mon Sep 17 00:00:00 2001 From: D <57647637+Drew4484@users.noreply.github.com> Date: Sun, 17 Mar 2024 22:36:52 -0700 Subject: [PATCH 20/23] Linting, in my PR??? --- data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json index dbcf4d621f137..c90e7e55c1de7 100644 --- a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json +++ b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json @@ -360,7 +360,7 @@ "FLASH_PROTECTION", "TARDIS" ], - "power_draw": "8170 mW", + "power_draw": "8170 mW", "revert_to": "modular_exosuit", "use_action": [ { "type": "transform", "menu_text": "Turn off", "msg": "The %s disengages.", "target": "modular_exosuit" } ], "armor": [ From bd5095da16b120f0c0c185e930137a9d24cd32ef Mon Sep 17 00:00:00 2001 From: D <57647637+Drew4484@users.noreply.github.com> Date: Thu, 21 Mar 2024 00:14:34 -0700 Subject: [PATCH 21/23] Adjust power consumption --- data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json index c90e7e55c1de7..e9818082b7da5 100644 --- a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json +++ b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json @@ -360,7 +360,7 @@ "FLASH_PROTECTION", "TARDIS" ], - "power_draw": "8170 mW", + "power_draw": "6460 mW", "revert_to": "modular_exosuit", "use_action": [ { "type": "transform", "menu_text": "Turn off", "msg": "The %s disengages.", "target": "modular_exosuit" } ], "armor": [ @@ -588,7 +588,7 @@ "TARDIS" ], "relic_data": { "passive_effects": [ { "condition": "ACTIVE", "values": [ { "value": "STRENGTH", "add": 5 } ] } ] }, - "power_draw": "4075 mW", + "power_draw": "5787 mW", "revert_to": "modular_exosuit_light", "use_action": [ { "type": "transform", "menu_text": "Turn off", "msg": "The %s disengages.", "target": "modular_exosuit_light" } ], "armor": [ From 50d26e75c549fe7fbb31a023c993c46c658a0ab8 Mon Sep 17 00:00:00 2001 From: D <57647637+Drew4484@users.noreply.github.com> Date: Thu, 21 Mar 2024 16:20:58 -0700 Subject: [PATCH 22/23] Single character fix --- data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json index e9818082b7da5..b508cfa98fcb1 100644 --- a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json +++ b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json @@ -360,7 +360,7 @@ "FLASH_PROTECTION", "TARDIS" ], - "power_draw": "6460 mW", + "power_draw": "6460 mW", "revert_to": "modular_exosuit", "use_action": [ { "type": "transform", "menu_text": "Turn off", "msg": "The %s disengages.", "target": "modular_exosuit" } ], "armor": [ From a03591f7cfe5c05ca60bf23dd4c0d33db6b75475 Mon Sep 17 00:00:00 2001 From: D <57647637+Drew4484@users.noreply.github.com> Date: Thu, 21 Mar 2024 22:39:12 -0700 Subject: [PATCH 23/23] kevlar to Kevlar --- .../Aftershock/items/armor/exosuit/exosuit_underlayers.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_underlayers.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_underlayers.json index 81b6353ae15ab..5271d401020c3 100644 --- a/data/mods/Aftershock/items/armor/exosuit/exosuit_underlayers.json +++ b/data/mods/Aftershock/items/armor/exosuit/exosuit_underlayers.json @@ -36,7 +36,7 @@ "copy-from": "jumpsuit", "looks_like": "robofac_enviro_suit", "name": { "str": "exosuit combat underlayer" }, - "description": "A form-fitting suit meant to be worn by an exosuit pilot. Although not a requirement for the operation of an exosuit, it features haptic feedback systems that offer improved performance and comfort while doing so. The suit is not designed for use outside of armor. This model offers tough kevlar to protect from spalling.", + "description": "A form-fitting suit meant to be worn by an exosuit pilot. Although not a requirement for the operation of an exosuit, it features haptic feedback systems that offer improved performance and comfort while doing so. The suit is not designed for use outside of armor. This model includes tough Kevlar to protect from spalling.", "weight": "610 g", "volume": "3500 ml", "color": "brown",