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

…into migrate-dig-activities
CleverRaven · May 4, 2020 · c8042ac · c8042ac
2 parents 71f214b + 4aaba04
commit c8042ac
Show file tree

Hide file tree

Showing 259 changed files with 2,876 additions and 1,549 deletions.
diff --git a/data/json/flags.json b/data/json/flags.json
@@ -719,6 +719,11 @@
     "context": [  ],
     "type": "json_flag"
   },
+  {
+    "id": "EFFECT_BULLET_IMMUNE",
+    "context": [  ],
+    "type": "json_flag"
+  },
   {
     "id": "EFFECT_ACID_IMMUNE",
     "context": [  ],

diff --git a/data/json/furniture_and_terrain/furniture-storage.json b/data/json/furniture_and_terrain/furniture-storage.json
@@ -293,7 +293,7 @@
     "coverage": 30,
     "required_str": 14,
     "max_volume": "250 L",
-    "flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "MINEABLE" ],
+    "flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "MINEABLE", "PICKABLE" ],
     "examine_action": "locked_object_pickable",
     "bash": {
       "str_min": 40,

diff --git a/data/json/furniture_and_terrain/terrain-doors.json b/data/json/furniture_and_terrain/terrain-doors.json
@@ -1391,7 +1391,16 @@
     "move_cost": 0,
     "coverage": 95,
     "roof": "t_flat_roof",
-    "flags": [ "FLAMMABLE_ASH", "NOITEM", "REDUCE_SCENT", "CONNECT_TO_WALL", "BARRICADABLE_DOOR", "LOCKED", "BLOCK_WIND" ],
+    "flags": [
+      "FLAMMABLE_ASH",
+      "NOITEM",
+      "REDUCE_SCENT",
+      "CONNECT_TO_WALL",
+      "BARRICADABLE_DOOR",
+      "LOCKED",
+      "BLOCK_WIND",
+      "PICKABLE"
+    ],
     "examine_action": "locked_object",
     "bash": {
       "str_min": 8,
@@ -1428,6 +1437,7 @@
       "CONNECT_TO_WALL",
       "BARRICADABLE_DOOR",
       "LOCKED",
+      "PICKABLE",
       "BLOCK_WIND"
     ],
     "examine_action": "locked_object",
@@ -1467,6 +1477,7 @@
       "CONNECT_TO_WALL",
       "BARRICADABLE_DOOR",
       "LOCKED",
+      "PICKABLE",
       "BLOCK_WIND"
     ],
     "open": "t_door_o_peep",
@@ -1498,7 +1509,17 @@
     "move_cost": 0,
     "coverage": 95,
     "roof": "t_flat_roof",
-    "flags": [ "FLAMMABLE_ASH", "ALARMED", "NOITEM", "REDUCE_SCENT", "CONNECT_TO_WALL", "BARRICADABLE_DOOR", "LOCKED", "BLOCK_WIND" ],
+    "flags": [
+      "FLAMMABLE_ASH",
+      "ALARMED",
+      "NOITEM",
+      "REDUCE_SCENT",
+      "CONNECT_TO_WALL",
+      "BARRICADABLE_DOOR",
+      "LOCKED",
+      "BLOCK_WIND",
+      "PICKABLE"
+    ],
     "examine_action": "locked_object",
     "bash": {
       "str_min": 8,
@@ -2156,7 +2177,7 @@
     "move_cost": 0,
     "coverage": 95,
     "roof": "t_flat_roof",
-    "flags": [ "NOITEM", "REDUCE_SCENT", "OPENCLOSE_INSIDE", "CONNECT_TO_WALL", "LOCKED", "MINEABLE", "BLOCK_WIND" ],
+    "flags": [ "NOITEM", "REDUCE_SCENT", "OPENCLOSE_INSIDE", "CONNECT_TO_WALL", "LOCKED", "MINEABLE", "BLOCK_WIND", "PICKABLE" ],
     "open": "t_door_metal_o",
     "examine_action": "locked_object_pickable",
     "bash": {
@@ -2239,7 +2260,7 @@
     "color": "cyan",
     "move_cost": 0,
     "roof": "t_flat_roof",
-    "flags": [ "TRANSPARENT", "NOITEM", "PERMEABLE", "CONNECT_TO_WALL", "LOCKED", "THIN_OBSTACLE" ],
+    "flags": [ "TRANSPARENT", "NOITEM", "PERMEABLE", "CONNECT_TO_WALL", "LOCKED", "THIN_OBSTACLE", "PICKABLE" ],
     "examine_action": "locked_object_pickable",
     "bash": {
       "str_min": 30,

diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json
@@ -243,7 +243,8 @@
       { "item": "fish_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
       { "item": "sauce_red", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
       { "item": "kompot", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
-      { "group": "big_canned_food", "prob": 4 }
+      { "group": "big_canned_food", "prob": 4 },
+      { "group": "teabag_box", "prob": 20 }
     ]
   },
   {
@@ -456,7 +457,8 @@
       { "item": "coffee_syrup", "prob": 10 },
       { "item": "fruit_leather", "prob": 25 },
       { "item": "kernels", "prob": 25 },
-      { "item": "pine_nuts", "prob": 5 }
+      { "item": "pine_nuts", "prob": 5 },
+      { "group": "teabag_box", "prob": 10 }
     ]
   },
   {
@@ -777,7 +779,17 @@
       { "item": "restaurantmap", "prob": 5 },
       { "item": "touristmap", "prob": 2 },
       { "item": "noodles_fast", "prob": 30 },
-      { "item": "milkshake_fastfood", "prob": 15 }
+      { "item": "milkshake_fastfood", "prob": 15 },
+      { "group": "teabag_box", "prob": 5 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "teabag_box",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "tea_bag", "prob": 20, "container-item": "box_tea", "charges-min": 1, "charges-max": 10 },
+      { "item": "herbal_tea_bag", "prob": 5, "container-item": "box_tea", "charges-min": 1, "charges-max": 10 }
     ]
   }
 ]
diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json
@@ -262,7 +262,8 @@
         "prob": 60
       },
       { "item": "spoon", "count": [ 1, 6 ] },
-      { "item": "ceramic_mug", "count": [ 1, 6 ] }
+      { "item": "ceramic_mug", "count": [ 1, 6 ] },
+      { "group": "teabag_box", "prob": 60 }
     ]
   },
   {

diff --git a/data/json/itemgroups/food_service.json b/data/json/itemgroups/food_service.json
@@ -85,7 +85,8 @@
       { "item": "tea_raw", "prob": 70 },
       { "item": "ceramic_cup", "prob": 70 },
       { "item": "teapot", "prob": 70 },
-      { "item": "clay_teapot", "prob": 70 }
+      { "item": "clay_teapot", "prob": 70 },
+      { "group": "teabag_box", "prob": 70 }
     ]
   },
   {
@@ -332,7 +333,8 @@
       { "item": "coffee_raw", "prob": 50 },
       { "item": "coffee_syrup", "prob": 15 },
       { "item": "cookies", "prob": 35 },
-      { "item": "tea_raw", "prob": 50 }
+      { "item": "tea_raw", "prob": 50 },
+      { "group": "teabag_box", "prob": 30 }
     ]
   },
   {
@@ -349,7 +351,8 @@
       { "item": "salt", "prob": 15 },
       { "item": "sugar", "prob": 70 },
       { "item": "tea_raw", "prob": 15 },
-      { "item": "wrapper", "prob": 75 }
+      { "item": "wrapper", "prob": 75 },
+      { "group": "teabag_box", "prob": 10 }
     ]
   },
   {
@@ -693,7 +696,8 @@
       { "item": "curry_powder", "prob": 40 },
       { "item": "can_cheese", "prob": 30 },
       { "item": "sauce_red", "prob": 40 },
-      { "item": "sauce_pesto", "prob": 20 }
+      { "item": "sauce_pesto", "prob": 20 },
+      { "group": "teabag_box", "prob": 45 }
     ]
   },
   {

diff --git a/data/json/items/ammo/10mm.json b/data/json/items/ammo/10mm.json
@@ -17,7 +17,7 @@
     "ammo_type": "10mm",
     "casing": "10mm_casing",
     "range": 14,
-    "damage": { "damage_type": "stab", "amount": 31, "armor_penetration": 4 },
+    "damage": { "damage_type": "bullet", "amount": 31, "armor_penetration": 4 },
     "dispersion": 50,
     "recoil": 750,
     "effects": [ "COOKOFF" ]
@@ -29,7 +29,7 @@
     "name": { "str": "10mm Auto FMJ, black powder" },
     "proportional": {
       "price": 0.3,
-      "damage": { "damage_type": "stab", "amount": 0.76, "armor_penetration": 0.5 },
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
       "recoil": 0.76,
       "dispersion": 1.2
     },
@@ -41,7 +41,7 @@
     "copy-from": "10mm_fmj",
     "type": "AMMO",
     "name": { "str": "10mm Auto FMJ, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }

diff --git a/data/json/items/ammo/12mm.json b/data/json/items/ammo/12mm.json
@@ -15,7 +15,7 @@
     "count": 20,
     "stack_size": 40,
     "ammo_type": "12mm",
-    "damage": { "damage_type": "stab", "amount": 50, "armor_penetration": 40 },
+    "damage": { "damage_type": "bullet", "amount": 50, "armor_penetration": 40 },
     "dispersion": 45,
     "recoil": 100
   }

diff --git a/data/json/items/ammo/20x66mm.json b/data/json/items/ammo/20x66mm.json
@@ -9,7 +9,7 @@
     "price_postapoc": 1000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 10,
-    "proportional": { "damage": { "damage_type": "stab", "amount": 0.1 }, "recoil": 0.4, "loudness": 0.6 },
+    "proportional": { "damage": { "damage_type": "bullet", "amount": 0.1 }, "recoil": 0.4, "loudness": 0.6 },
     "extend": { "effects": [ "LARGE_BEANBAG", "NOGIB" ] }
   },
   {
@@ -18,7 +18,7 @@
     "type": "AMMO",
     "name": { "str": "20x66mm flechette, handmade", "str_pl": "20x66mm flechettes, handmade" },
     "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless flechette rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
@@ -28,7 +28,7 @@
     "type": "AMMO",
     "name": { "str": "20x66mm buckshot, handmade" },
     "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless buckshot rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
@@ -38,7 +38,7 @@
     "type": "AMMO",
     "name": { "str": "20x66mm slug, handmade", "str_pl": "20x66mm slugs, handmade" },
     "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless solid projectile rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
@@ -52,7 +52,7 @@
     "price_postapoc": 8000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "range": 20,
-    "damage": { "damage_type": "stab", "amount": 16, "armor_penetration": 4 },
+    "damage": { "damage_type": "bullet", "amount": 16, "armor_penetration": 4 },
     "dispersion": 120,
     "effects": [ "COOKOFF", "EXPLOSIVE_20x66", "NEVER_MISFIRES" ]
   },
