From cc518d46a71237ddaa58f670c876b27432cedc8e Mon Sep 17 00:00:00 2001 From: Chorus System Date: Tue, 1 Oct 2024 17:09:13 -0400 Subject: [PATCH] feat(content): Monster Hunter, Monster Harder (#5466) * Scute, heavy bone, harvests, glue Added scute and heavy bone, changed monster harvests to include them, added them to superglue and bone glue recipes. * Scute armor, heavy bones in recipes Added scute armor and added heavy bones to more recipes * Itemgroups, harvest change Added scute armor to survivor suits, made scaled reptiles drop actual leather too, just less of it. * Added beesting arrows Added poisoned arrows and bolts made from bee/wasp stingers, plus corresponding recipes. * Stinger arrow name Changed poisoned arrow/bolt name to stinger arrow/bolt * Teeth, stinger knife Added in serrated teeth, harvest groups for it, recipes for it. Added in sharktooth leiomano, a polynesian weapon made from shark teeth. Added in sharktooth arrows and bolts, they do a lot of damage but less than carbon fiber. * Bone weapons, scaleskin tweak Added in heavy bone weapons, mace, machete, glaive, recipes. Changed scaleskin armor to be more equivalent to acidchitin armor. * Weight bump * Added tooth cestus Added tooth cestus, a piercing/bashing unarmed weapon. * Tainted meat/fat preserves Tainted fat and meat now rot in half the time of their conventional equivalents. * Tooth cestus is a little heavier * Sharktooth cestus rebalance Made it no longer heavier than the regular cestus, but also do not as much damage. It doesn't hit quite as hard, but it hits fast. * style(autofix.ci): automated formatting * Gave sharktooth cestus stabbing * Error fix * Bugfixes, balance Fixed bugs, made scaleskin armor less OP * Morerebalance * Repairs Made misc repair kit repair heavy bones and scute. * Update data/json/items/armor/helmets.json Co-authored-by: Chaosvolt * Update workshop.json * Apply suggestions from code review --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Chaosvolt --- data/json/harvest.json | 86 +++++++++++++++++-- .../itemgroups/Clothing_Gear/clothing.json | 1 + data/json/items/armor/arms_armor.json | 8 ++ data/json/items/armor/boots.json | 8 ++ data/json/items/armor/gloves.json | 8 ++ data/json/items/armor/helmets.json | 8 ++ data/json/items/armor/suits_protection.json | 8 ++ data/json/items/comestibles/carnivore.json | 4 +- data/json/items/generic.json | 42 +++++++++ data/json/items/melee/bludgeons.json | 9 ++ .../json/items/melee/spears_and_polearms.json | 9 ++ data/json/items/melee/swords_and_blades.json | 44 ++++++++++ data/json/items/melee/unarmed_weapons.json | 11 +++ data/json/items/ranged/archery.json | 46 ++++++++++ data/json/items/ranged/crossbows.json | 46 ++++++++++ data/json/items/tool/workshop.json | 4 +- data/json/materials.json | 56 ++++++++++++ data/json/monsters/reptile_amphibian.json | 4 +- data/json/monsters/zed-animal.json | 4 +- data/json/monsters/zed-classic.json | 2 +- data/json/monsters/zed_misc.json | 14 +-- data/json/recipes/ammo/arrows.json | 44 ++++++++++ .../animals/medium_quadruped_armor.json | 9 +- .../animals/small_quadruped_armor.json | 9 +- data/json/recipes/armor/arms.json | 13 +++ data/json/recipes/armor/feet.json | 13 +++ data/json/recipes/armor/hands.json | 13 +++ data/json/recipes/armor/head.json | 12 +++ data/json/recipes/armor/suit.json | 13 +++ data/json/recipes/chem/other.json | 15 +++- data/json/recipes/other/materials.json | 1 + data/json/recipes/other/vehicles.json | 2 +- data/json/recipes/weapon/bashing.json | 22 +++++ data/json/recipes/weapon/cutting.json | 66 ++++++++++++++ data/json/recipes/weapon/piercing.json | 37 ++++++++ .../uncraft/armor/pets_medium_quadruped.json | 2 +- .../uncraft/armor/pets_small_quadruped.json | 2 +- 37 files changed, 663 insertions(+), 32 deletions(-) diff --git a/data/json/harvest.json b/data/json/harvest.json index 9b1e1166cec3..f10447c98b90 100644 --- a/data/json/harvest.json +++ b/data/json/harvest.json @@ -340,11 +340,32 @@ { "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", "type": "bone", "mass_ratio": 0.15 }, + { "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_leather", "type": "skin", "mass_ratio": 0.04 }, { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 } ] }, + { + "id": "mutant_mammal_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": "scute_piece", "type": "skin", "mass_ratio": 0.02 }, + { "drop": "raw_leather", "type": "skin", "mass_ratio": 0.02 }, + { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 } + ] + }, { "id": "mammal_small_wool", "//": "does not drop stomach or other small organs", @@ -410,7 +431,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.15 }, + { "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.02 }, { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 } ] @@ -468,7 +489,7 @@ { "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", "type": "bone", "mass_ratio": 0.15 }, + { "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.15 }, { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 } ] }, @@ -764,6 +785,34 @@ { "drop": "pheromone", "type": "bionic", "max": 1 } ] }, + { + "id": "zombie_tooth_fur", + "//": "any zombie that might drop leather 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_tainted", "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.", + "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_tainted", "type": "bone", "mass_ratio": 0.1 }, + { "drop": "teeth_serrated", "type": "bone", "mass_ratio": 0.02 }, + { "drop": "raw_tainted_leather", "type": "skin", "mass_ratio": 0.04 }, + { "drop": "pheromone", "type": "bionic", "max": 1 } + ] + }, { "id": "zombie_meatslug", "//": "no bones or organs", @@ -787,6 +836,31 @@ { "drop": "pheromone", "type": "bionic", "max": 1 } ] }, + { + "id": "zombie_tooth", + "//": "your bog standard zombie", + "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_tainted", "type": "bone", "mass_ratio": 0.1 }, + { "drop": "teeth_serrated", "type": "bone", "mass_ratio": 0.02 }, + { "drop": "pheromone", "type": "bionic", "max": 1 } + ] + }, + { + "id": "zombie_heavy", + "//": "zombies that will have heavy bones", + "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": "pheromone", "type": "bionic", "max": 1 } + ] + }, { "id": "zombie_acid", "//": "zombies with acid for blood", @@ -832,7 +906,7 @@ "type": "harvest", "entries": [ { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, - { "drop": "bone_tainted", "type": "flesh", "mass_ratio": 0.5 } + { "drop": "bone_heavy", "type": "flesh", "mass_ratio": 0.5 } ] }, { @@ -858,7 +932,7 @@ { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.1 }, { "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_hleather", "type": "skin", "mass_ratio": 0.03 } ] }, @@ -885,7 +959,7 @@ { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, { "drop": "human_fat", "type": "flesh", "mass_ratio": 0.1 }, { "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_leather", "type": "skin", "mass_ratio": 0.03 }, { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.001 } ] diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index 86b9c5139213..dd993d92e534 100644 --- a/data/json/itemgroups/Clothing_Gear/clothing.json +++ b/data/json/itemgroups/Clothing_Gear/clothing.json @@ -2316,6 +2316,7 @@ [ "aep_suit", 4 ], [ "armor_scrapsuit", 12 ], [ "armor_chitin", 2 ], + [ "armor_scute", 2 ], [ "armor_acidchitin", 1 ], [ "armor_lightplate", 1 ], [ "exosuit_survivor", 1 ], diff --git a/data/json/items/armor/arms_armor.json b/data/json/items/armor/arms_armor.json index d12ef671c390..2c3b8d671189 100644 --- a/data/json/items/armor/arms_armor.json +++ b/data/json/items/armor/arms_armor.json @@ -304,5 +304,13 @@ "copy-from": "armguard_lightplate", "material": [ "carbon_fiber" ], "proportional": { "weight": 0.6, "price": 2, "price_postapoc": 2 } + }, + { + "id": "armguard_scute", + "type": "ARMOR", + "name": { "str": "scaleskin armguards" }, + "description": "Arm guards made from the hardened scales of large reptiles.", + "copy-from": "armguard_acidchitin", + "material": [ "scute" ] } ] diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json index aa7fbd522019..c81f94a6b011 100644 --- a/data/json/items/armor/boots.json +++ b/data/json/items/armor/boots.json @@ -1475,5 +1475,13 @@ "encumbrance": 22, "material": [ "carbon_fiber" ], "proportional": { "weight": 0.6, "price": 2, "price_postapoc": 2 } + }, + { + "id": "boots_scute", + "type": "ARMOR", + "name": { "str": "scaleskin boots" }, + "description": "Boots made from the hardened scales of large reptiles. It doesn't look quite like normal alligator skin boots due to the armored design.", + "copy-from": "boots_acidchitin", + "material": [ "scute" ] } ] diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json index c416652b706b..ae2c3e7472e1 100644 --- a/data/json/items/armor/gloves.json +++ b/data/json/items/armor/gloves.json @@ -1003,5 +1003,13 @@ "material": [ "carbon_fiber" ], "extend": { "flags": [ "ALLOWS_NATURAL_ATTACKS" ] }, "proportional": { "weight": 0.6, "price": 2, "price_postapoc": 2 } + }, + { + "id": "gauntlets_scute", + "type": "ARMOR", + "name": { "str": "scaleskin gauntlets" }, + "description": "Gauntlets made from the hardened scales of large reptiles.", + "copy-from": "gauntlets_acidchitin", + "material": [ "scute" ] } ] diff --git a/data/json/items/armor/helmets.json b/data/json/items/armor/helmets.json index 54ef9ce2baa2..c6424c4cd5de 100644 --- a/data/json/items/armor/helmets.json +++ b/data/json/items/armor/helmets.json @@ -769,5 +769,13 @@ "copy-from": "helmet_survivor", "material": [ "carbon_fiber" ], "proportional": { "weight": 0.6, "price": 2, "price_postapoc": 2 } + }, + { + "id": "helmet_scute", + "type": "ARMOR", + "name": { "str": "scaleskin helmet" }, + "description": "A helmet made from the hardened scales of large reptiles.", + "copy-from": "helmet_acidchitin", + "material": [ "scute" ] } ] diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json index 34950570000d..6a3c743e92d7 100644 --- a/data/json/items/armor/suits_protection.json +++ b/data/json/items/armor/suits_protection.json @@ -839,5 +839,13 @@ "copy-from": "armor_lightplate", "material": [ "carbon_fiber" ], "proportional": { "weight": 0.6, "price": 2, "price_postapoc": 2 } + }, + { + "id": "armor_scute", + "type": "ARMOR", + "name": { "str": "scaleskin armor" }, + "description": "Leg and body armor made from the hardened scales of large reptiles.", + "copy-from": "armor_acidchitin", + "material": [ "scute" ] } ] diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index 782a1faff24e..d29a24a8f5bd 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/data/json/items/comestibles/carnivore.json @@ -802,7 +802,7 @@ "name": { "str": "chunk of tainted meat", "str_pl": "chunks of tainted meat" }, "weight": "238 g", "color": "red", - "spoils_in": "4 hours", + "spoils_in": "12 hours", "use_action": "POISON", "comestible_type": "FOOD", "symbol": "%", @@ -853,7 +853,7 @@ "name": "tainted fat", "weight": "192 g", "color": "yellow", - "spoils_in": "4 hours", + "spoils_in": "3 days", "use_action": "POISON", "comestible_type": "FOOD", "symbol": "%", diff --git a/data/json/items/generic.json b/data/json/items/generic.json index 3c1f69c0b9ef..cc7b27251829 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -3189,6 +3189,48 @@ "flags": [ "NO_SALVAGE" ], "stackable": true }, + { + "type": "GENERIC", + "id": "scute_piece", + "category": "spare_parts", + "name": { "str": "scute" }, + "weight": "225 g", + "color": "green", + "symbol": "%", + "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" + }, + { + "type": "GENERIC", + "id": "bone_heavy", + "category": "spare_parts", + "name": { "str": "heavy bone" }, + "weight": "450 g", + "color": "white", + "symbol": "%", + "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" + }, + { + "type": "GENERIC", + "id": "teeth_serrated", + "category": "spare_parts", + "name": { "str": "sharp teeth" }, + "weight": "450 g", + "color": "white", + "symbol": "%", + "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" + }, { "id": "beehive_empty", "type": "GENERIC", diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index 91a2423dd323..747c6024a093 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -992,5 +992,14 @@ "to_hit": 1, "price": "500 USD", "price_postapoc": "15 USD" + }, + { + "id": "mace_bone", + "type": "GENERIC", + "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" ], + "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 index 12a27e47c291..4e92059b8cdb 100644 --- a/data/json/items/melee/spears_and_polearms.json +++ b/data/json/items/melee/spears_and_polearms.json @@ -597,5 +597,14 @@ "description": "A custom 3D-printed spear made out of carbon fiber. It is more lightweight than a normal spear thanks to its method of manufacturing, but it can only be repaired using a 3D printer.", "material": [ "carbon_fiber" ], "proportional": { "weight": 0.6, "price": 2, "price_postapoc": 2 } + }, + { + "id": "glaive_bone", + "type": "GENERIC", + "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" ], + "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 index 06193bd3ae97..5e7cbbf0b101 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -1854,5 +1854,49 @@ "description": "A custom 3D-printed two-handed sword made out of carbon fiber. It is more lightweight than a normal sword thanks to its method of manufacturing, but it can only be repaired using a 3D printer.", "material": [ "carbon_fiber" ], "proportional": { "weight": 0.6, "price": 2, "price_postapoc": 2 } + }, + { + "id": "knife_stinger", + "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" ], + "relic_data": { + "passive_effects": [ + { + "has": "WIELD", + "condition": "ALWAYS", + "hit_you_effect": [ + { + "id": "poison", + "once_in": 10, + "message": "The stinger injects a small amount of poison into your target.", + "npc_message": "%1$s stings their target." + } + ] + } + ] + } + }, + { + "id": "tooth_leiomano", + "copy-from": "glass_macuahuitl", + "type": "GENERIC", + "name": { "str": "sharktooth leiomano" }, + "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" ], + "cutting": 21 + }, + { + "id": "sword_bone", + "type": "GENERIC", + "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" ], + "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 index 755cec3811af..9a0bbb1f1d55 100644 --- a/data/json/items/melee/unarmed_weapons.json +++ b/data/json/items/melee/unarmed_weapons.json @@ -220,5 +220,16 @@ "description": "A custom 3D-printed katar made out of carbon fiber. It is more lightweight than a normal weapon thanks to its method of manufacturing, but it can only be repaired using a 3D printer.", "material": [ "carbon_fiber" ], "proportional": { "weight": 0.6, "price": 2, "price_postapoc": 2 } + }, + { + "id": "cestus_tooth", + "type": "GENERIC", + "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" ], + "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 index ad3c19ea2287..fc3f358e9e8a 100644 --- a/data/json/items/ranged/archery.json +++ b/data/json/items/ranged/archery.json @@ -171,6 +171,52 @@ "show_stats": true, "dont_recover_one_in": 8 }, + { + "type": "AMMO", + "id": "arrow_stinger", + "price": "4 USD", + "name": { "str": "stinger arrow" }, + "symbol": "=", + "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", + "volume": "250 ml", + "price_postapoc": "250 cent", + "weight": "30 g", + "bashing": 6, + "cutting": 2, + "ammo_type": "arrow", + "effects": [ "PARALYZEPOISON" ], + "dispersion": 150, + "loudness": 0, + "count": 10, + "show_stats": true, + "dont_recover_one_in": 20 + }, + { + "type": "AMMO", + "id": "arrow_tooth", + "price": "4 USD", + "name": { "str": "sharktooth arrow" }, + "symbol": "=", + "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", + "volume": "250 ml", + "price_postapoc": "250 cent", + "weight": "30 g", + "bashing": 6, + "cutting": 2, + "ammo_type": "arrow", + "damage": { "damage_type": "stab", "damage_multiplier": 1.15 }, + "dispersion": 150, + "loudness": 0, + "count": 10, + "show_stats": true, + "dont_recover_one_in": 20 + }, { "type": "AMMO", "id": "arrow_metal_sharpened_fletched", diff --git a/data/json/items/ranged/crossbows.json b/data/json/items/ranged/crossbows.json index 5ec0f77f3853..03992176dee7 100644 --- a/data/json/items/ranged/crossbows.json +++ b/data/json/items/ranged/crossbows.json @@ -142,6 +142,52 @@ "dont_recover_one_in": 35, "effects": [ "NOGIB" ] }, + { + "type": "AMMO", + "id": "bolt_stinger", + "price": "4 USD", + "name": { "str": "stinger bolt" }, + "symbol": "=", + "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", + "volume": "250 ml", + "price_postapoc": "250 cent", + "weight": "30 g", + "bashing": 6, + "cutting": 2, + "ammo_type": "bolt", + "effects": [ "PARALYZEPOISON" ], + "dispersion": 150, + "loudness": 0, + "count": 10, + "show_stats": true, + "dont_recover_one_in": 25 + }, + { + "type": "AMMO", + "id": "bolt_tooth", + "price": "4 USD", + "name": { "str": "sharktooth bolt" }, + "symbol": "=", + "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", + "volume": "250 ml", + "price_postapoc": "250 cent", + "weight": "30 g", + "bashing": 6, + "cutting": 2, + "ammo_type": "bolt", + "damage": { "damage_type": "stab", "damage_multiplier": 1.15 }, + "dispersion": 150, + "loudness": 0, + "count": 10, + "show_stats": true, + "dont_recover_one_in": 20 + }, { "type": "AMMO", "id": "bolt_metal", diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json index 62fef3364487..2de9c5eaf9cf 100644 --- a/data/json/items/tool/workshop.json +++ b/data/json/items/tool/workshop.json @@ -638,7 +638,7 @@ { "type": "repair_item", "item_action_type": "repair_metal", - "materials": [ "acidchitin", "bone", "chitin", "paper", "dry_plant", "cardboard", "wood", "kevlar_rigid" ], + "materials": [ "acidchitin", "bone", "bone_heavy", "chitin", "paper", "dry_plant", "cardboard", "wood", "kevlar_rigid", "scute" ], "skill": "fabrication", "tool_quality": 5, "cost_scaling": 0.1, @@ -669,7 +669,7 @@ { "type": "repair_item", "item_action_type": "repair_metal", - "materials": [ "acidchitin", "bone", "chitin", "paper", "dry_plant", "cardboard", "wood", "kevlar_rigid" ], + "materials": [ "acidchitin", "bone", "bone_heavy", "chitin", "paper", "dry_plant", "cardboard", "wood", "kevlar_rigid", "scute" ], "skill": "fabrication", "tool_quality": 4, "cost_scaling": 0.1, diff --git a/data/json/materials.json b/data/json/materials.json index 62abbe4fee9d..9f5bc386e3ea 100644 --- a/data/json/materials.json +++ b/data/json/materials.json @@ -1871,5 +1871,61 @@ "dmg_adj": [ "dented", "bent", "smashed", "shattered" ], "bash_dmg_verb": "dented", "cut_dmg_verb": "scratched" + }, + { + "type": "material", + "id": "scute", + "name": "Scute", + "density": 15, + "specific_heat_liquid": 4.186, + "specific_heat_solid": 2.108, + "latent_heat": 333, + "reinforces": true, + "bash_resist": 3, + "cut_resist": 3, + "bullet_resist": 3, + "acid_resist": 13, + "fire_resist": 2, + "elec_resist": 2, + "chip_resist": 10, + "repaired_with": "scute_piece", + "salvaged_into": "scute_piece", + "dmg_adj": [ "scratched", "cut", "cracked", "shattered" ], + "bash_dmg_verb": "cracked", + "cut_dmg_verb": "chipped", + "burn_data": [ + { "fuel": 0, "smoke": 1, "burn": 1, "volume_per_turn": "1250 ml" }, + { "fuel": 1, "smoke": 3, "burn": 1 }, + { "fuel": 1, "smoke": 5, "burn": 5 } + ] + }, + { + "type": "material", + "id": "bone_heavy", + "name": "Heavy Bone", + "density": 7, + "specific_heat_liquid": 1.2, + "specific_heat_solid": 1.2, + "latent_heat": 200, + "edible": true, + "rotting": true, + "reinforces": true, + "bash_resist": 4, + "cut_resist": 6, + "bullet_resist": 4, + "acid_resist": 7, + "fire_resist": 1, + "elec_resist": 2, + "chip_resist": 8, + "wind_resist": 90, + "repaired_with": "bone_heavy", + "dmg_adj": [ "scratched", "cut", "cracked", "shattered" ], + "bash_dmg_verb": "cracked", + "cut_dmg_verb": "chipped", + "burn_data": [ + { "fuel": 0, "smoke": 0, "burn": 0 }, + { "fuel": 0, "smoke": 1, "burn": 1, "volume_per_turn": "250 ml" }, + { "fuel": 1, "smoke": 1, "burn": 2 } + ] } ] diff --git a/data/json/monsters/reptile_amphibian.json b/data/json/monsters/reptile_amphibian.json index d4d36de3fd5b..74da25a742a4 100644 --- a/data/json/monsters/reptile_amphibian.json +++ b/data/json/monsters/reptile_amphibian.json @@ -57,7 +57,7 @@ "armor_bullet": 6, "vision_day": 3, "vision_night": 35, - "harvest": "animal_large_noskin", + "harvest": "animal_large_scute", "path_settings": { "max_dist": 8 }, "special_attacks": [ { @@ -141,7 +141,7 @@ "armor_bullet": 3, "vision_day": 30, "vision_night": 5, - "harvest": "mutant_animal_large_noskin", + "harvest": "mutant_animal_large_scute", "special_attacks": [ [ "RATTLE", 6 ], { diff --git a/data/json/monsters/zed-animal.json b/data/json/monsters/zed-animal.json index be5f19ae78ed..e0f854256c20 100644 --- a/data/json/monsters/zed-animal.json +++ b/data/json/monsters/zed-animal.json @@ -25,7 +25,7 @@ "armor_cut": 2, "armor_bullet": 2, "luminance": 0, - "harvest": "zombie_leather", + "harvest": "zombie_tooth_leather", "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "SWIMS", "AQUATIC", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ] }, @@ -180,7 +180,7 @@ "melee_cut": 4, "dodge": 2, "vision_night": 5, - "harvest": "zombie_fur", + "harvest": "zombie_tooth_fur", "special_attacks": [ [ "HOWL", 10 ] ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "FIRE" ], diff --git a/data/json/monsters/zed-classic.json b/data/json/monsters/zed-classic.json index 4dc53abe6fde..7909f489d436 100644 --- a/data/json/monsters/zed-classic.json +++ b/data/json/monsters/zed-classic.json @@ -501,7 +501,7 @@ "armor_cut": 1, "armor_bullet": 1, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie_heavy", "special_attacks": [ { "type": "bite", "cooldown": 5, "min_mul": 0.7 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json index ae7da9c7dd65..4ff9ad4d905e 100644 --- a/data/json/monsters/zed_misc.json +++ b/data/json/monsters/zed_misc.json @@ -26,7 +26,7 @@ "armor_bullet": 2, "vision_day": 15, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie_tooth", "special_attacks": [ { "type": "bite", @@ -133,7 +133,7 @@ "armor_cut": 6, "armor_bullet": 5, "vision_night": 4, - "harvest": "zombie", + "harvest": "zombie_heavy", "special_attacks": [ [ "SMASH", 30 ], [ "GRAB", 7 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -184,7 +184,7 @@ "armor_bullet": 11, "armor_stab": 8, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie_heavy", "special_attacks": [ [ "SMASH", 30 ], [ "BIO_OP_TAKEDOWN", 20 ], [ "RANGED_PULL", 20 ], [ "GRAB_DRAG", 10 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -457,7 +457,7 @@ "armor_bullet": 10, "vision_day": 50, "vision_night": 4, - "harvest": "zombie", + "harvest": "zombie_heavy", "special_attacks": [ [ "SMASH", 20 ] ], "death_drops": "mon_zombie_hulk_death_drops", "death_function": [ "NORMAL" ], @@ -502,7 +502,7 @@ "melee_cut": 2, "dodge": 3, "vision_night": 5, - "harvest": "zombie", + "harvest": "zombie_tooth", "special_attacks": [ { "id": "scratch", "damage_max_instance": [ { "damage_type": "cut", "amount": 12 } ] }, { "type": "leap", "cooldown": 5, "max_range": 5 }, @@ -579,7 +579,7 @@ "armor_bullet": 8, "vision_day": 25, "vision_night": 5, - "harvest": "zombie", + "harvest": "zombie_tooth", "special_attacks": [ { "type": "bite", @@ -783,7 +783,7 @@ "armor_bullet": 4, "vision_day": 45, "vision_night": 15, - "harvest": "zombie", + "harvest": "zombie_tooth", "path_settings": { "max_dist": 5 }, "special_attacks": [ { "type": "leap", "cooldown": 10, "max_range": 8, "min_consider_range": 3, "max_consider_range": 7 }, diff --git a/data/json/recipes/ammo/arrows.json b/data/json/recipes/ammo/arrows.json index 58184685e57e..ece1ff687eeb 100644 --- a/data/json/recipes/ammo/arrows.json +++ b/data/json/recipes/ammo/arrows.json @@ -142,6 +142,27 @@ "delete_flags": [ "FILTHY" ], "flags": [ "ALLOW_FILTHY" ] }, + { + "type": "recipe", + "result": "arrow_stinger", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_ARROWS", + "skill_used": "fabrication", + "skills_required": [ [ "archery", 3 ], [ "survival", 1 ] ], + "difficulty": 4, + "time": "30 m", + "autolearn": true, + "book_learn": [ [ "recipe_arrows", 2 ] ], + "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], + "components": [ + [ [ "adhesive", 1, "LIST" ], [ "filament", 20, "LIST" ] ], + [ [ "bee_sting", 1 ], [ "wasp_sting", 1 ] ], + [ [ "stick", 1 ], [ "broom", 1 ], [ "2x4", 1 ], [ "bee_sting", 1 ] ], + [ [ "fletching", 1, "LIST" ] ] + ], + "delete_flags": [ "FILTHY" ], + "flags": [ "ALLOW_FILTHY" ] + }, { "type": "recipe", "result": "arrow_wood_heavy", @@ -161,6 +182,7 @@ [ "bone", 5 ], [ "bone_human", 5 ], [ "bone_tainted", 10 ], + [ "bone_heavy", 3 ], [ "rock", 1 ], [ "ceramic_shard", 1 ], [ "scrap", 2 ], @@ -242,6 +264,27 @@ "delete_flags": [ "FILTHY" ], "flags": [ "ALLOW_FILTHY" ] }, + { + "type": "recipe", + "result": "bolt_stinger", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_ARROWS", + "skill_used": "fabrication", + "skills_required": [ [ "survival", 1 ] ], + "difficulty": 4, + "time": "30 m", + "autolearn": true, + "book_learn": [ [ "recipe_arrows", 2 ] ], + "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], + "components": [ + [ [ "adhesive", 1, "LIST" ], [ "filament", 20, "LIST" ] ], + [ [ "bee_sting", 1 ], [ "wasp_sting", 1 ] ], + [ [ "stick", 1 ], [ "broom", 1 ], [ "2x4", 1 ], [ "bee_sting", 1 ] ], + [ [ "fletching", 1, "LIST" ] ] + ], + "delete_flags": [ "FILTHY" ], + "flags": [ "ALLOW_FILTHY" ] + }, { "type": "recipe", "result": "bolt_metal", @@ -335,6 +378,7 @@ [ "bone", 5 ], [ "bone_human", 5 ], [ "bone_tainted", 10 ], + [ "bone_heavy", 3 ], [ "rock", 1 ], [ "ceramic_shard", 1 ], [ "scrap", 2 ], diff --git a/data/json/recipes/animals/medium_quadruped_armor.json b/data/json/recipes/animals/medium_quadruped_armor.json index 8f193e9d3fb4..d9bdd0f895a1 100644 --- a/data/json/recipes/animals/medium_quadruped_armor.json +++ b/data/json/recipes/animals/medium_quadruped_armor.json @@ -95,7 +95,7 @@ "difficulty": 4, "time": "210 m", "using": [ [ "sewing_standard", 75 ] ], - "components": [ [ [ "bone", 39 ], [ "bone_human", 39 ], [ "bone_tainted", 75 ] ], [ [ "armor_blarmor", 3 ] ] ] + "components": [ [ [ "bone", 39 ], [ "bone_human", 39 ], [ "bone_tainted", 75 ], [ "bone_heavy", 18 ] ], [ [ "armor_blarmor", 3 ] ] ] }, { "result": "leatherbone_armor_medium_quadruped", @@ -109,7 +109,10 @@ "autolearn": true, "byproducts": [ [ "rag", 6 ] ], "using": [ [ "sewing_standard", 35 ] ], - "components": [ [ [ "bone", 39 ], [ "bone_human", 39 ], [ "bone_tainted", 75 ] ], [ [ "leather_armor_medium_quadruped", 1 ] ] ] + "components": [ + [ [ "bone", 39 ], [ "bone_human", 39 ], [ "bone_tainted", 75 ], [ "bone_heavy", 18 ] ], + [ [ "leather_armor_medium_quadruped", 1 ] ] + ] }, { "result": "leatherbone_armor_medium_quadruped", @@ -136,7 +139,7 @@ [ [ "water", 30 ], [ "water_clean", 30 ] ], [ [ "wax", 6 ], [ "any_tallow", 24, "LIST" ], [ "vinegar", 30 ], [ "pine_bough", 60 ] ], [ [ "salt", 150 ] ], - [ [ "bone", 39 ], [ "bone_human", 39 ], [ "bone_tainted", 75 ] ], + [ [ "bone", 39 ], [ "bone_human", 39 ], [ "bone_tainted", 75 ], [ "bone_heavy", 18 ] ], [ [ "leather", 105 ] ] ] }, diff --git a/data/json/recipes/animals/small_quadruped_armor.json b/data/json/recipes/animals/small_quadruped_armor.json index d84718890622..b567f51120a0 100644 --- a/data/json/recipes/animals/small_quadruped_armor.json +++ b/data/json/recipes/animals/small_quadruped_armor.json @@ -77,7 +77,7 @@ "difficulty": 2, "time": "30 m", "using": [ [ "sewing_standard", 15 ] ], - "components": [ [ [ "bone", 13 ], [ "bone_human", 13 ], [ "bone_tainted", 25 ] ], [ [ "vest_leather", 1 ] ] ] + "components": [ [ [ "bone", 13 ], [ "bone_human", 13 ], [ "bone_tainted", 25 ], [ "bone_heavy", 7 ] ], [ [ "vest_leather", 1 ] ] ] }, { "result": "leatherbone_armor_small_quadruped", @@ -90,7 +90,10 @@ "time": "15 m", "autolearn": true, "using": [ [ "sewing_standard", 5 ] ], - "components": [ [ [ "bone", 13 ], [ "bone_human", 13 ], [ "bone_tainted", 25 ] ], [ [ "leather_armor_small_quadruped", 1 ] ] ] + "components": [ + [ [ "bone", 13 ], [ "bone_human", 13 ], [ "bone_tainted", 25 ], [ "bone_heavy", 7 ] ], + [ [ "leather_armor_small_quadruped", 1 ] ] + ] }, { "result": "leatherbone_armor_small_quadruped", @@ -104,7 +107,7 @@ "autolearn": true, "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 3 ] ], "using": [ [ "sewing_standard", 20 ] ], - "components": [ [ [ "bone", 13 ], [ "bone_human", 13 ], [ "bone_tainted", 25 ] ], [ [ "leather", 6 ] ] ] + "components": [ [ [ "bone", 13 ], [ "bone_human", 13 ], [ "bone_tainted", 25 ], [ "bone_heavy", 7 ] ], [ [ "leather", 6 ] ] ] }, { "result": "rubber_armor_small_quadruped", diff --git a/data/json/recipes/armor/arms.json b/data/json/recipes/armor/arms.json index 7f73ac529dc2..3952b5361a1c 100644 --- a/data/json/recipes/armor/arms.json +++ b/data/json/recipes/armor/arms.json @@ -242,5 +242,18 @@ "book_learn": [ [ "textbook_computer", 1 ], [ "advanced_electronics", 1 ], [ "reference_fabrication1", 1 ] ], "using": [ [ "3d_printing_standard", 33 ] ], "components": [ [ [ "carbon_fiber_filament", 330 ] ] ] + }, + { + "result": "armguard_scute", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_ARMS", + "skill_used": "fabrication", + "difficulty": 5, + "time": "30 m", + "autolearn": true, + "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ], + "using": [ [ "sewing_standard", 16 ] ], + "components": [ [ [ "scute_piece", 4 ] ], [ [ "fabric_hides_proper", 4, "LIST" ] ] ] } ] diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index b45e912cbebf..139fc9ec608b 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -621,5 +621,18 @@ "book_learn": [ [ "textbook_computer", 2 ], [ "advanced_electronics", 2 ], [ "reference_fabrication1", 2 ] ], "using": [ [ "3d_printing_standard", 17 ] ], "components": [ [ [ "carbon_fiber_filament", 170 ] ] ] + }, + { + "result": "boots_scute", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_FEET", + "skill_used": "tailor", + "difficulty": 5, + "time": "1 h 20 m", + "autolearn": true, + "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ], + "using": [ [ "sewing_standard", 64 ] ], + "components": [ [ [ "scute_piece", 16 ] ], [ [ "fabric_hides_proper", 16, "LIST" ] ] ] } ] diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json index 8f525ddd810d..dea20ec150b2 100644 --- a/data/json/recipes/armor/hands.json +++ b/data/json/recipes/armor/hands.json @@ -619,5 +619,18 @@ "book_learn": [ [ "textbook_computer", 4 ], [ "advanced_electronics", 4 ], [ "reference_fabrication1", 4 ] ], "using": [ [ "3d_printing_standard", 12 ] ], "components": [ [ [ "carbon_fiber_filament", 120 ] ] ] + }, + { + "result": "gauntlets_scute", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_HANDS", + "skill_used": "tailor", + "difficulty": 5, + "time": "1 h", + "autolearn": true, + "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ], + "using": [ [ "sewing_standard", 12 ] ], + "components": [ [ [ "scute_piece", 3 ] ], [ [ "fabric_hides_proper", 3, "LIST" ] ] ] } ] diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json index fa6b630c40fe..5439fc1c50bf 100644 --- a/data/json/recipes/armor/head.json +++ b/data/json/recipes/armor/head.json @@ -1575,5 +1575,17 @@ "autolearn": true, "using": [ [ "sewing_standard", 18 ] ], "components": [ [ [ "leather", 16 ] ] ] + }, + { + "result": "helmet_scute", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_HEAD", + "skill_used": "tailor", + "difficulty": 4, + "time": "1 h", + "autolearn": true, + "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ], + "components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "scute_piece", 6 ] ], [ [ "fabric_hides_proper", 6, "LIST" ] ] ] } ] diff --git a/data/json/recipes/armor/suit.json b/data/json/recipes/armor/suit.json index 68defd129954..3fe2abb2f2ae 100644 --- a/data/json/recipes/armor/suit.json +++ b/data/json/recipes/armor/suit.json @@ -980,5 +980,18 @@ "autolearn": true, "using": [ [ "sewing_standard", 52 ] ], "components": [ [ [ "leather", 30 ] ] ] + }, + { + "result": "armor_scute", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_SUIT", + "skill_used": "tailor", + "difficulty": 5, + "time": "1 h 40 m", + "autolearn": true, + "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ], + "using": [ [ "cordage", 2 ] ], + "components": [ [ [ "scute_piece", 36 ] ], [ [ "leather", 36 ] ] ] } ] diff --git a/data/json/recipes/chem/other.json b/data/json/recipes/chem/other.json index 25969689d914..de530d591725 100644 --- a/data/json/recipes/chem/other.json +++ b/data/json/recipes/chem/other.json @@ -113,7 +113,17 @@ "book_learn": [ [ "recipe_arrows", 1 ], [ "textbook_survival", 1 ], [ "survival_book", 1 ], [ "reference_firstaid2", 2 ] ], "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], - "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "bone", 10 ], [ "bone_human", 10 ], [ "bone_tainted", 20 ] ] ] + "components": [ + [ [ "water", 1 ], [ "water_clean", 1 ] ], + [ + [ "bone", 10 ], + [ "bone_human", 10 ], + [ "bone_tainted", 20 ], + [ "teeth_serrated", 10 ], + [ "bone_heavy", 5 ], + [ "scute_piece", 5 ] + ] + ] }, { "result": "pitch_wood", @@ -153,6 +163,9 @@ [ "bone", 20 ], [ "bone_human", 20 ], [ "bone_tainted", 40 ], + [ "teeth_serrated", 20 ], + [ "bone_heavy", 10 ], + [ "scute_piece", 10 ], [ "cured_hide", 2 ], [ "pine_bough", 10 ], [ "birchbark", 10 ], diff --git a/data/json/recipes/other/materials.json b/data/json/recipes/other/materials.json index 76174a071da1..f3dfc72d71ae 100644 --- a/data/json/recipes/other/materials.json +++ b/data/json/recipes/other/materials.json @@ -441,6 +441,7 @@ [ "bone", 40 ], [ "bone_human", 40 ], [ "bone_tainted", 40 ], + [ "bone_heavy", 20 ], [ "pine_bough", 20 ], [ "log", 1 ] ], diff --git a/data/json/recipes/other/vehicles.json b/data/json/recipes/other/vehicles.json index c543e013f6b3..45991f0b92f5 100644 --- a/data/json/recipes/other/vehicles.json +++ b/data/json/recipes/other/vehicles.json @@ -1370,7 +1370,7 @@ "reversible": true, "autolearn": true, "components": [ - [ [ "bone", 25 ], [ "bone_human", 25 ], [ "bone_tainted", 50 ] ], + [ [ "bone", 25 ], [ "bone_human", 25 ], [ "bone_tainted", 50 ], [ "bone_heavy", 13 ] ], [ [ "rope_natural_short", 1, "LIST" ], [ "nail", 5 ], [ "adhesive", 2, "LIST" ] ] ] }, diff --git a/data/json/recipes/weapon/bashing.json b/data/json/recipes/weapon/bashing.json index 4ac4e8e0351c..e489029ae2c8 100644 --- a/data/json/recipes/weapon/bashing.json +++ b/data/json/recipes/weapon/bashing.json @@ -481,5 +481,27 @@ "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "CUT", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "using": [ [ "steel_tiny", 2 ] ], "components": [ [ [ "log", 1 ], [ "shillelagh", 1 ], [ "bat", 1 ] ], [ [ "spike", 4 ], [ "steel_chunk", 4 ] ] ] + }, + { + "type": "recipe", + "result": "mace_bone", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_BASHING", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ [ "survival", 2 ] ], + "time": "30 m", + "autolearn": true, + "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "CUT", "level": 1 } ], + "components": [ + [ + [ "fabric_standard", 1, "LIST" ], + [ "felt_patch", 1 ], + [ "duct_tape", 50 ], + [ "cordage_short", 2, "LIST" ], + [ "filament", 100, "LIST" ] + ], + [ [ "bone_heavy", 10 ] ] + ] } ] diff --git a/data/json/recipes/weapon/cutting.json b/data/json/recipes/weapon/cutting.json index 090324adbb94..bfa95e233779 100644 --- a/data/json/recipes/weapon/cutting.json +++ b/data/json/recipes/weapon/cutting.json @@ -816,5 +816,71 @@ "book_learn": [ [ "textbook_computer", 4 ], [ "advanced_electronics", 4 ], [ "reference_fabrication1", 4 ] ], "using": [ [ "3d_printing_standard", 5 ], [ "steel_tiny", 6 ], [ "blacksmithing_standard", 6 ] ], "components": [ [ [ "carbon_fiber_filament", 50 ] ] ] + }, + { + "type": "recipe", + "result": "tooth_leiomano", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_CUTTING", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ [ "survival", 3 ] ], + "time": "30 m", + "autolearn": true, + "using": [ [ "adhesive_proper", 1 ] ], + "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "teeth_serrated", 10 ] ], [ [ "wood_structural_small", 1, "LIST" ] ] ] + }, + { + "type": "recipe", + "result": "sword_bone", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_CUTTING", + "skill_used": "fabrication", + "difficulty": 5, + "skills_required": [ [ "survival", 3 ] ], + "time": "30 m", + "autolearn": true, + "using": [ [ "adhesive_proper", 1 ] ], + "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], + "components": [ + [ [ "bone_heavy", 10 ] ], + [ [ "2x4", 1 ], [ "stick", 2 ] ], + [ + [ "cordage_short", 2, "LIST" ], + [ "filament", 100, "LIST" ], + [ "rag", 1 ], + [ "leather", 1 ], + [ "fur", 1 ], + [ "faux_fur", 1 ], + [ "felt_patch", 1 ] + ] + ] + }, + { + "type": "recipe", + "result": "glaive_bone", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_CUTTING", + "skill_used": "fabrication", + "difficulty": 5, + "skills_required": [ [ "survival", 3 ] ], + "time": "15 m", + "autolearn": true, + "using": [ [ "adhesive_proper", 1 ] ], + "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], + "components": [ + [ [ "sword_bone", 1 ] ], + [ [ "stick_long", 1 ] ], + [ + [ "cordage_short", 2, "LIST" ], + [ "filament", 100, "LIST" ], + [ "rag", 1 ], + [ "leather", 1 ], + [ "fur", 1 ], + [ "faux_fur", 1 ], + [ "felt_patch", 1 ] + ] + ] } ] diff --git a/data/json/recipes/weapon/piercing.json b/data/json/recipes/weapon/piercing.json index c8c1187aa185..6999958bf3b7 100644 --- a/data/json/recipes/weapon/piercing.json +++ b/data/json/recipes/weapon/piercing.json @@ -933,5 +933,42 @@ "time": "15 m", "using": [ [ "3d_printing_standard", 5 ], [ "steel_standard", 2 ], [ "blacksmithing_standard", 8 ] ], "components": [ [ [ "carbon_fiber_filament", 50 ] ] ] + }, + { + "type": "recipe", + "result": "knife_stinger", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_PIERCING", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ [ "survival", 2 ] ], + "time": "30 m", + "autolearn": true, + "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 } ], + "components": [ + [ + [ "fabric_standard", 1, "LIST" ], + [ "felt_patch", 1 ], + [ "duct_tape", 50 ], + [ "cordage_short", 2, "LIST" ], + [ "filament", 100, "LIST" ] + ], + [ [ "bee_sting", 1 ], [ "wasp_sting", 1 ] ] + ] + }, + { + "type": "recipe", + "result": "cestus_tooth", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_BASHING", + "skill_used": "fabrication", + "skills_required": [ "unarmed", 2 ], + "difficulty": 4, + "time": "30 m", + "reversible": true, + "autolearn": true, + "book_learn": [ [ "recipe_melee", 1 ], [ "textbook_weapeast", 7 ] ], + "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 } ], + "components": [ [ [ "leather", 4 ] ], [ [ "bone_heavy", 1 ] ], [ [ "teeth_serrated", 4 ] ] ] } ] diff --git a/data/json/uncraft/armor/pets_medium_quadruped.json b/data/json/uncraft/armor/pets_medium_quadruped.json index 41ca2a2658e4..f65c544759d7 100644 --- a/data/json/uncraft/armor/pets_medium_quadruped.json +++ b/data/json/uncraft/armor/pets_medium_quadruped.json @@ -42,7 +42,7 @@ "difficulty": 1, "time": "30 s", "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "leather", 52 ] ], [ [ "bone", 19 ] ] ] + "components": [ [ [ "leather", 52 ] ], [ [ "bone", 19 ], [ "bone_heavy", 9 ] ] ] }, { "result": "kevlar_armor_medium_quadruped", diff --git a/data/json/uncraft/armor/pets_small_quadruped.json b/data/json/uncraft/armor/pets_small_quadruped.json index b40a3b38ccd8..06f5590036f8 100644 --- a/data/json/uncraft/armor/pets_small_quadruped.json +++ b/data/json/uncraft/armor/pets_small_quadruped.json @@ -42,7 +42,7 @@ "difficulty": 1, "time": "30 s", "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "leather", 4 ] ], [ [ "bone", 7 ] ] ] + "components": [ [ [ "leather", 4 ] ], [ [ "bone", 7 ], [ "bone_heavy", 4 ] ] ] }, { "result": "kevlar_armor_small_quadruped",