From 1489349c0bf62e2760dbcc17b81201120efcdd6f Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Thu, 12 Mar 2020 00:24:40 +0100 Subject: [PATCH] Generic name to object --- data/json/items/book/maps.json | 2 +- data/json/items/generic.json | 6 +++--- data/json/items/tool/misc.json | 2 +- data/json/items/vehicle/alternator.json | 4 ++-- data/json/items/vehicle/controls.json | 4 ++-- data/json/items/vehicle/rigs.json | 8 ++++---- data/json/items/vehicle/solar.json | 4 ++-- data/json/items/vehicle/turrets.json | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/data/json/items/book/maps.json b/data/json/items/book/maps.json index 74c83ac06b322..095d1ac6720df 100644 --- a/data/json/items/book/maps.json +++ b/data/json/items/book/maps.json @@ -81,7 +81,7 @@ "id": "trailmap", "copy-from": "abstractmap", "type": "GENERIC", - "name": "trail guide", + "name": { "str": "trail guide" }, "description": "This is a printed guide to the best local trails. It has general details about the trails, trailhead amenities, suggestions for the best thru-hikes, and advice on interacting with local wildlife in a responsible and respectful manner.", "color": "green", "use_action": { diff --git a/data/json/items/generic.json b/data/json/items/generic.json index 22d4600b59589..fea3b30ac1bc3 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -549,13 +549,13 @@ "id": "tree_spile", "symbol": ".", "color": "light_gray", - "name": "tree spile", + "name": { "str": "tree spile" }, "description": "A hollow metal cylinder which is inserted in a tree crust in order to slowly harvest its sap. Can be used on a maple tree in between late winter and early spring to harvest maple sap.", "category": "tools", "price": 5, "material": "steel", "weight": "11 g", - "volume": 0 + "volume": "50 ml" }, { "type": "GENERIC", @@ -1295,7 +1295,7 @@ "id": "transponder", "symbol": ",", "color": "light_gray", - "name": "transponder circuit", + "name": { "str": "transponder circuit" }, "category": "spare_parts", "description": "A circuit designed to repeat a signal. Useful for crafting communications equipment.", "price": 14000, diff --git a/data/json/items/tool/misc.json b/data/json/items/tool/misc.json index 03f2205cde464..498c7b8409545 100644 --- a/data/json/items/tool/misc.json +++ b/data/json/items/tool/misc.json @@ -647,7 +647,7 @@ "id": "umbrella", "type": "GENERIC", "category": "tools", - "name": "umbrella", + "name": { "str": "umbrella" }, "description": "An umbrella with a pointy end, useful for keeping dry when wielded.", "weight": "141 g", "volume": "1500 ml", diff --git a/data/json/items/vehicle/alternator.json b/data/json/items/vehicle/alternator.json index 99be5de2c1607..92e5abe212b77 100644 --- a/data/json/items/vehicle/alternator.json +++ b/data/json/items/vehicle/alternator.json @@ -2,7 +2,7 @@ { "abstract": "vehicle_alternator", "type": "GENERIC", - "name": "vehicle alternator", + "name": { "str": "vehicle alternator" }, "category": "veh_parts", "material": [ "steel", "copper" ], "symbol": ",", @@ -42,7 +42,7 @@ "id": "alternator_truck", "copy-from": "vehicle_alternator", "type": "GENERIC", - "name": "truck alternator", + "name": { "str": "truck alternator" }, "description": "A larger and more powerful alternator used to power vehicle electrical systems.", "weight": "5800 g", "volume": "3 L", diff --git a/data/json/items/vehicle/controls.json b/data/json/items/vehicle/controls.json index e5a04cfcb2b25..921a3e8f77807 100644 --- a/data/json/items/vehicle/controls.json +++ b/data/json/items/vehicle/controls.json @@ -45,7 +45,7 @@ { "type": "GENERIC", "id": "veh_tracker", - "name": "vehicle tracking device", + "name": { "str": "vehicle tracking device" }, "description": "A vehicle tracking device. When installed on a vehicle it allows you track the vehicle.", "weight": "400 g", "color": "red", @@ -127,7 +127,7 @@ { "type": "GENERIC", "id": "turret_controls", - "name": "turret control unit", + "name": { "str": "turret control unit" }, "description": "A set of motor, camera, and various electronic modules banded together to allow for tracking targets, friend-or-foe identification, and firing the connected turret in full automatic mode.", "weight": "4000 g", "color": "white", diff --git a/data/json/items/vehicle/rigs.json b/data/json/items/vehicle/rigs.json index d4662451fdab0..46d4a97ce02af 100644 --- a/data/json/items/vehicle/rigs.json +++ b/data/json/items/vehicle/rigs.json @@ -3,7 +3,7 @@ "abstract": "vehicle_rig", "type": "GENERIC", "category": "veh_parts", - "name": "vehicle crafting rig", + "name": { "str": "vehicle crafting rig" }, "weight": "40000 g", "volume": "20 L", "price": 40000, @@ -29,14 +29,14 @@ "id": "forgerig", "copy-from": "vehicle_rig", "type": "GENERIC", - "name": "vehicle forge rig", + "name": { "str": "vehicle forge rig" }, "description": "A forge rig made to run off a vehicle's storage battery with integrated tool storage for metalworking equipment." }, { "id": "kilnrig", "copy-from": "vehicle_rig", "type": "GENERIC", - "name": "vehicle kiln", + "name": { "str": "vehicle kiln" }, "description": "An electric kiln made to run off a vehicle's storage battery." }, { @@ -50,7 +50,7 @@ "id": "weldrig", "copy-from": "vehicle_rig", "type": "GENERIC", - "name": "vehicle welding rig", + "name": { "str": "vehicle welding rig" }, "description": "A welding rig made to run off a vehicle's storage battery. It has a soldering iron attachment for delicate work, and a compartment to store your extra tools in." } ] diff --git a/data/json/items/vehicle/solar.json b/data/json/items/vehicle/solar.json index 675361a2160c7..8ef702447d067 100644 --- a/data/json/items/vehicle/solar.json +++ b/data/json/items/vehicle/solar.json @@ -30,7 +30,7 @@ { "type": "GENERIC", "id": "solar_panel_v2", - "name": "upgraded solar panel", + "name": { "str": "upgraded solar panel" }, "description": "Electronic device that can convert solar radiation into electric power. This panel has been upgraded to convert more sunlight into power. Useful for a vehicle.", "weight": "18494 g", "volume": "4500 ml", @@ -40,7 +40,7 @@ { "type": "GENERIC", "id": "reinforced_solar_panel_v2", - "name": "upgraded reinforced solar panel", + "name": { "str": "upgraded reinforced solar panel" }, "description": "An upgraded 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 upgraded panel. Useful for a vehicle.", "weight": "29062 g", "to_hit": -5, diff --git a/data/json/items/vehicle/turrets.json b/data/json/items/vehicle/turrets.json index f944f596e34ec..cab00f11513c3 100644 --- a/data/json/items/vehicle/turrets.json +++ b/data/json/items/vehicle/turrets.json @@ -2,7 +2,7 @@ { "id": "turret_mount", "type": "GENERIC", - "name": "turret mount", + "name": { "str": "turret mount" }, "description": "A universal mount for weapons intended to be installed as turrets.", "color": "cyan", "symbol": "X",