From 0e2213418f854ed86b6fa028a8787ffea8f8de91 Mon Sep 17 00:00:00 2001 From: Kamejeir <99511880+Kamejeir@users.noreply.github.com> Date: Tue, 4 Jun 2024 10:21:40 +0200 Subject: [PATCH] large kitchen knife Update domestic.json --- data/json/itemgroups/SUS/domestic.json | 8 ++--- .../json/itemgroups/collections_domestic.json | 6 ++-- data/json/items/tool/knives.json | 36 +++++++++++++++++++ data/json/mapgen/house/house08.json | 2 +- data/json/monsterdrops/feral_humans.json | 2 +- data/json/monsterdrops/zombie_survivor.json | 4 +-- data/json/npcs/island_prison/prisoners.json | 4 +-- .../recipe_modular_firestation1.json | 2 +- .../recipe_modular_canteen_common.json | 2 +- .../recipe_modular_canteen_common.json | 2 +- data/json/recipes/recipe_deconstruction.json | 18 +--------- data/json/recipes/tools/tool.json | 2 +- data/json/recipes/tools/tools_hand.json | 9 +++-- data/json/recipes/weapon/piercing.json | 9 ++--- data/json/requirements/melee.json | 5 ++- data/mods/CrazyCataclysm/crazy_recipes.json | 2 +- .../mods/Magiclysm/items/enchanted_tools.json | 4 +-- data/mods/Magiclysm/recipes/enchanting.json | 2 +- .../requirements/spell_components.json | 2 +- .../recipes/dreamforged_weapon.json | 5 +-- tests/npc_attack_test.cpp | 20 +++++------ 21 files changed, 81 insertions(+), 65 deletions(-) diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json index 53260f912c7e0..b6aa4cf029036 100644 --- a/data/json/itemgroups/SUS/domestic.json +++ b/data/json/itemgroups/SUS/domestic.json @@ -78,14 +78,14 @@ "entries": [ { "distribution": [ - { "item": "knife_chef", "prob": 10 }, + { "item": "knife_large", "variant": "knife_chef", "prob": 10 }, { "item": "knife_vegetable_cleaver", "prob": 3 } ] }, { "item": "knife_small", "variant": "knife_paring" }, { "item": "knife_small", "variant": "knife_paring", "prob": 75 }, - { "item": "knife_bread", "prob": 95 }, - { "item": "knife_bread", "prob": 45 }, + { "item": "knife_large", "variant": "knife_bread", "prob": 95 }, + { "item": "knife_large", "variant": "knife_bread", "prob": 45 }, { "distribution": [ { "item": "knife_butcher", "prob": 10 }, @@ -95,7 +95,7 @@ }, { "item": "knife_small", "variant": "knife_steak", "count": [ 2, 4 ], "prob": 75 }, { - "collection": [ { "item": "knife_carving" }, { "item": "carving_fork", "prob": 90 } ], + "collection": [ { "item": "knife_large", "variant": "knife_carving" }, { "item": "carving_fork", "prob": 90 } ], "prob": 85 }, { "item": "scissors", "prob": 80 }, diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json index 81b6742534f4e..03d59afa6d911 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_bread", 20 ], - [ "knife_chef", 20 ], - [ "knife_carving", 20 ], [ "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 }, [ "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 107445032d233..f414397ea89d6 100644 --- a/data/json/items/tool/knives.json +++ b/data/json/items/tool/knives.json @@ -39,6 +39,42 @@ "weapon_category": [ "SHIVS" ], "melee_damage": { "bash": 2, "stab": 7 } }, + { + "id": "knife_large", + "name": { "str": "large kitchen knife", "str_pl": "large kitchen knives" }, + "type": "TOOL", + "variants": [ + { + "id": "knife_chef", + "name": { "str": "chef knife", "str_pl": "chef knives" }, + "description": "A long-bladed kitchen knife. The blade is wider than the handle, giving room for the wielder's knuckles, and it has a characteristic curve for a fast rocking action for chopping vegetables. It makes an acceptable melee weapon, but the wide blade is unwieldy for butchering.", + "ascii_picture": "knife_chef" + }, + { + "id": "knife_carving", + "name": { "str": "carving knife", "str_pl": "carving knives" }, + "description": "A long-bladed kitchen knife with a thin, slightly curved blade for deftly slicing meat either in flat sheets or around the bone. It makes a decent melee weapon, and is excellent for butchery.", + "ascii_picture": "knife_carving" + }, + { + "id": "knife_bread", + "name": { "str": "bread knife", "str_pl": "bread knives" }, + "description": "This knife has quite a long blade with a scalloped edge for cutting bread. It's not that sharp, but its length and heft mean it could do a bit of damage and cause some nasty tearing.", + "ascii_picture": "knife_bread" + } + ], + "copy-from": "base_kitchen_knife", + "weight": "140 g", + "volume": "200 ml", + "longest_side": "30 cm", + "price": "20 USD", + "price_postapoc": "50 cent", + "to_hit": { "grip": "weapon", "length": "short", "surface": "point", "balance": "neutral" }, + "qualities": [ [ "CUT", 2 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 22 ] ], + "flags": [ "SHEATH_KNIFE", "ALLOWS_BODY_BLOCK" ], + "weapon_category": [ "SHIVS" ], + "melee_damage": { "bash": 1, "stab": 18 } + }, { "id": "copper_knife", "type": "TOOL", diff --git a/data/json/mapgen/house/house08.json b/data/json/mapgen/house/house08.json index bef19c84c5b80..c7569de2ebabc 100644 --- a/data/json/mapgen/house/house08.json +++ b/data/json/mapgen/house/house08.json @@ -112,7 +112,7 @@ { "item": "child_book", "x": 3, "y": 2, "chance": 100 }, { "item": "sponge_cake", "x": 11, "y": 17, "chance": 100 }, { "item": "candle", "x": 11, "y": 17, "chance": 100 }, - { "item": "knife_chef", "x": 11, "y": 17, "chance": 100 }, + { "item": "knife_large", "variant": "knife_chef", "x": 11, "y": 17, "chance": 100 }, { "item": "ceramic_plate", "x": 11, "y": 17, "chance": 100 }, { "item": "balloon", "x": [ 7, 18 ], "y": [ 15, 19 ], "chance": 75, "repeat": [ 3, 6 ] }, { "item": "paper", "x": [ 9, 10 ], "y": [ 16, 18 ], "chance": 66, "repeat": [ 2, 5 ] }, diff --git a/data/json/monsterdrops/feral_humans.json b/data/json/monsterdrops/feral_humans.json index 16a66df9b7d4b..9ac8b5b9eafc4 100644 --- a/data/json/monsterdrops/feral_humans.json +++ b/data/json/monsterdrops/feral_humans.json @@ -186,8 +186,8 @@ "entries": [ { "distribution": [ - { "item": "knife_chef", "prob": 50, "damage": [ 0, 3 ] }, { "item": "knife_butcher", "prob": 50, "damage": [ 0, 3 ] } + { "item": "knife_large", "variant": "knife_chef", "prob": 50, "damage": [ 0, 3 ] }, ] }, { diff --git a/data/json/monsterdrops/zombie_survivor.json b/data/json/monsterdrops/zombie_survivor.json index 2377f4760358b..a3b2dd42e2722 100644 --- a/data/json/monsterdrops/zombie_survivor.json +++ b/data/json/monsterdrops/zombie_survivor.json @@ -196,8 +196,8 @@ "type": "item_group", "items": [ [ "knife_butcher", 15 ], - [ "knife_chef", 15 ], - [ "knife_carving", 15 ], + { "item": "knife_large", "variant": "knife_chef", "prob": 15 }, + { "item": "knife_large", "variant": "knife_carving", "prob": 15 }, [ "knife_folding", 10 ], [ "makeshift_knife", 1 ], { "item": "knife_small", "variant": "knife_steak", "prob": 35 }, diff --git a/data/json/npcs/island_prison/prisoners.json b/data/json/npcs/island_prison/prisoners.json index 3dfa93d0fcb62..4ba52b15d3dfd 100644 --- a/data/json/npcs/island_prison/prisoners.json +++ b/data/json/npcs/island_prison/prisoners.json @@ -84,12 +84,12 @@ "items": [ [ "baton-extended", 50 ], [ "PR24-retracted", 50 ], - [ "knife_chef", 30 ], [ "knife_butcher", 30 ], [ "knife_meat_cleaver", 30 ], - [ "knife_carving", 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_large", "variant": "knife_carving", "prob": 30 }, [ "pointy_stick", 30 ], [ "cudgel", 20 ], [ "knuckle_nail", 20 ], 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 3f25a565d064e..1c820be0b20db 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_chef", 1 ], [ "knife_carving", 1 ] ] ] + "components": [ [ [ "knife_butcher", 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 7eb10e4c5576f..ddfae61e314d1 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_chef", 1 ], [ "knife_carving", 1 ] ] ] + "components": [ [ [ "knife_butcher", 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 115478d39d506..c0387b337d2f2 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_chef", 1 ], [ "knife_carving", 1 ] ] ], + "components": [ [ [ "knife_butcher", 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 081434358c785..c4e8ae2b7ac1e 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -3068,7 +3068,7 @@ { "type": "uncraft", "activity_level": "MODERATE_EXERCISE", - "result": "knife_bread", + "result": "knife_large", "time": "2 m", "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "steel_chunk", 1 ], [ "scrap", 5 ] ] ] @@ -3081,22 +3081,6 @@ "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 2 } ], "components": [ [ [ "spike", 1 ], [ "steel_chunk", 4 ], [ "scrap", 20 ] ], [ [ "leather", 1 ], [ "fur", 1 ] ] ] }, - { - "type": "uncraft", - "activity_level": "LIGHT_EXERCISE", - "result": "knife_carving", - "time": "30 s", - "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "spike", 1 ] ], [ [ "scrap", 1 ] ] ] - }, - { - "type": "uncraft", - "activity_level": "MODERATE_EXERCISE", - "result": "knife_chef", - "time": "5 m", - "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "spike", 1 ], [ "scrap", 5 ] ] ] - }, { "type": "uncraft", "activity_level": "MODERATE_EXERCISE", diff --git a/data/json/recipes/tools/tool.json b/data/json/recipes/tools/tool.json index aec646eb643ef..e73cb3a876a82 100644 --- a/data/json/recipes/tools/tool.json +++ b/data/json/recipes/tools/tool.json @@ -228,8 +228,8 @@ "autolearn": true, "components": [ [ [ "knife_butcher", 1 ] ], - [ [ "knife_carving", 1 ] ], [ [ "knife_meat_cleaver", 1 ] ], + [ [ "knife_large", 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 1b47940f757d8..0280c75da2446 100644 --- a/data/json/recipes/tools/tools_hand.json +++ b/data/json/recipes/tools/tools_hand.json @@ -1279,7 +1279,8 @@ }, { "type": "recipe", - "result": "knife_chef", + "result": "knife_large", + "variant": "knife_chef", "activity_level": "BRISK_EXERCISE", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", @@ -1299,7 +1300,8 @@ }, { "type": "recipe", - "result": "knife_carving", + "result": "knife_large", + "variant": "knife_carving", "activity_level": "BRISK_EXERCISE", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", @@ -1319,7 +1321,8 @@ }, { "type": "recipe", - "result": "knife_bread", + "result": "knife_large", + "variant": "knife_bread", "activity_level": "BRISK_EXERCISE", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", diff --git a/data/json/recipes/weapon/piercing.json b/data/json/recipes/weapon/piercing.json index 79f3d8d88bbc0..07a852041666a 100644 --- a/data/json/recipes/weapon/piercing.json +++ b/data/json/recipes/weapon/piercing.json @@ -955,8 +955,7 @@ [ [ "stick_long", 1 ], [ "long_pole", 1 ] ], [ [ "knife_butcher", 1 ], - [ "knife_chef", 1 ], - [ "knife_carving", 1 ], + [ "knife_large", 1 ], [ "knife_combat", 1 ], [ "knife_combat_army", 1 ], [ "knife_combat_marine", 1 ], @@ -992,8 +991,7 @@ [ [ "stick_long", 1 ], [ "long_pole", 1 ] ], [ [ "knife_butcher", 1 ], - [ "knife_chef", 1 ], - [ "knife_carving", 1 ], + [ "knife_large", 1 ], [ "knife_combat", 1 ], [ "knife_combat_army", 1 ], [ "knife_combat_marine", 1 ], @@ -1049,8 +1047,7 @@ [ [ "spear_shaft", 1 ] ], [ [ "knife_butcher", 1 ], - [ "knife_chef", 1 ], - [ "knife_carving", 1 ], + [ "knife_large", 1 ], [ "knife_combat", 1 ], [ "knife_combat_army", 1 ], [ "knife_combat_marine", 1 ], diff --git a/data/json/requirements/melee.json b/data/json/requirements/melee.json index 3c45c3547a227..f989b46354181 100644 --- a/data/json/requirements/melee.json +++ b/data/json/requirements/melee.json @@ -16,9 +16,8 @@ [ "bone_knife", -1 ], [ "knuckle_katar", -1 ], [ "sharp_toothbrush", -1 ], - [ "knife_carving", -1 ], - [ "knife_bread", -1 ], [ "knife_small", -1 ], + [ "knife_large", -1 ], [ "screwdriver", -1 ], [ "scissors_child", -1 ], [ "scissors_medical", -1 ], @@ -100,9 +99,9 @@ [ "kirpan_cheap", -1 ], [ "enfield_bayonet", -1 ], [ "knife_butcher", -1 ], - [ "knife_chef", -1 ], [ "knife_vegetable_cleaver", -1 ], [ "knife_meat_cleaver", -1 ] + [ "knife_large", -1 ], ] ] }, diff --git a/data/mods/CrazyCataclysm/crazy_recipes.json b/data/mods/CrazyCataclysm/crazy_recipes.json index 8c712d234b66a..5f753feb5a933 100644 --- a/data/mods/CrazyCataclysm/crazy_recipes.json +++ b/data/mods/CrazyCataclysm/crazy_recipes.json @@ -84,7 +84,7 @@ "time": "25 m", "autolearn": true, "qualities": [ { "id": "OVEN", "level": 1 } ], - "tools": [ [ [ "surface_heat", 8, "LIST" ] ], [ "knife_bread" ] ], + "tools": [ [ [ "surface_heat", 8, "LIST" ] ], [ "knife_large" ] ], "components": [ [ [ "flour", 20 ], [ "bread_flour", 20 ] ], [ [ "yeast", 1 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ] ] }, { diff --git a/data/mods/Magiclysm/items/enchanted_tools.json b/data/mods/Magiclysm/items/enchanted_tools.json index 41bd0f62ee8b1..93b73d7ebcb05 100644 --- a/data/mods/Magiclysm/items/enchanted_tools.json +++ b/data/mods/Magiclysm/items/enchanted_tools.json @@ -102,7 +102,7 @@ { "type": "GENERIC", "id": "knife_carving_plus_one", - "copy-from": "knife_carving", + "copy-from": "knife_large", "name": { "str": "carving knife +1", "str_pl": "carving knives +1" }, "proportional": { "price": 3.0, "price_postapoc": 3.0, "weight": 0.9, "melee_damage": { "all": 1.1 } }, "extend": { "qualities": [ [ "BUTCHER", 24 ] ] } @@ -110,7 +110,7 @@ { "type": "GENERIC", "id": "knife_carving_plus_two", - "copy-from": "knife_carving", + "copy-from": "knife_large", "name": { "str": "carving knife +2", "str_pl": "carving knives +2" }, "proportional": { "price": 6.0, "price_postapoc": 6.0, "weight": 0.8, "melee_damage": { "all": 1.2 } }, "extend": { "qualities": [ [ "BUTCHER", 26 ] ] } diff --git a/data/mods/Magiclysm/recipes/enchanting.json b/data/mods/Magiclysm/recipes/enchanting.json index 19c62d823d1fc..3d78de7c5a2ca 100644 --- a/data/mods/Magiclysm/recipes/enchanting.json +++ b/data/mods/Magiclysm/recipes/enchanting.json @@ -125,7 +125,7 @@ "copy-from": "cestus_plus_one", "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ], "result": "knife_carving_plus_one", - "components": [ [ [ "knife_carving", 1 ] ], [ [ "mana_dust", 20 ] ], [ [ "mercury", 10 ] ] ] + "components": [ [ [ "knife_large", 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 b3218b71af0bf..33e60c77c00d8 100644 --- a/data/mods/Magiclysm/requirements/spell_components.json +++ b/data/mods/Magiclysm/requirements/spell_components.json @@ -21,7 +21,7 @@ [ "diveknife", 1 ], [ "knife_butcher", 1 ], [ "knife_combat", 1 ], - [ "knife_chef", 1 ], + [ "knife_large", 1 ], [ "knife_hunting", 1 ], [ "knife_rambo", 1 ], [ "knife_small", 1 ], diff --git a/data/mods/Xedra_Evolved/recipes/dreamforged_weapon.json b/data/mods/Xedra_Evolved/recipes/dreamforged_weapon.json index 287a25d5d282c..48872f9bb75c7 100644 --- a/data/mods/Xedra_Evolved/recipes/dreamforged_weapon.json +++ b/data/mods/Xedra_Evolved/recipes/dreamforged_weapon.json @@ -19,10 +19,7 @@ "type": "recipe", "result": "dreamdross_knife", "copy-from": "dreamdross_bo", - "components": [ - [ [ "dreamdross_lump", 2 ], [ "scrap_dreamdross", 20 ] ], - [ [ "knife_butcher", 1 ], [ "knife_chef", 1 ], [ "knife_carving", 1 ] ] - ], + "components": [ [ [ "dreamdross_lump", 2 ], [ "scrap_dreamdross", 20 ] ], [ [ "knife_butcher", 1 ], [ "knife_large", 1 ] ] ], "time": "2 h", "flags": [ "SECRET" ], "difficulty": 1 diff --git a/tests/npc_attack_test.cpp b/tests/npc_attack_test.cpp index 63033e92c6dd6..2817b2c4f9f9d 100644 --- a/tests/npc_attack_test.cpp +++ b/tests/npc_attack_test.cpp @@ -15,7 +15,7 @@ static const faction_id faction_your_followers( "your_followers" ); static const itype_id itype_combat_exoskeleton_medium( "combat_exoskeleton_medium" ); static const itype_id itype_combat_exoskeleton_medium_on( "combat_exoskeleton_medium_on" ); -static const itype_id itype_knife_chef( "knife_chef" ); +static const itype_id itype_knife_large( "knife_large" ); static const itype_id itype_rock( "rock" ); static const itype_id itype_wearable_light( "wearable_light" ); @@ -76,10 +76,10 @@ TEST_CASE( "NPC_faces_zombies", "[npc_attack]" ) GIVEN( "There is a zombie 1 tile away" ) { monster *zombie = npc_attack_setup::spawn_zombie_at_range( 1 ); - WHEN( "NPC only has a chef knife" ) { - item weapon( "knife_chef" ); + WHEN( "NPC only has a large knife" ) { + item weapon( "knife_large" ); main_npc.set_wielded_item( weapon ); - REQUIRE( main_npc.get_wielded_item()->typeId() == itype_knife_chef ); + REQUIRE( main_npc.get_wielded_item()->typeId() == itype_knife_large ); THEN( "NPC attempts to melee the enemy target" ) { main_npc.evaluate_best_attack( zombie ); @@ -207,10 +207,10 @@ TEST_CASE( "NPC_faces_zombies", "[npc_attack]" ) GIVEN( "There is a zombie 5 tiles away" ) { monster *zombie = npc_attack_setup::spawn_zombie_at_range( 5 ); - WHEN( "NPC only has a chef knife" ) { - item weapon( "knife_chef" ); + WHEN( "NPC only has a large knife" ) { + item weapon( "knife_large" ); main_npc.set_wielded_item( weapon ); - REQUIRE( main_npc.get_wielded_item()->typeId() == itype_knife_chef ); + REQUIRE( main_npc.get_wielded_item()->typeId() == itype_knife_large ); THEN( "NPC attempts to melee the enemy target" ) { main_npc.evaluate_best_attack( zombie ); @@ -241,10 +241,10 @@ TEST_CASE( "NPC_faces_zombies", "[npc_attack]" ) monster *zombie = npc_attack_setup::spawn_zombie_at_range( 1 ); monster *zombie_far = npc_attack_setup::spawn_zombie_at_range( 8 ); - WHEN( "NPC only has a chef knife" ) { - item weapon( "knife_chef" ); + WHEN( "NPC only has a large knife" ) { + item weapon( "knife_large" ); main_npc.set_wielded_item( weapon ); - REQUIRE( main_npc.get_wielded_item()->typeId() == itype_knife_chef ); + REQUIRE( main_npc.get_wielded_item()->typeId() == itype_knife_large ); WHEN( "NPC is targetting closest zombie" ) { main_npc.evaluate_best_attack( zombie );