Skip to content

Commit

Permalink
Merge pull request #45186 from Ciac32/kitchen_length
Browse files Browse the repository at this point in the history
The Lengthening #1 - Kitchen Tools & Knives
  • Loading branch information
Rivet-the-Zombie authored Nov 12, 2020
2 parents 48b6f14 + 78b16c4 commit b48a967
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
12 changes: 12 additions & 0 deletions data/json/items/generic/dining_kitchen.json
Original file line number Diff line number Diff line change
Expand Up @@ -712,6 +712,7 @@
"name": { "str": "rolling pin" },
"description": "A stout piece of hardwood, turned and sanded smooth, with rounded handles at the ends. This timeless kitchen tool also doubles as a very effective club.",
"weight": "725 g",
"longest_side": "45 cm",
"color": "brown",
"symbol": "/",
"material": [ "wood" ],
Expand All @@ -732,6 +733,7 @@
"color": "light_gray",
"weight": "550 g",
"volume": "2100 ml",
"longest_side": "23 cm",
"bashing": 6,
"pocket_data": [
{
Expand All @@ -754,6 +756,7 @@
"color": "dark_gray",
"weight": "3000 g",
"volume": "2375 ml",
"longest_side": "24 cm",
"bashing": 10,
"pocket_data": [
{
Expand All @@ -776,6 +779,7 @@
"color": "light_red",
"weight": "750 g",
"volume": "2100 ml",
"longest_side": "23 cm",
"bashing": 6,
"to_hit": -2,
"pocket_data": [
Expand All @@ -799,6 +803,7 @@
"color": "white",
"weight": "650 g",
"volume": "2100 ml",
"longest_side": "23 cm",
"bashing": 4,
"pocket_data": [
{
Expand All @@ -821,6 +826,7 @@
"color": "light_gray",
"weight": "2490 g",
"volume": "12800 ml",
"longest_side": "25 cm",
"bashing": 8,
"pocket_data": [
{
Expand All @@ -840,6 +846,7 @@
"description": "A very large 25 liter pot, primarily meant for canning food in glass jars via the water bath method, though it can cook normal foods just as well. Canning foods with it will require a lot of water. If you're only canning a couple of jars at a time, you'd fill it up with rocks or something to displace the water above the lids.",
"weight": "5625 g",
"volume": "26250 ml",
"longest_side": "27 cm",
"price": 20000,
"to_hit": -2,
"bashing": 10,
Expand Down Expand Up @@ -870,6 +877,7 @@
"color": "dark_gray",
"weight": "2628 g",
"volume": "1335 ml",
"longest_side": "36 cm",
"bashing": 12,
"to_hit": -3,
"pocket_data": [
Expand All @@ -896,6 +904,7 @@
"looks_like": "pan",
"weight": "528 g",
"volume": "1 L",
"longest_side": "35 cm",
"bashing": 8,
"to_hit": -2,
"pocket_data": [
Expand All @@ -922,6 +931,7 @@
"looks_like": "pan",
"weight": "628 g",
"volume": "1050 ml",
"longest_side": "35 cm",
"bashing": 7,
"to_hit": -2,
"pocket_data": [
Expand All @@ -944,6 +954,7 @@
"description": "A sheet of metal crudely hammered into a cooking pot. Good enough to cook food and boil water, but not as useful as proper cookware.",
"weight": "6000 g",
"volume": "1050 ml",
"longest_side": "20 cm",
"price": 200,
"price_postapoc": 5,
"to_hit": 1,
Expand Down Expand Up @@ -971,6 +982,7 @@
"description": "A cooking pot crudely hammered out of copper. Good enough to cook food and boil water, but not as useful as proper cookware.",
"weight": "884 g",
"volume": "1050 ml",
"longest_side": "20 cm",
"price": 200,
"price_postapoc": 5,
"to_hit": 1,
Expand Down
8 changes: 8 additions & 0 deletions data/json/items/melee/knives_kitchen.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"copy-from": "base_kitchen_knife",
"weight": "380 g",
"volume": "300 ml",
"longest_side": "35 cm",
"price": 3000,
"price_postapoc": 50,
"to_hit": { "grip": "weapon", "length": "short", "surface": "point", "balance": "neutral" },
Expand All @@ -36,6 +37,7 @@
"copy-from": "base_kitchen_knife",
"weight": "112 g",
"volume": "100 ml",
"longest_side": "25 cm",
"price": 250,
"price_postapoc": 50,
"to_hit": { "grip": "weapon", "length": "hand", "surface": "point", "balance": "neutral" },
Expand All @@ -55,6 +57,7 @@
"looks_like": "knife_steak",
"weight": "50 g",
"volume": "30 ml",
"longest_side": "15 cm",
"price": 250,
"price_postapoc": 50,
"to_hit": { "grip": "weapon", "length": "hand", "surface": "point", "balance": "neutral" },
Expand All @@ -74,6 +77,7 @@
"ascii_picture": "knife_chef",
"weight": "280 g",
"volume": "200 ml",
"longest_side": "30 cm",
"price": 1500,
"price_postapoc": 100,
"to_hit": { "grip": "weapon", "length": "short", "surface": "point", "balance": "neutral" },
Expand All @@ -93,6 +97,7 @@
"looks_like": "knife_butcher",
"weight": "280 g",
"volume": "200 ml",
"longest_side": "30 cm",
"price": 1500,
"price_postapoc": 50,
"to_hit": { "grip": "weapon", "length": "short", "surface": "point", "balance": "neutral" },
Expand All @@ -112,6 +117,7 @@
"looks_like": "knife_butcher",
"weight": "280 g",
"volume": "200 ml",
"longest_side": "35 cm",
"price": 500,
"price_postapoc": 50,
"bashing": 4,
Expand All @@ -131,6 +137,7 @@
"looks_like": "knife_butcher",
"weight": "250 g",
"volume": "250 ml",
"longest_side": "30 cm",
"price": 2500,
"price_postapoc": 50,
"to_hit": { "grip": "weapon", "length": "short", "surface": "line", "balance": "neutral" },
Expand All @@ -150,6 +157,7 @@
"looks_like": "knife_butcher",
"weight": "350 g",
"volume": "300 ml",
"longest_side": "30 cm",
"price": 3500,
"price_postapoc": 50,
"to_hit": { "grip": "weapon", "length": "short", "surface": "line", "balance": "uneven" },
Expand Down

0 comments on commit b48a967

Please sign in to comment.