Skip to content

Commit

Permalink
huge kitchen knife
Browse files Browse the repository at this point in the history
  • Loading branch information
Kamejeir committed Jun 4, 2024
1 parent 0e22134 commit 6d21820
Show file tree
Hide file tree
Showing 45 changed files with 90 additions and 59 deletions.
2 changes: 1 addition & 1 deletion data/json/itemgroups/Locations_MapExtras/locations.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand Down
4 changes: 2 additions & 2 deletions data/json/itemgroups/Locations_MapExtras/mansion.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand Down Expand Up @@ -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 ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/itemgroups/SUS/domestic.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions data/json/itemgroups/collections_domestic.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand All @@ -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 ]
Expand Down Expand Up @@ -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 ] },
Expand Down
8 changes: 4 additions & 4 deletions data/json/itemgroups/food_service.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand Down Expand Up @@ -1074,7 +1074,7 @@
[ "lasagne_raw", 20 ],
[ "macaroni_raw", 20 ],
[ "foodplace_food", 5 ],
[ "knife_butcher", 10 ]
{ "item": "knife_huge", "variant": "knife_butcher", "prob": 10 }
]
},
{
Expand Down Expand Up @@ -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 }
]
},
{
Expand Down Expand Up @@ -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 ] },
Expand Down
2 changes: 1 addition & 1 deletion data/json/itemgroups/furniture.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion data/json/itemgroups/science_and_tech.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand Down
24 changes: 24 additions & 0 deletions data/json/items/tool/knives.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 } ]
}
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 } ]
}
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 } ]
}
},
{
Expand Down
8 changes: 7 additions & 1 deletion data/json/monsterdrops/clothing_halloween.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion data/json/monsterdrops/feral_humans.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] }
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/monsterdrops/zombie_survivor.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/NC_ARMY.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/NC_ARSONIST.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/NC_OPS.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/NC_SURVIVOR_CHEF.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand Down
6 changes: 3 additions & 3 deletions data/json/npcs/godco/godco_missions.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/island_prison/prisoners.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/items_generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
]
},
Expand Down
4 changes: 2 additions & 2 deletions data/json/professions.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand All @@ -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" },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/recipe_deconstruction.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] ] ]
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/tools/tool.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ] ]
Expand Down
Loading

0 comments on commit 6d21820

Please sign in to comment.