Magiclysm name to object, flags to array, delete duplicate items (#39106

)
CleverRaven · Mar 30, 2020 · 725f3f0 · 725f3f0
1 parent 57bc72f
commit 725f3f0
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 88 deletions.
diff --git a/data/mods/Magiclysm/enchanted/enchanted_melee.json b/data/mods/Magiclysm/enchanted/enchanted_melee.json
@@ -112,7 +112,7 @@
     "id": "bat_plus_one",
     "copy-from": "bat",
     "looks_like": "bat",
-    "name": "bat +1",
+    "name": { "str": "bat +1", "str_pl": "bats +1" },
     "proportional": { "price": 3.0, "bashing": 1.1, "cutting": 1.1, "weight": 0.9 },
     "relative": { "to_hit": 1 }
   },
@@ -121,7 +121,7 @@
     "id": "bat_plus_two",
     "copy-from": "bat",
     "looks_like": "bat",
-    "name": "bat +2",
+    "name": { "str": "bat +2", "str_pl": "bats +2" },
     "proportional": { "price": 6.0, "bashing": 1.2, "cutting": 1.2, "weight": 0.8 },
     "relative": { "to_hit": 2 }
   },
@@ -130,7 +130,7 @@
     "id": "bat_metal_plus_one",
     "copy-from": "bat_metal",
     "looks_like": "bat_metal",
-    "name": "aluminum bat +1",
+    "name": { "str": "aluminum bat +1", "str_pl": "aluminum bats +1" },
     "proportional": { "price": 3.0, "bashing": 1.1, "cutting": 1.1, "weight": 0.9 },
     "relative": { "to_hit": 1 }
   },
@@ -139,7 +139,7 @@
     "id": "bat_metal_plus_two",
     "copy-from": "bat_metal",
     "looks_like": "bat_metal",
-    "name": "aluminum bat +2",
+    "name": { "str": "aluminum bat +2", "str_pl": "aluminum bats +2" },
     "proportional": { "price": 6.0, "bashing": 1.2, "cutting": 1.2, "weight": 0.8 },
     "relative": { "to_hit": 2 }
   },
@@ -328,7 +328,7 @@
     "id": "arming_sword_plus_one",
     "copy-from": "arming_sword",
     "looks_like": "arming_sword",
-    "name": "arming sword +1",
+    "name": { "str": "arming sword +1", "str_pl": "arming swords +1" },
     "proportional": { "price": 3.0, "bashing": 1.1, "cutting": 1.1, "weight": 0.9 },
     "relative": { "to_hit": 1 }
   },
@@ -337,7 +337,7 @@
     "id": "arming_sword_plus_two",
     "copy-from": "arming_sword",
     "looks_like": "arming_sword",
-    "name": "arming sword +2",
+    "name": { "str": "arming sword +2", "str_pl": "arming swords +2" },
     "proportional": { "price": 6.0, "bashing": 1.2, "cutting": 1.2, "weight": 0.8 },
     "relative": { "to_hit": 2 }
   },
@@ -364,7 +364,7 @@
     "id": "battleaxe_plus_one",
     "copy-from": "battleaxe",
     "looks_like": "battleaxe",
-    "name": "battle axe +1",
+    "name": { "str": "battle axe +1", "str_pl": "battle axes +1" },
     "proportional": { "price": 3.0, "bashing": 1.1, "cutting": 1.1, "weight": 0.9 },
     "relative": { "to_hit": 1 }
   },
@@ -373,7 +373,7 @@
     "id": "battleaxe_plus_two",
     "copy-from": "battleaxe",
     "looks_like": "battleaxe",
-    "name": "battle axe +2",
+    "name": { "str": "battle axe +2", "str_pl": "battle axes +2" },
     "proportional": { "price": 6.0, "bashing": 1.2, "cutting": 1.2, "weight": 0.8 },
     "relative": { "to_hit": 2 }
   },

diff --git a/data/mods/Magiclysm/enchanted/enchanted_rings.json b/data/mods/Magiclysm/enchanted/enchanted_rings.json
@@ -87,7 +87,7 @@
     "copy-from": "mring_gold",
     "type": "TOOL_ARMOR",
     "id": "mring_dodge_bonus_2",
-    "name": "bicephalous eel ring",
+    "name": { "str": "bicephalous eel ring" },
     "description": "A thin gold band ring, depicting a bicephalous eel coiled on itself.  Allows you to dodge two extra attacks per turn.",
     "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "BONUS_DODGE", "add": 2 } ] } ] }
   },

diff --git a/data/mods/Magiclysm/enchanted/enchanted_tokens.json b/data/mods/Magiclysm/enchanted/enchanted_tokens.json
@@ -29,7 +29,7 @@
     "copy-from": "mtoken",
     "type": "GENERIC",
     "id": "mtoken_arming_sword",
