From 707c66a2f4edea48906b0e9aa9972e0afd4f648b Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Tue, 3 Mar 2020 16:17:56 +0100 Subject: [PATCH] Tool name to object, volume to string --- data/json/items/melee/knives_kitchen.json | 2 +- data/json/items/melee/spears_and_polearms.json | 2 +- data/json/items/melee/swords_and_blades.json | 4 ++-- data/json/items/tool/cooking.json | 4 ++-- data/json/items/tool/deployable.json | 4 ++-- data/json/items/tool/entry_tools.json | 2 +- data/json/items/tool/explosives.json | 4 ++-- data/json/items/tool/fire.json | 4 ++-- data/json/items/tool/metalworking.json | 2 +- data/json/items/tool/raincatchers.json | 4 ++-- data/json/items/tool/toileteries.json | 4 ++-- data/json/items/tool/woodworking.json | 2 +- data/json/items/tool/workshop.json | 10 +++++----- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/data/json/items/melee/knives_kitchen.json b/data/json/items/melee/knives_kitchen.json index 8d82e8e394ac7..2a32081ef3eec 100644 --- a/data/json/items/melee/knives_kitchen.json +++ b/data/json/items/melee/knives_kitchen.json @@ -122,7 +122,7 @@ }, { "id": "knife_meat_cleaver", - "name": "meat cleaver", + "name": { "str": "meat cleaver" }, "type": "TOOL", "category": "weapons", "description": "This is a menacing looking knife with a broad, square shaped blade. Its heft and sharpness would make it a very effective melee weapon, and an excellent butchering tool.", diff --git a/data/json/items/melee/spears_and_polearms.json b/data/json/items/melee/spears_and_polearms.json index d2dbc8716c2f9..1c6c080f100c5 100644 --- a/data/json/items/melee/spears_and_polearms.json +++ b/data/json/items/melee/spears_and_polearms.json @@ -57,7 +57,7 @@ "id": "makeshift_scythe_war", "type": "TOOL", "category": "weapons", - "name": "makeshift war scythe", + "name": { "str": "makeshift war scythe" }, "description": "This farming tool has been modified into an improvised weapon by rotating its blade 90 degrees, transforming it into a deadly giant blade on the end of a stick. However it's quite fragile.", "weight": "3013 g", "volume": "3250 ml", diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index 9b33e4015a3d7..2875c0ab9411b 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -238,7 +238,7 @@ "id": "makeshift_machete", "type": "TOOL", "category": "weapons", - "name": "makeshift machete", + "name": { "str": "makeshift machete" }, "description": "This is a large blade that has had a portion of the handle wrapped in duct tape, making it easier to wield as a rough machete.", "weight": "581 g", "volume": "2 L", @@ -257,7 +257,7 @@ "id": "machete", "type": "TOOL", "category": "weapons", - "name": "machete", + "name": { "str": "machete" }, "description": "This huge steel knife makes an excellent tool for cutting down large vegetation or other 'obstacles.'", "weight": "538 g", "volume": "1 L", diff --git a/data/json/items/tool/cooking.json b/data/json/items/tool/cooking.json index 499f9b11e7ea8..019dc33e7314e 100644 --- a/data/json/items/tool/cooking.json +++ b/data/json/items/tool/cooking.json @@ -495,7 +495,7 @@ { "id": "makeshift_sealer", "type": "TOOL", - "name": "makeshift vacuum sealer", + "name": { "str": "makeshift vacuum sealer" }, "description": "This is a homemade heat sealer unit with an air pump. It's used for vacuum packing food to preserve it.", "weight": "3218 g", "volume": "2 L", @@ -517,7 +517,7 @@ { "id": "mess_kit", "type": "TOOL", - "name": "mess kit", + "name": { "str": "mess kit" }, "description": "A self-contained camping mess kit, containing everything you might need for wilderness cooking. This model relies on a battery-operated hotplate, rather than the more commonplace chemical-fueled Esbit stove.", "weight": "1500 g", "volume": "1 L", diff --git a/data/json/items/tool/deployable.json b/data/json/items/tool/deployable.json index db5f315cfa513..1fa3406de0f7b 100644 --- a/data/json/items/tool/deployable.json +++ b/data/json/items/tool/deployable.json @@ -119,7 +119,7 @@ { "id": "metal_butcher_rack", "type": "TOOL", - "name": "metal butchering rack", + "name": { "str": "metal butchering rack" }, "description": "Metal butchering rack designed to hang a carcass in the air. It is folded for easy transportation.", "weight": "5000 g", "volume": "10 L", @@ -155,7 +155,7 @@ { "id": "metal_smoking_rack", "type": "TOOL", - "name": "metal smoking rack", + "name": { "str": "metal smoking rack" }, "description": "A metal rack designed to smoke food for better preservation and taste. It is folded for easy transportation.", "weight": "5000 g", "volume": "25 L", diff --git a/data/json/items/tool/entry_tools.json b/data/json/items/tool/entry_tools.json index 02d0978b8a544..4478b5e423409 100644 --- a/data/json/items/tool/entry_tools.json +++ b/data/json/items/tool/entry_tools.json @@ -53,7 +53,7 @@ { "id": "makeshift_crowbar", "type": "TOOL", - "name": "makeshift crowbar", + "name": { "str": "makeshift crowbar" }, "description": "This is a pipe whose ends have been bent and hammered flat to resemble a crowbar. Use it to open locked crates without destroying them, or to lift manhole covers. You could also wield it to fight with, in a pinch.", "weight": "1250 g", "volume": "1 L", diff --git a/data/json/items/tool/explosives.json b/data/json/items/tool/explosives.json index 28823543b811b..c7c5bf683c070 100644 --- a/data/json/items/tool/explosives.json +++ b/data/json/items/tool/explosives.json @@ -531,7 +531,7 @@ "id": "gasbomb_makeshift", "type": "TOOL", "category": "weapons", - "name": "makeshift gas canister", + "name": { "str": "makeshift gas canister" }, "description": "This is a crude gasbomb using household chemicals. Use this item to arm it. In three turns it will begin to expel a highly toxic gas for a short time. This gas poisons those exposed to it, in addition to obscuring vision and scent.", "weight": "1264 g", "volume": "250 ml", @@ -835,7 +835,7 @@ "id": "makeshift_grenade", "copy-from": "grenade", "type": "TOOL", - "name": "makeshift grenade", + "name": { "str": "makeshift grenade" }, "description": "An improvised explosive device cobbled together from parts. Use this item to pull the pin and light the fuse. You will then have some amount of time before it explodes; throwing it would be a good idea.", "weight": "350 g", "price": 750, diff --git a/data/json/items/tool/fire.json b/data/json/items/tool/fire.json index 24d3d39082ad1..2aaa584428311 100644 --- a/data/json/items/tool/fire.json +++ b/data/json/items/tool/fire.json @@ -117,10 +117,10 @@ { "id": "matches", "type": "TOOL", - "name": "matchbook", + "name": { "str": "matchbook" }, "description": "This is a small book of matches with a coarse strike surface on the outside flap. Matches must be carried to use various drugs like cigarettes, or to light things like Molotov cocktails. You can also use matches to light nearby items on fire.", "weight": "10 g", - "volume": 0, + "volume": "10 ml", "price": 10, "material": "cardboard", "symbol": ",", diff --git a/data/json/items/tool/metalworking.json b/data/json/items/tool/metalworking.json index 8b030a953d979..3095e21b20d83 100644 --- a/data/json/items/tool/metalworking.json +++ b/data/json/items/tool/metalworking.json @@ -85,7 +85,7 @@ { "id": "chisel", "type": "TOOL", - "name": "metalworking chisel", + "name": { "str": "metalworking chisel" }, "description": "This is a short, stout metalworking chisel. It's used in some metalworking fabrication recipes.", "weight": "660 g", "volume": "250 ml", diff --git a/data/json/items/tool/raincatchers.json b/data/json/items/tool/raincatchers.json index dda36ec7739ad..466b7f4d818c6 100644 --- a/data/json/items/tool/raincatchers.json +++ b/data/json/items/tool/raincatchers.json @@ -66,7 +66,7 @@ { "id": "makeshift_funnel", "type": "TOOL", - "name": "makeshift funnel", + "name": { "str": "makeshift funnel" }, "description": "This is a small, makeshift funnel used to collect rainwater. Use it outside and place a container beneath it to collect water when it rains.", "weight": "4 g", "volume": "250 ml", @@ -87,7 +87,7 @@ { "id": "metal_funnel", "type": "TOOL", - "name": "metal funnel", + "name": { "str": "metal funnel" }, "description": "This is a large metal funnel used to collect rainwater. Less portable than plastic funnels, but collects more water. Use it outside and place a container beneath it to collect water when it rains.", "weight": "4017 g", "volume": "4 L", diff --git a/data/json/items/tool/toileteries.json b/data/json/items/tool/toileteries.json index e95ed46a93fcc..77ff1934bb8c6 100644 --- a/data/json/items/tool/toileteries.json +++ b/data/json/items/tool/toileteries.json @@ -128,7 +128,7 @@ { "id": "survivor_hairtrimmer", "type": "TOOL", - "name": "makeshift haircut kit", + "name": { "str": "makeshift haircut kit" }, "description": "This is a kit with tools for cutting hair.", "weight": "642 g", "volume": "1 L", @@ -143,7 +143,7 @@ { "id": "survivor_shavingkit", "type": "TOOL", - "name": "makeshift shaving kit", + "name": { "str": "makeshift shaving kit" }, "description": "This is a makeshift shaving kit. You can use it to shave if it's supplied with soap. It requires 1 unit of soap per use.", "weight": "540 g", "volume": "750 ml", diff --git a/data/json/items/tool/woodworking.json b/data/json/items/tool/woodworking.json index 96a49ebed5fb2..7f6d6f09afbe7 100644 --- a/data/json/items/tool/woodworking.json +++ b/data/json/items/tool/woodworking.json @@ -197,7 +197,7 @@ "id": "makeshift_axe", "copy-from": "hand_axe", "type": "TOOL", - "name": "metal hand axe", + "name": { "str": "metal hand axe" }, "description": "This is a chunk of steel with one edge hammered down to something resembling a cutting edge. It works passably well as an axe but really can't compare to a proper axe.", "material": "steel", "flags": [ "SHEATH_AXE" ] diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json index dfadbfa9b09c9..c189c7e7ecb79 100644 --- a/data/json/items/tool/workshop.json +++ b/data/json/items/tool/workshop.json @@ -330,7 +330,7 @@ { "id": "jack_makeshift", "type": "TOOL", - "name": "makeshift jack", + "name": { "str": "makeshift jack" }, "description": "A poorly constructed improvised scissor jack used for lifting vehicles if you're brave enough to use it.", "material": "steel", "symbol": ";", @@ -437,7 +437,7 @@ { "id": "makeshift_hammer", "type": "TOOL", - "name": "makeshift hammer", + "name": { "str": "makeshift hammer" }, "description": "This is a crude hammer made from a piece of metal affixed to a stick. It functions adequately as a hammer, but really can't compare to a proper one.", "weight": "1020 g", "volume": "500 ml", @@ -453,7 +453,7 @@ { "id": "metal_file", "type": "TOOL", - "name": "metal fileset", + "name": { "str": "metal fileset" }, "description": "These tools are commonly used to remove small amounts of materials from the surface of metal objects.", "weight": "76 g", "volume": "250 ml", @@ -469,7 +469,7 @@ { "id": "metal_smoother", "type": "TOOL", - "name": "metallic smoother", + "name": { "str": "metallic smoother" }, "description": "This metallic tool is most often used to smooth concrete, or mortar, in construction projects.", "weight": "362 g", "volume": "500 ml", @@ -935,7 +935,7 @@ { "id": "welder_crude", "type": "TOOL", - "name": "makeshift arc welder", + "name": { "str": "makeshift arc welder" }, "description": "This crude arc welder has been fashioned from a few small transformers, some wire, improvised electrode holder and complete disregard for personal safety. While it's not as efficient as a factory welder, it will serve in a pinch.", "weight": "7250 g", "volume": "3500 ml",