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

…into migrate-dig-activities
CleverRaven · May 5, 2020 · ba115ae · ba115ae
2 parents f5e57c7 + 781ca2e
commit ba115ae
Show file tree

Hide file tree

Showing 111 changed files with 2,368 additions and 5,386 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -52,7 +52,6 @@ readability-*,\
 -readability-magic-numbers,\
 -readability-named-parameter,\
 -readability-redundant-control-flow,\
--clang-analyzer-optin.performance.Padding,\
 "
 WarningsAsErrors: '*'
 HeaderFilterRegex: '(src|test|tools).*'

diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json
@@ -97,6 +97,11 @@
     "aoe": { "field_type": "fd_plasma", "intensity_min": 2, "intensity_max": 3, "chance": 50 },
     "trail": { "field_type": "fd_plasma", "intensity_min": 1, "intensity_max": 2, "chance": 50 }
   },
+  {
+    "id": "PLASMA_BUBBLE",
+    "type": "ammo_effect",
+    "aoe": { "field_type": "fd_plasma", "intensity_min": 1, "intensity_max": 3, "radius": 1, "chance": 10 }
+  },
   {
     "id": "EXPLOSIVE_HUGE",
     "type": "ammo_effect",

diff --git a/data/json/flags.json b/data/json/flags.json
@@ -784,5 +784,11 @@
     "type": "json_flag",
     "context": [ "COMESTIBLE" ],
     "craft_inherit": true
+  },
+  {
+    "id": "STRICT_HUMANITARIANISM",
+    "type": "json_flag",
+    "context": [ "COMESTIBLE" ],
+    "craft_inherit": true
   }
 ]
diff --git a/data/json/furniture_and_terrain/furniture-flora.json b/data/json/furniture_and_terrain/furniture-flora.json
@@ -94,7 +94,7 @@
         "seasons": [ "spring", "summer", "autumn" ],
         "entries": [
           { "drop": "withered", "base_num": [ 1, 2 ] },
-          { "drop": "seed_flower", "base_num": [ 1, 2 ] },
+          { "drop": "seed_spurge", "base_num": [ 1, 2 ] },
           { "drop": "spurge", "base_num": [ 1, 4 ] }
         ]
       }
@@ -178,11 +178,7 @@
     "harvest_by_season": [
       {
         "seasons": [ "spring", "summer", "autumn" ],
-        "entries": [
-          { "drop": "withered", "base_num": [ 1, 2 ] },
-          { "drop": "seed_flower", "base_num": [ 1, 2 ] },
-          { "drop": "lotus", "base_num": [ 1, 2 ] }
-        ]
+        "entries": [ { "drop": "withered", "base_num": [ 1, 2 ] }, { "drop": "lotus", "base_num": [ 1, 2 ] } ]
       }
     ],
     "//": "Add flower and bud spawns once useful.",

diff --git a/data/json/harvest.json b/data/json/harvest.json
@@ -174,6 +174,32 @@
       { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.07 }
     ]
   },
