Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA

SuddenEyePuncture · Jun 5, 2021 · f56767e · f56767e
2 parents 0b476f2 + d3b1ed2
commit f56767e
Show file tree

Hide file tree

Showing 16 changed files with 507 additions and 16 deletions.
diff --git a/data/json/furniture_and_terrain/terrain-fences-gates.json b/data/json/furniture_and_terrain/terrain-fences-gates.json
@@ -650,6 +650,21 @@
         { "item": "nail", "charges": 12 },
         { "item": "hinge", "count": [ 1, 2 ] }
       ]
+    },
+    "bash": {
+      "str_min": 4,
+      "str_max": 20,
+      "str_min_blocked": 6,
+      "str_max_blocked": 30,
+      "sound": "crack.",
+      "sound_fail": "wham.",
+      "ter_set": "t_null",
+      "items": [
+        { "item": "2x4", "count": [ 1, 4 ] },
+        { "item": "nail", "charges": [ 2, 8 ] },
+        { "item": "splinter", "count": [ 1, 2 ] },
+        { "item": "hinge", "count": [ 1, 2 ] }
+      ]
     }
   },
   {
@@ -835,7 +850,7 @@
     "color": "brown",
     "looks_like": "t_fencegate_o",
     "move_cost": 1,
-    "flags": [ "FLAMMABLE_ASH", "FLAT", "ROAD", "BURROWABLE" ],
+    "flags": [ "FLAMMABLE_ASH", "FLAT", "ROAD", "BURROWABLE", "TRANSPARENT" ],
     "connects_to": "WOODFENCE",
     "close": "t_privacy_fencegate_c",
     "deconstruct": {
@@ -846,6 +861,21 @@
         { "item": "nail", "charges": 20 },
         { "item": "hinge", "count": [ 1, 2 ] }
       ]
+    },
+    "bash": {
+      "str_min": 4,
+      "str_max": 20,
+      "str_min_blocked": 6,
+      "str_max_blocked": 30,
+      "sound": "crack.",
+      "sound_fail": "wham.",
+      "ter_set": "t_null",
+      "items": [
+        { "item": "2x4", "count": [ 4, 8 ] },
+        { "item": "nail", "charges": [ 10, 20 ] },
+        { "item": "splinter", "count": [ 4, 6 ] },
+        { "item": "hinge", "count": [ 1, 2 ] }
+      ]
     }
   },
   {

diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json
@@ -2009,7 +2009,7 @@
     "stack_size": 60,
     "symbol": "u",
     "color": "light_gray",
-    "material": [ "powder" ],
+    "phase": "liquid",
     "container": "bottle_plastic_small",
     "addiction_potential": 5,
     "addiction_type": "cocaine",

diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json
@@ -1962,7 +1962,7 @@
         "rigid": true,
         "max_contains_volume": "20 L",
         "max_contains_weight": "20 kg",
-        "item_restriction": [ "light_minus_battery_cell", "light_minus_atomic_battery_cell" ]
+        "item_restriction": [ "light_minus_battery_cell", "light_minus_atomic_battery_cell", "light_minus_disposable_cell" ]
       }
     ]
   },

diff --git a/data/json/mapgen/farm_dairy.json b/data/json/mapgen/farm_dairy.json
@@ -118,7 +118,7 @@
         ".$........aa.............|!|||!|....|!|||!|...$.",
         ".$............................................$.",
         ".$............................................$.",
-        ".$$$$$$$$$$$$$$$$$$fffff$$$$$$$$$$$$$$$$$$$$$$$.",
+        ".$$$$$$$$$$$$$$$$$fffffff$$$$$$$$$$$$$$$$$$$$$$.",
         "................................................"
       ],
       "terrain": {
@@ -202,7 +202,7 @@
         { "item": "cattlefodder", "x": 39, "y": 17, "amount": [ 0, 4 ] }
       ],
       "place_vehicles": [
-        { "vehicle": "cube_van_cheap", "x": 7, "y": 5, "chance": 50, "fuel": 300, "status": -1, "rotation": 0 },
+        { "vehicle": "cube_van_cheap", "x": 7, "y": 4, "chance": 50, "fuel": 300, "status": -1, "rotation": 0 },
         { "vehicle": "quad_bike", "x": 15, "y": 6, "chance": 30, "fuel": 200, "status": -1, "rotation": 0 },
         { "vehicle": "bicycle", "x": 13, "y": 8, "chance": 80, "fuel": 0, "status": 0, "rotation": 0 }
       ]

