Merge branch 'master' into obsolete-ksub-cx4

CleverRaven · Apr 20, 2024 · 45a4f06 · 45a4f06
2 parents ead51d3 + f32b285
commit 45a4f06
Show file tree

Hide file tree

Showing 51 changed files with 254,677 additions and 203,734 deletions.
diff --git a/data/json/enchantments.json b/data/json/enchantments.json
@@ -144,5 +144,53 @@
       ]
     },
     "values": [ { "value": "MOVE_COST", "multiply": -0.5 } ]
+  },
+  {
+    "id": "combat_exoskeleton_inactive",
+    "type": "enchantment",
+    "name": { "str": "Inactive exoskeleton" },
+    "description": "The exoskeleton is inactive and makes moving in it difficult and exhausting.",
+    "has": "WORN",
+    "condition": "INACTIVE",
+    "values": [ { "value": "MOVEMENT_EXERTION_MODIFIER", "multiply": 0.5 } ]
+  },
+  {
+    "id": "combat_exoskeleton_heavy_active",
+    "type": "enchantment",
+    "name": { "str": "Active combat exoskeleton mk.1" },
+    "description": "The exoskeleton helps you carry more weight, protects you against harmful gas, cools you down, and has reduced encumbrance.",
+    "has": "WORN",
+    "condition": "ACTIVE",
+    "values": [
+      { "value": "MOVEMENT_EXERTION_MODIFIER", "multiply": 0.4 },
+      { "value": "CARRY_WEIGHT", "multiply": 0.8 },
+      { "value": "CLIMATE_CONTROL_CHILL", "add": 50 }
+    ]
+  },
+  {
+    "id": "combat_exoskeleton_medium_active",
+    "type": "enchantment",
+    "name": { "str": "Active combat exoskeleton mk.2" },
+    "description": "The exoskeleton helps you carry more weight, protects you against harmful gas, cools you down, and has reduced encumbrance.",
+    "has": "WORN",
+    "condition": "ACTIVE",
+    "values": [
+      { "value": "MOVEMENT_EXERTION_MODIFIER", "multiply": 0.6 },
+      { "value": "CARRY_WEIGHT", "multiply": 0.6 },
+      { "value": "CLIMATE_CONTROL_CHILL", "add": 50 }
+    ]
+  },
+  {
+    "id": "combat_exoskeleton_light_active",
+    "type": "enchantment",
+    "name": { "str": "Active combat exoskeleton mk.3" },
+    "description": "The exoskeleton helps you carry more weight, protects you against harmful gas, cools you down, and has reduced encumbrance.",
+    "has": "WORN",
+    "condition": "ACTIVE",
+    "values": [
+      { "value": "MOVEMENT_EXERTION_MODIFIER", "multiply": 0.8 },
+      { "value": "CARRY_WEIGHT", "multiply": 0.4 },
+      { "value": "CLIMATE_CONTROL_CHILL", "add": 50 }
+    ]
   }
 ]
