AFS Exosuits Updates II (CleverRaven#69048)

* Adds RIGID to all frame storage. * Add TARDIS to frame * Increase initial power supply reserves * Add security and military item groups for exosuit * Prepnet vendor stocked with exosuit modules * Initial draft of exosuit manual * Update data/mods/Aftershock/itemgroups/item_groups.json * Text corrections and dictionary update --------- Co-authored-by: John Candlebury <[email protected]>
Cyrano7 · Nov 5, 2023 · 20accf2 · 20accf2
1 parent bab59b4
commit 20accf2
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 7 deletions.
diff --git a/data/mods/Aftershock/itemgroups/item_groups.json b/data/mods/Aftershock/itemgroups/item_groups.json
@@ -343,6 +343,7 @@
       { "group": "afs_scrapgroup", "count": [ 1, 3 ], "prob": 30 },
       { "group": "exoticplants", "count": [ 1, 3 ], "prob": 30 },
       { "group": "science", "count": [ 1, 3 ], "prob": 30 },
+      { "group": "afs_exo_basic_accessories", "count": 1, "prob": 15 },
       { "item": "subsuit_xl" }
     ]
   },
@@ -448,8 +449,8 @@
     "id": "afs_exo_basic_power",
     "type": "item_group",
     "items": [
-      { "item": "exo_back_battery_rechargable", "prob": 75, "charges": [ 50, 100 ] },
-      { "item": "exo_back_gasoline", "prob": 50, "charges": [ 50, 100 ] },
+      { "item": "exo_back_battery_rechargable", "prob": 75, "charges": [ 200, 300 ] },
+      { "item": "exo_back_gasoline", "prob": 50, "charges": [ 200, 300 ] },
       { "item": "exo_aux_power", "prob": 25, "charges": [ 50, 100 ] },
       { "item": "exo_small_aux_power", "prob": 25, "charges": [ 50, 100 ] }
     ]
@@ -458,8 +459,8 @@
     "id": "afs_exo_advanced_power",
     "type": "item_group",
     "items": [
-      { "item": "exo_back_battery_rechargable", "prob": 50, "charges": [ 50, 100 ] },
-      { "item": "exo_back_fuelcell", "prob": 75, "charges": [ 50, 100 ] },
+      { "item": "exo_back_battery_rechargable", "prob": 50, "charges": [ 200, 300 ] },
+      { "item": "exo_back_fuelcell", "prob": 75, "charges": [ 200, 300 ] },
       { "item": "exo_asrg", "prob": 10 },
       { "item": "exo_aux_power", "count": [ 0, 1 ], "prob": 25, "charges": [ 50, 100 ] },
       { "item": "exo_small_aux_power", "prob": 25, "charges": [ 50, 100 ] }
@@ -501,5 +502,41 @@
       { "group": "afs_exo_basic_accessories", "prob": 75 },
       { "group": "afs_power_tools", "prob": 75 }
     ]
+  },
+  {
+    "id": "afs_exosuit_security",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      { "item": "afs_exo_combat_underlayer", "prob": 75 },
+      { "item": "afs_exo_standard_underlayer", "prob": 25 },
+      { "item": "afs_exo_hazard_underlayer", "prob": 10 },
+      { "item": "exo_helmet_steel", "prob": 90 },
+      { "item": "exo_torso_steel", "prob": 90 },
+      { "item": "exo_arm_steel", "prob": 90 },
+      { "item": "exo_leg_steel", "prob": 90 },
+      { "item": "exo_sonic_unit", "prob": 60 },
+      { "item": "exo_microwave_cannon", "prob": 60 },
+      { "item": "afs_cartridge", "count": [ 0, 4 ], "prob": 95, "charges": [ 50, 100 ] },
+      { "group": "afs_exo_basic_power", "prob": 25 }
+    ]
+  },
+  {
+    "id": "afs_exosuit_military",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      { "item": "modular_exosuit", "prob": 5 },
+      { "item": "afs_exo_combat_underlayer", "prob": 75 },
+      { "item": "afs_exo_hazard_underlayer", "prob": 25 },
+      { "item": "exo_helmet_vcc", "prob": 90 },
+      { "item": "exo_torso_vcc", "prob": 90 },
+      { "item": "exo_arm_vcc", "prob": 90 },
+      { "item": "exo_leg_vcc", "prob": 90 },
+      { "item": "exo_electrolaser", "prob": 15 },
+      { "item": "exo_flame_thrower", "prob": 50, "charges-min": 100, "charges-max": 1500 },
+      { "item": "afs_cartridge", "count": [ 2, 6 ], "prob": 95, "charges": [ 50, 100 ] },
+      { "group": "afs_exo_advanced_power", "prob": 25 }
+    ]
   }
 ]
diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_frame.json
@@ -18,6 +18,7 @@
         "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",
@@ -30,6 +31,7 @@
         "description": "This is a mounting point for helmet plating.",
         "ablative": true,
         "holster": true,
+        "rigid": true,
         "max_contains_volume": "25 L",
         "max_contains_weight": "140 kg",
         "flag_restriction": [ "EXO_HELMET_PLATE" ],
@@ -40,6 +42,7 @@
         "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",
@@ -51,6 +54,7 @@
         "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",
@@ -62,6 +66,7 @@
         "name": "Helmet hardpoint 3",
         "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",
@@ -73,6 +78,7 @@
         "name": "Helmet hardpoint 4",
         "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",
@@ -85,6 +91,7 @@
         "description": "This is a mounting point for torso armor.",
         "ablative": true,
         "holster": true,
+        "rigid": true,
         "max_contains_volume": "60 L",
         "max_contains_weight": "140 kg",
         "flag_restriction": [ "EXO_TORSO_PLATE" ],
@@ -95,6 +102,7 @@
         "name": "Torso large hardpoint 1",
         "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",
@@ -106,6 +114,7 @@
         "name": "Torso large hardpoint 2",
         "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",
@@ -117,6 +126,7 @@
         "name": "Torso small hardpoint 1",
         "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",
@@ -128,6 +138,7 @@
         "name": "Torso small hardpoint 2",
         "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",
@@ -139,6 +150,7 @@
         "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",
@@ -151,6 +163,7 @@
         "description": "This is a mounting point for arm armor.",
         "ablative": true,
         "holster": true,
+        "rigid": true,
         "max_contains_volume": "25 L",
         "max_contains_weight": "140 kg",
         "flag_restriction": [ "EXO_ARM_PLATE" ],
@@ -161,6 +174,7 @@
         "name": "Arm medium hardpoint 1",
         "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",
@@ -172,6 +186,7 @@
         "name": "Arm medium hardpoint 2",
         "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",
@@ -183,6 +198,7 @@
         "name": "Arm small hardpoint 1",
         "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",
@@ -194,6 +210,7 @@
         "name": "Arm small hardpoint 2",
         "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",
@@ -206,6 +223,7 @@
         "description": "This is a mounting point for leg armor.",
         "ablative": true,
         "holster": true,
+        "rigid": true,
         "max_contains_volume": "25 L",
         "max_contains_weight": "140 kg",
         "flag_restriction": [ "EXO_LEG_PLATE" ],
@@ -216,6 +234,7 @@
         "name": "Leg medium hardpoint 1",
         "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",
@@ -227,6 +246,7 @@
         "name": "Leg medium hardpoint 2",
         "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",
@@ -238,6 +258,7 @@
         "name": "Leg small hardpoint 1",
         "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",
@@ -249,6 +270,7 @@
         "name": "Leg small hardpoint 2",
         "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",
@@ -283,7 +305,7 @@
       }
     ],
     "ammo": "battery",
