diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json index ea60131e417c3..b20e9b30726d5 100644 --- a/data/json/itemgroups/SUS/domestic.json +++ b/data/json/itemgroups/SUS/domestic.json @@ -79,7 +79,7 @@ { "distribution": [ { "item": "knife_large", "variant": "knife_chef", "prob": 10 }, - { "item": "knife_vegetable_cleaver", "prob": 3 } + { "item": "knife_cleaver", "variant": "knife_vegetable_cleaver", "prob": 3 } ] }, { "item": "knife_small", "variant": "knife_paring" }, @@ -89,7 +89,7 @@ { "distribution": [ { "item": "knife_huge", "variant": "knife_butcher", "prob": 10 }, - { "item": "knife_meat_cleaver", "prob": 10 } + { "item": "knife_cleaver", "variant": "knife_meat_cleaver", "prob": 10 } ], "prob": 65 }, diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json index 6da6fe6f3e995..554ca91a49537 100644 --- a/data/json/itemgroups/collections_domestic.json +++ b/data/json/itemgroups/collections_domestic.json @@ -97,13 +97,13 @@ [ "corkscrew", 10 ], [ "peeler", 15 ], [ "brush", 15 ], - [ "knife_meat_cleaver", 10 ], - [ "knife_vegetable_cleaver", 10 ], { "item": "knife_small", "variant": "knife_paring", "prob": 25 }, { "item": "knife_large", "variant": "knife_bread", "prob": 20 }, { "item": "knife_large", "variant": "knife_chef", "prob": 20 }, { "item": "knife_large", "variant": "knife_carving", "prob": 20 }, { "item": "knife_huge", "variant": "knife_butcher", "prob": 10 }, + { "item": "knife_cleaver", "variant": "knife_meat_cleaver", "prob": 10 }, + { "item": "knife_cleaver", "variant": "knife_vegetable_cleaver", "prob": 10 }, [ "cutting_board", 20 ], [ "bottle_opener", 15 ], [ "mortar_pestle", 10 ] diff --git a/data/json/items/tool/knives.json b/data/json/items/tool/knives.json index 2a417a10569b7..5ec4755ef3be3 100644 --- a/data/json/items/tool/knives.json +++ b/data/json/items/tool/knives.json @@ -99,6 +99,35 @@ "weapon_category": [ "KNIVES" ], "melee_damage": { "bash": 2, "stab": 14 } }, + { + "id": "knife_cleaver", + "name": { "str": "cleaver" }, + "type": "TOOL", + "variants": [ + { + "id": "knife_meat_cleaver", + "name": { "str": "meat cleaver" }, + "description": "A menacing-looking knife with a broad, square-shaped blade. Its heft and sharpness would make it a very effective melee weapon and an excellent butchering tool.", + "ascii_picture": "knife_meat_cleaver" + }, + { + "id": "knife_vegetable_cleaver", + "name": { "str": "vegetable cleaver" }, + "description": "A menacing-looking knife with a broad, square shaped blade, curved for fast vegetable chopping. Its heft and sharpness make it a decent weapon as well, although not as good as a meat cleaver.", + "ascii_picture": "knife_vegetable_cleaver" + } + ], + "copy-from": "base_kitchen_knife", + "weight": "450 g", + "volume": "1 L", + "longest_side": "30 cm", + "price": "35 USD", + "price_postapoc": "50 cent", + "to_hit": { "grip": "weapon", "length": "short", "surface": "line", "balance": "neutral" }, + "qualities": [ [ "CUT", 2 ], [ "BUTCHER", 25 ] ], + "flags": [ "SHEATH_KNIFE", "ALLOWS_BODY_BLOCK" ], + "melee_damage": { "bash": 6, "cut": 16 } + }, { "id": "copper_knife", "type": "TOOL", diff --git a/data/json/monsterdrops/zombie_survivor.json b/data/json/monsterdrops/zombie_survivor.json index d173ff9755104..b371f4974650f 100644 --- a/data/json/monsterdrops/zombie_survivor.json +++ b/data/json/monsterdrops/zombie_survivor.json @@ -203,7 +203,7 @@ { "item": "knife_small", "variant": "knife_steak", "prob": 35 }, { "group": "knife_rambo_cont", "prob": 15 }, [ "knife_hunting", 10 ], - [ "knife_meat_cleaver", 10 ] + { "item": "knife_cleaver", "variant": "knife_meat_cleaver", "prob": 10 } ] }, { diff --git a/data/json/npcs/island_prison/prisoners.json b/data/json/npcs/island_prison/prisoners.json index 6f1f74f933000..cdc576b439075 100644 --- a/data/json/npcs/island_prison/prisoners.json +++ b/data/json/npcs/island_prison/prisoners.json @@ -84,11 +84,11 @@ "items": [ [ "baton-extended", 50 ], [ "PR24-retracted", 50 ], - [ "knife_meat_cleaver", 30 ], { "item": "knife_small", "variant": "knife_steak", "prob": 30 }, { "item": "knife_large", "variant": "knife_chef", "prob": 30 }, { "item": "knife_small", "variant": "knife_paring", "prob": 30 }, { "item": "knife_huge", "variant": "knife_butcher", "prob": 30 }, + { "item": "knife_cleaver", "variant": "knife_meat_cleaver", "prob": 30 }, { "item": "knife_large", "variant": "knife_carving", "prob": 30 }, [ "pointy_stick", 30 ], [ "cudgel", 20 ], diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index 0ae814f3a0d34..69ef267d30b31 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -3092,7 +3092,7 @@ { "type": "uncraft", "activity_level": "MODERATE_EXERCISE", - "result": "knife_meat_cleaver", + "result": "knife_cleaver", "time": "5 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "blade", 1 ], [ "scrap", 10 ] ] ] @@ -3105,14 +3105,6 @@ "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "scrap", 2 ] ] ] }, - { - "type": "uncraft", - "activity_level": "MODERATE_EXERCISE", - "result": "knife_vegetable_cleaver", - "time": "30 s", - "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "scrap", 6 ] ] ] - }, { "result": "laptop", "type": "uncraft", diff --git a/data/json/recipes/tools/tool.json b/data/json/recipes/tools/tool.json index fc54438500796..a8f515804a5b2 100644 --- a/data/json/recipes/tools/tool.json +++ b/data/json/recipes/tools/tool.json @@ -227,9 +227,9 @@ "time": "30 s", "autolearn": true, "components": [ - [ [ "knife_meat_cleaver", 1 ] ], [ [ "knife_huge", 1 ] ], [ [ "knife_large", 1 ] ], + [ [ "knife_cleaver", 1 ] ], [ [ "leather", 2 ], [ "cotton_patchwork", 2 ] ], [ [ "cordage_short", 2, "LIST" ] ] ] diff --git a/data/json/recipes/tools/tools_hand.json b/data/json/recipes/tools/tools_hand.json index c2e1c7750e3cf..e5f35b8e2be5e 100644 --- a/data/json/recipes/tools/tools_hand.json +++ b/data/json/recipes/tools/tools_hand.json @@ -1343,7 +1343,8 @@ }, { "type": "recipe", - "result": "knife_vegetable_cleaver", + "result": "knife_cleaver", + "variant": "knife_vegetable_cleaver", "activity_level": "BRISK_EXERCISE", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", @@ -1363,7 +1364,8 @@ }, { "type": "recipe", - "result": "knife_meat_cleaver", + "result": "knife_cleaver", + "variant": "knife_meat_cleaver", "activity_level": "BRISK_EXERCISE", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", diff --git a/data/json/recipes/weapon/cutting.json b/data/json/recipes/weapon/cutting.json index bbcbe7da087f4..11b6b91037de8 100644 --- a/data/json/recipes/weapon/cutting.json +++ b/data/json/recipes/weapon/cutting.json @@ -250,11 +250,7 @@ "reversible": true, "autolearn": true, "proficiencies": [ { "proficiency": "prof_carving", "time_multiplier": 1.5, "skill_penalty": 0 } ], - "components": [ - [ [ "duct_tape", 100 ] ], - [ [ "blade", 1 ], [ "knife_meat_cleaver", 1 ], [ "knife_vegetable_cleaver", 1 ] ], - [ [ "stick_long", 1 ] ] - ] + "components": [ [ [ "duct_tape", 100 ] ], [ [ "blade", 1 ], [ "knife_cleaver", 1 ] ], [ [ "stick_long", 1 ] ] ] }, { "type": "recipe", @@ -271,7 +267,7 @@ "proficiencies": [ { "proficiency": "prof_carving", "time_multiplier": 1.5, "skill_penalty": 0.5 } ], "components": [ [ [ "duct_tape", 100 ] ], - [ [ "blade", 1 ], [ "knife_meat_cleaver", 1 ], [ "knife_vegetable_cleaver", 1 ] ], + [ [ "blade", 1 ], [ "knife_cleaver", 1 ] ], [ [ "stick_long", 1 ] ], [ [ "cordage", 2, "LIST" ] ] ] diff --git a/data/json/requirements/melee.json b/data/json/requirements/melee.json index edf16cd30615f..e63183ccad445 100644 --- a/data/json/requirements/melee.json +++ b/data/json/requirements/melee.json @@ -98,10 +98,9 @@ [ "tanto_inferior", -1 ], [ "kirpan_cheap", -1 ], [ "enfield_bayonet", -1 ], - [ "knife_vegetable_cleaver", -1 ], - [ "knife_meat_cleaver", -1 ] [ "knife_huge", -1 ], [ "knife_large", -1 ], + [ "knife_cleaver", -1 ] ] ] }, diff --git a/data/mods/Magiclysm/items/enchanted_tools.json b/data/mods/Magiclysm/items/enchanted_tools.json index 94de35151afa6..9d05b514e2920 100644 --- a/data/mods/Magiclysm/items/enchanted_tools.json +++ b/data/mods/Magiclysm/items/enchanted_tools.json @@ -86,7 +86,7 @@ { "type": "GENERIC", "id": "knife_meat_cleaver_plus_one", - "copy-from": "knife_meat_cleaver", + "copy-from": "knife_cleaver", "name": { "str": "meat cleaver +1", "str_pl": "meat cleavers +1" }, "proportional": { "price": 3.0, "price_postapoc": 3.0, "weight": 0.9, "melee_damage": { "all": 1.1 } }, "extend": { "qualities": [ [ "BUTCHER", 28 ] ] } @@ -94,7 +94,7 @@ { "type": "GENERIC", "id": "knife_meat_cleaver_plus_two", - "copy-from": "knife_meat_cleaver", + "copy-from": "knife_cleaver", "name": { "str": "meat cleaver +2", "str_pl": "meat cleavers +2" }, "proportional": { "price": 6.0, "price_postapoc": 6.0, "weight": 0.8, "melee_damage": { "all": 1.2 } }, "extend": { "qualities": [ [ "BUTCHER", 30 ] ] } diff --git a/data/mods/Magiclysm/recipes/enchanting.json b/data/mods/Magiclysm/recipes/enchanting.json index df4b78fbce223..37849a564a3fc 100644 --- a/data/mods/Magiclysm/recipes/enchanting.json +++ b/data/mods/Magiclysm/recipes/enchanting.json @@ -111,7 +111,7 @@ "copy-from": "cestus_plus_one", "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ], "result": "knife_meat_cleaver_plus_one", - "components": [ [ [ "knife_meat_cleaver", 1 ] ], [ [ "mana_dust", 20 ] ], [ [ "mercury", 10 ] ] ] + "components": [ [ [ "knife_cleaver", 1 ] ], [ [ "mana_dust", 20 ] ], [ [ "mercury", 10 ] ] ] }, { "type": "recipe", diff --git a/data/mods/TEST_DATA/expected_dps_data/knives_dps.json b/data/mods/TEST_DATA/expected_dps_data/knives_dps.json index f630ab785f6ae..d130ee3cd36bb 100644 --- a/data/mods/TEST_DATA/expected_dps_data/knives_dps.json +++ b/data/mods/TEST_DATA/expected_dps_data/knives_dps.json @@ -16,7 +16,7 @@ "kirpan_cheap": 2.809, "kris": 13.5, "kris_fake": 1.811, - "knife_meat_cleaver": 13.97, + "knife_cleaver": 13.97, "pockknife": 4.5, "primitive_knife": 2.5, "mc_knife_rambo": 9.415,