From ac839ac4c5aa3810b48f68911891a9647d56fd34 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Fri, 6 Mar 2020 20:40:06 +0100 Subject: [PATCH 1/2] Generic name to object, volume to string, flags to array --- data/json/items/book/maps.json | 4 ++-- data/json/items/chemicals_and_resources.json | 2 +- data/json/items/generic.json | 12 ++++++------ data/json/items/melee/swords_and_blades.json | 8 ++++---- data/json/items/melee/unarmed_weapons.json | 2 +- data/json/items/robot_parts.json | 2 +- data/json/items/tool/cooking.json | 4 ++-- data/json/items/tool/science.json | 2 +- data/json/items/tool/toileteries.json | 2 +- data/json/items/vehicle/armor.json | 2 +- data/json/items/vehicle/controls.json | 2 +- data/json/items/vehicle/engineering.json | 2 +- data/json/items/vehicle/lights.json | 4 ++-- data/json/items/vehicle/seating.json | 4 ++-- data/json/items/vehicle/solar.json | 2 +- data/json/items/vehicle/utilities.json | 2 +- 16 files changed, 28 insertions(+), 28 deletions(-) diff --git a/data/json/items/book/maps.json b/data/json/items/book/maps.json index ebf699d992874..63063cf280f42 100644 --- a/data/json/items/book/maps.json +++ b/data/json/items/book/maps.json @@ -57,7 +57,7 @@ "id": "roadmap", "copy-from": "abstractmap", "type": "GENERIC", - "name": "road map", + "name": { "str": "road map" }, "description": "This is a road map for the local area. Listing information on civic sites like hospitals and police stations, it can be used to add points of interest to your map.", "color": "yellow", "use_action": { @@ -109,7 +109,7 @@ "id": "restaurantmap", "copy-from": "abstractmap", "type": "GENERIC", - "name": "restaurant guide", + "name": { "str": "restaurant guide" }, "description": "This is glossy printed pamphlet that details dining establishments in the local area. Printed by the Chamber of Commerce, it lists the addresses of all the best diners and bars. Using it will add points of interest to your map.", "color": "pink", "use_action": { diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index bc77c3b265dad..283b836d80319 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -1346,7 +1346,7 @@ "id": "sandbag", "type": "GENERIC", "category": "other", - "name": "sandbag", + "name": { "str": "sandbag" }, "description": "This is a canvas sack filled with sand. It can be used to construct simple barricades.", "weight": "24415 g", "volume": "16L", diff --git a/data/json/items/generic.json b/data/json/items/generic.json index 210a76196bafc..fcd169362590f 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -514,7 +514,7 @@ "id": "blade_scythe", "symbol": "(", "color": "light_gray", - "name": "scythe blade", + "name": { "str": "scythe blade" }, "description": "A large, curved blade. Could be used to assemble a scythe, or make an improvised polearm.", "category": "spare_parts", "price": 28000, @@ -605,7 +605,7 @@ "id": "rebar", "symbol": "/", "color": "dark_gray", - "name": "rebar", + "name": { "str": "rebar" }, "description": "A length of rebar, makes a nice melee weapon, and could be handy in constructing tougher walls and such.", "category": "spare_parts", "price": 7500, @@ -1491,7 +1491,7 @@ "id": "radio_repeater_mod", "symbol": ",", "color": "light_gray", - "name": "radio repeater mod", + "name": { "str": "radio repeater mod" }, "category": "spare_parts", "description": "A system designed to convert a radio station into an autonomous repeater.", "price": 25000, @@ -2076,7 +2076,7 @@ "id": "sapphire", "copy-from": "garnet", "color": "blue", - "name": "sapphire", + "name": { "str": "sapphire" }, "description": "A sparkling sapphire." }, { @@ -2535,13 +2535,13 @@ "id": "id_science", "symbol": ",", "color": "blue", - "name": "science ID card", + "name": { "str": "science ID card" }, "description": "This ID card once belonged to a scientist. The reverse side describes protocol for using it; this could grant access at one control panel, if you can find one.", "price": 60000, "price_postapoc": 5000, "material": "plastic", "weight": "6 g", - "volume": 0, + "volume": "15 ml", "to_hit": -3 }, { diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index 2abdc6945f193..bb71d01218160 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -429,13 +429,13 @@ "type": "GENERIC", "symbol": "/", "color": "light_gray", - "name": "scimitar", + "name": { "str": "scimitar" }, "description": "This is a dull, cheaply made replica of a curved sword, associated with various Middle Eastern and Central Asian countries.", "price": 9300, "price_postapoc": 0, "material": "aluminum", "techniques": [ "WBLOCK_2" ], - "flags": "SHEATH_SWORD", + "flags": [ "SHEATH_SWORD" ], "weight": "586 g", "volume": "2 L", "bashing": 6, @@ -1332,13 +1332,13 @@ "type": "GENERIC", "symbol": "/", "color": "light_gray", - "name": "rapier", + "name": { "str": "rapier" }, "description": "This is a blunted, cheap replica of a thin sword with an ornate hand guard. It looks like the preferred weapon of gentlemen and swashbucklers. Light and quick, it makes any battle a stylish battle.", "price": 9800, "price_postapoc": 0, "material": "aluminum", "techniques": [ "RAPID", "WBLOCK_2", "PRECISE" ], - "flags": "SHEATH_SWORD", + "flags": [ "SHEATH_SWORD" ], "weight": "660 g", "volume": "1500 ml", "bashing": 4, diff --git a/data/json/items/melee/unarmed_weapons.json b/data/json/items/melee/unarmed_weapons.json index 2065b22ef6f89..d8795b59984b3 100644 --- a/data/json/items/melee/unarmed_weapons.json +++ b/data/json/items/melee/unarmed_weapons.json @@ -46,7 +46,7 @@ "id": "knuckle_katar", "symbol": "!", "color": "dark_gray", - "name": "razorbar katar", + "name": { "str": "razorbar katar" }, "description": "Five pieces of rebar sharpened to cruel points and strapped to a brace fastened at wrist and forearm on both arms. The next bub better watch out.", "material": "steel", "volume": "500 ml", diff --git a/data/json/items/robot_parts.json b/data/json/items/robot_parts.json index 53a42bdfab547..1418fc8e96ba9 100644 --- a/data/json/items/robot_parts.json +++ b/data/json/items/robot_parts.json @@ -43,7 +43,7 @@ { "type": "GENERIC", "id": "sensor_module", - "name": "sensor array", + "name": { "str": "sensor array" }, "description": "A wide range of sensors meant to give the ability to perceive the surrounding world.", "copy-from": "robot_module_abstract" }, diff --git a/data/json/items/tool/cooking.json b/data/json/items/tool/cooking.json index 5bd429a240d95..5a7466888bcd5 100644 --- a/data/json/items/tool/cooking.json +++ b/data/json/items/tool/cooking.json @@ -286,7 +286,7 @@ "id": "flask_yeast", "type": "GENERIC", "category": "food", - "name": "sealed yeast culture", + "name": { "str": "sealed yeast culture" }, "description": "A sealed flask holding sanitized yeast wort. You may harvest the yeast inside when it's done culturing.", "weight": "52 g", "volume": "250 ml", @@ -576,7 +576,7 @@ "id": "milk_cream_rising", "type": "GENERIC", "category": "food", - "name": "rising cream jar", + "name": { "str": "rising cream jar" }, "description": "This jar contains raw milk separating into cream. You can seal up the jar once the process is completed.", "weight": "3461 g", "volume": "3000 ml", diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json index 3c05530c0965f..60d8374664d69 100644 --- a/data/json/items/tool/science.json +++ b/data/json/items/tool/science.json @@ -695,7 +695,7 @@ "id": "stand_ring", "type": "GENERIC", "category": "spare_parts", - "name": "ring stand", + "name": { "str": "ring stand" }, "description": "This is a heavy metal plate and a sturdy rod, for clamping lab stuff to.", "weight": "900 g", "volume": "550ml", diff --git a/data/json/items/tool/toileteries.json b/data/json/items/tool/toileteries.json index 732ba227dc818..eaf8f30f9be8f 100644 --- a/data/json/items/tool/toileteries.json +++ b/data/json/items/tool/toileteries.json @@ -85,7 +85,7 @@ "id": "razor_blade", "symbol": ",", "color": "light_cyan", - "name": "razor blade", + "name": { "str": "razor blade" }, "description": "A double-edged razor blade.", "price": 600, "price_postapoc": 100, diff --git a/data/json/items/vehicle/armor.json b/data/json/items/vehicle/armor.json index ccb9b760c27b4..882d87ed99148 100644 --- a/data/json/items/vehicle/armor.json +++ b/data/json/items/vehicle/armor.json @@ -3,7 +3,7 @@ "id": "rebar_plate", "type": "GENERIC", "category": "veh_parts", - "name": "rebar grate", + "name": { "str": "rebar grate" }, "description": "Interlocked sections of rebar that allows for light and effective reinforcement of vehicle sections.", "weight": "2200 g", "volume": "3 L", diff --git a/data/json/items/vehicle/controls.json b/data/json/items/vehicle/controls.json index fa355eda276e2..e5a04cfcb2b25 100644 --- a/data/json/items/vehicle/controls.json +++ b/data/json/items/vehicle/controls.json @@ -16,7 +16,7 @@ { "type": "GENERIC", "id": "omnicamera", - "name": "security camera", + "name": { "str": "security camera" }, "description": "A security camera you could connect to a display. Image quality is quite low, but the field of vision is great.", "weight": "1100 g", "to_hit": -3, diff --git a/data/json/items/vehicle/engineering.json b/data/json/items/vehicle/engineering.json index cae8810b3df49..9fa1d8d431433 100644 --- a/data/json/items/vehicle/engineering.json +++ b/data/json/items/vehicle/engineering.json @@ -42,7 +42,7 @@ "type": "GENERIC", "id": "v_rockwheel_item", "symbol": "&", - "name": "rockwheel", + "name": { "str": "rockwheel" }, "color": "dark_gray", "description": "A large and heavy jagged metal disc to dig trenches.", "weight": "62000 g", diff --git a/data/json/items/vehicle/lights.json b/data/json/items/vehicle/lights.json index 1f2a164f6ad88..645dedf1d3edb 100644 --- a/data/json/items/vehicle/lights.json +++ b/data/json/items/vehicle/lights.json @@ -36,7 +36,7 @@ { "type": "GENERIC", "id": "headlight_reinforced", - "name": "reinforced headlight", + "name": { "str": "reinforced headlight" }, "description": "A vehicle headlight with a cage built around it to protect it from damage without reducing its effectiveness.", "weight": "1200 g", "to_hit": -2, @@ -50,7 +50,7 @@ { "type": "GENERIC", "id": "wide_headlight_reinforced", - "name": "reinforced wide-angle headlight", + "name": { "str": "reinforced wide-angle headlight" }, "description": "A wide-angle vehicle headlight with a cage built around it to protect it from damage without reducing its effectiveness.", "weight": "4800 g", "volume": "1250 ml", diff --git a/data/json/items/vehicle/seating.json b/data/json/items/vehicle/seating.json index 0da1998527c29..36cdc74857ea8 100644 --- a/data/json/items/vehicle/seating.json +++ b/data/json/items/vehicle/seating.json @@ -2,7 +2,7 @@ { "type": "GENERIC", "id": "seat", - "name": "seat", + "name": { "str": "seat" }, "description": "A soft car seat made from synthetic fabric.", "weight": "9071 g", "to_hit": -4, @@ -28,7 +28,7 @@ { "type": "GENERIC", "id": "saddle", - "name": "saddle", + "name": { "str": "saddle" }, "description": "A leather-covered seat designed to be straddled.", "weight": "300 g", "material": [ "plastic", "aluminum" ], diff --git a/data/json/items/vehicle/solar.json b/data/json/items/vehicle/solar.json index b329bde34b2b0..47045fdc03e61 100644 --- a/data/json/items/vehicle/solar.json +++ b/data/json/items/vehicle/solar.json @@ -18,7 +18,7 @@ { "type": "GENERIC", "id": "reinforced_solar_panel", - "name": "reinforced solar panel", + "name": { "str": "reinforced solar panel" }, "description": "A solar panel that has been covered with a pane of reinforced glass to protect the delicate solar cells from zombies or errant baseballs. The glass causes this panel to produce slightly less power than a normal panel. Useful for a vehicle.", "weight": "24153 g", "color": "light_blue", diff --git a/data/json/items/vehicle/utilities.json b/data/json/items/vehicle/utilities.json index 09cb11051dc86..baf14b324c7d5 100644 --- a/data/json/items/vehicle/utilities.json +++ b/data/json/items/vehicle/utilities.json @@ -79,7 +79,7 @@ { "type": "GENERIC", "id": "recharge_station", - "name": "recharging station", + "name": { "str": "recharging station" }, "description": "A universal recharging station designed to operate on vehicle power. While on it will steadily charge all rechargeable batteries (battery cells, lead-acid batteries, etc) placed directly within its storage space. The system can only be installed onto existing storage compartments, and is controlled from a dashboard or electronics control unit.", "weight": "10000 g", "to_hit": 1, From d50961661642e07e12a240d4cbfb1f84fff54cbc Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Sat, 7 Mar 2020 08:25:53 +0100 Subject: [PATCH 2/2] Update data/json/items/tool/cooking.json Co-Authored-By: ZhilkinSerg --- 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 5a7466888bcd5..a1dc4e0effeb7 100644 --- a/data/json/items/tool/cooking.json +++ b/data/json/items/tool/cooking.json @@ -286,7 +286,7 @@ "id": "flask_yeast", "type": "GENERIC", "category": "food", - "name": { "str": "sealed yeast culture" }, + "name": { "str": "sealed yeast culture", "str_pl": "sealed yeast culture" }, "description": "A sealed flask holding sanitized yeast wort. You may harvest the yeast inside when it's done culturing.", "weight": "52 g", "volume": "250 ml",