-    "flags": [ "USE_UPS", "STURDY", "WATERPROOF", "ELECTRIC_IMMUNE", "COMBAT_TOGGLEABLE", "OUTER", "MUNDANE", "DEAF" ],
+    "flags": [ "USE_UPS", "STURDY", "WATERPROOF", "ELECTRIC_IMMUNE", "COMBAT_TOGGLEABLE", "OUTER", "MUNDANE", "DEAF", "TARDIS" ],
     "relic_data": { "passive_effects": [ { "id": "ench_exo_strength" } ] },
     "use_action": [
       {
@@ -314,7 +336,8 @@
       "OUTER",
       "PARTIAL_DEAF",
       "SUN_GLASSES",
-      "FLASH_PROTECTION"
+      "FLASH_PROTECTION",
+      "TARDIS"
     ],
     "weight_capacity_bonus": "20 kg",
     "power_draw": "6173 mW",

diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_manual.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_manual.json
@@ -0,0 +1,24 @@
+[
+  {
+    "type": "snippet",
+    "category": "note",
+    "text": [
+      {
+        "id": "exosuit_guide_introduction",
+        "text": "\"Welcome to your Exosuit Piloting and Maintenance Manual.  This manual will walk you through the basic operations of an exosuit.  Before proceeding, please ensure you have completed the UCIA Exosuit Piloting course.  Any operation without a valid UCIA Exosuit Pilot Licence is considered a violation of safety standards.  <this is followed by twenty pages of disclaimers>\""
+      },
+      {
+        "id": "exosuit_guide_underlayer",
+        "text": "\"Part One: The Underlayer.  Underlayer are specialized clothing meant to interface with the exosuit frame.  While not essential, they do minimize the risk of clothing getting caught on the frame.  Some underlayers offer additional protection to the pilot, ranging from ballistic armor to fully sealed suits designed for operating underwater or outside a breathable atmosphere.\""
+      },
+      {
+        "id": "exosuit_guide_frame",
+        "text": "\"Part Two: The Frame.  The exosuit frame meets UICA Interoperability Standard AV-98, allowing it to interface with UICA and legacy TSKBEM modules.  Third-party modules should not be used unless also UISAV-98 compliant.  Designed to be worn over an underlayer or conventional clothes, the frame is adjustable to fit a range of pilots, and will adjust automatically when powered on.\""
+      },
+      {
+        "id": "exosuit_guide_management",
+        "text": "\"Part Three: Activation and Management.  On activation, the pilot will be asked to choose between 'Manage Exosuit Modules' or 'Turn On'. Selecting, 'Enter', the option to Manage Exosuit Modules will display a list of the exosuit frame's module slots, which are a combination of compartments for mounting protective plating and hardpoints.  Selecting an item, 'Enter', will show options based on the slot selected.  An empty slot will prompt the pilot to select an available appropriate module to load into that slot.  Selecting an occupied module will prompt the pilot to unload the slot, unload/reload the module (when appropriate), or swap the module with another.  Modules can be manually activated through this menu as well.\""
+      }
+    ]
+  }
+]
diff --git a/data/mods/Aftershock/npcs/prepnet_phyle/prepnet_trade.json b/data/mods/Aftershock/npcs/prepnet_phyle/prepnet_trade.json
@@ -11,7 +11,10 @@
       { "group": "prepnet_basic_robots", "prob": 20 },
       { "group": "prepnet_basic_grenades", "prob": 30 },
       { "group": "ammo_any_batteries_full", "prob": 100 },
-      { "group": "prepnet_id_cards", "prob": 50 }
+      { "group": "prepnet_id_cards", "prob": 50 },
+      { "group": "afs_exosuit_worker", "prob": 10 },
+      { "group": "afs_exo_advanced_power", "prob": 5 },
+      { "group": "afs_exosuit_security", "prob": 5 }
     ]
   },
   {

diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt
@@ -793,6 +793,8 @@ disapprovingly
 disassembles
 disassembly
 disburse
+disclaimer
+disclaimers
 discoes
 discolorations
 disconcertingly
@@ -1326,6 +1328,7 @@ hardcover
 hardcovers
 hardhat
 hardpoint
+hardpoints
 harmonically
 harries
 harvestable