-    "name": "arming sword token",
+    "name": { "str": "arming sword token" },
     "description": "A large silver coin that, when activated by uttering the word on the back, turns into the item pictured on the front, in this case an arming sword.",
     "use_action": {
       "type": "transform",
@@ -57,7 +57,7 @@
     "copy-from": "mtoken",
     "type": "GENERIC",
     "id": "mtoken_battleaxe",
-    "name": "battleaxe token",
+    "name": { "str": "battleaxe token" },
     "description": "A large silver coin that, when activated by uttering the word on the back, turns into the item pictured on the front, in this case a battle axe.",
     "use_action": {
       "type": "transform",

diff --git a/data/mods/Magiclysm/items/armor.json b/data/mods/Magiclysm/items/armor.json
@@ -15,7 +15,7 @@
   },
   {
     "id": "quiver_birchbark",
-    "name": "birchbark quiver",
+    "name": { "str": "birchbark quiver" },
     "copy-from": "quiver_birchbark",
     "type": "ARMOR",
     "use_action": { "type": "bandolier", "capacity": 20, "ammo": [ "arrow", "bolt", "arrow_orichalcum" ], "draw_cost": 20 }

diff --git a/data/mods/Magiclysm/items/black_dragon_items.json b/data/mods/Magiclysm/items/black_dragon_items.json
@@ -268,50 +268,6 @@
     "encumbrance": 28,
     "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
   },
-  {
-    "id": "helmet_xlblack_dragon_scale",
-    "copy-from": "helmet_black_dragon_scale",
-    "type": "ARMOR",
-    "name": "XL black dragonscale helmet",
-    "description": "A massive helmet made from black dragonscale, held together with black dragonhide.  It comes equipped with a full face visor and is large enough to fit even the strangest of heads.",
-    "weight": "1256 g",
-    "volume": "4500 ml",
-    "encumbrance": 42,
-    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
-  },
-  {
-    "id": "helmet_xlblack_dragon_hide",
-    "copy-from": "helmet_black_dragon_hide",
-    "type": "ARMOR",
-    "name": "XL black dragonhide helmet",
-    "description": "A massive helmet made from black dragonhide.  It protects your head well, and doesn't cover your face, but is large enough to fit even the strangest of heads.",
-    "weight": "815 g",
-    "volume": "4500 ml",
-    "encumbrance": 42,
-    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
-  },
-  {
-    "id": "suit_xlblack_dragon_scale",
-    "copy-from": "suit_black_dragon_scale",
-    "type": "ARMOR",
-    "name": "XL black dragonscale armor",
-    "description": "A massive full suit of black dragon scale mail.  It comes with all the accoutrements that cover your torso, legs, and arms; sized to fit even the strangest of bodies.",
-    "weight": "6250 g",
-    "volume": "18 L",
-    "encumbrance": 35,
-    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "RAINPROOF", "STURDY" ]
-  },
-  {
-    "id": "suit_xlblack_dragon_hide",
-    "copy-from": "suit_black_dragon_hide",
-    "type": "ARMOR",
-    "name": "XL black dragonhide armor",
-    "description": "A massive full suit of black dragonhide armor.  It comes with all the accoutrements that cover your torso, legs, and arms; sized to fit even the strangest of bodies.",
-    "weight": "5500 g",
-    "volume": "18 L",
-    "encumbrance": 28,
-    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "RAINPROOF", "STURDY" ]
-  },
   {
     "id": "gauntlets_xlblack_dragon_scale",
     "copy-from": "gauntlets_black_dragon_scale",
@@ -360,7 +316,7 @@
     "id": "helmet_xlblack_dragon_scale",
     "copy-from": "helmet_black_dragon_scale",
     "type": "ARMOR",
-    "name": "XL black dragonscale helmet",
+    "name": { "str": "XL black dragonscale helmet" },
     "description": "A massive helmet made from black dragonscale, held together with black dragonhide.  It comes equipped with a full face visor and is large enough to fit even the strangest of heads.",
     "weight": "1256 g",
     "volume": "4500 ml",
@@ -371,7 +327,29 @@
     "id": "helmet_xlblack_dragon_hide",
     "copy-from": "helmet_black_dragon_hide",
     "type": "ARMOR",
-    "name": "XL black dragonhide helmet",
+    "name": { "str": "XL black dragonhide helmet" },
+    "description": "A massive helmet made from black dragonhide.  It protects your head well, and doesn't cover your face, but is large enough to fit even the strangest of heads.",
+    "weight": "815 g",
+    "volume": "4500 ml",
+    "encumbrance": 42,
+    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
+  },
+  {
+    "id": "helmet_xlblack_dragon_scale",
+    "copy-from": "helmet_black_dragon_scale",
+    "type": "ARMOR",
+    "name": { "str": "XL black dragonscale helmet" },
+    "description": "A massive helmet made from black dragonscale, held together with black dragonhide.  It comes equipped with a full face visor and is large enough to fit even the strangest of heads.",
+    "weight": "1256 g",
+    "volume": "4500 ml",
+    "encumbrance": 42,
+    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
+  },
+  {
+    "id": "helmet_xlblack_dragon_hide",
+    "copy-from": "helmet_black_dragon_hide",
+    "type": "ARMOR",
+    "name": { "str": "XL black dragonhide helmet" },
     "description": "A massive helmet made from black dragonhide.  It protects your head well, and doesn't cover your face, but is large enough to fit even the strangest of heads.",
     "weight": "815 g",
     "volume": "4500 ml",
@@ -382,7 +360,7 @@
     "id": "suit_xlblack_dragon_scale",
     "copy-from": "suit_black_dragon_scale",
     "type": "ARMOR",
-    "name": "XL black dragonscale armor",
+    "name": { "str": "XL black dragonscale armor" },
     "description": "A massive full suit of black dragon scale mail.  It comes with all the accoutrements that cover your torso, legs, and arms; sized to fit even the strangest of bodies.",
     "weight": "6250 g",
     "volume": "18 L",
@@ -393,34 +371,11 @@
     "id": "suit_xlblack_dragon_hide",
     "copy-from": "suit_black_dragon_hide",
     "type": "ARMOR",
-    "name": "XL black dragonhide armor",
+    "name": { "str": "XL black dragonhide armor" },
     "description": "A massive full suit of black dragonhide armor.  It comes with all the accoutrements that cover your torso, legs, and arms; sized to fit even the strangest of bodies.",
     "weight": "5500 g",
     "volume": "18 L",
     "encumbrance": 28,
     "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "RAINPROOF", "STURDY" ]
-  },
-  {
-    "id": "gauntlets_xlblack_dragon_scale",
-    "copy-from": "gauntlets_black_dragon_scale",
-    "type": "ARMOR",
-    "name": { "str": "pair of XL black dragonscale gauntlets", "str_pl": "pairs of XL black dragonscale gauntlets" },
-    "description": "A pair of heavy-duty gauntlets made of black dragonscale that covers your hands, or whatever you use as hands.",
-    "weight": "680 g",
-    "volume": "2 L",
-    "encumbrance": 30,
-    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
-  },
-  {
-    "id": "gloves_xlblack_dragon_hide",
-    "copy-from": "gloves_black_dragon_hide",
-    "type": "ARMOR",
-    "name": { "str": "pair of XL black dragonhide gloves", "str_pl": "pairs of XL black dragonhide gloves" },
-    "description": "A pair of customized, Kevlar armored leather gloves, modified to be easy to wear while providing maximum protection under extreme conditions.  Sized to fit even the strangest of anatomy.",
-    "weight": "430 g",
-    "volume": "1500 ml",
-    "price": 180000,
-    "encumbrance": 18,
-    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
   }
 ]
