Merge branch 'CleverRaven:master' into Body-Bags

CleverRaven · Oct 24, 2024 · 5cce409 · 5cce409
2 parents 4b8f973 + 3edfea1
commit 5cce409
Show file tree

Hide file tree

Showing 27 changed files with 1,409 additions and 2,180 deletions.
diff --git a/data/json/construction_category.json b/data/json/construction_category.json
@@ -65,6 +65,11 @@
     "id": "OTHER",
     "name": "Others"
   },
+  {
+    "type": "construction_category",
+    "id": "DECONSTRUCT",
+    "name": "Deconstructions"
+  },
   {
     "//": "Should be last in the list",
     "type": "construction_category",

diff --git a/data/json/deconstruction.json b/data/json/deconstruction.json
diff --git a/data/json/flags.json b/data/json/flags.json
@@ -512,7 +512,8 @@
     "id": "FRAGILE",
     "type": "json_flag",
     "info": "This gear is <bad>fragile</bad> and <info>won't protect you for long</info>.",
-    "conflicts": [ "STURDY" ]
+    "conflicts": [ "STURDY" ],
+    "inherit": false
   },
   {
     "id": "FRAGILE_MELEE",
@@ -920,7 +921,8 @@
     "id": "STURDY",
     "type": "json_flag",
     "info": "This clothing will <good>protect</good> you from harm and withstand <info>a lot of abuse</info>.",
-    "conflicts": [ "FRAGILE" ]
+    "conflicts": [ "FRAGILE" ],
+    "inherit": false
   },
   {
     "id": "SUN_GLASSES",
@@ -2210,72 +2212,86 @@
   {
     "id": "EXO_SMALL",
     "type": "json_flag",
-    "info": "This is meant for a small exosuit hardpoint."
+    "info": "This is meant for a small exosuit hardpoint.",
+    "inherit": false
   },
   {
     "id": "EXO_LARGE",
     "type": "json_flag",
-    "info": "This is meant for a large exosuit hardpoint."
+    "info": "This is meant for a large exosuit hardpoint.",
+    "inherit": false
   },
   {
     "id": "EXO_PSU",
     "type": "json_flag",
-    "info": "This is meant for an exosuit PSU hardpoint."
+    "info": "This is meant for an exosuit PSU hardpoint.",
+    "inherit": false
   },
   {
     "id": "EXO_SMALL_GADGET",
     "type": "json_flag",
-    "info": "This is meant for small exosuit gadgets, 1 L or less."
+    "info": "This is meant for small exosuit gadgets, 1 L or less.",
+    "inherit": false
   },
   {
     "id": "EXO_HELMET_GADGET",
     "type": "json_flag",
-    "info": "This is meant for helmet-specific gadgets."
+    "info": "This is meant for helmet-specific gadgets.",
+    "inherit": false
   },
   {
     "id": "EXO_MEDIUM_GADGET",
     "type": "json_flag",
-    "info": "This is meant for medium exosuit gadgets, between 1 L and 5 L."
+    "info": "This is meant for medium exosuit gadgets, between 1 L and 5 L.",
+    "inherit": false
   },
   {
     "id": "EXO_LARGE_GADGET",
     "type": "json_flag",
-    "info": "This is meant for large exosuit gadgets, larger than 5 L."
+    "info": "This is meant for large exosuit gadgets, larger than 5 L.",
+    "inherit": false
   },
   {
     "id": "EXO_UNDERLAYER",
     "type": "json_flag",
-    "info": "This is meant for exosuit underlayers."
+    "info": "This is meant for exosuit underlayers.",
+    "inherit": false
   },
   {
     "id": "EXO_HELMET_PLATE",
     "type": "json_flag",
-    "info": "This is meant for exoskeleton helmet plating."
+    "info": "This is meant for exoskeleton helmet plating.",
+    "inherit": false
   },
   {
     "id": "EXO_TORSO_PLATE",
     "type": "json_flag",
-    "info": "This is meant for exoskeleton torso plating."
+    "info": "This is meant for exoskeleton torso plating.",
+    "inherit": false
   },
   {
     "id": "EXO_ARM_PLATE",
     "type": "json_flag",
-    "info": "This is meant for exoskeleton arm plating."
+    "info": "This is meant for exoskeleton arm plating.",
+    "inherit": false
   },
   {
     "id": "EXO_GLOVE_PLATE",
     "type": "json_flag",
-    "info": "This is meant for exoskeleton arm plating."
+    "info": "This is meant for exoskeleton arm plating.",
+    "inherit": false
   },
   {
     "id": "EXO_LEG_PLATE",
     "type": "json_flag",
-    "info": "This is meant for exoskeleton leg plating."
+    "info": "This is meant for exoskeleton leg plating.",
+    "inherit": false
   },
   {
     "id": "EXO_BOOT_PLATE",
     "type": "json_flag",
-    "info": "This is meant for exoskeleton foot plating."
+    "info": "This is meant for exoskeleton foot plating.",
+    "inherit": false
   },
   {
     "id": "ROBOFAC_ROBOT_MEDIUM",

diff --git a/data/json/furniture_and_terrain/terrain-walls.json b/data/json/furniture_and_terrain/terrain-walls.json
@@ -2321,17 +2321,7 @@
     "roof": "t_wood_roof",
     "connect_groups": "WALL",
     "connects_to": "WALL",
-    "flags": [
-      "FLAMMABLE",
-      "NOITEM",
-      "SUPPORTS_ROOF",
-      "WALL",
-      "NO_SCENT",
-      "AUTO_WALL_SYMBOL",
-      "MINEABLE",
-      "BLOCK_WIND",
-      "WIRED_WALL"
-    ],
+    "flags": [ "FLAMMABLE", "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ],
     "bash": {
       "str_min": 60,
       "str_max": 180,

diff --git a/data/json/items/armor/torso_clothes.json b/data/json/items/armor/torso_clothes.json
@@ -921,6 +921,7 @@
   {
     "id": "hoodie_cropped",
     "copy-from": "hoodie",
+    "delete": { "flags": [ "POCKETS" ] },
     "type": "ARMOR",
     "name": { "str": "cropped hoodie" },
     "description": "A sweatshirt with a hood, cropped to expose the stomach.",

diff --git a/data/json/mapgen/military/mil_base/mil_base_z0.json b/data/json/mapgen/military/mil_base/mil_base_z0.json
@@ -907,7 +907,7 @@
         "x,,,,b ,,,                                      Xssssssssssss8888ssX     sss_______yy_______sss ",
         "x,,,,b,,,,                                      XssssssssssssssssssX     sss_______yy_______sss ",
         "x ,, b ,,,                                      XssssssssssssssssssX     sss________________sss ",
-        "x ,, b,,,,                                      XssssUsssssss8888ssX     sss_______yy_______sss ",
+        "x ,, b,,,,                                      Xssss№sssssss8888ssX     sss_______yy_______sss ",
         "x ,, b ,,,                                      XsssZssssZsssdJJ8ssX     sss_______yy_______sss ",
         "x,,, b,,,                                       Xssssssssssss8888ssX     sss_______yy_______sss ",
         "x,,,,b ,,,                                      XssssssssssssssssssX     sss________________sss ",
@@ -964,7 +964,7 @@
         "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxG"
       ],
       "palettes": [ "mil_base_palette" ],
-      "terrain": { "U": "t_ladder_up" },
+      "terrain": { "№": "t_ladder_up" },
       "items": {
         "n": [ { "item": "mil_base_casing_hmg", "chance": 50, "repeat": [ 50, 100 ] } ],
         ";": [ { "item": "mil_base_bodybag", "chance": 90 } ],

diff --git a/data/mods/Aftershock/itemgroups/clothing/winter_outfits.json b/data/mods/Aftershock/itemgroups/clothing/winter_outfits.json
@@ -32,7 +32,11 @@
     "type": "item_group",
     "//": "The matching frontier-cryosuit set. Includes suit, mask and possible future accessories",
     "subtype": "collection",
-    "entries": [ { "item": "afs_frontier_cryo" }, { "item": "afs_frontier_cryomask", "prob": 90 } ]
+    "entries": [
+      { "item": "afs_frontier_cryo" },
+      { "item": "afs_frontier_cryomask", "prob": 90 },
+      { "item": "afs_heavy_suit_battery_cell", "count": [ 1, 2 ], "prob": 25, "charges": [ 0, 1000 ] }
+    ]
   },
   {
     "id": "afs_cryopod_g",

diff --git a/data/mods/Aftershock/itemgroups/loot_corpse_groups.json b/data/mods/Aftershock/itemgroups/loot_corpse_groups.json
@@ -13,6 +13,7 @@
         ]
       },
       { "group": "afs_survivor_weapon_set", "prob": 80 },
+      { "item": "afs_heavy_suit_battery_cell", "count": [ 1, 2 ], "prob": 80, "charges": [ 100, 1000 ] },
       { "group": "afs_tools_scavenging", "prob": 30 },
       { "group": "tools_survival", "prob": 80, "count": [ 1, 3 ] },
       { "group": "afs_cheap_food", "prob": 30, "count": [ 2, 6 ] },

diff --git a/data/mods/Aftershock/items/armor/winter_suits.json b/data/mods/Aftershock/items/armor/winter_suits.json
@@ -104,8 +104,8 @@
       {
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
-        "flag_restriction": [ "BATTERY_MEDIUM" ],
-        "default_magazine": "medium_battery_cell"
+        "flag_restriction": [ "BATTERY_HEAVY" ],
+        "default_magazine": "afs_heavy_suit_battery_cell"
       }
     ],
     "warmth": 20,
@@ -169,8 +169,8 @@
       {
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
-        "flag_restriction": [ "BATTERY_MEDIUM" ],
-        "default_magazine": "medium_battery_cell"
+        "flag_restriction": [ "BATTERY_HEAVY" ],
+        "default_magazine": "afs_heavy_suit_battery_cell"
       }
     ],
     "warmth": 20,

diff --git a/data/mods/Aftershock/items/battery.json b/data/mods/Aftershock/items/battery.json
@@ -0,0 +1,23 @@
+[
+  {
+    "id": "afs_heavy_suit_battery_cell",
+    "type": "MAGAZINE",
+    "category": "tool_magazine",
+    "name": { "str": "suit battery", "str_pl": "suit batteries" },
+    "description": "A heavy battery cell, compatible with most industrial equipment but purposefully designed to power EVA suits  It's a bit too big to fit in most portable tools.",
+    "ascii_picture": "heavy_plus_battery_cell",
+    "weight": "880 g",
+    "volume": "900 ml",
+    "longest_side": "113 mm",
+    "price": "200 USD",
+    "price_postapoc": "200 USD",
+    "material": [ { "type": "budget_steel", "portion": 99 }, { "type": "plastic", "portion": 1 } ],
+    "symbol": "=",
+    "color": "yellow",
+    "ammo_type": [ "battery" ],
+    "capacity": 1000,
+    "looks_like": "battery",
+    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "RECHARGE", "BATTERY_HEAVY" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 1000 } } ]
+  }
+]
diff --git a/data/mods/Aftershock/items/tool_armor.json b/data/mods/Aftershock/items/tool_armor.json
@@ -20,8 +20,8 @@
       {
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
-        "flag_restriction": [ "BATTERY_MEDIUM" ],
-        "default_magazine": "medium_battery_cell"
+        "flag_restriction": [ "BATTERY_HEAVY" ],
+        "default_magazine": "afs_heavy_suit_battery_cell"
       }
     ],
     "use_action": {

diff --git a/data/mods/Aftershock/npcs/Augustmoon_Salvors/augustmoon_tool_trader.json b/data/mods/Aftershock/npcs/Augustmoon_Salvors/augustmoon_tool_trader.json
@@ -36,6 +36,7 @@
       { "group": "afs_tools_scavenging", "count": [ 6, 12 ] },
       { "group": "afs_tools_pocket", "count": [ 5, 10 ] },
       { "item": "afs_40g_plasma_civ", "count": [ 2, 5 ] },
+      { "item": "afs_heavy_suit_battery_cell", "count": [ 2, 5 ] },
       { "group": "afs_tools_welding_consumable", "count": [ 6, 8 ] },
       { "group": "afs_augustmoon_batteries_disposable", "count": [ 5, 10 ] },
       { "group": "afs_augustmoon_batteries_rechargeable", "count": [ 2, 3 ], "prob": 20 }

diff --git a/...condition/eoc_dummy_mod_interactions.json → ...erMatter/effectoncondition/eoc_dummy.json b/...condition/eoc_dummy_mod_interactions.json → ...erMatter/effectoncondition/eoc_dummy.json