Merge pull request #69186 from Drew4484/AFS-Exosuit-Updates-III

[CR] AFS Exosuit Updates III
CleverRaven · Mar 24, 2024 · 91f42e3 · 91f42e3
2 parents 7bfad84 + a03591f
commit 91f42e3
Show file tree

Hide file tree

Showing 8 changed files with 345 additions and 41 deletions.
diff --git 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/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)",
@@ -318,13 +305,27 @@
         "material": [ { "type": "titanium", "covered_by_mat": 100, "thickness": 2 } ],
         "covers": [ "hand_l", "hand_r" ],
         "coverage": 40,
-        "encumbrance": 20
+        "encumbrance": 20,
+        "layers": [ "OUTER" ]
       }
     ],
     "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" }, { "condition": "ACTIVE", "values": [ { "value": "CARRY_WEIGHT", "add": 20000 } ] } ]
+      "passive_effects": [
+        { "condition": "ACTIVE", "values": [ { "value": "STRENGTH", "add": 10 }, { "value": "CARRY_WEIGHT", "add": 20000 } ] }
+      ]
     },
     "use_action": [
       {
@@ -348,6 +349,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",
@@ -358,7 +360,7 @@
       "FLASH_PROTECTION",
       "TARDIS"
     ],
-    "power_draw": "6173 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": [
@@ -387,5 +389,237 @@
         "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": "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": 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": 90,
+        "encumbrance": 25,
+        "layers": [ "OUTER" ]
+      },
+      {
+        "material": [ { "type": "titanium", "covered_by_mat": 100, "thickness": 2 } ],
+        "covers": [ "hand_l", "hand_r" ],
+        "coverage": 40,
+        "encumbrance": 20,
+        "layers": [ "OUTER" ]
+      }
+    ],
+    "ammo": "battery",
+    "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_light_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": "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",
+      "COMBAT_TOGGLEABLE",
+      "OUTER",
+      "PARTIAL_DEAF",
+      "SUN_GLASSES",
+      "FLASH_PROTECTION",
+      "TARDIS"
+    ],
+    "relic_data": { "passive_effects": [ { "condition": "ACTIVE", "values": [ { "value": "STRENGTH", "add": 5 } ] } ] },
+    "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": [
+      {
+        "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": 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": 90,
+        "encumbrance": 20,
+        "layers": [ "OUTER" ]
+      },
+      {
+        "material": [ { "type": "titanium", "covered_by_mat": 100, "thickness": 2 } ],
+        "covers": [ "hand_l", "hand_r" ],
+        "coverage": 40,
+        "encumbrance": 20,
+        "layers": [ "OUTER" ]
+      }
+    ]
   }
 ]
diff --git 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" ],