Gunmod modern json (CleverRaven#38096)

* Volume, integral weight to string, ammo_modifier to array

* Volume to string

* Name to object

data/json/items/gunmod/barrel.json

@@ -37,7 +37,7 @@
   {
     "id": "lead_barrel_big",
     "type": "GUNMOD",
-    "name": "LW barrel extension",
+    "name": { "str": "LW barrel extension" },
     "description": "A Leadworks built in longer barrel increases the muzzle velocity of a firearm, contributing to both accuracy and damage.",
     "to_hit": 2,
     "bashing": 5,
@@ -56,10 +56,10 @@
     "id": "lead_barrel_small",
     "copy-from": "barrel_small",
     "type": "GUNMOD",
-    "name": "LW shortened barrel",
+    "name": { "str": "LW shortened barrel" },
     "description": "A Leadworks built in shortened barrel results in reduced weapon range, and a minor increase in noise, but also greatly improves the ease with which the weapon can be carried and wielded.",
     "price": 0,
-    "volume": 0,
+    "volume": "0 ml",
     "dispersion_modifier": 0,
     "range_modifier": -6,
     "flags": [ "IRREMOVABLE" ]
@@ -68,7 +68,7 @@
     "id": "lead_barrel_heavy_duty",
     "copy-from": "lead_barrel_big",
     "type": "GUNMOD",
-    "name": "LW heavy duty barrel",
+    "name": { "str": "LW heavy duty barrel" },
     "description": "A Leadworks built in heavy duty barrel especially designed for prolonged shooting.  Increases damage output and weapon range.",
     "dispersion_modifier": 0,
     "flags": [ "IRREMOVABLE" ]

data/json/items/gunmod/conversions.json

@@ -2,20 +2,20 @@
   {
     "id": "retool_ar15_300blk",
     "type": "GUNMOD",
-    "name": ".300 AAC Blackout AR-15 conversion kit",
+    "name": { "str": ".300 AAC Blackout AR-15 conversion kit" },
     "description": "A complete AR-15 upper assembly with a .300 AAC Blackout barrel.",
     "weight": "1000 g",
     "volume": "500 ml",
-    "integral_volume": 0,
-    "integral_weight": 0,
+    "integral_volume": "0 ml",
+    "integral_weight": "0 g",
     "price": 50000,
     "material": "steel",
     "symbol": ":",
     "color": "green",
     "location": "bore",
     "mod_targets": [ "ar15", "m4a1", "m16a4", "h&k416a5", "m27iar" ],
     "install_time": "1 m",
-    "ammo_modifier": "300blk",
+    "ammo_modifier": [ "300blk" ],
     "magazine_adaptor": [ [ "300blk", [ "stanag30", "stanag50", "survivor223mag" ] ] ],
     "min_skills": [ [ "weapon", 1 ] ],
     "flags": [ "IRREMOVABLE" ]

data/json/items/gunmod/magazine.json

@@ -2,7 +2,7 @@
   {
     "id": "lwfeed",
     "type": "GUNMOD",
-    "name": "Leadworks magazine adapter",
+    "name": { "str": "Leadworks magazine adapter" },
     "description": "A bootleg adapter for permanently converting a firearm to accept proprietary Leadworks magazines.  Guaranteed to void your warranty.",
     "weight": "140 g",
     "volume": "250 ml",

data/json/items/gunmod/muzzle.json

@@ -70,7 +70,7 @@
   {
     "id": "filter_suppressor",
     "type": "GUNMOD",
-    "name": "'solvent trap' suppressor",
+    "name": { "str": "'solvent trap' suppressor" },
     "description": "This is an automotive filter crudely adapted to mate up with a firearm's barrel, generating an illegal, unregistered suppressor.  Good thing there don't seem to be any ATF agents around to arrest you.  While close in design to a real suppressor, it was not designed for high pressures involved and will eventually lose effectiveness.  The installed filter is large and, when attached, will interfere with your ability to aim down the base sights of the gun.",
     "weight": "880 g",
     "volume": "750 ml",
@@ -174,13 +174,13 @@
     "id": "mp5sd_suppressor",
     "copy-from": "suppressor",
     "type": "GUNMOD",
-    "name": "MP5SD integral suppressor",
+    "name": { "str": "MP5SD integral suppressor" },
     "description": "This is the integrated suppressor for the H&K MP5SD.  Its large expansion chamber decelerates ammunition via several ports in the barrel, rendering most ammo subsonic at the cost of terminal performance.  It is not as effective as modern designs.",
     "damage_modifier": -7,
     "weight": "250 g",
-    "integral_volume": 0,
+    "integral_volume": "0 ml",
     "//": "weight is accounted for in gun item",
-    "integral_weight": 0,
+    "integral_weight": "0 g",
     "loudness_modifier": -32,
     "range_modifier": -1,
     "dispersion_modifier": 0,

data/json/items/gunmod/rail.json

@@ -125,10 +125,10 @@
     "id": "lead_stabilizer",
     "copy-from": "stabilizer",
     "type": "GUNMOD",
-    "name": "LW gyroscopic stabilizer",
+    "name": { "str": "LW gyroscopic stabilizer" },
     "description": "An advanced Leadworks built in gyroscopic stabilizer.",
     "weight": "0 g",
-    "volume": 0,
+    "volume": "0 ml",
     "price": 0,
     "flags": [ "IRREMOVABLE" ]
   }

data/json/items/gunmod/sights.json

@@ -160,7 +160,7 @@
   {
     "id": "acog_scope",
     "type": "GUNMOD",
-    "name": "ACOG scope",
+    "name": { "str": "ACOG scope" },
     "description": "A 4x32 TA01 Advanced Combat Optical Gunsight with a tritium illuminated crosshair.",
     "weight": "280 g",
     "volume": "112 ml",
@@ -242,40 +242,40 @@
     "id": "lead_red_dot_sight",
     "copy-from": "red_dot_sight",
     "type": "GUNMOD",
-    "name": "LW red dot sight",
+    "name": { "str": "LW red dot sight" },
     "description": "Built in red-dot sight for the Leadworks weapon.",
     "weight": "0 g",
-    "volume": 0,
+    "volume": "0 ml",
     "price": 0,
     "flags": [ "DISABLE_SIGHTS", "IRREMOVABLE" ]
   },
   {
     "id": "lead_rifle_scope",
     "copy-from": "rifle_scope",
     "type": "GUNMOD",
-    "name": "LW rifle scope",
+    "name": { "str": "LW rifle scope" },
     "description": "Built in rifle scope for the Leadworks weapon.",
     "weight": "0 g",
-    "volume": 0,
+    "volume": "0 ml",
     "price": 0,
     "flags": [ "DISABLE_SIGHTS", "ZOOM", "IRREMOVABLE" ]
   },
   {
     "id": "lead_acog_scope",
     "copy-from": "acog_scope",
     "type": "GUNMOD",
-    "name": "LW ACOG scope",
+    "name": { "str": "LW ACOG scope" },
     "description": "An Leadworks built in Advanced Combat Optical Gunsight, a milspec medium magnification scope.  Improves accuracy significantly.",
     "weight": "0 g",
-    "volume": 0,
+    "volume": "0 ml",
     "price": 0,
     "flags": [ "DISABLE_SIGHTS", "ZOOM", "IRREMOVABLE" ]
   },
   {
     "id": "lead_holo_sight",
     "copy-from": "holo_sight",
     "type": "GUNMOD",
-    "name": "LW holographic sight",
+    "name": { "str": "LW holographic sight" },
     "description": "Leadworks built in holographic sight.",
     "weight": "0 g",
     "price": 0,

data/json/items/gunmod/underbarrel.json

@@ -128,7 +128,7 @@
   {
     "id": "ksg_aux_shotgun",
     "type": "GUNMOD",
-    "name": "KSG second magazine",
+    "name": { "str": "KSG second magazine" },
     "description": "The integrated second shotgun magazine of the Kel-Tec KSG which holds 7 shots.  It's irremovable.",
     "weight": "1550 g",
     "volume": "1750 ml",
@@ -221,10 +221,10 @@
   {
     "id": "lemat_revolver_shotgun",
     "type": "GUNMOD",
-    "name": "LeMat revolver shotgun",
+    "name": { "str": "LeMat revolver shotgun" },
     "description": "The Lemat revolver is unique in that its cylinder axis pin is also a fully functional 20ga percussion-primed smoothbore barrel.  It's irremovable.",
     "volume": "250 ml",
-    "integral_volume": 0,
+    "integral_volume": "0 ml",
     "material": [ "steel" ],
     "symbol": ":",
     "color": "light_red",
@@ -295,9 +295,9 @@
   {
     "id": "M6_shotgun",
     "type": "GUNMOD",
-    "name": "M6 Survival Gun shotgun",
+    "name": { "str": "M6 Survival Gun shotgun" },
     "description": "The integrated 12 gauge shotgun barrel of the Chiappa M6 Survival Gun.  It's irremovable.",
-    "volume": 0,
+    "volume": "0 ml",
     "price": 0,
     "material": [ "steel" ],
     "symbol": ":",
@@ -436,43 +436,43 @@
     "id": "lead_laser_sight",
     "copy-from": "laser_sight",
     "type": "GUNMOD",
-    "name": "LW underbarrel laser sight",
+    "name": { "str": "LW underbarrel laser sight" },
     "description": "A Leadworks built in visible-light laser that mounts under a firearm's barrel to enhance ease and speed of target acquisition.",
     "weight": "0 g",
-    "volume": 0,
+    "volume": "0 ml",
     "price": 0,
     "flags": [ "PUMP_RAIL_COMPATIBLE", "IRREMOVABLE" ]
   },
   {
     "id": "lead_grip",
     "copy-from": "grip",
     "type": "GUNMOD",
-    "name": "LW forward grip",
+    "name": { "str": "LW forward grip" },
     "description": "A Leadworks built in grip placed forward on the barrel allows for greater control.",
     "weight": "0 g",
-    "volume": 0,
+    "volume": "0 ml",
     "price": 0,
     "flags": [ "PUMP_RAIL_COMPATIBLE", "IRREMOVABLE" ]
   },
   {
     "id": "lead_bipod",
     "copy-from": "bipod",
     "type": "GUNMOD",
-    "name": "LW bipod",
+    "name": { "str": "LW bipod" },
     "description": "Leadworks built in bipod designed to provide a forward rest and reduce motion.  Although it greatly improve handling of recoil it is usable only on certain surfaces and are slow to equip.",
     "weight": "0 g",
-    "volume": 0,
+    "volume": "0 ml",
     "price": 0,
     "flags": [ "BIPOD", "SLOW_WIELD", "IRREMOVABLE" ]
   },
   {
     "id": "lead_u_shotgun",
     "copy-from": "masterkey",
     "type": "GUNMOD",
-    "name": "LW underslung shotgun",
+    "name": { "str": "LW underslung shotgun" },
     "description": "Leadworks built in minimalist pump action shotgun module.  It allows 4 shotgun shells to be loaded and fired.",
     "weight": "0 g",
-    "volume": 0,
+    "volume": "0 ml",
     "price": 0,
     "flags": [ "RELOAD_ONE", "IRREMOVABLE" ]
   },