Batteries and animecon modern json name (#37717)

CleverRaven · Feb 5, 2020 · d8db28f · d8db28f
1 parent abbb7c7
commit d8db28f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/data/json/items/book/tailor.json b/data/json/items/book/tailor.json
@@ -3,8 +3,7 @@
     "id": "mag_animecon",
     "copy-from": "mag_tailor",
     "type": "BOOK",
-    "name": "Boston AnimeCon magazine",
-    "name_plural": "Boston AnimeCon magazines",
+    "name": { "str": "Boston AnimeCon magazine", "str_pl": "Boston AnimeCon magazines" },
     "description": "A short magazine printed as an advertisement for the now canceled Boston AnimeCon.  A few costume ideas are intermixed with miscellaneous information about the event."
   },
   {

diff --git a/data/json/items/vehicle/battery.json b/data/json/items/vehicle/battery.json
@@ -3,8 +3,7 @@
     "id": "battery_car",
     "type": "MAGAZINE",
     "category": "veh_parts",
-    "name": "car battery",
-    "name_plural": "car batteries",
+    "name": { "str": "car battery", "str_pl": "car batteries" },
     "description": "A 12v lead-acid battery used to power car electrical systems.",
     "weight": "18000 g",
     "volume": "6250 ml",
@@ -21,8 +20,7 @@
     "id": "battery_motorbike",
     "copy-from": "battery_car",
     "type": "MAGAZINE",
-    "name": "motorbike battery",
-    "name_plural": "motorbike batteries",
+    "name": { "str": "motorbike battery", "str_pl": "motorbike batteries" },
     "description": "A 12v lead-acid battery used to power smaller vehicles' electrical systems.",
     "weight": "4000 g",
     "volume": "1250 ml",
@@ -34,8 +32,7 @@
     "id": "battery_motorbike_small",
     "copy-from": "battery_car",
     "type": "MAGAZINE",
-    "name": "small motorbike battery",
-    "name_plural": "small motorbike batteries",
+    "name": { "str": "small motorbike battery", "str_pl": "small motorbike batteries" },
     "description": "A miniature 12v lead-acid battery used to power smaller vehicles' electrical systems.",
     "weight": "1500 g",
     "volume": "750 ml",
@@ -63,8 +60,7 @@
     "id": "large_storage_battery",
     "copy-from": "storage_battery",
     "type": "MAGAZINE",
-    "name": "large storage battery",
-    "name_plural": "large storage batteries",
+    "name": { "str": "large storage battery", "str_pl": "large storage batteries" },
     "description": "A huge storage battery containing many lithium ion cells.  Holds a tremendous amount of energy.  Could be installed into a storage battery case for easy removal from a vehicle, or just welded straight in.",
     "weight": "400 kg",
     "volume": "50 L",
@@ -77,8 +73,7 @@
     "id": "medium_storage_battery",
     "copy-from": "storage_battery",
     "type": "MAGAZINE",
-    "name": "medium storage battery",
-    "name_plural": "medium storage batteries",
+    "name": { "str": "medium storage battery", "str_pl": "medium storage batteries" },
     "description": "A medium storage battery containing multiple lithium ion cells.",
     "weight": "35000 g",
     "volume": "6250 ml",
@@ -91,8 +86,7 @@
     "id": "small_storage_battery",
     "copy-from": "storage_battery",
     "type": "MAGAZINE",
-    "name": "small storage battery",
-    "name_plural": "small storage batteries",
+    "name": { "str": "small storage battery", "str_pl": "small storage batteries" },
     "description": "A small storage battery created with pre-Cataclysm lithium ion technology.  Useful for crafting.",
     "weight": "2500 g",
     "volume": "500 ml",
@@ -105,8 +99,7 @@
     "id": "storage_battery",
     "type": "MAGAZINE",
     "category": "veh_parts",
-    "name": "storage battery",
-    "name_plural": "storage batteries",
+    "name": { "str": "storage battery", "str_pl": "storage batteries" },
     "description": "A large storage battery containing many lithium ion cells.  Could be installed into a storage battery case for easy removal from a vehicle, or just welded straight in.",
     "weight": "200000 g",
     "volume": "25 L",