+  {
+    "id": "demihuman_fur",
+    "//": "drops regular stomach",
+    "type": "harvest",
+    "entries": [
+      { "drop": "demihuman_flesh", "type": "flesh", "mass_ratio": 0.34 },
+      { "drop": "demihuman_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
+      { "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
+      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
+      { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 },
+      { "drop": "demihuman_fat", "type": "flesh", "mass_ratio": 0.07 }
+    ]
+  },
+  {
+    "id": "demihuman_large_fur",
+    "//": "drops large stomach",
+    "type": "harvest",
+    "entries": [
+      { "drop": "demihuman_flesh", "type": "flesh", "mass_ratio": 0.34 },
+      { "drop": "demihuman_stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
+      { "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
+      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
+      { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 },
+      { "drop": "demihuman_fat", "type": "flesh", "mass_ratio": 0.07 }
+    ]
+  },
   {
     "id": "mammal_small_leather",
     "//": "does not drop stomach or other small organs",
@@ -556,6 +582,19 @@
       { "drop": "raw_hleather", "type": "skin", "mass_ratio": 0.01 }
     ]
   },
+  {
+    "id": "demihuman",
+    "//": "a near human sapient being possibly from another dimension, some people will consider it human and some won't",
+    "type": "harvest",
+    "entries": [
+      { "drop": "demihuman_flesh", "type": "flesh", "mass_ratio": 0.2 },
+      { "drop": "demihuman_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
+      { "drop": "demihuman_fat", "type": "flesh", "mass_ratio": 0.1 },
+      { "drop": "bone_human", "type": "bone", "mass_ratio": 0.12 },
+      { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
+      { "drop": "raw_demihumanleather", "type": "skin", "mass_ratio": 0.01 }
+    ]
+  },
   {
     "id": "mutant_human",
     "type": "harvest",

diff --git a/data/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json b/data/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json
@@ -33,6 +33,7 @@
       [ "seed_chili_pepper", 60 ],
       [ "seed_tomato", 60 ],
       [ "seed_horseradish", 10 ],
+      [ "seed_spurge", 10 ],
       [ "seed_popcorn", 10 ],
       [ "seed_mustard", 10 ]
     ]

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -311,6 +311,7 @@
       { "item": "acr", "prob": 25, "charges-min": 0, "charges-max": 30 },
       { "item": "colt_lightning", "prob": 15, "charges-min": 0, "charges-max": 10 },
       { "item": "fn_fal", "prob": 40, "charges-min": 0, "charges-max": 20 },
+      { "item": "fs2000", "prob": 6, "charges-min": 0, "charges-max": 30 },
       { "item": "hk_g3", "prob": 40, "charges-min": 0, "charges-max": 20 },
       { "item": "hk_g36", "prob": 30, "charges-min": 0, "charges-max": 30 },
       { "item": "henry_big_boy", "prob": 10, "charges-min": 0, "charges-max": 10 },

diff --git a/data/json/itemgroups/trash_and_debris.json b/data/json/itemgroups/trash_and_debris.json
@@ -99,6 +99,7 @@
       [ "seed_weed", 5 ],
       [ "seed_flower", 5 ],
       [ "seed_tobacco", 1 ],
+      [ "seed_spurge", 1 ],
       [ "joint_roach", 5 ],
       [ "pipe", 20 ],
       [ "bag_plastic", 10 ],

diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json
@@ -363,7 +363,7 @@
     "coverage": 15,
     "encumbrance": 3,
     "material_thickness": 1,
-    "pocket_data": [ { "ammo_restriction": { "arrow": 20, "bolt": 20 }, "moves": 20 } ],
+    "pocket_data": [ { "ammo_restriction": { "arrow": 60, "bolt": 60 }, "moves": 20 } ],
     "flags": [ "BELTED", "OVERSIZE", "WATER_FRIENDLY" ]
   },
   {

diff --git a/data/json/items/armor/ballistic_armor.json b/data/json/items/armor/ballistic_armor.json
@@ -39,7 +39,7 @@
     "coverage": 85,
     "encumbrance": 10,
     "warmth": 15,
-    "material_thickness": 20,
+    "material_thickness": 16,
     "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "NO_REPAIR" ]
   },
   {

diff --git a/data/json/items/armor/belts.json b/data/json/items/armor/belts.json
@@ -120,7 +120,7 @@
     "pocket_data": [
       {
         "holster": true,
-        "max_contains_volume": "500 ml",
+        "max_contains_volume": "1 L",
         "max_contains_weight": "400 g",
         "moves": 60,
         "flag_restriction": [ "BELT_CLIP" ]

diff --git a/data/json/items/armor/coats.json b/data/json/items/armor/coats.json
@@ -11,7 +11,7 @@
     "price": 91000,
     "price_postapoc": 1500,
     "to_hit": -1,
-    "material": [ "nomex", "kevlar" ],
+    "material": [ "nomex", "kevlar", "lycra" ],
     "symbol": "[",
     "looks_like": "coat_winter",
     "color": "yellow",

diff --git a/data/json/items/armor/hoods.json b/data/json/items/armor/hoods.json
@@ -85,7 +85,7 @@
     "covers": [ "HEAD" ],
     "coverage": 100,
     "encumbrance": 15,
-    "warmth": 15,
+    "warmth": 10,
     "material_thickness": 4,
     "environmental_protection": 3,
     "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OUTER", "HELMET_COMPAT" ]

diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json
@@ -35,7 +35,7 @@
     "price": 81500,
     "price_postapoc": 500,
     "to_hit": -1,
-    "material": [ "nomex", "kevlar" ],
+    "material": [ "nomex", "kevlar", "lycra" ],
     "symbol": "[",
     "looks_like": "pants_cargo",
     "color": "dark_gray",

diff --git a/data/json/items/armor/power_armor.json b/data/json/items/armor/power_armor.json
@@ -62,7 +62,7 @@
     "price_postapoc": 30000,
     "to_hit": 1,
     "bashing": 1,
-    "material": [ "hardsteel", "steel" ],
+    "material": [ "hardsteel", "ceramic", "kevlar_rigid" ],
     "symbol": "[",
     "looks_like": "depowered_armor",
     "color": "light_gray",
@@ -72,7 +72,7 @@
     "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "2500 ml", "max_contains_weight": "15 kg", "moves": 200 } ],
     "warmth": 90,
     "power_armor": true,
-    "material_thickness": 11,
+    "material_thickness": 14,
     "environmental_protection": 16,
     "use_action": { "type": "ups_based_armor", "activate_msg": "Your power armor engages." },
     "flags": [ "WATERPROOF", "STURDY", "ELECTRIC_IMMUNE" ]
@@ -113,7 +113,7 @@
     "price_postapoc": 40000,
     "to_hit": 1,
     "bashing": 1,
-    "material": [ "hardsteel", "steel" ],
+    "material": [ "hardsteel", "ceramic", "kevlar_rigid" ],
     "symbol": "[",
     "looks_like": "power_armor_basic",
     "color": "dark_gray",
@@ -123,7 +123,7 @@
     "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "4 L", "max_contains_weight": "30 kg", "moves": 200 } ],
     "warmth": 60,
     "power_armor": true,
-    "material_thickness": 12,
+    "material_thickness": 16,
     "environmental_protection": 16,
     "use_action": { "type": "ups_based_armor", "activate_msg": "Your power armor engages." },
     "flags": [ "WATERPROOF", "STURDY", "ELECTRIC_IMMUNE" ]
@@ -140,7 +140,7 @@
     "price_postapoc": 7500,
     "to_hit": 1,
     "bashing": 1,
-    "material": [ "hardsteel", "steel" ],
+    "material": [ "hardsteel", "ceramic", "kevlar_rigid" ],
     "symbol": "[",
     "looks_like": "depowered_helmet",
     "color": "light_gray",
@@ -149,7 +149,7 @@
     "encumbrance": 50,
     "warmth": 90,
     "power_armor": true,
-    "material_thickness": 11,
+    "material_thickness": 14,
     "environmental_protection": 16,
     "qualities": [ [ "GLARE", 2 ] ],
     "flags": [ "WATCH", "WATERPROOF", "STURDY", "PARTIAL_DEAF", "THERMOMETER", "SUN_GLASSES" ]
@@ -166,7 +166,7 @@
     "price_postapoc": 10000,
     "to_hit": 1,
     "bashing": 1,
-    "material": [ "hardsteel", "steel" ],
+    "material": [ "hardsteel", "ceramic", "kevlar_rigid" ],
     "symbol": "[",
     "looks_like": "power_armor_helmet_basic",
     "color": "dark_gray",
@@ -175,7 +175,7 @@
     "encumbrance": 60,
     "warmth": 60,
     "power_armor": true,
-    "material_thickness": 12,
+    "material_thickness": 16,
     "environmental_protection": 16,
     "qualities": [ [ "GLARE", 2 ] ],
     "flags": [ "WATCH", "WATERPROOF", "STURDY", "PARTIAL_DEAF", "THERMOMETER", "SUN_GLASSES" ]
@@ -192,7 +192,7 @@
     "price_postapoc": 10000,
     "to_hit": 1,
     "bashing": 1,
-    "material": [ "superalloy", "plastic" ],
+    "material": [ "hardsteel", "kevlar", "kevlar_rigid" ],
     "symbol": "[",
     "looks_like": "power_armor_helmet_basic",
     "color": "dark_gray",
@@ -201,7 +201,7 @@
     "encumbrance": 40,
     "warmth": 60,
     "power_armor": true,
-    "material_thickness": 9,
+    "material_thickness": 8,
     "environmental_protection": 16,
     "qualities": [ [ "GLARE", 1 ] ],
     "flags": [ "WATCH", "WATERPROOF", "STURDY", "THERMOMETER", "SUN_GLASSES" ]
@@ -218,7 +218,7 @@
     "price_postapoc": 40000,
     "to_hit": 1,
     "bashing": 1,
-    "material": [ "superalloy", "plastic" ],
+    "material": [ "hardsteel", "kevlar", "kevlar_rigid" ],
     "symbol": "[",
     "looks_like": "depowered_armor",
     "color": "dark_gray",
@@ -228,7 +228,7 @@
     "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "4 L", "max_contains_weight": "30 kg", "moves": 200 } ],
     "warmth": 60,
     "power_armor": true,
-    "material_thickness": 9,
+    "material_thickness": 8,
     "environmental_protection": 16,
     "use_action": { "type": "ups_based_armor", "activate_msg": "Your power armor engages." },
     "flags": [ "WATERPROOF", "STURDY", "ELECTRIC_IMMUNE" ]

diff --git a/data/json/items/armor/torso_armor.json b/data/json/items/armor/torso_armor.json
@@ -319,7 +319,7 @@
     "coverage": 85,
     "encumbrance": 5,
     "warmth": 15,
-    "material_thickness": 4,
+    "material_thickness": 3,
     "flags": [ "STURDY", "SKINTIGHT" ]
   },
   {