From b3bc95dbf5a9fdccca1b8e4c1605776fba72525f Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Fri, 7 Feb 2020 09:19:41 +0100 Subject: [PATCH 1/3] Name to object, volume to string --- data/json/items/ammo.json | 6 ++---- data/json/items/chemicals_and_resources.json | 3 +-- data/json/items/generic.json | 5 ++--- data/json/items/resources/tailoring.json | 3 +-- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index 8d412abf94521..a192265a48623 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -342,8 +342,7 @@ "type": "AMMO", "id": "bearing", "price": 100, - "name": "bearings", - "name_plural": "bearings", + "name": { "str": "bearings", "str_pl": "bearings" }, "symbol": "=", "color": "dark_gray", "looks_like": "pebble", @@ -1153,8 +1152,7 @@ "type": "AMMO", "id": "RPG_die", "price": 10, - "name": "RPG die", - "name_plural": "RPG dice", + "name": { "str": "RPG die", "str_pl": "RPG dice" }, "symbol": "=", "color": "light_gray", "looks_like": "marble", diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index 068c92fceb9f4..baa4f9a9f38fc 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -917,8 +917,7 @@ "id": "chem_hmtd", "category": "chems", "price": 5000, - "name": "HMTD", - "name_plural": "HMTD", + "name": { "str": "HMTD", "str_pl": "HMTD" }, "symbol": "=", "color": "white", "description": "Hexamine peroxide: this fine, yellowish powder is a powerful primary explosive, used to initiate detonation of more stable explosives, such as RDX. Relatively stable, but best not store it for too long.", diff --git a/data/json/items/generic.json b/data/json/items/generic.json index 9f1ac5fbb77d9..f73f475af54c1 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -2316,11 +2316,10 @@ "type": "AMMO", "ammo_type": "NULL", "category": "other", - "name": "autoclave pouch", - "name_plural": "autoclave pouches", + "name": { "str": "autoclave pouch", "str_pl": "autoclave pouches" }, "description": "This is a medical device that bears the approval of the FDA (Food and Drug Administration). If used properly, these pouches can keep things sterile indefinitely.", "weight": "2 g", - "volume": 0, + "volume": "1 ml", "price": 5, "use_action": "PACK_CBM", "to_hit": -1, diff --git a/data/json/items/resources/tailoring.json b/data/json/items/resources/tailoring.json index 0e96f775f4ee1..be855713c32a4 100644 --- a/data/json/items/resources/tailoring.json +++ b/data/json/items/resources/tailoring.json @@ -97,8 +97,7 @@ "id": "scrap_nomex", "copy-from": "scrap_cotton", "type": "AMMO", - "name": "Nomex scraps", - "name_plural": "Nomex scraps", + "name": { "str": "Nomex scraps", "str_pl": "Nomex scraps" }, "description": "Oddly-shaped smallish bits of heat-resistant Nomex fabric, waste material from tailoring projects. Normally it's disposed of, but since Nomex would be very difficult to make in a post-apocalyptic world, it might be worth recycling it.", "price": 5, "material": "nomex" From f7c047268883ca6079ef6e521050071da492ba79 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Fri, 7 Feb 2020 09:20:55 +0100 Subject: [PATCH 2/3] Name to object --- data/json/items/ammo.json | 6 ++---- data/json/items/chemicals_and_resources.json | 6 ++---- data/json/items/resources/home_improvement.json | 3 +-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index a192265a48623..e6f4432b4b54f 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -827,8 +827,7 @@ "id": "cac2powder", "category": "spare_parts", "price": 200, - "name": "calcium carbide premix", - "name_plural": "calcium carbide premix", + "name": { "str": "calcium carbide premix", "str_pl": "calcium carbide premix" }, "symbol": "=", "color": "dark_gray", "description": "A powdered mixture of coke and lime ready to be smelted into usable calcium carbide in an arc furnace.", @@ -1195,8 +1194,7 @@ "id": "scrap_bronze", "type": "AMMO", "category": "spare_parts", - "name": "bronze", - "name_plural": "bronze", + "name": { "str": "bronze", "str_pl": "bronze" }, "description": "Decent-sized chunks of bronze, for fashioning some old-school items.", "weight": "218 g", "volume": "250 ml", diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index baa4f9a9f38fc..b17aed792fba7 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -57,8 +57,7 @@ "id": "material_cement", "category": "spare_parts", "price": 200, - "name": "cement", - "name_plural": "cement", + "name": { "str": "cement", "str_pl": "cement" }, "symbol": "=", "color": "dark_gray", "description": "Portland is most likely long gone, but its memory persists in cement. This ubiquitous binder can be used for all kinds of advanced masonry. Just add water.", @@ -674,8 +673,7 @@ "id": "chem_carbide", "category": "chems", "price": 75, - "name": "calcium carbide", - "name_plural": "calcium carbide", + "name": { "str": "calcium carbide", "str_pl": "calcium carbide" }, "symbol": "=", "color": "white", "description": "A handful of calcium carbide, giving off a faint, garlic-like smell. Commercially, calcium carbide was used for on-the-spot manufacture of acetylene and historically to power acetylene lamps. If mixed with water and sealed, it will explode with little strength, but with relatively loud noise and could maybe be used as a decoy.", diff --git a/data/json/items/resources/home_improvement.json b/data/json/items/resources/home_improvement.json index 461febfa50716..679f76ce3aab4 100644 --- a/data/json/items/resources/home_improvement.json +++ b/data/json/items/resources/home_improvement.json @@ -20,8 +20,7 @@ "id": "b_paint", "category": "other", "price": 120, - "name": "blue paint", - "name_plural": "blue paint", + "name": { "str": "blue paint", "str_pl": "blue paint" }, "symbol": "o", "color": "blue", "description": "A can of blue paint.", From 4dc5b8182aa327a9c4dc4b3669b9cad0cc806e9a Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Fri, 7 Feb 2020 09:23:38 +0100 Subject: [PATCH 3/3] Name to object --- data/json/items/chemicals_and_resources.json | 6 ++---- data/json/items/fuel.json | 6 ++---- data/json/items/resources/tailoring.json | 3 +-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index b17aed792fba7..9f9ec8b5721cd 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -40,8 +40,7 @@ "id": "chunk_sulfur", "category": "spare_parts", "price": 50, - "name": "chunk of sulfur", - "name_plural": "chunks of sulfur", + "name": { "str": "chunk of sulfur", "str_pl": "chunks of sulfur" }, "symbol": "*", "color": "yellow", "description": "A chunk of pure sulfur. Break it up to use it.", @@ -654,8 +653,7 @@ "id": "chem_chromium_oxide", "category": "chems", "price": 500, - "name": "chromium oxide", - "name_plural": "chromium oxide", + "name": { "str": "chromium oxide", "str_pl": "chromium oxide" }, "symbol": "=", "color": "green", "description": "A handful of chromium oxide. This substance, typically known as the only stable green pigment for paints, is also a mild oxidizer, which can be mixed with aluminum powder to make thermite for welding. If one had access to a CVD machine and a laboratory worth of reagents, they might be able to produce very durable ceramic layers.", diff --git a/data/json/items/fuel.json b/data/json/items/fuel.json index 29539ce9ae8eb..98e3a5ade1144 100644 --- a/data/json/items/fuel.json +++ b/data/json/items/fuel.json @@ -2,8 +2,7 @@ { "id": "chem_ethanol", "type": "AMMO", - "name": "ethanol", - "name_plural": "ethanol", + "name": { "str": "ethanol", "str_pl": "ethanol" }, "description": "Extremely pure alcohol suitable for use as a component in chemical reactions. You could also water it down and drink it, or use it as fuel in alcohol-burning stoves.", "weight": "1 g", "volume": "200ml", @@ -44,8 +43,7 @@ { "id": "diesel", "type": "AMMO", - "name": "diesel", - "name_plural": "diesel", + "name": { "str": "diesel", "str_pl": "diesel" }, "description": "Petroleum-based fuel made from a byproduct of the gasoline making process.", "category": "fuel", "weight": "1 g", diff --git a/data/json/items/resources/tailoring.json b/data/json/items/resources/tailoring.json index be855713c32a4..9e6d2b13d16c8 100644 --- a/data/json/items/resources/tailoring.json +++ b/data/json/items/resources/tailoring.json @@ -3,8 +3,7 @@ "id": "scrap_cotton", "type": "AMMO", "category": "other", - "name": "cotton scraps", - "name_plural": "cotton scraps", + "name": { "str": "cotton scraps", "str_pl": "cotton scraps" }, "description": "Oddly-shaped smallish bits of cotton, waste material from tailoring projects. Not useful for much and usually disposed of, but can be recycled into some thread if you really want.", "weight": "1 g", "volume": "1 ml",