Merge pull request #38106 from snipercup/Gunmod-modern-json

Gunmod name to object, volume to string

data/json/items/gunmod/accessories.json

@@ -2,11 +2,11 @@
   {
     "id": "arrowrest",
     "type": "GUNMOD",
-    "name": "arrow rest",
+    "name": { "str": "arrow rest" },
     "description": "A small extension above the grip which an arrow rests upon while being aimed.  Improves accuracy with no drawbacks.",
     "weight": "16 g",
     "volume": "250 ml",
-    "integral_volume": 0,
+    "integral_volume": "0 ml",
     "price": 4000,
     "material": [ "plastic", "aluminum" ],
     "symbol": ":",
@@ -19,7 +19,7 @@
   {
     "id": "bow_stabilizer",
     "type": "GUNMOD",
-    "name": "bow stabilizer",
+    "name": { "str": "bow stabilizer" },
     "description": "A counterweight placed forward of the bow's grip allows for greater accuracy.  Aside from increased weight and size, there are no drawbacks.",
     "weight": "88 g",
     "volume": "500 ml",
@@ -36,7 +36,7 @@
   {
     "id": "bow_stabilizer_set",
     "type": "GUNMOD",
-    "name": "bow stabilizer system",
+    "name": { "str": "bow stabilizer system" },
     "description": "A set of three stabilizing, dampened rods with a spring-loaded bracket to mount on modern bows.  Takes extra time to set up when wielding, but doesn't take much extra space.",
     "weight": "300 g",
     "volume": "500 ml",
@@ -54,7 +54,7 @@
   {
     "id": "bow_silencer",
     "type": "GUNMOD",
-    "name": "bow dampening kit",
+    "name": { "str": "bow dampening kit" },
     "description": "A set of simple pads and strips of fur or rubber with adhesive backing, designed to stick on the limbs and string of a bow to absorb vibrations.  This substantially reduces noise during firing and can help with accuracy.",
     "weight": "50 g",
     "volume": "250 ml",
@@ -72,11 +72,11 @@
   {
     "id": "belt_clip",
     "type": "GUNMOD",
-    "name": "belt clip",
+    "name": { "str": "belt clip" },
     "description": "This is a belt clip that attaches to the grip or slide of a pistol so as to facilitate 'Mexican carry', the practice of carrying without a holster.  It does not offer any protection for the trigger, so users are strongly advised to carry with the chamber empty or select a firearm with a very heavy trigger pull.",
     "weight": "40 g",
     "volume": "250 ml",
-    "integral_volume": 0,
+    "integral_volume": "0 ml",
     "price": 2000,
     "material": "steel",
     "symbol": ":",

data/json/items/gunmod/bionicmods.json

@@ -2,10 +2,10 @@
   {
     "id": "bio_powershot",
     "type": "GUNMOD",
-    "name": "Power shot",
+    "name": { "str": "Power shot" },
     "description": "This is a pseudo item -- the builtin part of a fusion blaster for the maximum power firing mode.",
     "weight": "1 g",
-    "volume": 0,
+    "volume": "0 ml",
     "price": 85000,
     "material": [ "steel" ],
     "symbol": ":",

data/json/items/gunmod/brass_catcher.json

@@ -2,7 +2,7 @@
   {
     "id": "brass_catcher",
     "type": "GUNMOD",
-    "name": "brass catcher",
+    "name": { "str": "brass catcher" },
     "description": "A bag that hangs off the side of your gun and catches ejected casings so you don't have to pick them up.",
     "weight": "114 g",
     "volume": "250 ml",

data/json/items/gunmod/grip.json

@@ -39,12 +39,12 @@
   {
     "id": "breacher_grip",
     "type": "GUNMOD",
-    "name": "breacher grip",
+    "name": { "str": "breacher grip" },
     "description": "A very uncomfortable straight grip.  Clearly not intended for regular use.",
     "weight": "125 g",
     "volume": "250 ml",
-    "integral_volume": 0,
-    "integral_weight": 0,
+    "integral_volume": "0 ml",
+    "integral_weight": "0 g",
     "price": 38000,
     "material": [ "steel" ],
     "symbol": ":",

data/json/items/gunmod/laser_gunmods.json

@@ -2,7 +2,7 @@
   {
     "id": "beam_scatterer",
     "type": "GUNMOD",
-    "name": "beam scatterer",
+    "name": { "str": "beam scatterer" },
     "description": "A set of optics made to fit on laser weapons, which will diffract the laser beam into several lower powered beams.  This increases point-blank damage, but greatly reduces range.",
     "weight": "380 g",
     "volume": "250 ml",

data/json/items/gunmod/muzzle.json

@@ -113,10 +113,10 @@
     "id": "riv_suppressor",
     "copy-from": "suppressor",
     "type": "GUNMOD",
-    "name": "RK6S34 suppressor",
+    "name": { "str": "RK6S34 suppressor" },
     "description": "A suppressor reduces the amount of noise and muzzle flash generated by the report of a firearm.  This RK6S34 Mustela is a rather advanced version integral to the RM11B rifle system.",
     "weight": "0 g",
-    "volume": 0,
+    "volume": "0 ml",
     "price": 0,
     "material": [ "superalloy", "ceramic" ],
     "mod_targets": [ "rifle" ],

data/json/items/gunmod/sights.json

@@ -37,11 +37,11 @@
   {
     "id": "bow_scope",
     "type": "GUNMOD",
-    "name": "bow scope",
+    "name": { "str": "bow scope" },
     "description": "A single magnifying scope mounted on an adjustable bracket, with accompanying clarifier peep sight.  Designed for extra long shots, but easily adjusted for short range.  Spectacularly accurate.",
     "weight": "180 g",
     "volume": "250 ml",
-    "integral_volume": 0,
+    "integral_volume": "0 ml",
     "price": 20000,
     "material": [ "aluminum", "plastic", "glass" ],
     "symbol": ":",
@@ -188,10 +188,10 @@
     "id": "riv_scope",
     "copy-from": "rifle_scope",
     "type": "GUNMOD",
-    "name": "RS1219 scope",
+    "name": { "str": "RS1219 scope" },
     "description": "An integral component of the RM11B rifle system, the RS1219 Accipiter digital scope provides auto-adjusting focal length, a user-selectable reticle, and an offset reflex sight for close objectives.",
     "weight": "0 g",
-    "volume": 0,
+    "volume": "0 ml",
     "price": 0,
     "material": [ "superalloy", "ceramic" ],
     "aim_speed": 2,

data/json/items/gunmod/stock.json

@@ -2,12 +2,12 @@
   {
     "id": "adjustable_stock",
     "type": "GUNMOD",
-    "name": "adjustable stock",
+    "name": { "str": "adjustable stock" },
     "description": "An adjustable replacement stock improving both recoil and accuracy.",
     "weight": "350 g",
     "volume": "500 ml",
-    "integral_volume": 0,
-    "integral_weight": 0,
+    "integral_volume": "0 ml",
+    "integral_weight": "0 g",
     "price": 38000,
     "to_hit": 1,
     "bashing": 6,
@@ -95,11 +95,11 @@
   {
     "id": "cheek_pad",
     "type": "GUNMOD",
-    "name": "cheek pad",
+    "name": { "str": "cheek pad" },
     "description": "A stock accessory for sniper rifles and even DMRs considerably improving eye relief efficiency, prevents slipping, and reduces recoil to the neck and cheek.",
     "weight": "300 g",
     "volume": "250 ml",
-    "integral_volume": 0,
+    "integral_volume": "0 ml",
     "price": 4500,
     "to_hit": 1,
     "bashing": 2,

data/json/items/gunmod/underbarrel.json

@@ -2,7 +2,7 @@
   {
     "id": "aux_flamer",
     "type": "GUNMOD",
-    "name": "aux flamethrower",
+    "name": { "str": "aux flamethrower" },
     "description": "This custom-built miniature flamethrower is made to be attached to almost any sort of firearm, greatly expanding its lethality.",
     "weight": "1820 g",
     "volume": "1 L",
@@ -21,7 +21,7 @@
   {
     "id": "bipod",
     "type": "GUNMOD",
-    "name": "bipod",
+    "name": { "str": "bipod" },
     "description": "Bipods are commonly used on rifles and machine guns to provide a forward rest and reduce motion.  Although they greatly improve handling of recoil they are usable only on certain surfaces and are slow to equip.",
     "weight": "400 g",
     "volume": "500 ml",
@@ -152,11 +152,11 @@
   {
     "id": "ts12_aux_shotgun",
     "type": "GUNMOD",
-    "name": "TS12 second magazine",
+    "name": { "str": "TS12 second magazine" },
     "description": "The integrated second shotgun magazine of the Tavor TS12 which holds 5 shots.  It's irremovable.",
     "weight": "100 g",
     "volume": "1750 ml",
-    "integral_volume": 0,
+    "integral_volume": "0 ml",
     "price": 0,
     "material": [ "steel" ],
     "symbol": ":",
@@ -177,11 +177,11 @@
   {
     "id": "ts12_aux_shotgun2",
     "type": "GUNMOD",
-    "name": "TS12 third magazine",
+    "name": { "str": "TS12 third magazine" },
     "description": "The integrated third shotgun magazine of the Tavor TS12 which holds 5 shots.  It's irremovable.",
     "weight": "100 g",
     "volume": "1750 ml",
-    "integral_volume": 0,
+    "integral_volume": "0 ml",
     "price": 0,
     "material": [ "steel" ],
     "symbol": ":",
@@ -383,7 +383,7 @@
   {
     "id": "rm121aux",
     "type": "GUNMOD",
-    "name": "RM121 aux shotgun",
+    "name": { "str": "RM121 aux shotgun" },
     "description": "The Rivtech RM121 auxiliary weapon system is a magazine-fed semi-automatic caseless shotgun, which can be mounted under the barrel of many rifles.  Accepts RMSA10 box magazines.",
     "weight": "1140 g",
     "volume": "750 ml",