Skip to content

Commit

Permalink
feat(content): Monster Hunter, Monster Harder (cataclysmbnteam#5466)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>

* 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 <[email protected]>
  • Loading branch information
3 people authored Oct 1, 2024
1 parent 9b26653 commit cc518d4
Show file tree
Hide file tree
Showing 37 changed files with 663 additions and 32 deletions.
86 changes: 80 additions & 6 deletions data/json/harvest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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 }
]
Expand Down Expand Up @@ -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 }
]
},
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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 }
]
},
{
Expand All @@ -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 }
]
},
Expand All @@ -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 }
]
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/Clothing_Gear/clothing.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand Down
8 changes: 8 additions & 0 deletions data/json/items/armor/arms_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
}
]
8 changes: 8 additions & 0 deletions data/json/items/armor/boots.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
}
]
8 changes: 8 additions & 0 deletions data/json/items/armor/gloves.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
}
]
8 changes: 8 additions & 0 deletions data/json/items/armor/helmets.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
}
]
8 changes: 8 additions & 0 deletions data/json/items/armor/suits_protection.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
}
]
4 changes: 2 additions & 2 deletions data/json/items/comestibles/carnivore.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "%",
Expand Down Expand Up @@ -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": "%",
Expand Down
42 changes: 42 additions & 0 deletions data/json/items/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 9 additions & 0 deletions data/json/items/melee/bludgeons.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
]
9 changes: 9 additions & 0 deletions data/json/items/melee/spears_and_polearms.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
]
44 changes: 44 additions & 0 deletions data/json/items/melee/swords_and_blades.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
]
11 changes: 11 additions & 0 deletions data/json/items/melee/unarmed_weapons.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
}
]
Loading

0 comments on commit cc518d4

Please sign in to comment.