diff --git a/data/mods/Magiclysm/items/class_runes.json b/data/mods/Magiclysm/items/class_runes.json
@@ -100,11 +100,11 @@
     "type": "TOOL",
     "symbol": "=",
     "color": "black",
-    "name": "alchemist rune",
+    "name": { "str": "alchemist rune" },
     "description": "This magical pebble has an insignia of alchemy and potions on it.  While versatile in use, the lack of attunement to any school prevents creation of more advanced recipes.",
     "volume": "5ml",
     "weight": "1 g",
     "material": "stone",
-    "flags": "TRADER_AVOID"
+    "flags": [ "TRADER_AVOID" ]
   }
 ]
diff --git a/data/mods/Magiclysm/items/ethereal_items.json b/data/mods/Magiclysm/items/ethereal_items.json
@@ -357,7 +357,7 @@
   {
     "id": "acid_res_aura",
     "type": "ARMOR",
-    "name": "acid resistance aura",
+    "name": { "str": "acid resistance aura" },
     "description": "An all-encompassing, invisible layer of protection against acid.",
     "weight": "1g",
     "volume": "1ml",

diff --git a/data/mods/Magiclysm/items/weapons.json b/data/mods/Magiclysm/items/weapons.json
@@ -31,7 +31,7 @@
   {
     "id": "lizardfolk_javelin",
     "type": "GENERIC",
-    "name": "barbed javelin",
+    "name": { "str": "barbed javelin" },
     "category": "weapons",
     "copy-from": "javelin",
     "//": "A barbed version of the standard javelin (from spears_and_polearms.json) with a different description to match the lizardfolk lore.  Not craftable, but wieldable if discovered.",
@@ -44,7 +44,7 @@
     "id": "lizardfolk_javelin_gun",
     "type": "GUN",
     "copy-from": "fake_item",
-    "name": "barbed javelin",
+    "name": { "str": "barbed javelin" },
     "description": "Fake gun that fires barbed javelins.",
     "flags": [ "NEVER_JAMS", "NONCONDUCTIVE", "NO_REPAIR", "WATERPROOF_GUN", "NO_SALVAGE", "NO_UNLOAD" ],
     "skill": "rifle",