From 64c8ec4a2143cd049fe4a925190a4a28bbc693ae Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Tue, 28 Jan 2020 15:45:40 +0100 Subject: [PATCH 1/9] Tool name_plural and name to object --- data/json/items/tool/cooking.json | 3 +-- data/json/items/tool/electronics.json | 3 +-- data/json/items/tool/explosives.json | 5 ++--- data/json/items/tool/traps.json | 6 ++---- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/data/json/items/tool/cooking.json b/data/json/items/tool/cooking.json index 5a87b70160121..4345be422fd52 100644 --- a/data/json/items/tool/cooking.json +++ b/data/json/items/tool/cooking.json @@ -629,8 +629,7 @@ { "id": "mortar_pestle", "type": "TOOL", - "name": "mortar and pestle", - "name_plural": "sets of mortar and pestle", + "name": { "str": "mortar and pestle", "str_pl": "sets of mortar and pestle" }, "description": "This is a simple combination of a small grindstone and a bowl-shaped stone. Used for grinding grain, but time-consuming compared to more complex methods.", "weight": "1632 g", "volume": "1 L", diff --git a/data/json/items/tool/electronics.json b/data/json/items/tool/electronics.json index 46e344b6afe6a..7fda825003126 100644 --- a/data/json/items/tool/electronics.json +++ b/data/json/items/tool/electronics.json @@ -326,8 +326,7 @@ { "id": "mp3", "type": "TOOL", - "name": "mp3 player (off)", - "name_plural": "mp3 players (off)", + "name": { "str": "mp3 player (off)", "str_pl": "mp3 players (off)" }, "description": "This battery-powered device is loaded up with someone's music collection. Fortunately, there's lots of songs you like, and listening to it will raise your morale slightly. Use it to turn it on.", "weight": "140 g", "volume": "50 ml", diff --git a/data/json/items/tool/explosives.json b/data/json/items/tool/explosives.json index 8a0dfa27dca19..3c146656c2f8c 100644 --- a/data/json/items/tool/explosives.json +++ b/data/json/items/tool/explosives.json @@ -316,11 +316,10 @@ { "id": "firecracker_pack", "type": "TOOL", - "name": "pack of firecrackers", - "name_plural": "packs of firecrackers", + "name": { "str": "pack of firecrackers", "str_pl": "packs of firecrackers" }, "description": "This is a pack of 25 firecrackers with a starter fuse. Use this item to light the fuse. Of course, you will need a lighter or some matches to do so. Shortly after you light the fuse they will begin to explode, so throw them quickly!", "weight": "75 g", - "volume": 0, + "volume": "0 ml", "price": 100, "to_hit": -3, "bashing": 1, diff --git a/data/json/items/tool/traps.json b/data/json/items/tool/traps.json index 8faefe73240df..08fdc7ce9bd80 100644 --- a/data/json/items/tool/traps.json +++ b/data/json/items/tool/traps.json @@ -113,8 +113,7 @@ { "id": "caltrops", "type": "TOOL", - "name": "loose caltrops", - "name_plural": "loose caltrops", + "name": { "str": "loose caltrops", "str_pl": "loose caltrops" }, "description": "These are small metal objects covered with many sharp points. If an unsuspecting victim steps on one, they'll get a spine through the foot.", "weight": "264 g", "volume": "250 ml", @@ -136,8 +135,7 @@ { "id": "caltrops_glass", "type": "TOOL", - "name": "loose glass caltrops", - "name_plural": "loose glass caltrops", + "name": { "str": "loose glass caltrops", "str_pl": "loose glass caltrops" }, "description": "These are glass shards glued together to expose their sharp edges. If an unsuspecting victim steps on one, they'll get cut.", "weight": "264 g", "volume": "500 ml", From 36d572b0a83f4d2d445f1c4bab2650bd5c2023bd Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Tue, 28 Jan 2020 15:49:17 +0100 Subject: [PATCH 2/9] Names to object, volume to string --- data/json/items/tool/electronics.json | 3 +-- data/json/items/tool/lighting.json | 5 ++--- data/json/items/tool/radio_tools.json | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/data/json/items/tool/electronics.json b/data/json/items/tool/electronics.json index 7fda825003126..7f9dde9678fa5 100644 --- a/data/json/items/tool/electronics.json +++ b/data/json/items/tool/electronics.json @@ -252,8 +252,7 @@ { "id": "geiger_off", "type": "TOOL", - "name": "geiger counter (off)", - "name_plural": "geiger counters (off)", + "name": { "str": "geiger counter (off)", "str_pl": "geiger counters (off)" }, "description": "This is a tool for measuring radiation. Using it will prompt you to choose whether to scan yourself or the terrain, or to turn it on, which will provide continuous feedback on ambient radiation. It is currently off.", "weight": "225 g", "volume": "500 ml", diff --git a/data/json/items/tool/lighting.json b/data/json/items/tool/lighting.json index 28df06fe4b55e..f52fd0a5f0300 100644 --- a/data/json/items/tool/lighting.json +++ b/data/json/items/tool/lighting.json @@ -555,11 +555,10 @@ { "id": "reading_light", "type": "TOOL", - "name": "reading light", - "name_plural": "reading lights", + "name": { "str": "reading light", "str_pl": "reading lights" }, "description": "A little clip-on LED light, meant for reading books in the dark.", "weight": "90 g", - "volume": 0, + "volume": "0 ml", "price": 100, "material": [ "plastic", "aluminum" ], "symbol": ";", diff --git a/data/json/items/tool/radio_tools.json b/data/json/items/tool/radio_tools.json index 292fd4a096017..e1f6d6b01c80d 100644 --- a/data/json/items/tool/radio_tools.json +++ b/data/json/items/tool/radio_tools.json @@ -87,8 +87,7 @@ { "id": "radio", "type": "TOOL", - "name": "radio (off)", - "name_plural": "radios (off)", + "name": { "str": "radio (off)", "str_pl": "radios (off)" }, "description": "This is a portable radio. Using this radio turns it on. It will pick up any nearby signals being broadcast and play them audibly.", "weight": "295 g", "volume": "1 L", From 695c457026a017ecaa610b1f6242404227443a6a Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Tue, 28 Jan 2020 16:05:12 +0100 Subject: [PATCH 3/9] Names to object --- data/json/items/tool/electronics.json | 3 +-- data/json/items/tool/lighting.json | 12 ++++-------- data/json/items/tool/workshop.json | 3 +-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/data/json/items/tool/electronics.json b/data/json/items/tool/electronics.json index 7f9dde9678fa5..e31190426944b 100644 --- a/data/json/items/tool/electronics.json +++ b/data/json/items/tool/electronics.json @@ -524,8 +524,7 @@ { "id": "vibrator", "type": "TOOL", - "name": "vibrator", - "name_plural": "vibrators", + "name": { "str": "vibrator", "str_pl": "vibrators" }, "description": "This battery-devouring device is just the thing to knead the tension out and help you relax. Use it to take a break and unwind.", "weight": "453 g", "volume": "500 ml", diff --git a/data/json/items/tool/lighting.json b/data/json/items/tool/lighting.json index f52fd0a5f0300..0db3d14fff429 100644 --- a/data/json/items/tool/lighting.json +++ b/data/json/items/tool/lighting.json @@ -185,8 +185,7 @@ { "id": "flashlight", "type": "TOOL", - "name": "flashlight (off)", - "name_plural": "flashlights (off)", + "name": { "str": "flashlights (off)", "str_pl": "flashlights (off)" }, "description": "This is a typical household flashlight with a plastic handle. Using this flashlight will turn it on and provide light, assuming it is charged with batteries.", "material": [ "plastic", "aluminum" ], "symbol": ";", @@ -365,8 +364,7 @@ { "id": "heavy_flashlight", "type": "TOOL", - "name": "heavy duty flashlight (off)", - "name_plural": "heavy duty flashlights (off)", + "name": { "str": "heavy duty flashlight (off)", "str_pl": "heavy duty flashlight (off)" }, "description": "This is a heavy duty tubular aluminum LED flashlight as often used by security guards. Makes for a passable melee weapon. Using this flashlight will turn it on and provide light, assuming it is charged with batteries.", "weight": "650 g", "volume": "750 ml", @@ -520,8 +518,7 @@ { "id": "oxylamp", "type": "TOOL", - "name": "acetylene lamp (off)", - "name_plural": "acetylene lamps (off)", + "name": { "str": "acetylene lamp (off)", "str_pl": "acetylene lamps (off)" }, "description": "An antique brass lamp designed to run from a pressurized cylinder of acetylene. It is an efficient, if not somewhat dangerous light source.", "weight": "800 g", "volume": "500 ml", @@ -645,8 +642,7 @@ { "id": "torch", "type": "TOOL", - "name": "torch", - "name_plural": "torches", + "name": { "str": "torch", "str_pl": "torches" }, "description": "This is a large stick, wrapped in rags that are soaked with a flammable material. When lit, produces a fair amount of light. You'll need a lighter or matches to light it.", "weight": "831 g", "volume": "750 ml", diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json index 214c86dcdfb17..bb70f3f9519ab 100644 --- a/data/json/items/tool/workshop.json +++ b/data/json/items/tool/workshop.json @@ -797,8 +797,7 @@ { "id": "toolbox", "type": "TOOL", - "name": "toolbox", - "name_plural": "toolboxes", + "name": { "str": "toolbox", "str_pl": "toolboxes" }, "description": "This is a stout metal box containing a complete tool kit suitable for most household maintenance and construction activities.", "weight": "3522 g", "volume": "2500 ml", From 8a8367b5fe09eacc3821f349574f7c7baa1e8292 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Tue, 28 Jan 2020 16:27:54 +0100 Subject: [PATCH 4/9] Update data/json/items/tool/lighting.json --- data/json/items/tool/lighting.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/tool/lighting.json b/data/json/items/tool/lighting.json index 0db3d14fff429..67a7be6290c90 100644 --- a/data/json/items/tool/lighting.json +++ b/data/json/items/tool/lighting.json @@ -185,7 +185,7 @@ { "id": "flashlight", "type": "TOOL", - "name": { "str": "flashlights (off)", "str_pl": "flashlights (off)" }, + "name": { "str": "flashlight (off)", "str_pl": "flashlights (off)" }, "description": "This is a typical household flashlight with a plastic handle. Using this flashlight will turn it on and provide light, assuming it is charged with batteries.", "material": [ "plastic", "aluminum" ], "symbol": ";", From b37ba724ad5629271e5f19b911ad0f6a80527254 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Tue, 28 Jan 2020 18:59:40 +0100 Subject: [PATCH 5/9] Update data/json/items/tool/cooking.json Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> --- data/json/items/tool/cooking.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/tool/cooking.json b/data/json/items/tool/cooking.json index 4345be422fd52..e03bb6635fa0c 100644 --- a/data/json/items/tool/cooking.json +++ b/data/json/items/tool/cooking.json @@ -629,7 +629,7 @@ { "id": "mortar_pestle", "type": "TOOL", - "name": { "str": "mortar and pestle", "str_pl": "sets of mortar and pestle" }, + "name": { "str": "mortar and pestle", "str_pl": "mortars and pestles" }, "description": "This is a simple combination of a small grindstone and a bowl-shaped stone. Used for grinding grain, but time-consuming compared to more complex methods.", "weight": "1632 g", "volume": "1 L", From 0cd7e2734b6bcd9ec46dc975e20e82bec936d436 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Tue, 28 Jan 2020 18:59:49 +0100 Subject: [PATCH 6/9] Update data/json/items/tool/electronics.json Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> --- data/json/items/tool/electronics.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/tool/electronics.json b/data/json/items/tool/electronics.json index e31190426944b..7a4eda2bbcfb5 100644 --- a/data/json/items/tool/electronics.json +++ b/data/json/items/tool/electronics.json @@ -524,7 +524,7 @@ { "id": "vibrator", "type": "TOOL", - "name": { "str": "vibrator", "str_pl": "vibrators" }, + "name": { "str": "vibrator" }, "description": "This battery-devouring device is just the thing to knead the tension out and help you relax. Use it to take a break and unwind.", "weight": "453 g", "volume": "500 ml", From 20f93db99582f2e59807236b73088517c405c410 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Tue, 28 Jan 2020 18:59:59 +0100 Subject: [PATCH 7/9] Update data/json/items/tool/explosives.json Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> --- data/json/items/tool/explosives.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/tool/explosives.json b/data/json/items/tool/explosives.json index 3c146656c2f8c..b6bf54621986f 100644 --- a/data/json/items/tool/explosives.json +++ b/data/json/items/tool/explosives.json @@ -319,7 +319,7 @@ "name": { "str": "pack of firecrackers", "str_pl": "packs of firecrackers" }, "description": "This is a pack of 25 firecrackers with a starter fuse. Use this item to light the fuse. Of course, you will need a lighter or some matches to do so. Shortly after you light the fuse they will begin to explode, so throw them quickly!", "weight": "75 g", - "volume": "0 ml", + "volume": "50 ml", "price": 100, "to_hit": -3, "bashing": 1, From f709721f5e18855f3373c255b0db1d05c3a61f78 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Tue, 28 Jan 2020 19:00:53 +0100 Subject: [PATCH 8/9] Update data/json/items/tool/lighting.json Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> --- data/json/items/tool/lighting.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/tool/lighting.json b/data/json/items/tool/lighting.json index 67a7be6290c90..e258a9a3cb02f 100644 --- a/data/json/items/tool/lighting.json +++ b/data/json/items/tool/lighting.json @@ -364,7 +364,7 @@ { "id": "heavy_flashlight", "type": "TOOL", - "name": { "str": "heavy duty flashlight (off)", "str_pl": "heavy duty flashlight (off)" }, + "name": { "str": "heavy duty flashlight (off)", "str_pl": "heavy duty flashlights (off)" }, "description": "This is a heavy duty tubular aluminum LED flashlight as often used by security guards. Makes for a passable melee weapon. Using this flashlight will turn it on and provide light, assuming it is charged with batteries.", "weight": "650 g", "volume": "750 ml", From c9f905514bb8256902992271e132105abc91be55 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Tue, 28 Jan 2020 19:01:01 +0100 Subject: [PATCH 9/9] Update data/json/items/tool/lighting.json Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> --- data/json/items/tool/lighting.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/tool/lighting.json b/data/json/items/tool/lighting.json index e258a9a3cb02f..4012d549a0f7b 100644 --- a/data/json/items/tool/lighting.json +++ b/data/json/items/tool/lighting.json @@ -555,7 +555,7 @@ "name": { "str": "reading light", "str_pl": "reading lights" }, "description": "A little clip-on LED light, meant for reading books in the dark.", "weight": "90 g", - "volume": "0 ml", + "volume": "100 ml", "price": 100, "material": [ "plastic", "aluminum" ], "symbol": ";",