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

Maleclypse · Jul 13, 2021 · c8ef7c5 · c8ef7c5
2 parents ace1825 + 4663683
commit c8ef7c5
Show file tree

Hide file tree

Showing 98 changed files with 8,522 additions and 8,505 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -46,7 +46,6 @@ modernize-*,\
 performance-*,\
 readability-*,\
 -readability-braces-around-statements,\
--bugprone-branch-clone,\
 -bugprone-infinite-loop,\
 -bugprone-misplaced-widening-cast,\
 -bugprone-narrowing-conversions,\

diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json
@@ -210,9 +210,9 @@
         "pocket_type": "CONTAINER",
         "holster": true,
         "min_item_volume": "100 ml",
-        "max_contains_volume": "400 ml",
+        "max_contains_volume": "855 ml",
         "max_contains_weight": "2 kg",
-        "max_item_length": "25 cm",
+        "max_item_length": "38 cm",
         "moves": 30
       },
       {

diff --git a/data/json/items/tool/metalworking.json b/data/json/items/tool/metalworking.json
@@ -264,6 +264,22 @@
     "color": "light_gray",
     "flags": [ "DURABLE_MELEE" ]
   },
+  {
+    "id": "hotcut",
+    "type": "TOOL",
+    "name": { "str": "hotcut" },
+    "description": "This is a hardened chisel like object for metalsmithing.  This is used to cut lengths of metal in some metalworking fabrication recipes.",
+    "weight": "800 g",
+    "volume": "500 ml",
+    "price": 1600,
+    "price_postapoc": 25,
+    "to_hit": 1,
+    "bashing": 10,
+    "material": [ "steel" ],
+    "symbol": ";",
+    "color": "light_gray",
+    "flags": [ "DURABLE_MELEE" ]
+  },
   {
     "id": "tongs",
     "type": "TOOL",

diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json
@@ -99,13 +99,11 @@
     "symbol": "[",
     "looks_like": "scarf",
     "color": "yellow",
-    "covers": [ "eyes" ],
-    "coverage": 95,
-    "encumbrance": 10,
     "warmth": 0,
     "material_thickness": 0.1,
     "environmental_protection": 0,
-    "flags": [ "BLIND" ]
+    "flags": [ "BLIND" ],
+    "armor": [ { "encumbrance": 10, "coverage": 95, "covers": [ "eyes" ] } ]
   },
   {
     "id": "blindfold",

diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json
@@ -851,6 +851,7 @@
     "melee_cut": 3,
     "dodge": 3,
     "vision_night": 5,
+    "zombify_into": "mon_zombie_dog",
     "path_settings": { "max_dist": 10 },
     "reproduction": { "baby_monster": "mon_dog_pup", "baby_count": 4, "baby_timer": 270 },
     "//": "1-4 puppies & 270 days per-litter for size small canines",

diff --git a/data/json/morale_types.json b/data/json/morale_types.json
@@ -132,12 +132,12 @@
   {
     "id": "morale_vegetarian",
     "type": "morale_type",
-    "text": "Ate Meat"
+    "text": "Ate Vegetables"
   },
   {
     "id": "morale_meatarian",
     "type": "morale_type",
-    "text": "Ate Vegetables"
+    "text": "Ate Meat"
   },
   {
     "id": "morale_antifruit",

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain.json b/data/json/overmap/overmap_terrain/overmap_terrain.json
@@ -758,6 +758,7 @@
     "name": "rock border",
     "sym": "#",
     "color": "white",
-    "flags": [ "NO_ROTATE" ]
+    "flags": [ "NO_ROTATE" ],
+    "see_cost": 5
   }
 ]
diff --git a/data/json/recipes/food/dairy_products.json b/data/json/recipes/food/dairy_products.json
@@ -3,17 +3,34 @@
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
     "result": "raw_butter",
-    "result_mult": 1,
+    "result_mult": 3,
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_OTHER",
     "skill_used": "cooking",
     "difficulty": 5,