diff --git a/data/json/professions.json b/data/json/professions.json
@@ -749,6 +749,7 @@
       "both": {
         "items": [ "pants_army", "undershirt", "jacket_army", "gloves_liner", "socks", "boots", "beret", "wristwatch", "binoculars" ],
         "entries": [
+          { "item": "water_clean", "container-item": "canteen" },
           { "item": "m17", "ammo-item": "9mm", "container-item": "holster", "charges": 17 },
           { "item": "p320mag_17rd_9x19mm", "ammo-item": "9mm", "charges": 17, "count": 2 },
           { "item": "militarymap" }
@@ -792,6 +793,7 @@
         ],
         "entries": [
           { "group": "charged_two_way_radio" },
+          { "item": "water_clean", "container-item": "canteen" },
           { "item": "legpouch_large", "contents-group": "army_mags_m4" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "knife_combat", "container-item": "sheath" },
@@ -836,6 +838,7 @@
           "molle_pack"
         ],
         "entries": [
+          { "item": "water_clean", "container-item": "canteen" },
           { "item": "wrench" },
           { "item": "hacksaw" },
           { "item": "pliers" },
@@ -884,6 +887,7 @@
         ],
         "entries": [
           { "group": "charged_two_way_radio" },
+          { "item": "water_clean", "container-item": "canteen" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "c4", "count": 3 }
         ]
@@ -928,6 +932,7 @@
         ],
         "entries": [
           { "group": "charged_two_way_radio" },
+          { "item": "water_clean", "container-item": "canteen" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "knife_combat", "container-item": "sheath" },
           { "item": "shot_00", "count": 2 },
@@ -977,6 +982,7 @@
         ],
         "entries": [
           { "group": "charged_two_way_radio" },
+          { "item": "water_clean", "container-item": "canteen" },
           { "item": "legpouch_large", "contents-group": "army_mags_m4" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "knife_combat", "container-item": "sheath" },
@@ -1023,6 +1029,7 @@
           "diving_watch"
         ],
         "entries": [
+          { "item": "water_clean", "container-item": "canteen" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "kukri", "container-item": "sheath" },
           { "item": "chestrig", "contents-group": "army_mags_mp5" },
@@ -2741,6 +2748,7 @@
           "wristwatch"
         ],
         "entries": [
+          { "item": "water_clean", "container-item": "canteen" },
           { "item": "scar_h", "ammo-item": "762_51", "contents-item": "shoulder_strap" },
           { "item": "katana", "container-item": "scabbard" }
         ]
@@ -2781,6 +2789,7 @@
           "quikclot"
         ],
         "entries": [
+          { "item": "water_clean", "container-item": "canteen" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "knife_combat", "container-item": "sheath" },
           { "item": "m4a1", "ammo-item": "556", "contents-item": "shoulder_strap" },
@@ -3668,6 +3677,7 @@
         ],
         "entries": [
           { "group": "charged_two_way_radio" },
+          { "item": "water_clean", "container-item": "canteen" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "m17", "ammo-item": "9mm", "container-item": "holster", "charges": 17 },
           { "item": "p320mag_17rd_9x19mm", "ammo-item": "9mm", "charges": 17 },
@@ -3772,6 +3782,7 @@
         "entries": [
           { "group": "charged_two_way_radio" },
           { "group": "full_ifak" },
+          { "item": "water_clean", "container-item": "canteen" },
           { "item": "legpouch_large", "contents-group": "army_mags_m4" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "gloves_medical", "custom-flags": [ "no_auto_equip" ] },
@@ -3885,6 +3896,7 @@
         "entries": [
           { "group": "charged_two_way_radio" },
           { "group": "full_gasmask" },
+          { "item": "water_clean", "container-item": "canteen" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "flamethrower", "ammo-item": "napalm", "charges": 3000, "custom-flags": [ "auto_wield" ] },
           { "item": "m17", "ammo-item": "9mm", "container-item": "holster", "charges": 17 },

diff --git a/data/json/recipes/armor/pets_horse.json b/data/json/recipes/armor/pets_horse.json
@@ -68,7 +68,7 @@
     "reversible": true,
     "autolearn": true,
     "using": [ [ "sewing_standard", 190 ], [ "clasps", 4 ] ],
-    "components": [ [ [ "sheet_kevlar_layered", 56 ] ], [ [ "rag", 42 ] ], [ [ "leather", 24 ], [ "tanned_hide", 24 ] ] ],
+    "components": [ [ [ "sheet_kevlar_layered", 56 ] ], [ [ "rag", 42 ] ], [ [ "leather", 24 ], [ "tanned_hide", 4 ] ] ],
     "proficiencies": [ { "proficiency": "prof_polymerworking" }, { "proficiency": "prof_closures" } ]
   },
   {

diff --git a/data/json/recipes/other/cords_and_ropes.json b/data/json/recipes/other/cords_and_ropes.json
@@ -79,7 +79,7 @@
     "reversible": true,
     "autolearn": true,
     "proficiencies": [ { "proficiency": "prof_fibers_rope", "required": false, "time_multiplier": 1.5 } ],
-    "components": [ [ [ "rope_6", 5 ], [ "string_36", 30 ] ] ]
+    "components": [ [ [ "rope_6", 5 ] ] ]
   },
   {
     "type": "recipe",

diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json
@@ -1660,7 +1660,7 @@
     "book_learn": [ [ "reference_cooking", 4 ] ],
     "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "CHEM", "level": 2 } ],
     "tools": [ [ [ "syringe", -1 ] ], [ [ "surface_heat", 1, "LIST" ] ] ],
-    "components": [ [ [ "chem_citric_acid", 9 ] ], [ [ "coke", 1 ] ], [ [ "bottle_plastic_small", 1 ] ], [ [ "water_clean", 1 ] ] ]
+    "components": [ [ [ "chem_citric_acid", 9 ] ], [ [ "coke", 1 ] ], [ [ "water_clean", 1 ] ] ]
   },
   {
     "type": "recipe",