diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index 7daf889337d3b..f8519764e5664 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -454,7 +454,7 @@ { "item": "knife_small", "variant": "knife_steak", "prob": 85 }, [ "fork", 90 ], [ "spoon", 90 ], - [ "knife_butcher", 10 ], + { "item": "knife_huge", "variant": "knife_butcher", "prob": 10 }, { "item": "extinguisher", "prob": 20, "charges": [ 0, 5 ] }, [ "hose", 15 ], [ "water_faucet", 20 ], diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json index 3a2b459b7fcdb..1750c7fd351e5 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json +++ b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json @@ -359,7 +359,7 @@ [ "hammer_sledge_engineer", 1 ], [ "hammer_sledge_heavy", 1 ], [ "ax", 8 ], - [ "knife_butcher", 10 ], + { "item": "knife_huge", "variant": "knife_butcher", "prob": 10 }, [ "knife_KABAR", 14 ], { "group": "infantry_knives", "prob": 1 }, [ "kukri", 2 ], diff --git a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json index c4c8fa9256a31..cc3c9aab5e846 100644 --- a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json +++ b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json @@ -159,7 +159,7 @@ "id": "knife_shop", "type": "item_group", "items": [ - [ "knife_butcher", 20 ], + { "item": "knife_huge", "variant": "knife_butcher", "prob": 20 }, [ "knife_combat", 5 ], [ "knife_combat_army", 2 ], [ "knife_combat_marine", 1 ], diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json index 75821c1f79641..221d16740a877 100644 --- a/data/json/itemgroups/Locations_MapExtras/mansion.json +++ b/data/json/itemgroups/Locations_MapExtras/mansion.json @@ -809,7 +809,7 @@ [ "ceramic_bowl", 10 ], [ "ceramic_cup", 10 ], { "group": "tinware", "prob": 10 }, - [ "knife_butcher", 10 ], + { "item": "knife_huge", "variant": "knife_butcher", "prob": 10 }, [ "funnel", 50 ], [ "jar_glass_sealed", 50 ], [ "jar_3l_glass_sealed", 40 ], @@ -1673,7 +1673,7 @@ "type": "item_group", "subtype": "distribution", "items": [ - [ "knife_butcher", 35 ], + { "item": "knife_huge", "variant": "knife_butcher", "prob": 35 }, [ "cane", 25 ], [ "sinister_cane", 2 ], [ "wizard_cane", 1 ], diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json index b6aa4cf029036..ea60131e417c3 100644 --- a/data/json/itemgroups/SUS/domestic.json +++ b/data/json/itemgroups/SUS/domestic.json @@ -88,7 +88,7 @@ { "item": "knife_large", "variant": "knife_bread", "prob": 45 }, { "distribution": [ - { "item": "knife_butcher", "prob": 10 }, + { "item": "knife_huge", "variant": "knife_butcher", "prob": 10 }, { "item": "knife_meat_cleaver", "prob": 10 } ], "prob": 65 diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json index 03d59afa6d911..6da6fe6f3e995 100644 --- a/data/json/itemgroups/collections_domestic.json +++ b/data/json/itemgroups/collections_domestic.json @@ -83,7 +83,7 @@ [ "jar_glass_sealed", 50 ], [ "jar_3l_glass_sealed", 40 ], [ "bowl_pewter", 25 ], - [ "knife_butcher", 20 ], + { "item": "knife_huge", "variant": "knife_butcher", "prob": 20 }, [ "thermos", 15 ], [ "tongs", 15 ], [ "spatula", 15 ], @@ -97,13 +97,13 @@ [ "corkscrew", 10 ], [ "peeler", 15 ], [ "brush", 15 ], - [ "knife_butcher", 10 ], [ "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 }, [ "cutting_board", 20 ], [ "bottle_opener", 15 ], [ "mortar_pestle", 10 ] @@ -685,7 +685,7 @@ { "group": "dishes_dining", "prob": 460 }, { "group": "condiments", "prob": 425 }, { "group": "pantry_liquids", "prob": 160 }, - { "item": "knife_butcher", "prob": 10 }, + { "item": "knife_huge", "variant": "knife_butcher", "prob": 10 }, { "item": "cookbook", "prob": 35 }, { "item": "cotton_patchwork", "prob": 1 }, { "item": "popcan_stove", "prob": 5, "charges": [ 0, 500 ] }, diff --git a/data/json/itemgroups/food_service.json b/data/json/itemgroups/food_service.json index bc3cab06167a3..7ef4274e4222f 100644 --- a/data/json/itemgroups/food_service.json +++ b/data/json/itemgroups/food_service.json @@ -597,7 +597,7 @@ "type": "item_group", "subtype": "distribution", "entries": [ - { "item": "knife_butcher", "prob": 30 }, + { "item": "knife_huge", "variant": "knife_butcher", "prob": 30 }, { "prob": 50, "group": "bread_bag_plastic_14" }, { "prob": 50, "group": "seasoning_salt_bulk" }, { "prob": 50, "group": "seasoning_italian_bulk" }, @@ -1074,7 +1074,7 @@ [ "lasagne_raw", 20 ], [ "macaroni_raw", 20 ], [ "foodplace_food", 5 ], - [ "knife_butcher", 10 ] + { "item": "knife_huge", "variant": "knife_butcher", "prob": 10 } ] }, { @@ -1110,7 +1110,7 @@ { "prob": 15, "group": "chilly-p_various" }, { "prob": 15, "group": "curry_powder_various" }, [ "macaroni_raw", 20 ], - [ "knife_butcher", 10 ] + { "item": "knife_huge", "variant": "knife_butcher", "prob": 10 } ] }, { @@ -1350,8 +1350,8 @@ "id": "butcher_tools", "subtype": "distribution", "entries": [ - { "item": "knife_butcher", "prob": 30 }, { "item": "knife_small", "variant": "knife_steak", "prob": 20 }, + { "item": "knife_huge", "variant": "knife_butcher", "prob": 30 }, { "item": "butchering_kit", "prob": 5 }, { "item": "tongs", "prob": 10 }, { "item": "carver_off", "prob": 5, "charges": [ 0, 500 ] }, diff --git a/data/json/itemgroups/furniture.json b/data/json/itemgroups/furniture.json index fc37c2496cdb4..2a856bf02b734 100644 --- a/data/json/itemgroups/furniture.json +++ b/data/json/itemgroups/furniture.json @@ -4,8 +4,8 @@ "id": "knifeblock", "subtype": "distribution", "entries": [ - { "item": "knife_butcher", "prob": 10 }, { "item": "knife_small", "variant": "knife_steak", "prob": 85 }, + { "item": "knife_huge", "variant": "knife_butcher", "prob": 10 }, { "item": "kukri", "prob": 1 }, { "item": "tongs", "prob": 28 }, { "item": "meat", "prob": 1 } diff --git a/data/json/itemgroups/science_and_tech.json b/data/json/itemgroups/science_and_tech.json index f80c8c5c0d052..585d70a92a558 100644 --- a/data/json/itemgroups/science_and_tech.json +++ b/data/json/itemgroups/science_and_tech.json @@ -577,7 +577,7 @@ [ "string_6", 2 ], [ "hacksaw", 17 ], [ "xacto", 10 ], - [ "knife_butcher", 10 ], + { "item": "knife_huge", "variant": "knife_butcher", "prob": 10 }, [ "machete", 5 ], [ "gloves_rubber", 20 ], [ "apron_plastic", 20 ], diff --git a/data/json/items/tool/knives.json b/data/json/items/tool/knives.json index f414397ea89d6..2a417a10569b7 100644 --- a/data/json/items/tool/knives.json +++ b/data/json/items/tool/knives.json @@ -75,6 +75,30 @@ "weapon_category": [ "SHIVS" ], "melee_damage": { "bash": 1, "stab": 18 } }, + { + "id": "knife_huge", + "name": { "str": "huge kitchen knife", "str_pl": "huge kitchen knives" }, + "type": "TOOL", + "variants": [ + { + "id": "knife_butcher", + "name": { "str": "butcher knife", "str_pl": "butcher knives" }, + "description": "A sharp, heavy knife. It makes a good melee weapon, and is an ideal item for butchering corpses.", + "ascii_picture": "knife_butcher" + } + ], + "copy-from": "base_kitchen_knife", + "weight": "380 g", + "volume": "300 ml", + "longest_side": "35 cm", + "price": "30 USD", + "price_postapoc": "50 cent", + "to_hit": { "grip": "weapon", "length": "short", "surface": "point", "balance": "neutral" }, + "qualities": [ [ "CUT", 2 ], [ "BUTCHER", 25 ] ], + "flags": [ "SHEATH_KNIFE", "ALLOWS_BODY_BLOCK" ], + "weapon_category": [ "KNIVES" ], + "melee_damage": { "bash": 2, "stab": 14 } + }, { "id": "copper_knife", "type": "TOOL", diff --git a/data/json/mapgen/basecamps/base/modular_firestation_1/modular_firestation1.json b/data/json/mapgen/basecamps/base/modular_firestation_1/modular_firestation1.json index 9f200715d3a70..822961b86292b 100644 --- a/data/json/mapgen/basecamps/base/modular_firestation_1/modular_firestation1.json +++ b/data/json/mapgen/basecamps/base/modular_firestation_1/modular_firestation1.json @@ -175,7 +175,7 @@ { "point": "furniture", "id": "f_butcher_rack", "x": 1, "y": 5 }, { "point": "furniture", "id": "f_table", "x": 1, "y": 4 } ], - "place_loot": [ { "item": "knife_butcher", "x": 1, "y": 4, "chance": 100 } ] + "place_loot": [ { "item": "knife_huge", "variant": "knife_butcher", "x": 1, "y": 4, "chance": 100 } ] } }, { diff --git a/data/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_common.json b/data/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_common.json index d4b1c9a1f246e..ee969f3c8b1b6 100644 --- a/data/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_common.json +++ b/data/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_common.json @@ -123,7 +123,7 @@ { "point": "furniture", "id": "f_butcher_rack", "x": 17, "y": 12 }, { "point": "furniture", "id": "f_table", "x": 16, "y": 12 } ], - "place_loot": [ { "item": "knife_butcher", "x": 16, "y": 12 } ] + "place_loot": [ { "item": "knife_huge", "variant": "knife_butcher", "x": 16, "y": 12 } ] } }, { diff --git a/data/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_common.json b/data/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_common.json index e14b2ce1d963d..06a2d0d297263 100644 --- a/data/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_common.json +++ b/data/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_common.json @@ -211,7 +211,7 @@ { "point": "furniture", "id": "f_butcher_rack", "x": 16, "y": 22 }, { "point": "furniture", "id": "f_table", "x": 17, "y": 22 } ], - "place_loot": [ { "item": "knife_butcher", "x": 17, "y": 22 } ] + "place_loot": [ { "item": "knife_huge", "variant": "knife_butcher", "x": 17, "y": 22 } ] } }, { diff --git a/data/json/monsterdrops/clothing_halloween.json b/data/json/monsterdrops/clothing_halloween.json index 660693ef5d1d9..ed787a5b250a2 100644 --- a/data/json/monsterdrops/clothing_halloween.json +++ b/data/json/monsterdrops/clothing_halloween.json @@ -1132,7 +1132,13 @@ { "item": "hat_chef", "prob": 70, "damage": [ 1, 4 ] }, { "group": "shirts_unisex", "prob": 75, "damage": [ 1, 4 ] }, { "group": "costume_masks", "prob": 10, "damage": [ 1, 4 ] }, - { "item": "knife_butcher", "container-item": "sheath", "prob": 60, "damage": [ 1, 4 ] }, + { + "item": "knife_huge", + "variant": "knife_butcher", + "container-item": "sheath", + "prob": 60, + "damage": [ 1, 4 ] + }, { "group": "socks_unisex", "damage": [ 1, 4 ] }, { "distribution": [ diff --git a/data/json/monsterdrops/feral_humans.json b/data/json/monsterdrops/feral_humans.json index 9ac8b5b9eafc4..ce354c0e241d2 100644 --- a/data/json/monsterdrops/feral_humans.json +++ b/data/json/monsterdrops/feral_humans.json @@ -186,8 +186,8 @@ "entries": [ { "distribution": [ - { "item": "knife_butcher", "prob": 50, "damage": [ 0, 3 ] } { "item": "knife_large", "variant": "knife_chef", "prob": 50, "damage": [ 0, 3 ] }, + { "item": "knife_huge", "variant": "knife_butcher", "prob": 50, "damage": [ 0, 3 ] } ] }, { diff --git a/data/json/monsterdrops/zombie_survivor.json b/data/json/monsterdrops/zombie_survivor.json index a3b2dd42e2722..d173ff9755104 100644 --- a/data/json/monsterdrops/zombie_survivor.json +++ b/data/json/monsterdrops/zombie_survivor.json @@ -195,7 +195,7 @@ "id": "survivor_knife", "type": "item_group", "items": [ - [ "knife_butcher", 15 ], + { "item": "knife_huge", "variant": "knife_butcher", "prob": 15 }, { "item": "knife_large", "variant": "knife_chef", "prob": 15 }, { "item": "knife_large", "variant": "knife_carving", "prob": 15 }, [ "knife_folding", 10 ], diff --git a/data/json/npcs/NC_ARMY.json b/data/json/npcs/NC_ARMY.json index 75356b736cf6b..3212db7ffc0b1 100644 --- a/data/json/npcs/NC_ARMY.json +++ b/data/json/npcs/NC_ARMY.json @@ -110,7 +110,7 @@ "id": "NC_ARMY_cutting", "subtype": "distribution", "entries": [ - { "item": "knife_butcher", "prob": 20 }, + { "item": "knife_huge", "variant": "knife_butcher", "prob": 20 }, { "item": "hatchet", "prob": 20 }, { "item": "knife_combat", "prob": 20 }, { "item": "machete", "prob": 20 }, diff --git a/data/json/npcs/NC_ARSONIST.json b/data/json/npcs/NC_ARSONIST.json index 56af7e62b4bea..8f90653b4ac5f 100644 --- a/data/json/npcs/NC_ARSONIST.json +++ b/data/json/npcs/NC_ARSONIST.json @@ -142,7 +142,7 @@ "id": "NC_ARSONIST_cutting", "subtype": "distribution", "entries": [ - { "item": "knife_butcher", "prob": 20 }, + { "item": "knife_huge", "variant": "knife_butcher", "prob": 20 }, { "item": "hatchet", "prob": 20 }, { "item": "ax", "prob": 20 }, { "item": "machete", "prob": 20 }, diff --git a/data/json/npcs/NC_OPS.json b/data/json/npcs/NC_OPS.json index 57b138be68056..d737a3d49d819 100644 --- a/data/json/npcs/NC_OPS.json +++ b/data/json/npcs/NC_OPS.json @@ -95,7 +95,7 @@ "type": "item_group", "id": "NC_OPS_cutting", "items": [ - [ "knife_butcher", 20 ], + { "item": "knife_huge", "variant": "knife_butcher", "prob": 20 }, [ "hatchet", 20 ], [ "knife_combat", 20 ], [ "machete", 20 ], diff --git a/data/json/npcs/NC_SURVIVOR_CHEF.json b/data/json/npcs/NC_SURVIVOR_CHEF.json index 99a1c72d8e9f4..02bbffeda0e3c 100644 --- a/data/json/npcs/NC_SURVIVOR_CHEF.json +++ b/data/json/npcs/NC_SURVIVOR_CHEF.json @@ -69,7 +69,7 @@ "subtype": "distribution", "entries": [ { "item": "water_clean", "prob": 90 }, - { "item": "knife_butcher", "prob": 100 }, + { "item": "knife_huge", "variant": "knife_butcher", "prob": 100 }, { "item": "joint", "prob": 50 }, { "prob": 5, "group": "coke_bag_zipper_8" }, { "prob": 60, "group": "cig_box_cigarette_20" }, diff --git a/data/json/npcs/godco/godco_missions.json b/data/json/npcs/godco/godco_missions.json index 6b54e4a41f971..b31aa77c8665d 100644 --- a/data/json/npcs/godco/godco_missions.json +++ b/data/json/npcs/godco/godco_missions.json @@ -53,16 +53,16 @@ "id": "MISSION_GODCO_COOK_FOOD_3", "type": "mission_definition", "name": { "str": "Prickled Meals" }, - "description": "Find a butcher knife.", + "description": "Find a sizable knife.", "goal": "MGOAL_FIND_ITEM", "difficulty": 1, "value": 0, - "item": "knife_butcher", + "item": "knife_huge", "count": 1, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { "describe": "I need something sharper.", - "offer": "I don't have any butcher knives in here. It's difficult to cut anything hard without it. It's good to have one, even though I won't use it that often. Could you get me one?", + "offer": "I don't have any butcher knives in here. It's difficult to cut anything hard without it. It's good to have one, even though I won't use it that often. Could you get me one, or anything similarly suitable?", "accepted": "Thank you for accepting. I can't cut anything with this dull knife.", "rejected": "I guess I have to cut them with my steak knife.", "advice": "Butcher knives are not that rare to find. They are commonly found in kitchens.", diff --git a/data/json/npcs/island_prison/prisoners.json b/data/json/npcs/island_prison/prisoners.json index 4ba52b15d3dfd..6f1f74f933000 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_butcher", 30 ], [ "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_large", "variant": "knife_carving", "prob": 30 }, [ "pointy_stick", 30 ], [ "cudgel", 20 ], diff --git a/data/json/npcs/items_generic.json b/data/json/npcs/items_generic.json index ba652acbe0e5c..50af1b1e51d7c 100644 --- a/data/json/npcs/items_generic.json +++ b/data/json/npcs/items_generic.json @@ -706,7 +706,7 @@ [ "ketchup", 4 ], [ "sheet_kevlar_layered", 1 ], [ "knee_pads", 4 ], - [ "knife_butcher", 6 ], + [ "knife_huge", 6 ], [ "knife_butter", 4 ], [ "knife_combat", 4 ], { "item": "knife_small", "variant": "knife_steak", "prob": 8 }, diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Mangalpreet_Singh.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Mangalpreet_Singh.json index 379d32c639acb..152f4faac2a10 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Mangalpreet_Singh.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Mangalpreet_Singh.json @@ -64,8 +64,8 @@ "id": "REFUGEE_Mangalpreet_wield", "subtype": "distribution", "entries": [ - { "item": "knife_butcher", "container-item": "sheath", "prob": 2 }, { "item": "knife_small", "variant": "knife_steak", "container-item": "sheath", "prob": 4 }, + { "item": "knife_huge", "variant": "knife_butcher", "container-item": "sheath", "prob": 2 }, { "item": "kukri", "container-item": "sheath", "prob": 1 } ] }, diff --git a/data/json/professions.json b/data/json/professions.json index 1970f97bf6981..cdd188142c71f 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -803,7 +803,7 @@ { "item": "socks" }, { "item": "dress_shoes" }, { "group": "charged_smart_phone" }, - { "item": "knife_butcher", "container-item": "sheath" }, + { "item": "knife_huge", "variant": "knife_butcher", "container-item": "sheath" }, { "item": "hat_chef", "variant": "white_hat_chef" }, { "item": "jacket_chef", "variant": "white_jacket_chef" }, { "item": "apron_cotton", "variant": "generic_apron_cotton" }, @@ -828,7 +828,7 @@ { "item": "socks" }, { "item": "sneakers" }, { "group": "charged_smart_phone" }, - { "item": "knife_butcher", "container-item": "sheath" }, + { "item": "knife_huge", "variant": "knife_butcher", "container-item": "sheath" }, { "item": "hat_chef", "variant": "white_hat_chef" }, { "item": "jacket_chef", "variant": "white_jacket_chef" }, { "item": "apron_plastic" }, diff --git a/data/json/recipes/basecamps/base/recipe_modular_firestation_1/recipe_modular_firestation1.json b/data/json/recipes/basecamps/base/recipe_modular_firestation_1/recipe_modular_firestation1.json index 1c820be0b20db..2fa8cfc105aa8 100644 --- a/data/json/recipes/basecamps/base/recipe_modular_firestation_1/recipe_modular_firestation1.json +++ b/data/json/recipes/basecamps/base/recipe_modular_firestation_1/recipe_modular_firestation1.json @@ -235,7 +235,7 @@ { "id": "hunting" } ], "blueprint_excludes": [ { "id": "fbmc_firestation1_butchery" } ], - "components": [ [ [ "knife_butcher", 1 ], [ "knife_small", 1 ], [ "knife_large", 2 ] ] ] + "components": [ [ [ "knife_huge", 1 ], [ "knife_small", 1 ], [ "knife_large", 2 ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_common.json b/data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_common.json index ddfae61e314d1..bf0dab688d87f 100644 --- a/data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_common.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_common.json @@ -139,7 +139,7 @@ "blueprint_requires": [ { "id": "fbmk_canteen_smoking" } ], "blueprint_provides": [ { "id": "fbmk_canteen_butchery" }, { "id": "kitchen_recipes_3" }, { "id": "trapping" }, { "id": "hunting" } ], "blueprint_excludes": [ { "id": "fbmk_canteen_butchery" } ], - "components": [ [ [ "knife_butcher", 1 ], [ "knife_small", 1 ], [ "knife_large", 2 ] ] ] + "components": [ [ [ "knife_huge", 1 ], [ "knife_small", 1 ], [ "knife_large", 2 ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_common.json b/data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_common.json index c0387b337d2f2..df9bf290e56c2 100644 --- a/data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_common.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_common.json @@ -250,7 +250,7 @@ "blueprint_requires": [ { "id": "fbmk_2_smoking" } ], "blueprint_provides": [ { "id": "fbmk_2_butchery" }, { "id": "fbmk_2_recipes_3" }, { "id": "trapping" }, { "id": "hunting" } ], "blueprint_excludes": [ { "id": "fbmk_2_butchery" } ], - "components": [ [ [ "knife_butcher", 1 ], [ "knife_small", 1 ], [ "knife_large", 2 ] ] ], + "components": [ [ [ "knife_huge", 1 ], [ "knife_small", 1 ], [ "knife_large", 2 ] ] ], "flags": [ "MAP_MIRROR_HORIZONTAL_IF_N", "MAP_ROTATE_90_IF_NE", diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index c4e8ae2b7ac1e..0ae814f3a0d34 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -3076,7 +3076,7 @@ { "type": "uncraft", "activity_level": "MODERATE_EXERCISE", - "result": "knife_butcher", + "result": "knife_huge", "time": "10 m", "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 2 } ], "components": [ [ [ "spike", 1 ], [ "steel_chunk", 4 ], [ "scrap", 20 ] ], [ [ "leather", 1 ], [ "fur", 1 ] ] ] diff --git a/data/json/recipes/tools/tool.json b/data/json/recipes/tools/tool.json index e73cb3a876a82..fc54438500796 100644 --- a/data/json/recipes/tools/tool.json +++ b/data/json/recipes/tools/tool.json @@ -227,8 +227,8 @@ "time": "30 s", "autolearn": true, "components": [ - [ [ "knife_butcher", 1 ] ], [ [ "knife_meat_cleaver", 1 ] ], + [ [ "knife_huge", 1 ] ], [ [ "knife_large", 1 ] ], [ [ "leather", 2 ], [ "cotton_patchwork", 2 ] ], [ [ "cordage_short", 2, "LIST" ] ] diff --git a/data/json/recipes/tools/tools_electronic.json b/data/json/recipes/tools/tools_electronic.json index a973108fea60e..69a588629d337 100644 --- a/data/json/recipes/tools/tools_electronic.json +++ b/data/json/recipes/tools/tools_electronic.json @@ -461,7 +461,7 @@ [ "pan", 1 ], [ "pot", 1 ], [ "pot_copper", 1 ], - [ "knife_butcher", 2 ], + [ "knife_huge", 2 ], [ "knife_small", 6 ], [ "knife_butter", 6 ], [ "muffler", 1 ] @@ -493,7 +493,7 @@ [ "pan", 1 ], [ "pot", 1 ], [ "pot_copper", 1 ], - [ "knife_butcher", 2 ], + [ "knife_huge", 2 ], [ "knife_small", 6 ], [ "knife_butter", 6 ], [ "muffler", 1 ] diff --git a/data/json/recipes/tools/tools_hand.json b/data/json/recipes/tools/tools_hand.json index 0280c75da2446..c2e1c7750e3cf 100644 --- a/data/json/recipes/tools/tools_hand.json +++ b/data/json/recipes/tools/tools_hand.json @@ -1124,7 +1124,8 @@ { "type": "recipe", "activity_level": "BRISK_EXERCISE", - "result": "knife_butcher", + "result": "knife_huge", + "variant": "knife_butcher", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", diff --git a/data/json/recipes/weapon/piercing.json b/data/json/recipes/weapon/piercing.json index 07a852041666a..5b487a7fd7162 100644 --- a/data/json/recipes/weapon/piercing.json +++ b/data/json/recipes/weapon/piercing.json @@ -954,7 +954,7 @@ "components": [ [ [ "stick_long", 1 ], [ "long_pole", 1 ] ], [ - [ "knife_butcher", 1 ], + [ "knife_huge", 1 ], [ "knife_large", 1 ], [ "knife_combat", 1 ], [ "knife_combat_army", 1 ], @@ -990,7 +990,7 @@ "components": [ [ [ "stick_long", 1 ], [ "long_pole", 1 ] ], [ - [ "knife_butcher", 1 ], + [ "knife_huge", 1 ], [ "knife_large", 1 ], [ "knife_combat", 1 ], [ "knife_combat_army", 1 ], @@ -1046,7 +1046,7 @@ "components": [ [ [ "spear_shaft", 1 ] ], [ - [ "knife_butcher", 1 ], + [ "knife_huge", 1 ], [ "knife_large", 1 ], [ "knife_combat", 1 ], [ "knife_combat_army", 1 ], diff --git a/data/json/requirements/melee.json b/data/json/requirements/melee.json index f989b46354181..edf16cd30615f 100644 --- a/data/json/requirements/melee.json +++ b/data/json/requirements/melee.json @@ -98,9 +98,9 @@ [ "tanto_inferior", -1 ], [ "kirpan_cheap", -1 ], [ "enfield_bayonet", -1 ], - [ "knife_butcher", -1 ], [ "knife_vegetable_cleaver", -1 ], [ "knife_meat_cleaver", -1 ] + [ "knife_huge", -1 ], [ "knife_large", -1 ], ] ] diff --git a/data/mods/Magiclysm/items/enchanted_tools.json b/data/mods/Magiclysm/items/enchanted_tools.json index 93b73d7ebcb05..94de35151afa6 100644 --- a/data/mods/Magiclysm/items/enchanted_tools.json +++ b/data/mods/Magiclysm/items/enchanted_tools.json @@ -70,7 +70,7 @@ { "type": "GENERIC", "id": "knife_butcher_plus_one", - "copy-from": "knife_butcher", + "copy-from": "knife_huge", "name": { "str": "butcher knife +1", "str_pl": "butcher knives +1" }, "proportional": { "price": 3.0, "price_postapoc": 3.0, "weight": 0.9, "melee_damage": { "all": 1.1 } }, "extend": { "qualities": [ [ "BUTCHER", 28 ] ] } @@ -78,7 +78,7 @@ { "type": "GENERIC", "id": "knife_butcher_plus_two", - "copy-from": "knife_butcher", + "copy-from": "knife_huge", "name": { "str": "butcher knife +2", "str_pl": "butcher knives +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 3d78de7c5a2ca..df4b78fbce223 100644 --- a/data/mods/Magiclysm/recipes/enchanting.json +++ b/data/mods/Magiclysm/recipes/enchanting.json @@ -97,7 +97,7 @@ "copy-from": "cestus_plus_one", "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ], "result": "knife_butcher_plus_one", - "components": [ [ [ "knife_butcher", 1 ] ], [ [ "mana_dust", 20 ] ], [ [ "mercury", 10 ] ] ] + "components": [ [ [ "knife_huge", 1 ] ], [ [ "mana_dust", 20 ] ], [ [ "mercury", 10 ] ] ] }, { "type": "recipe", diff --git a/data/mods/Magiclysm/requirements/spell_components.json b/data/mods/Magiclysm/requirements/spell_components.json index 33e60c77c00d8..b8003edf40952 100644 --- a/data/mods/Magiclysm/requirements/spell_components.json +++ b/data/mods/Magiclysm/requirements/spell_components.json @@ -19,7 +19,7 @@ [ [ "xacto", 1 ], [ "diveknife", 1 ], - [ "knife_butcher", 1 ], + [ "knife_huge", 1 ], [ "knife_combat", 1 ], [ "knife_large", 1 ], [ "knife_hunting", 1 ], diff --git a/data/mods/Military_Professions/npc/NC_ARMY.json b/data/mods/Military_Professions/npc/NC_ARMY.json index 82961b7cf3754..0c24f87ea7e5a 100644 --- a/data/mods/Military_Professions/npc/NC_ARMY.json +++ b/data/mods/Military_Professions/npc/NC_ARMY.json @@ -108,7 +108,7 @@ "id": "NC_ARMY_cutting", "subtype": "distribution", "entries": [ - { "item": "knife_butcher", "prob": 20 }, + { "item": "knife_huge", "variant": "knife_butcher", "prob": 20 }, { "item": "hatchet", "prob": 20 }, { "item": "knife_combat", "prob": 20 }, { "item": "machete", "prob": 20 }, diff --git a/data/mods/Military_Professions/npc/NC_OPS.json b/data/mods/Military_Professions/npc/NC_OPS.json index 661d704859d69..508f043bd6247 100644 --- a/data/mods/Military_Professions/npc/NC_OPS.json +++ b/data/mods/Military_Professions/npc/NC_OPS.json @@ -94,7 +94,7 @@ "type": "item_group", "id": "NC_OPS_cutting", "items": [ - [ "knife_butcher", 20 ], + { "item": "knife_huge", "variant": "knife_butcher", "prob": 20 }, [ "hatchet", 20 ], [ "knife_combat", 20 ], [ "machete", 20 ], 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 29289cbfcea28..f630ab785f6ae 100644 --- a/data/mods/TEST_DATA/expected_dps_data/knives_dps.json +++ b/data/mods/TEST_DATA/expected_dps_data/knives_dps.json @@ -7,7 +7,7 @@ "knife_baselard": 14.872, "bio_blade_weapon": 24.5, "bone_knife": 7.11, - "knife_butcher": 10, + "knife_huge": 10, "knife_combat": 16.489, "copper_knife": 8.0, "diveknife": 8.0, diff --git a/data/mods/Xedra_Evolved/recipes/dreamforged_weapon.json b/data/mods/Xedra_Evolved/recipes/dreamforged_weapon.json index 48872f9bb75c7..f1a7d26f9507e 100644 --- a/data/mods/Xedra_Evolved/recipes/dreamforged_weapon.json +++ b/data/mods/Xedra_Evolved/recipes/dreamforged_weapon.json @@ -19,7 +19,7 @@ "type": "recipe", "result": "dreamdross_knife", "copy-from": "dreamdross_bo", - "components": [ [ [ "dreamdross_lump", 2 ], [ "scrap_dreamdross", 20 ] ], [ [ "knife_butcher", 1 ], [ "knife_large", 1 ] ] ], + "components": [ [ [ "dreamdross_lump", 2 ], [ "scrap_dreamdross", 20 ] ], [ [ "knife_huge", 1 ], [ "knife_large", 1 ] ] ], "time": "2 h", "flags": [ "SECRET" ], "difficulty": 1 diff --git a/data/mods/innawood/recipes/tools_electronic.json b/data/mods/innawood/recipes/tools_electronic.json index 1e3ffe18c8aa2..42ef12b49f1a1 100644 --- a/data/mods/innawood/recipes/tools_electronic.json +++ b/data/mods/innawood/recipes/tools_electronic.json @@ -93,7 +93,7 @@ [ "pan", 1 ], [ "pot", 1 ], [ "pot_copper", 1 ], - [ "knife_butcher", 2 ], + [ "knife_huge", 2 ], [ "knife_small", 6 ], [ "knife_butter", 6 ], [ "muffler", 1 ] @@ -125,7 +125,7 @@ [ "pan", 1 ], [ "pot", 1 ], [ "pot_copper", 1 ], - [ "knife_butcher", 2 ], + [ "knife_huge", 2 ], [ "knife_small", 6 ], [ "knife_butter", 6 ], [ "muffler", 1 ] diff --git a/tests/crafting_test.cpp b/tests/crafting_test.cpp index 4413fa1964ead..ea93639d0200a 100644 --- a/tests/crafting_test.cpp +++ b/tests/crafting_test.cpp @@ -2153,7 +2153,7 @@ TEST_CASE( "recipes_inherit_rot_of_components_properly", "[crafting][rot]" ) tools.insert( tools.end(), 10, tool_with_ammo( "popcan_stove", 500 ) ); tools.insert( tools.end(), 10, tool_with_ammo( "dehydrator", 500 ) ); tools.emplace_back( "pot_canning" ); - tools.emplace_back( "knife_butcher" ); + tools.emplace_back( "knife_huge" ); GIVEN( "1 hour until rotten macaroni and fresh cheese" ) { diff --git a/tests/iuse_actor_test.cpp b/tests/iuse_actor_test.cpp index 0534a56ed24a2..e11031a53d1b2 100644 --- a/tests/iuse_actor_test.cpp +++ b/tests/iuse_actor_test.cpp @@ -136,7 +136,7 @@ static void cut_up_yields( const std::string &target ) CAPTURE( target ); salvage_actor test_actor; item cut_up_target{ target }; - item tool{ "knife_butcher" }; + item tool{ "knife_huge" }; const std::map &target_materials = cut_up_target.made_of(); const float mat_total = cut_up_target.type->mat_portion_total == 0 ? 1 : cut_up_target.type->mat_portion_total; diff --git a/tests/npc_talk_test.cpp b/tests/npc_talk_test.cpp index dc4275b8d738a..85afe3711224c 100644 --- a/tests/npc_talk_test.cpp +++ b/tests/npc_talk_test.cpp @@ -47,7 +47,7 @@ static const item_category_id item_category_manual( "manual" ); static const itype_id itype_beer( "beer" ); static const itype_id itype_bottle_glass( "bottle_glass" ); static const itype_id itype_dnd_handbook( "dnd_handbook" ); -static const itype_id itype_knife_butcher( "knife_butcher" ); +static const itype_id itype_knife_huge( "knife_huge" ); static const itype_id itype_manual_speech( "manual_speech" ); static const mtype_id mon_zombie_bio_op( "mon_zombie_bio_op" ); @@ -784,7 +784,7 @@ TEST_CASE( "npc_talk_items", "[npc_talk]" ) CHECK( d.responses[7].text == "This is a basic test response." ); d.add_topic( "TALK_TEST_ITEM_WIELDED" ); - item_location loc = player_character.i_add( item( itype_knife_butcher ) ); + item_location loc = player_character.i_add( item( itype_knife_huge ) ); CHECK( player_character.wield( *loc ) ); gen_response_lines( d, 2 ); CHECK( d.responses[0].text == "This is a basic test response." );