@@ -67,7 +67,7 @@
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 10,
     "range": 20,
-    "damage": { "damage_type": "stab", "amount": 16 },
+    "damage": { "damage_type": "bullet", "amount": 16 },
     "dispersion": 200,
     "recoil": 100,
     "drop": "handflare_lit",
@@ -83,7 +83,7 @@
     "price_postapoc": 4000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 10,
-    "relative": { "damage": { "damage_type": "stab", "amount": -10, "armor_penetration": 20 } }
+    "relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 20 } }
   },
   {
     "id": "20x66_frag",
@@ -95,8 +95,8 @@
     "price_postapoc": 5000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 5,
-    "proportional": { "damage": { "damage_type": "stab", "amount": 0.25, "armor_penetration": 0.25 } },
-    "extend": { "effects": [ "FRAG_20x66" ] }
+    "extend": { "effects": [ "FRAG_20x66" ] },
+    "proportional": { "damage": { "damage_type": "bullet", "amount": 0.25, "armor_penetration": 0.25 } }
   },
   {
     "id": "20x66_inc",
@@ -128,7 +128,7 @@
     "stack_size": 20,
     "ammo_type": "20x66mm",
     "range": 12,
-    "damage": { "damage_type": "stab", "amount": 60 },
+    "damage": { "damage_type": "bullet", "amount": 60 },
     "recoil": 2500,
     "effects": [ "COOKOFF", "SHOT", "NEVER_MISFIRES" ]
   },