+    "batch_time_factors": [ 95, 2 ],
     "time": "30 m",
     "qualities": [ { "id": "CHURN", "level": 1 } ],
     "book_learn": [ [ "dairy_book", 3 ] ],
     "//": "Book Things to do with milk.  Add curdled milk and cheese recipes to the book.  Also consider adding to brewing json Airag from this book.",
     "components": [ [ [ "milk_cream", 5 ] ] ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "raw_butter",
+    "id_suffix": "shake",
+    "byproducts": [ [ "buttermilk", 3 ], [ "jar_glass_sealed", 1 ] ],
+    "result_mult": 1,
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_OTHER",
+    "skill_used": "cooking",
+    "difficulty": 5,
+    "time": "20 m",
+    "book_learn": [ [ "dairy_book", 3 ] ],
+    "//": "Book Things to do with milk.  Add curdled milk and cheese recipes to the book.  Also consider adding to brewing json Airag from this book.",
+    "components": [ [ [ "jar_glass_sealed", 1 ] ], [ [ "water_clean", 1 ] ], [ [ "milk_cream", 3 ] ] ]
+  },
   {
     "type": "recipe",
     "activity_level": "NO_EXERCISE",

diff --git a/data/json/recipes/other/parts.json b/data/json/recipes/other/parts.json
@@ -197,7 +197,7 @@
     "using": [ [ "blacksmithing_standard", 32 ], [ "steel_standard", 8 ] ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
-    "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "swage", -1 ] ] ]
+    "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "hotcut", -1 ] ] ]
   },
   {
     "result": "circsaw_blade",
@@ -235,7 +235,7 @@
       { "proficiency": "prof_bladesmith" }
     ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
-    "tools": [ [ [ "swage", -1 ] ] ]
+    "tools": [ [ [ "hotcut", -1 ] ] ]
   },
   {
     "type": "recipe",
@@ -433,7 +433,7 @@
     "qualities": [ { "id": "ANVIL", "level": 1 }, { "id": "HAMMER", "level": 2 } ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_wiremaking" } ],
     "//": "Requires annealing 4 times from the copper rod.",
-    "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 40 ], [ "oxy_torch", 40 ] ], [ [ "draw_plate", -1 ] ] ],
+    "tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ], [ [ "forge", 40 ], [ "oxy_torch", 40 ] ], [ [ "draw_plate", -1 ] ] ],
     "components": [ [ [ "copper_rod", 1 ] ] ]
   },
   {
@@ -451,7 +451,12 @@
     "qualities": [ { "id": "ANVIL", "level": 1 }, { "id": "HAMMER", "level": 2 } ],
     "proficiencies": [ { "proficiency": "prof_metalworking" } ],
     "//": "Requires annealing 4 times from the copper rod.",
-    "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 40 ], [ "oxy_torch", 40 ] ], [ [ "wire_draw_machine", 100 ] ] ],
+    "tools": [
+      [ [ "tongs", -1 ] ],
+      [ [ "hotcut", -1 ] ],
+      [ [ "forge", 40 ], [ "oxy_torch", 40 ] ],
+      [ [ "wire_draw_machine", 100 ] ]
+    ],
     "components": [ [ [ "copper_rod", 1 ] ] ]
   },
   {

diff --git a/data/json/recipes/other/parts_construction.json b/data/json/recipes/other/parts_construction.json
@@ -12,7 +12,7 @@
     "using": [ [ "blacksmithing_standard", 1 ], [ "steel_tiny", 1 ] ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
-    "tools": [ [ [ "swage", -1 ] ] ]
+    "tools": [ [ [ "hotcut", -1 ] ] ]
   },
   {
     "type": "recipe",
@@ -122,7 +122,7 @@
     "using": [ [ "blacksmithing_standard", 2 ], [ "steel_tiny", 2 ] ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
-    "tools": [ [ [ "swage", -1 ] ] ]
+    "tools": [ [ [ "hotcut", -1 ] ] ]
   },
   {
     "type": "recipe",
@@ -137,7 +137,7 @@
     "using": [ [ "blacksmithing_standard", 1 ], [ "steel_tiny", 1 ] ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
-    "tools": [ [ [ "swage", -1 ] ] ]
+    "tools": [ [ [ "hotcut", -1 ] ] ]
   },
   {
     "result": "hinge",
@@ -270,7 +270,7 @@
     "autolearn": true,
     "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_redsmithing" } ],
-    "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 50 ], [ "oxy_torch", 10 ] ] ],
+    "tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ], [ [ "forge", 50 ], [ "oxy_torch", 10 ] ] ],
     "components": [ [ [ "copper_scrap_equivalent", 8, "LIST" ] ] ]
   },
   {

diff --git a/data/json/recipes/recipe_ammo.json b/data/json/recipes/recipe_ammo.json
@@ -417,15 +417,7 @@
     "book_learn": [ [ "recipe_arrows", 5 ] ],
     "qualities": [ { "id": "CUT", "level": 1 } ],
     "components": [
-      [
-        [ "arrow_field_point_fletched", 5 ],
-        [ "arrow_fire_hardened_fletched", 5 ],
-        [ "arrow_wood", 5 ],
-        [ "arrow_heavy_fire_hardened_fletched", 5 ],
-        [ "arrow_heavy_field_point_fletched", 5 ],
-        [ "arrow_wood_heavy", 5 ],
-        [ "arrow_metal", 5 ]
-      ],
+      [ [ "arrow_field_point_fletched", 5 ] ],
       [ [ "rag", 1, "NO_RECOVER" ] ],
       [
         [ "lamp_oil", 50, "NO_RECOVER" ],

diff --git a/data/json/recipes/tools/tool.json b/data/json/recipes/tools/tool.json
@@ -52,7 +52,7 @@
       { "proficiency": "prof_bladesmith", "required": false, "time_multiplier": 1.5 }
     ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
-    "tools": [ [ [ "swage", -1 ] ] ]
+    "tools": [ [ [ "hotcut", -1 ] ] ]
   },
   {
     "type": "recipe",
@@ -97,7 +97,7 @@
       { "proficiency": "prof_toolsmithing" }
     ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
-    "tools": [ [ [ "swage", -1 ] ] ],
+    "tools": [ [ [ "hotcut", -1 ] ] ],
     "components": [ [ [ "2x4", 1 ], [ "stick", 2 ] ] ]
   },
   {
@@ -255,7 +255,7 @@
     ],
     "using": [ [ "forging_standard", 4 ], [ "plastic_molding", 1 ] ],
     "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ],
-    "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ] ],
+    "tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ] ],
     "components": [ [ [ "plastic_chunk", 2 ] ], [ [ "steel_lump", 2 ] ] ]
   },
   {
@@ -276,7 +276,7 @@
       { "proficiency": "prof_toolsmithing" }
     ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
-    "tools": [ [ [ "swage", -1 ] ] ]
+    "tools": [ [ [ "hotcut", -1 ] ] ]
   },
   {
     "result": "awl_bone",
@@ -302,7 +302,7 @@
     "difficulty": 4,
     "time": "120 m",
     "autolearn": true,
-    "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ] ],
+    "tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ] ],
     "using": [ [ "forging_standard", 1 ], [ "steel_tiny", 1 ] ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
     "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ],
@@ -339,7 +339,7 @@
       { "proficiency": "prof_plasticworking" }
     ],
     "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ],
-    "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ] ],
+    "tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ] ],
     "components": [ [ [ "scrap", 2 ] ] ]
   },
   {