Merge branch 'CleverRaven:master' into melding-welding

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",

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",

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,

data/json/itemgroups/military.json

@@ -761,6 +761,7 @@
       { "item": "winter_jacket_army", "prob": 20 },
       { "item": "winter_gloves_army", "prob": 20 },
       { "item": "tank_top", "variant": "tank_top_camo", "prob": 70 },
+      { "group": "eod_armor", "prob": 15 },
       { "group": "ammo_pocket_batteries_full", "prob": 40 },
       { "item": "radio", "prob": 10, "charges": [ 10, 95 ] },
       { "item": "boots_combat", "prob": 50 },

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.",

data/json/items/tool_armor.json

@@ -3537,7 +3537,7 @@
     "volume": "2500 ml",
     "price": "55 USD",
     "price_postapoc": "2 USD 50 cent",
-    "material": [ "cotton" ],
+    "material": [ "nylon" ],
     "symbol": "[",
     "color": "brown",
     "warmth": 50,

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 } ],

data/json/mapgen_palettes/common_parameters.json

@@ -0,0 +1,114 @@
+[
+  {
+    "type": "palette",
+    "id": "parametrized_walls_palette",
+    "//": "Intended as a palette for randomized interior and exterior walls",
+    "parameters": {
+      "interior_wall_type": {
+        "type": "ter_str_id",
+        "default": {
+          "distribution": [
+            [ "t_wall_b", 1 ],
+            [ "t_wall_g", 1 ],
+            [ "t_wall_p", 1 ],
+            [ "t_wall_P", 1 ],
+            [ "t_wall_r", 1 ],
+            [ "t_wall_w", 6 ],
+            [ "t_wall_y", 1 ],
+            [ "t_wall_gray", 1 ],
+            [ "t_wall_brown", 1 ],
+            [ "t_wall_cyan", 1 ],
+            [ "t_wall_black", 1 ],
+            [ "t_wall_orange", 1 ]
+          ]
+        }
+      },
+      "exterior_wall_type": {
+        "type": "ter_str_id",
+        "default": {
+          "distribution": [
+            [ "t_brick_wall", 6 ],
+            [ "t_rock_wall", 3 ],
+            [ "t_wall_wood", 3 ],
+            [ "t_concrete_wall", 4 ],
+            [ "t_adobe_brick_wall", 1 ]
+          ]
+        }
+      }
+    },
+    "terrain": {
+      "|": { "param": "interior_wall_type", "fallback": "t_wall_w" },
+      "#": { "param": "exterior_wall_type", "fallback": "t_brick_wall" }
+    }
+  },
+  {
+    "type": "palette",
+    "id": "parametrized_fences_palette",
+    "//": "Intended as a palette for randomized fences",
+    "parameters": {
+      "fence_type": {
+        "type": "ter_str_id",
+        "default": {
+          "distribution": [
+            [ "t_splitrail_fence", 3 ],
+            [ "t_chainfence", 2 ],
+            [ "t_fence", 2 ],
+            [ "t_privacy_fence", 1 ],
+            [ "t_drystone_wall_half", 1 ]
+          ]
+        }
+      }
+    },
+    "terrain": {
+      "Ŧ": { "param": "fence_type", "fallback": "t_fence" },
+      "ɤ": {
+        "switch": { "param": "fence_type", "fallback": "t_fence" },
+        "cases": {
+          "t_splitrail_fence": "t_splitrail_fencegate_c",
+          "t_chainfence": "t_chaingate_c",
+          "t_fence": "t_fencegate_c",
+          "t_privacy_fence": "t_privacy_fencegate_c",
+          "t_drystone_wall_half": "t_chaingate_l"
+        }
+      }
+    }
+  },
+  {
+    "type": "palette",
+    "id": "parametrized_linoleum_palette",
+    "//": "Intended as a palette for randomized fences",
+    "parameters": {
+      "linoleum_color": { "type": "ter_str_id", "default": { "distribution": [ [ "t_linoleum_gray", 1 ], [ "t_linoleum_white", 1 ] ] } }
+    },
+    "terrain": { "~": { "param": "linoleum_color", "fallback": "t_linoleum_gray" } }
+  },
+  {
+    "type": "palette",
+    "id": "parametrized_carpets_palette",
+    "//": "Use to randomly assign carpet colors",
+    "parameters": {
+      "carpet_color_type": {
+        "type": "ter_str_id",
+        "default": {
+          "distribution": [ [ "t_carpet_red", 1 ], [ "t_carpet_green", 1 ], [ "t_carpet_purple", 1 ], [ "t_carpet_yellow", 1 ] ]
+        }
+      }
+    },
+    "terrain": { "=": { "param": "carpet_color_type", "fallback": "t_carpet_red" } }
+  },
+  {
+    "type": "palette",
+    "id": "parametrized_carpets_nest_palette",
+    "//": "Use to randomly assign carpet colors(for use in carpets that only occur in nested mapgen)",
+    "parameters": {
+      "carpet_color_type": {
+        "type": "ter_str_id",
+        "scope": "nest",
+        "default": {
+          "distribution": [ [ "t_carpet_red", 1 ], [ "t_carpet_green", 1 ], [ "t_carpet_purple", 1 ], [ "t_carpet_yellow", 1 ] ]
+        }
+      }
+    },
+    "terrain": { "=": { "param": "carpet_color_type", "fallback": "t_carpet_red" } }
+  }
+]

data/json/recipes/armor/other.json

@@ -100,15 +100,15 @@
     "skills_required": [ "electronics", 2 ],
     "time": "120 m",
     "book_learn": [ [ "textbook_tailor", 2 ], [ "manual_tailor", 2 ] ],
-    "using": [ [ "tailoring_cotton_patchwork", 33 ], [ "soldering_standard", 20 ] ],
+    "using": [ [ "tailoring_nylon_patchwork", 33 ], [ "soldering_standard", 20 ] ],
     "proficiencies": [ { "proficiency": "prof_elec_soldering" } ],
     "components": [
       [ [ "plastic_chunk", 4 ] ],
       [ [ "element", 8 ], [ "crude_heating_element", 12 ] ],
       [ [ "cable", 10 ] ],
       [ [ "amplifier", 1 ] ]
     ],
-    "byproducts": [ [ "cotton_patchwork", 6 ], [ "scrap_cotton", 2 ] ]
+    "byproducts": [ [ "sheet_nylon_patchwork", 6 ], [ "scrap_nylon", 2 ] ]
   },
   {
     "result": "gold_ring",

data/json/uncraft/recipe_deconstruction.json

@@ -5089,7 +5089,7 @@
     "time": "5 m",
     "difficulty": 1,
     "qualities": [ { "id": "CUT", "level": 2 } ],
-    "components": [ [ [ "sheet_cotton", 8 ] ], [ [ "element", 5 ] ], [ [ "cable", 5 ] ] ]
+    "components": [ [ [ "sheet_nylon", 8 ] ], [ [ "element", 5 ] ], [ [ "cable", 5 ] ] ]
   },
   {
     "result": "wearable_light",

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",

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 ] },

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,