@@ -141,7 +141,7 @@
     "price": 1500,
     "price_postapoc": 4000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-    "damage": { "damage_type": "stab", "amount": 39, "armor_penetration": 8 },
+    "damage": { "damage_type": "bullet", "amount": 39, "armor_penetration": 8 },
     "relative": { "range": 12 },
     "proportional": { "dispersion": 1.3 },
     "delete": { "effects": [ "SHOT" ] }

diff --git a/data/json/items/ammo/22.json b/data/json/items/ammo/22.json
@@ -11,7 +11,7 @@
     "count": 100,
     "stack_size": 150,
     "recoil": 39,
-    "proportional": { "range": 0.6, "damage": { "damage_type": "stab", "amount": 0.5 }, "dispersion": 1.2 },
+    "proportional": { "range": 0.6, "damage": { "damage_type": "bullet", "amount": 0.5 }, "dispersion": 1.2 },
     "extend": { "effects": [ "NOGIB" ] }
   },
   {
@@ -20,7 +20,7 @@
     "type": "AMMO",
     "name": { "str": ".22 FMJ" },
     "description": ".22 Long Rifle ammunition with 30gr FMJ bullets.  The .22LR round is extremely weak with very low stopping power, short range, and negligible recoil.  It is most useful for rifle training, and hunting small animals.",
-    "relative": { "damage": { "damage_type": "stab", "amount": -1, "armor_penetration": 2 } }
+    "relative": { "damage": { "damage_type": "bullet", "amount": -1, "armor_penetration": 2 } }
   },
   {
     "id": "22_lr",
@@ -40,7 +40,7 @@
     "ammo_type": "22",
     "casing": "22_casing",
     "range": 13,
-    "damage": { "damage_type": "stab", "amount": 12 },
+    "damage": { "damage_type": "bullet", "amount": 12 },
     "dispersion": 60,
     "recoil": 150,
     "effects": [ "COOKOFF" ]
@@ -54,7 +54,7 @@
     "count": 100,
     "price_postapoc": 400,
     "dispersion": 0,
-    "proportional": { "range": 0.6, "damage": { "damage_type": "stab", "amount": 0.5 }, "recoil": 0.5 },
+    "proportional": { "range": 0.6, "damage": { "damage_type": "bullet", "amount": 0.5 }, "recoil": 0.5 },
     "extend": { "effects": [ "SHOT", "NOGIB" ] }
   },
   {
@@ -64,7 +64,7 @@
     "name": { "str": ".22 LR FMJ, black powder" },
     "proportional": {
       "price": 0.3,
-      "damage": { "damage_type": "stab", "amount": 0.57, "armor_penetration": 0.5 },
+      "damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
       "recoil": 0.57,
       "dispersion": 1.2
     },
@@ -78,7 +78,7 @@
     "name": { "str": ".22 LR, black powder" },
     "proportional": {
       "price": 0.3,
-      "damage": { "damage_type": "stab", "amount": 0.57, "armor_penetration": 0.5 },
+      "damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
       "recoil": 0.57,
       "dispersion": 1.2
     },
@@ -90,7 +90,7 @@
     "copy-from": "22_lr",
     "type": "AMMO",
     "name": { "str": ".22 LR, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
@@ -99,7 +99,7 @@
     "copy-from": "22_fmj",
     "type": "AMMO",
     "name": { "str": ".22 FMJ, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }