From ec168201ed7b56c4f111f75e6946bb8be2a394e5 Mon Sep 17 00:00:00 2001
From: snipercup <50166150+snipercup@users.noreply.github.com>
Date: Tue, 17 Mar 2020 15:43:18 +0100
Subject: [PATCH] Crazy Cataclysm and MMA name to object

---
 data/mods/CrazyCataclysm/crazy_items.json | 15 +++++----------
 data/mods/MMA/martial.json                |  3 +--
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/data/mods/CrazyCataclysm/crazy_items.json b/data/mods/CrazyCataclysm/crazy_items.json
index caee9b8fd927a..fc862be180525 100644
--- a/data/mods/CrazyCataclysm/crazy_items.json
+++ b/data/mods/CrazyCataclysm/crazy_items.json
@@ -102,8 +102,7 @@
     "id": "firekatana_off",
     "type": "TOOL",
     "category": "weapons",
-    "name": "Rising Sun",
-    "name_plural": "Rising Suns",
+    "name": { "str": "Rising Sun" },
     "description": "This is a katana with a nozzle just behind the cutting edge of the blade.  People love fire, and people love katanas, so why not put them together?  The gas burners attached to this blade can really turn up the heat on your foes.  Use to ignite.",
     "weight": "1400 g",
     "volume": "2250 ml",
@@ -132,8 +131,7 @@
     "id": "firekatana_on",
     "type": "TOOL",
     "category": "weapons",
-    "name": "Rising Sun",
-    "name_plural": "Rising Suns",
+    "name": { "str": "Rising Sun" },
     "description": "This is a katana that glows with the fury and heat of the SUN!  Well, okay it's not THAT hot, but getting hit with it still stings like the dickens.  Use to shut off the gas.",
     "weight": "1400 g",
     "volume": "2250 ml",
@@ -165,8 +163,7 @@
     "id": "zweifire_off",
     "type": "TOOL",
     "category": "weapons",
-    "name": "flammenschwert (aus)",
-    "name_plural": "flammenschwerter (aus)",
+    "name": { "str": "flammenschwert (aus)", "str_pl": "flammenschwerter (aus)" },
     "//": "All of this is SUPPOSED to be in German.",
     "description": "Ein großes zweihändiges Schwert aus Deutschland, an dessen Klinge sich, unter Zuführung von Benzin, eine anhaltende Flamme erzeugen lässt.  Es ist eine sehr mächtige Waffe.",
     "weight": "3400 g",
@@ -196,8 +193,7 @@
     "id": "zweifire_on",
     "type": "TOOL",
     "category": "weapons",
-    "name": "flammenschwert",
-    "name_plural": "flammenschwerter",
+    "name": { "str": "flammenschwert", "str_pl": "flammenschwerter" },
     "//": "All of this is SUPPOSED to be in German.",
     "description": "Ein großes zweihändiges Schwert aus Deutschland, an dessen Klinge sich, unter Zuführung von Benzin, eine anhaltende Flamme erzeugen lässt.  Es ist eine sehr mächtige Waffe.",
     "weight": "3400 g",
@@ -274,8 +270,7 @@
     "id": "battletorch_lit",
     "type": "TOOL",
     "category": "weapons",
-    "name": "Louisville Slaughterer",
-    "name_plural": "Louisville Slaughterers",
+    "name": { "str": "Louisville Slaughterer" },
     "description": "This is a sturdy wood bat, wrapped in gasoline-soaked rags and flame-resistant Nomex fabric.  It is burning brightly, and makes it much easier to see the baselines at night games (It also makes the umpire FAR more likely to call a ball instead of a strike).",
     "weight": "1485 g",
     "volume": "2 L",
diff --git a/data/mods/MMA/martial.json b/data/mods/MMA/martial.json
index bde0a7db8c599..0c0fa1c0fab76 100644
--- a/data/mods/MMA/martial.json
+++ b/data/mods/MMA/martial.json
@@ -4,8 +4,7 @@
     "copy-from": "book_martial",
     "looks_like": "manual_karate",
     "type": "GENERIC",
-    "name": "The Life and Work of Tiger Sauer",
-    "name_plural": "The Life and Work of Tiger Sauer",
+    "name": { "str": "The Life and Work of Tiger Sauer", "str_pl": "The Life and Work of Tiger Sauer" },
     "description": "A biography of a combat cyborg agent detailing his philosophy and martial art.",
     "book_data": { "martial_art": "style_mma_panzer" }
   }