diff --git a/data/json/flags.json b/data/json/flags.json
@@ -2196,32 +2196,32 @@
   {
     "id": "EXO_HELMET_PLATE",
     "type": "json_flag",
-    "info": "This is meant for exosuit helmet plating."
+    "info": "This is meant for exoskeleton helmet plating."
   },
   {
     "id": "EXO_TORSO_PLATE",
     "type": "json_flag",
-    "info": "This is meant for exosuit torso plating."
+    "info": "This is meant for exoskeleton torso plating."
   },
   {
     "id": "EXO_ARM_PLATE",
     "type": "json_flag",
-    "info": "This is meant for exosuit arm plating."
+    "info": "This is meant for exoskeleton arm plating."
   },
   {
     "id": "EXO_GLOVE_PLATE",
     "type": "json_flag",
-    "info": "This is meant for exosuit arm plating."
+    "info": "This is meant for exoskeleton arm plating."
   },
   {
     "id": "EXO_LEG_PLATE",
     "type": "json_flag",
-    "info": "This is meant for exosuit leg plating."
+    "info": "This is meant for exoskeleton leg plating."
   },
   {
     "id": "EXO_BOOT_PLATE",
     "type": "json_flag",
-    "info": "This is meant for exosuit foot plating."
+    "info": "This is meant for exoskeleton foot plating."
   },
   {
     "id": "ROBOFAC_ROBOT_MEDIUM",

diff --git a/data/json/furniture_and_terrain/terrain-manufactured.json b/data/json/furniture_and_terrain/terrain-manufactured.json
@@ -583,7 +583,7 @@
     "name": "nanofabricator control panel",
     "symbol": "&",
     "description": "A small computer panel attached to a nanofabricator.  It has a single slot for reading templates.",
-    "allowed_template_ids": [ "standard_template_construct", "debug_template" ],
+    "allowed_template_ids": [ "standard_template_construct", "standard_template_construct_combat_exoskeleton", "debug_template" ],
     "color": "red",
     "looks_like": "f_console",
     "move_cost": 0,

diff --git a/data/json/itemgroups/Labs/lab_security.json b/data/json/itemgroups/Labs/lab_security.json
@@ -9,28 +9,31 @@
         "distribution": [
           {
             "collection": [
-              { "item": "power_armor_frame" },
-              { "item": "power_armor_generator" },
-              { "item": "power_armor_basic" },
-              { "item": "power_armor_helmet_basic" }
+              { "item": "combat_exoskeleton_heavy" },
+              { "item": "combat_exoskeleton_armor_head_heavy" },
+              { "item": "combat_exoskeleton_armor_torso_heavy" },
+              { "item": "combat_exoskeleton_armor_arm_heavy" },
+              { "item": "combat_exoskeleton_armor_leg_heavy" }
             ],
             "prob": 30
           },
           {
             "collection": [
-              { "item": "power_armor_frame" },
-              { "item": "power_armor_generator" },
-              { "item": "power_armor_heavy" },
-              { "item": "power_armor_helmet_heavy" }
+              { "item": "combat_exoskeleton_medium" },
+              { "item": "combat_exoskeleton_armor_head_medium" },
+              { "item": "combat_exoskeleton_armor_torso_medium" },
+              { "item": "combat_exoskeleton_armor_arm_medium" },
+              { "item": "combat_exoskeleton_armor_leg_medium" }
             ],
             "prob": 10
           },
           {
             "collection": [
-              { "item": "power_armor_frame" },
-              { "item": "power_armor_generator" },
-              { "item": "power_armor_helmet_light" },
-              { "item": "power_armor_light" }
+              { "item": "combat_exoskeleton_light" },
+              { "item": "combat_exoskeleton_armor_head_light" },
+              { "item": "combat_exoskeleton_armor_torso_light" },
+              { "item": "combat_exoskeleton_armor_arm_light" },
+              { "item": "combat_exoskeleton_armor_leg_light" }
             ],
             "prob": 55
           },

diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -1935,6 +1935,7 @@
       [ "memory_card_unread", 40 ],
       [ "memory_card_science", 10 ],
       [ "standard_template_construct", 5 ],
+      [ "standard_template_construct_combat_exoskeleton", 5 ],
       { "item": "camera", "prob": 15, "charges": [ 0, 150 ] },
       { "item": "camera_pro", "prob": 5, "charges": [ 0, 150 ] },
       { "item": "lighter", "prob": 50, "charges": [ 0, 100 ] },
@@ -2393,6 +2394,7 @@
       [ "diamond_dental_grill", 5 ],
       [ "gold_dental_grill", 5 ],
       [ "standard_template_construct", 4 ],
+      [ "standard_template_construct_combat_exoskeleton", 4 ],
       [ "briefcase", 4 ],
       [ "small_relic", 3 ],
       [ "holy_symbol", 3 ],

diff --git a/data/json/itemgroups/main.json b/data/json/itemgroups/main.json
@@ -3,7 +3,10 @@
     "type": "item_group",
     "id": "debug_template_item",
     "subtype": "distribution",
-    "entries": [ { "item": "standard_template_construct", "prob": 10 } ]
+    "entries": [
+      { "item": "standard_template_construct", "prob": 10 },
+      { "item": "standard_template_construct_combat_exoskeleton", "prob": 10 }
+    ]
   },
   {
     "type": "item_group",
@@ -28,20 +31,35 @@
       { "item": "plasma_rifle", "prob": 10 },
       { "item": "portal", "prob": 10 },
       { "item": "atomic_coffeepot", "prob": 10 },
-      { "item": "power_armor_basic", "prob": 10 },
-      { "item": "power_armor_frame", "prob": 10 },
-      { "item": "power_armor_heavy", "prob": 10 },
-      { "item": "power_armor_helmet_basic", "prob": 10 },
-      { "item": "power_armor_helmet_heavy", "prob": 10 },
-      { "item": "power_armor_helmet_light", "prob": 10 },
+      { "item": "rm13_armor", "prob": 10 },
       { "item": "high_density_capacitor", "prob": 10 },
       { "item": "beam_scatterer", "prob": 10 },
-      { "item": "power_armor_light", "prob": 10 },
       { "item": "rm11b_sniper_rifle", "prob": 10 },
-      { "item": "rm13_armor", "prob": 10 },
       { "item": "v29", "prob": 10 }
     ]
   },
+  {
+    "type": "item_group",
+    "id": "nanofab_recipes_combat_exoskeletons",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "combat_exoskeleton_heavy", "prob": 10 },
+      { "item": "combat_exoskeleton_medium", "prob": 10 },
+      { "item": "combat_exoskeleton_light", "prob": 10 },
+      { "item": "combat_exoskeleton_armor_head_heavy", "prob": 1 },
+      { "item": "combat_exoskeleton_armor_torso_heavy", "prob": 1 },
+      { "item": "combat_exoskeleton_armor_arm_heavy", "prob": 1 },
+      { "item": "combat_exoskeleton_armor_leg_heavy", "prob": 1 },
+      { "item": "combat_exoskeleton_armor_head_medium", "prob": 1 },
+      { "item": "combat_exoskeleton_armor_torso_medium", "prob": 1 },
+      { "item": "combat_exoskeleton_armor_arm_medium", "prob": 1 },
+      { "item": "combat_exoskeleton_armor_leg_medium", "prob": 1 },
+      { "item": "combat_exoskeleton_armor_head_light", "prob": 1 },
+      { "item": "combat_exoskeleton_armor_torso_light", "prob": 1 },
+      { "item": "combat_exoskeleton_armor_arm_light", "prob": 1 },
+      { "item": "combat_exoskeleton_armor_leg_light", "prob": 1 }
+    ]
+  },
   {
     "type": "item_group",
     "id": "ammo",

diff --git a/data/json/itemgroups/science_and_tech.json b/data/json/itemgroups/science_and_tech.json
@@ -30,6 +30,7 @@
       [ "memory_card_unread", 50 ],
       [ "memory_card_science", 5 ],
       [ "standard_template_construct", 5 ],
+      [ "standard_template_construct_combat_exoskeleton", 5 ],
       { "item": "camera", "prob": 2, "charges": [ 0, 150 ] },
       { "item": "camera", "container-item": "camera_bag", "prob": 1, "charges": [ 0, 150 ] },
       { "item": "camera_pro", "prob": 1, "charges": [ 0, 150 ] },