From e258c466ff2c802c9f79e657110a434455ed4052 Mon Sep 17 00:00:00 2001
From: snipercup <50166150+snipercup@users.noreply.github.com>
Date: Fri, 24 Jan 2020 19:09:13 +0100
Subject: [PATCH] Generic modern json (#37342)

---
 data/json/items/generic/ammolink.json   |  2 +-
 data/json/items/generic/casing.json     | 14 +++++++-------
 data/json/items/gunmod/underbarrel.json |  2 +-
 data/json/items/robot_parts.json        |  2 +-
 data/json/items/vehicle/alternator.json |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/data/json/items/generic/ammolink.json b/data/json/items/generic/ammolink.json
index 7d08013a2769f..5b929b545f9aa 100644
--- a/data/json/items/generic/ammolink.json
+++ b/data/json/items/generic/ammolink.json
@@ -31,7 +31,7 @@
     "id": "ammolink40mm",
     "copy-from": "ammolink",
     "type": "GENERIC",
-    "name": "40mm grenade belt linkage",
+    "name": { "str": "40mm grenade belt linkage" },
     "weight": "10 g",
     "volume": "10ml",
     "use_action": { "type": "ammobelt", "belt": "belt40mm" }
diff --git a/data/json/items/generic/casing.json b/data/json/items/generic/casing.json
index d59da3710fbae..71b72402c0bb1 100644
--- a/data/json/items/generic/casing.json
+++ b/data/json/items/generic/casing.json
@@ -133,7 +133,7 @@
     "id": "40x46mm_m212_casing",
     "type": "GENERIC",
     "category": "spare_parts",
-    "name": "40x46mm M212 casing",
+    "name": { "str": "40x46mm M212 casing" },
     "description": "A large canister from a spent 40mm cartridge.",
     "weight": "50 g",
     "volume": "55ml",
@@ -145,7 +145,7 @@
     "id": "40x46mm_m118_casing",
     "type": "GENERIC",
     "category": "spare_parts",
-    "name": "40x46mm M118 casing",
+    "name": { "str": "40x46mm M118 casing" },
     "description": "A large canister from a spent 40mm cartridge.",
     "weight": "50 g",
     "volume": "58ml",
@@ -157,7 +157,7 @@
     "id": "40x46mm_m199_casing",
     "type": "GENERIC",
     "category": "spare_parts",
-    "name": "40x46mm M199 casing",
+    "name": { "str": "40x46mm M199 casing" },
     "description": "A large canister from a spent 40mm cartridge.",
     "weight": "50 g",
     "volume": "59ml",
@@ -169,7 +169,7 @@
     "id": "40x46mm_m195_casing",
     "type": "GENERIC",
     "category": "spare_parts",
-    "name": "40x46mm M195 casing",
+    "name": { "str": "40x46mm M195 casing" },
     "description": "A large canister from a spent 40mm cartridge.",
     "weight": "50 g",
     "volume": "45ml",
@@ -181,7 +181,7 @@
     "id": "40x53mm_m169_casing",
     "type": "GENERIC",
     "category": "spare_parts",
-    "name": "40x53mm M169 casing",
+    "name": { "str": "40x53mm M169 casing" },
     "description": "A large canister from a spent 40mm cartridge.",
     "weight": "50 g",
     "volume": "64ml",
@@ -355,7 +355,7 @@
     "id": "9mm_casing",
     "copy-from": "casing",
     "type": "GENERIC",
-    "name": "9x19mm casing",
+    "name": { "str": "9x19mm casing" },
     "description": "An empty casing from a 9x19mm round.",
     "weight": "3 g",
     "volume": "5ml"
@@ -404,7 +404,7 @@
     "id": "atgm_spent",
     "copy-from": "casing",
     "type": "GENERIC",
-    "name": "152mm ATGM tube",
+    "name": { "str": "152mm ATGM tube" },
     "color": "dark_gray",
     "description": "An empty steel tube which once contained a 152mm ATGM.  Now it's essentially just a huge pipe.",
     "material": "steel",
diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json
index b90b613fe1bc7..a90ad5afd18da 100644
--- a/data/json/items/gunmod/underbarrel.json
+++ b/data/json/items/gunmod/underbarrel.json
@@ -350,7 +350,7 @@
   {
     "id": "pipe_launcher40mm",
     "type": "GUNMOD",
-    "name": "40mm pipe launcher",
+    "name": { "str": "40mm pipe launcher" },
     "description": "This is a home built launcher tube that can be attached to almost any weapon except handguns.  It allows a single 40mm grenade to be loaded and fired.",
     "weight": "2080 g",
     "volume": "750 ml",
diff --git a/data/json/items/robot_parts.json b/data/json/items/robot_parts.json
index e4038e17414b4..3ff67820654fd 100644
--- a/data/json/items/robot_parts.json
+++ b/data/json/items/robot_parts.json
@@ -57,7 +57,7 @@
   {
     "type": "GENERIC",
     "id": "ai_module",
-    "name": "AI core",
+    "name": { "str": "AI core" },
     "description": "This module is responsible for decision making, it basically runs the AI of the robot.",
     "copy-from": "robot_module_abstract"
   },
diff --git a/data/json/items/vehicle/alternator.json b/data/json/items/vehicle/alternator.json
index bca17a784e593..ce27c5ad6f70b 100644
--- a/data/json/items/vehicle/alternator.json
+++ b/data/json/items/vehicle/alternator.json
@@ -52,7 +52,7 @@
     "id": "generator_7500w",
     "copy-from": "vehicle_alternator",
     "type": "GENERIC",
-    "name": "7.5kW generator",
+    "name": { "str": "7.5kW generator" },
     "description": "A bulky but efficient electrical generator designed to be attached to an engine.",
     "weight": "48000 g",
     "volume": "7500 ml",