feat(balance): fix stacking error with heavy bones, updates to harves…

…t entries and recipes, use new materials in mods (#5499) * feat(balance): fix stacking error with heavy bones, updates to harvest entries and recipes, use new materials in mods * style(autofix.ci): automated formatting * dingus * Weapon fixes * Missing recipes go nyooooom * Update mammal.json --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
cataclysmbnteam · Oct 4, 2024 · 1e21d4d · 1e21d4d
1 parent 0039f73
commit 1e21d4d
Show file tree

Hide file tree

Showing 30 changed files with 370 additions and 299 deletions.
diff --git a/data/json/harvest.json b/data/json/harvest.json
@@ -43,7 +43,18 @@
     "entries": [
       { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.38 },
       { "drop": "liver", "type": "offal", "mass_ratio": 0.01 },
-      { "drop": "bone", "type": "bone", "mass_ratio": 0.1 }
+      { "drop": "bone", "type": "bone", "mass_ratio": 0.1 },
+      { "drop": "scute_piece", "type": "skin", "mass_ratio": 0.04 }
+    ]
+  },
+  {
+    "id": "mutant_fish_large",
+    "type": "harvest",
+    "entries": [
+      { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.38 },
+      { "drop": "liver", "type": "offal", "mass_ratio": 0.01 },
+      { "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.1 },
+      { "drop": "scute_piece", "type": "skin", "mass_ratio": 0.04 }
     ]
   },
   {
@@ -199,7 +210,7 @@
       { "drop": "mutant_human_flesh", "type": "flesh", "mass_ratio": 0.34 },
       { "drop": "hstomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
       { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
-      { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 },
+      { "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.15 },
       { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 },
       { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.07 }
     ]
@@ -213,7 +224,8 @@
       { "drop": "mutant_human_flesh", "type": "flesh", "mass_ratio": 0.34 },
       { "drop": "hstomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
       { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
-      { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 },
+      { "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.15 },
+      { "drop": "teeth_serrated", "type": "bone", "mass_ratio": 0.02 },
       { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 },
       { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.07 }
     ]
@@ -325,6 +337,24 @@
       { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 }
     ]
   },
+  {
+    "id": "mutant_mammal_toothy_fur",
+    "//": "drops regular stomach",
+    "type": "harvest",
+    "entries": [
+      { "drop": "mutant_blood", "type": "blood", "mass_ratio": 0.1 },
+      { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.3 },
+      { "drop": "mutant_meat_scrap", "type": "flesh", "mass_ratio": 0.03 },
+      { "drop": "brain", "type": "flesh", "mass_ratio": 0.005 },
+      { "drop": "mutant_offal", "type": "offal", "mass_ratio": 0.01 },
+      { "drop": "stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
+      { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
+      { "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
+      { "drop": "teeth_serrated", "type": "bone", "mass_ratio": 0.02 },
+      { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.02 },
+      { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 }
+    ]
+  },
   {
     "id": "mutant_mammal_large_leather",
     "//": "drops large stomach",
@@ -366,6 +396,27 @@
       { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 }
     ]
   },
+  {
+    "id": "mutant_mammal_toothy_large_scute",
+    "//": "drops large stomach",
+    "type": "harvest",
+    "entries": [
+      { "drop": "mutant_blood", "type": "blood", "mass_ratio": 0.1 },
+      { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.32 },
+      { "drop": "mutant_meat_scrap", "type": "flesh", "mass_ratio": 0.01 },
+      { "drop": "lung", "type": "flesh", "mass_ratio": 0.0035 },
+      { "drop": "liver", "type": "offal", "mass_ratio": 0.01 },
+      { "drop": "brain", "type": "flesh", "mass_ratio": 0.005 },
+      { "drop": "sweetbread", "type": "flesh", "mass_ratio": 0.002 },
+      { "drop": "kidney", "type": "offal", "mass_ratio": 0.002 },
+      { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
+      { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
+      { "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.15 },
+      { "drop": "teeth_serrated", "type": "bone", "mass_ratio": 0.02 },
+      { "drop": "scute_piece", "type": "skin", "mass_ratio": 0.04 },
+      { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 }
+    ]
+  },
   {
     "id": "mammal_small_wool",
     "//": "does not drop stomach or other small organs",
@@ -414,7 +465,7 @@
       { "drop": "mutant_offal", "type": "offal", "mass_ratio": 0.01 },
       { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
       { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
-      { "drop": "bone", "type": "bone", "mass_ratio": 0.2 },
+      { "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.2 },
       { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 },
       { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.1 }
     ]
@@ -436,6 +487,24 @@
       { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 }
     ]
   },
+  {
+    "id": "mutant_mammal_large_toothy_fur",
+    "//": "drops large stomach",
+    "type": "harvest",
+    "entries": [
+      { "drop": "mutant_blood", "type": "blood", "mass_ratio": 0.1 },
+      { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.32 },
+      { "drop": "mutant_meat_scrap", "type": "flesh", "mass_ratio": 0.01 },
+      { "drop": "brain", "type": "flesh", "mass_ratio": 0.005 },
+      { "drop": "mutant_offal", "type": "offal", "mass_ratio": 0.01 },
+      { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
+      { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
+      { "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.15 },
+      { "drop": "teeth_serrated", "type": "bone", "mass_ratio": 0.02 },
+      { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.02 },
+      { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 }
+    ]
+  },
   {
     "id": "animal_noskin",
     "//": "for those vertebrates that don't have something you can skin off of them",
@@ -553,6 +622,7 @@
       { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
       { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.33 },
       { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.1 },
+      { "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.1 },
       { "drop": "flesh_golem_heart", "base_num": [ 0, 1 ], "scale_num": [ 0.6, 0.9 ], "max": 3, "type": "offal" }
     ]
   },
@@ -564,6 +634,7 @@
       { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
       { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.33 },
       { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.1 },
+      { "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.1 },
       { "drop": "jabberwock_heart", "base_num": [ 0, 1 ], "scale_num": [ 0.6, 0.9 ], "max": 3, "type": "offal" }
     ],
     "//": "what, you thought jabberwocks only had one heart?"
@@ -774,7 +845,7 @@
   },
   {
     "id": "zombie_fur",
-    "//": "any zombie that might drop leather. mostly animals.",
+    "//": "any zombie that might drop fur. mostly animals.",
     "type": "harvest",
     "entries": [
       { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
@@ -785,9 +856,22 @@
       { "drop": "pheromone", "type": "bionic", "max": 1 }
     ]
   },
+  {
+    "id": "zombie_fur_large",
+    "//": "big zombies that drop fur. mostly animals.",
+    "type": "harvest",
+    "entries": [
+      { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
+      { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 },
+      { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
+      { "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.1 },
+      { "drop": "raw_tainted_fur", "type": "skin", "mass_ratio": 0.04 },
+      { "drop": "pheromone", "type": "bionic", "max": 1 }
+    ]
+  },
   {
     "id": "zombie_tooth_fur",
-    "//": "any zombie that might drop leather and teeth. mostly animals.",
+    "//": "any zombie that might drop fur and teeth. mostly animals.",
     "type": "harvest",
     "entries": [
       { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
@@ -799,6 +883,20 @@
       { "drop": "pheromone", "type": "bionic", "max": 1 }
     ]
   },
+  {
+    "id": "zombie_tooth_fur_large",
+    "//": "big zombies that drop fur and teeth. mostly animals.",
+    "type": "harvest",
+    "entries": [
+      { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
+      { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 },
+      { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
+      { "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.1 },
+      { "drop": "teeth_serrated", "type": "bone", "mass_ratio": 0.02 },
+      { "drop": "raw_tainted_fur", "type": "skin", "mass_ratio": 0.04 },
+      { "drop": "pheromone", "type": "bionic", "max": 1 }
+    ]
+  },
   {
     "id": "zombie_tooth_leather",
     "//": "any zombie that might drop leather and teeth. mostly animals.",
@@ -895,7 +993,7 @@
       { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
       { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 },
       { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
-      { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
+      { "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.1 },
       { "drop": "kevlar_plate", "type": "skin", "mass_ratio": 0.035 },
       { "drop": "pheromone", "type": "bionic", "max": 1 }
     ]
@@ -904,6 +1002,15 @@
     "id": "mr_bones",
     "//": "spooky scary skeletons",
     "type": "harvest",
+    "entries": [
+      { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
+      { "drop": "bone_tainted", "type": "flesh", "mass_ratio": 0.5 }
+    ]
+  },
+  {
+    "id": "mr_bones_heavy",
+    "//": "12 foot tall hardware store skeletons",
+    "type": "harvest",
     "entries": [
       { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
       { "drop": "bone_heavy", "type": "flesh", "mass_ratio": 0.5 }
@@ -1169,7 +1276,7 @@
       { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
       { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 },
       { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
-      { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 }
+      { "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.1 }
     ]
   },
   {

diff --git a/data/json/items/generic.json b/data/json/items/generic.json
@@ -3197,11 +3197,13 @@
     "weight": "225 g",
     "color": "green",
     "symbol": "%",
+    "looks_like": "raw_leather",
     "description": "A bony and scaled protrusion harvested from a large reptile.  Such things were used to make handbags before the Cataclysm, but the material is sturdy and protective.",
     "price": "0 cent",
     "price_postapoc": "10 cent",
     "material": "scute",
-    "volume": "250 ml"
+    "volume": "250 ml",
+    "stackable": true
   },
   {
     "type": "GENERIC",
@@ -3211,11 +3213,13 @@
     "weight": "450 g",
     "color": "white",
     "symbol": "%",
+    "looks_like": "bone",
     "description": "A bone harvested from a large animal such as an elephant, or from certain types of zombies.  It is extremely dense and durable for its size, and largely inedible.",
     "price": "0 cent",
     "price_postapoc": "10 cent",
     "material": "bone_heavy",
-    "volume": "250 ml"
+    "volume": "250 ml",
+    "stackable": true
   },
   {
     "type": "GENERIC",
@@ -3225,11 +3229,13 @@
     "weight": "450 g",
     "color": "white",
     "symbol": "%",
+    "looks_like": "spike",
     "description": "Teeth harvested from a carnivore such as a shark, or from certain types of mutant animals.  They are extremely dense and durable for their size, and can very easily cause jagged wounds.",
     "price": "0 cent",
     "price_postapoc": "10 cent",
     "material": "bone_heavy",
-    "volume": "250 ml"
+    "volume": "250 ml",
+    "stackable": true
   },
   {
     "id": "beehive_empty",

diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json
@@ -999,7 +999,7 @@
     "copy-from": "mace",
     "name": { "str": "bone mace" },
     "description": "This mace is carved from a series of sturdy bones, capable of bashing faces in with swiftness and efficiency.",
-    "material": [ "bone" ],
+    "material": [ "bone_heavy" ],
     "proportional": { "weight": 0.8, "bashing": 0.9 }
   }
 ]
diff --git a/data/json/items/melee/spears_and_polearms.json b/data/json/items/melee/spears_and_polearms.json
@@ -604,7 +604,7 @@
     "copy-from": "glaive",
     "name": { "str": "bone glaive" },
     "description": "This glaive's blade is carved from a single massive bone, and is capable of slicing foes in with swiftness and efficiency.",
-    "material": [ "bone", "wood" ],
+    "material": [ "bone_heavy", "wood" ],
     "proportional": { "weight": 0.8, "cutting": 0.9 }
   }
 ]
diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json
@@ -1896,8 +1896,8 @@
     "type": "GENERIC",
     "copy-from": "dagger_medieval",
     "name": { "str": "stinger dagger" },
-    "description": "A 'bone' dagger made from a sharpened mutant insect stinger.  It's only natural that the Cataclysm would advent new, creative forms of old weapons.",
-    "material": [ "bone" ],
+    "description": "A dagger made from a sharpened mutant insect stinger.  It's only natural that the Cataclysm would advent new, creative forms of old weapons.",
+    "material": [ "chitin" ],
     "relic_data": {
       "passive_effects": [
         {
@@ -1923,7 +1923,7 @@
     "description": "A flat wooden club with razor-sharp teeth set into the edges.  This was a weapon of various Polynesian peoples, and was used to great effect.",
     "weight": "850 g",
     "price_postapoc": "3 USD",
-    "material": [ "wood", "bone" ],
+    "material": [ "wood", "bone_heavy" ],
     "cutting": 21
   },
   {
@@ -1932,7 +1932,7 @@
     "copy-from": "machete",
     "name": { "str": "bone machete" },
     "description": "This shortsword is carved from a single massive bone, and is capable of slicing foes in with swiftness and efficiency.",
-    "material": [ "bone" ],
+    "material": [ "bone_heavy" ],
     "proportional": { "weight": 0.8, "cutting": 0.9 }
   }
 ]
diff --git a/data/json/items/melee/unarmed_weapons.json b/data/json/items/melee/unarmed_weapons.json
@@ -227,7 +227,7 @@
     "copy-from": "cestus",
     "name": { "str": "sharktooth cestus", "str_pl": "sharktooth cestuses" },
     "description": "This weapon is a series of leather wrappings with a bone plate that has a series of razor-sharp teeth attached to it.  For when your punches need more bite.",
-    "material": [ "bone", "leather" ],
+    "material": [ "bone_heavy", "leather" ],
     "cutting": 8,
     "bashing": 6,
     "flags": [ "UNARMED_WEAPON", "DURABLE_MELEE", "STAB", "BELT_CLIP" ]

diff --git a/data/json/items/ranged/archery.json b/data/json/items/ranged/archery.json
@@ -180,7 +180,7 @@
     "color": "green",
     "looks_like": "arrow_fire_hardened_fletched",
     "description": "A simple fletched wooden arrow shaft with an arrowhead carved from a mutated insect stinger.  It paralyzes enemies it hits and stands a somewhat low chance of remaining intact once fired.",
-    "material": "wood",
+    "material": [ "wood", "chitin" ],
     "volume": "250 ml",
     "price_postapoc": "250 cent",
     "weight": "30 g",
@@ -203,7 +203,7 @@
     "color": "green",
     "looks_like": "arrow_fire_hardened_fletched",
     "description": "A simple fletched wooden arrow shaft with an arrowhead carved from a serrated tooth.  It stands a somewhat low chance of remaining intact once fired.",
-    "material": "wood",
+    "material": [ "wood", "bone_heavy" ],
     "volume": "250 ml",
     "price_postapoc": "250 cent",
     "weight": "30 g",

diff --git a/data/json/items/ranged/crossbows.json b/data/json/items/ranged/crossbows.json
@@ -151,7 +151,7 @@
     "color": "green",
     "looks_like": "bolt_makeshift",
     "description": "A simple fletched wooden crossbow bolt with a tip carved from a mutated insect stinger.  It paralyzes enemies it hits and stands a decent chance of remaining intact once fired.",
-    "material": "wood",
+    "material": [ "wood", "chitin" ],
     "volume": "250 ml",
     "price_postapoc": "250 cent",
     "weight": "30 g",
@@ -174,7 +174,7 @@
     "color": "green",
     "looks_like": "bolt_makeshift",
     "description": "A simple fletched crossbow bolt shaft with a tip carved from a serrated tooth.  It stands a somewhat low chance of remaining intact once fired.",
-    "material": "wood",
+    "material": [ "wood", "bone_heavy" ],
     "volume": "250 ml",
     "price_postapoc": "250 cent",
     "weight": "30 g",

diff --git a/data/json/items/resources/misc.json b/data/json/items/resources/misc.json
@@ -9,7 +9,7 @@
     "to_hit": -1,
     "color": "white",
     "symbol": ",",
-    "material": [ "flesh" ],
+    "material": [ "chitin" ],
     "volume": "250 ml",
     "cutting": 10,
     "flags": [ "STAB" ],
@@ -175,7 +175,7 @@
     "to_hit": -1,
     "color": "dark_gray",
     "symbol": ",",
-    "material": [ "flesh" ],
+    "material": [ "chitin" ],
     "volume": "250 ml",
     "cutting": 8,
     "flags": [ "STAB", "SHEATH_KNIFE" ],