Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjusting the volume and weight of a few small knives #38032

Merged
merged 2 commits into from
Feb 15, 2020
Merged

Adjusting the volume and weight of a few small knives #38032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13b97f6
Fixing volume and weight of the paring knife
TimPollard Feb 15, 2020
8c2178d
Adjusting the sizes of some folding knives
TimPollard Feb 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions data/json/items/melee/knives_kitchen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
"description": "This is a short-bladed knife with a sharp blade, made for fine controlled cuts to vegetables without using a cutting board.",
"copy-from": "base_kitchen_knife",
"looks_like": "knife_steak",
"weight": "100 g",
"volume": "250 ml",
"weight": "50 g",
"volume": "30 ml",
"price": 250,
"to_hit": -1,
"bashing": 1,
Expand Down
10 changes: 5 additions & 5 deletions data/json/items/melee/swords_and_blades.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
"category": "weapons",
"name": "switchblade",
"description": "This is a long and thin knife with a spring-loaded blade that rests inside the handle while not in use.",
"weight": "464 g",
"volume": 0,
"weight": "100 g",
"volume": "50 ml",
"price": 2000,
"to_hit": -2,
"cutting": 16,
Expand All @@ -69,7 +69,7 @@
"type": "TOOL",
"name": { "str": "folding knife", "str_pl": "folding knives" },
"description": "This is a small folding knife, with a locking blade and a pocket clip. Not as good a weapon as a solid fixed-blade knife, but better than a penknife.",
"weight": "256 g",
"weight": "80 g",
"volume": "40 ml",
"price": 1500,
"bashing": 1,
Expand Down Expand Up @@ -187,8 +187,8 @@
"name": { "str": "Swiss Army knife", "str_pl": "Swiss Army knives" },
"//": "The swiss army knife is a bit more of a knife than a toolkit.",
"description": "An iconic pocket knife imported from Europe. Its red plastic handle conceals many small tools.",
"weight": "246 g",
"volume": "5 ml",
"weight": "120 g",
"volume": "60 ml",
"price": 3000,
"to_hit": -2,
"cutting": 6,
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/tool/knives.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
"type": "TOOL",
"name": { "str": "pocket knife", "str_pl": "pocket knives" },
"description": "This is a small pocket knife. It isn't great for combat, but it's better than nothing. It's sharp enough to butcher with.",
"weight": "141 g",
"volume": "5 ml",
"weight": "20 g",
"volume": "10 ml",
"price": 1000,
"to_hit": -2,
"cutting": 7,
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/tool/workshop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,8 +531,8 @@
"name": "multi-tool",
"//": "The multi-tool is a bit more of a toolkit than a knife.",
"description": "A cleverly designed all-in-one tool which combines several smaller tools into the handles of a pair of pliers.",
"weight": "494 g",
"volume": "250 ml",
"weight": "250 g",
"volume": "70 ml",
"price": 3000,
"to_hit": -4,
"bashing": 1,
Expand Down