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

Gunmod name to object, volume to string

data/json/items/gunmod/barrel.json

@@ -2,9 +2,9 @@
   {
     "id": "barrel_small",
     "type": "GUNMOD",
-    "name": "shortened barrel",
+    "name": { "str": "shortened barrel" },
     "description": "A shortened barrel results in markedly reduced accuracy, and a minor increase in noise, but also greatly improves the ease with which the weapon can be carried and wielded.",
-    "volume": 0,
+    "volume": "0 ml",
     "price": 12000,
     "material": [ "steel" ],
     "symbol": ":",
@@ -18,7 +18,7 @@
   {
     "id": "upstest",
     "type": "GUNMOD",
-    "name": "upstest",
+    "name": { "str": "upstest" },
     "description": "Testmod for UPS drain on mods, this should never spawn, if you see this, it's a bug.  50x more UPS drain.",
     "weight": "450 g",
     "volume": "500 ml",
@@ -31,7 +31,7 @@
     "mod_targets": [ "smg", "rifle", "shotgun", "pistol" ],
     "damage_modifier": 500,
     "dispersion_modifier": 500,
-    "ups_charges_multiplier": 50,
+    "ups_charges_multiplier": 50.0,
     "min_skills": [ [ "gun", 1 ] ]
   },
   {

data/json/items/gunmod/muzzle.json

@@ -2,11 +2,11 @@
   {
     "id": "barrel_ported",
     "type": "GUNMOD",
-    "name": "ported barrel",
+    "name": { "str": "ported barrel" },
     "description": "A ported barrel redirects exhaust gases to compensate for muzzle climb, improves recoil but increases noise and reduces accuracy slightly.",
     "weight": "225 g",
-    "integral_weight": 0,
-    "volume": 0,
+    "integral_weight": "0 g",
+    "volume": "0 ml",
     "price": 72000,
     "material": [ "steel" ],
     "symbol": ":",
@@ -21,7 +21,7 @@
   {
     "id": "muzzle_brake",
     "type": "GUNMOD",
-    "name": "muzzle brake",
+    "name": { "str": "muzzle brake" },
     "description": "A muzzle brake redirects exhaust gases to compensate for muzzle climb, improving recoil but increasing bulk, noise, and reducing accuracy slightly.",
     "weight": "380 g",
     "volume": "250 ml",
@@ -40,7 +40,7 @@
     "id": "muzzle_brake_mod",
     "copy-from": "muzzle_brake",
     "type": "GUNMOD",
-    "name": "modified muzzle brake",
+    "name": { "str": "modified muzzle brake" },
     "description": "A muzzle brake redirects exhaust gases to compensate for muzzle climb, improving recoil but increasing bulk, noise, and reducing accuracy slightly.  This one was modified and customized to mount on pretty much any firearm other than launchers, if you so want.",
     "mod_targets": [ "pistol", "smg", "rifle", "shotgun" ]
   },
@@ -92,7 +92,7 @@
   {
     "id": "bottle_suppressor",
     "type": "GUNMOD",
-    "name": "soda bottle silencer",
+    "name": { "str": "soda bottle silencer" },
     "description": "This is a 'silencer' made from a 2 liter soda bottle, some smaller bottles for baffles, and a generous length of duct tape.  Gunfire is extremely loud and can damage your hearing without protection and you can be certain that this will not save your ears whatsoever.  What it might do is allow you to get a shot or two off with a slightly quieter report.  This simple suppressor is large and, when attached, will interfere with your ability to aim down the base sights of the gun.",
     "weight": "202 g",
     "volume": "2 L",
@@ -128,7 +128,7 @@
   {
     "id": "shot_suppressor",
     "type": "GUNMOD",
-    "name": "shotgun suppressor",
+    "name": { "str": "shotgun suppressor" },
     "//": "SilencerCo Salvo 12",
     "description": "A large suppressor designed to work with shotguns.  It's a lot more complex than a suppressor for a pistol or rifle.",
     "weight": "968 g",

data/json/items/gunmod/rail.json

@@ -2,7 +2,7 @@
   {
     "id": "gun_crossbow",
     "type": "GUNMOD",
-    "name": "rail-mounted crossbow",
+    "name": { "str": "rail-mounted crossbow" },
     "description": "A kit to attach a pair of crossbow arms and a firing rail to the barrel of a long firearm.  It allows crossbow bolts to be fired.",
     "weight": "1450 g",
     "volume": "500 ml",
@@ -29,7 +29,7 @@
     "id": "gun_crossbow_mod",
     "copy-from": "gun_crossbow",
     "type": "GUNMOD",
-    "name": "modified rail-mounted crossbow",
+    "name": { "str": "modified rail-mounted crossbow" },
     "description": "A kit to attach a pair of crossbow arms and a firing rail to the barrel of a long firearm.  It allows crossbow bolts to be fired.  This one was modified and customized to mount on pretty much any weapon other than pistols and SMGs, if you so want.",
     "mod_targets": [ "rifle", "shotgun", "launcher", "crossbow" ]
   },
@@ -56,7 +56,7 @@
   {
     "id": "offset_sight_rail",
     "type": "GUNMOD",
-    "name": "offset sight rail",
+    "name": { "str": "offset sight rail" },
     "description": "An additional rail set at 45° for attaching a secondary optic.",
     "weight": "40 g",
     "volume": "125ml",
@@ -73,18 +73,18 @@
     "id": "offset_sight_rail_mod",
     "copy-from": "offset_sight_rail",
     "type": "GUNMOD",
-    "name": "modified offset sight rail",
+    "name": { "str": "modified offset sight rail" },
     "description": "An additional rail set at 45° for attaching a secondary optic.  This one was modified and customized to mount on pretty much any weapon, if you so want.",
     "mod_targets": [ "pistol", "smg", "rifle", "shotgun", "launcher", "crossbow" ]
   },
   {
     "id": "rail_laser_sight",
     "type": "GUNMOD",
-    "name": "rail laser sight",
+    "name": { "str": "rail laser sight" },
     "description": "A small visible-light laser that mounts on a firearm's accessory rail to enhance ease and speed of target acquisition.  Aside from increased weight, there are no drawbacks.",
     "weight": "120 g",
     "volume": "250 ml",
-    "integral_volume": 0,
+    "integral_volume": "0 ml",
     "price": 12000,
     "material": [ "plastic", "steel" ],
     "symbol": ":",
@@ -117,7 +117,7 @@
     "id": "stabilizer_mod",
     "copy-from": "stabilizer",
     "type": "GUNMOD",
-    "name": "modified gyroscopic stabilizer",
+    "name": { "str": "modified gyroscopic stabilizer" },
     "description": "An advanced unit that straps onto the side of your firearm and reduces vibration, greatly reducing recoil and slightly increasing accuracy.  This one was modified and customized to mount on pretty much any weapon other than pistols, if you so want.",
     "mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ]
   },

data/json/items/gunmod/sights.json

@@ -20,11 +20,11 @@
   {
     "id": "bow_sight_pin",
     "type": "GUNMOD",
-    "name": "single pin bow sight",
+    "name": { "str": "single pin bow sight" },
     "description": "A single aluminum pin with a bracket to mount on modern bows.  Quick to use, but not very accurate.",
     "weight": "80 g",
     "volume": "250 ml",
-    "integral_volume": 0,
+    "integral_volume": "0 ml",
     "price": 3000,
     "material": [ "aluminum", "plastic" ],
     "symbol": ":",
@@ -95,7 +95,7 @@
   {
     "id": "pistol_scope",
     "type": "GUNMOD",
-    "name": "pistol scope",
+    "name": { "str": "pistol scope" },
     "description": "A small scope intended for use on a handgun.  Increases weight but improves accuracy greatly.",
     "weight": "212 g",
     "volume": "250 ml",
@@ -113,11 +113,11 @@
   {
     "id": "red_dot_sight",
     "type": "GUNMOD",
-    "name": "red dot sight",
+    "name": { "str": "red dot sight" },
     "description": "Adds a red dot optic to the top of your gun, replacing the iron sights.  Increases accuracy and weight.",
     "weight": "300 g",
     "volume": "250 ml",
-    "integral_volume": 0,
+    "integral_volume": "0 ml",
     "price": 68000,
     "material": [ "plastic", "steel" ],
     "symbol": ":",
@@ -153,7 +153,7 @@
     "id": "rifle_scope_mod",
     "copy-from": "rifle_scope",
     "type": "GUNMOD",
-    "name": "modified rifle scope",
+    "name": { "str": "modified rifle scope" },
     "description": "A 3-18x44 rifle scope.  It is adjustable for windage and elevation in 1/10th mrad increments and is remarkably small and light for its magnification.  This one was modified and customized to mount on pretty much any weapon other than pistols and SMGs, if you so want.",
     "mod_targets": [ "rifle", "shotgun", "launcher", "crossbow" ]
   },
@@ -221,7 +221,7 @@
   {
     "id": "tele_sight_pistol",
     "type": "GUNMOD",
-    "name": "telescopic pistol sight",
+    "name": { "str": "telescopic pistol sight" },
     "description": "A simple telescopic sight intended for use on a handgun.  Increases weight but improves accuracy greatly.",
     "weight": "220 g",
     "volume": "250 ml",

data/json/items/gunmod/sling.json

@@ -2,11 +2,11 @@
   {
     "id": "shoulder_strap",
     "type": "GUNMOD",
-    "name": "shoulder strap",
+    "name": { "str": "shoulder strap" },
     "description": "A shoulder strap allows the rifle to be worn over your shoulders like a piece of clothing.  However, it offers no protection.",
     "weight": "100 g",
     "volume": "250 ml",
-    "integral_volume": 0,
+    "integral_volume": "250 ml",
     "price": 480,
     "material": "cotton",
     "symbol": ":",

data/json/items/gunmod/stock.json

@@ -59,7 +59,7 @@
   {
     "id": "pistol_stock",
     "type": "GUNMOD",
-    "name": "pistol stock",
+    "name": { "str": "pistol stock" },
     "description": "An add-on stock for handguns considerably improving control of recoil.",
     "weight": "350 g",
     "volume": "500 ml",
@@ -75,12 +75,12 @@
   {
     "id": "recoil_stock",
     "type": "GUNMOD",
-    "name": "recoil stock",
+    "name": { "str": "recoil stock" },
     "description": "A replacement stock designed to absorb perceived recoil.",
     "weight": "960 g",
     "volume": "500 ml",
-    "integral_volume": 0,
-    "integral_weight": 0,
+    "integral_volume": "0 ml",
+    "integral_weight": "0 g",
     "price": 400,
     "to_hit": 1,
     "bashing": 6,

data/json/items/gunmod/underbarrel.json

@@ -41,7 +41,7 @@
     "id": "bipod_mod",
     "copy-from": "bipod",
     "type": "GUNMOD",
-    "name": "modified bipod",
+    "name": { "str": "modified 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.  This one was modified and customized to mount on pretty much any weapon, if you so want.",
     "mod_targets": [ "pistol", "smg", "rifle", "shotgun", "launcher", "crossbow" ],
     "extend": { "flags": [ "PUMP_RAIL_COMPATIBLE" ] }
@@ -66,7 +66,7 @@
   {
     "id": "combination_gun_shotgun_pipe",
     "type": "GUNMOD",
-    "name": "pipe combination gun shotgun",
+    "name": { "str": "pipe combination gun shotgun" },
     "description": "The integrated underbarrel shotgun of a pipe combination gun which holds two shots.  It's irremovable.",
     "weight": "1134 g",
     "volume": "1 L",
@@ -102,7 +102,7 @@
     "id": "grip_mod",
     "copy-from": "grip",
     "type": "GUNMOD",
-    "name": "modified forward grip",
+    "name": { "str": "modified forward grip" },
     "description": "A grip placed forward on the barrel allows for greater control.  Not as effective as a bipod but usable under all conditions.  This one was modified and customized to mount on pretty much any weapon, if you so want.",
     "mod_targets": [ "pistol", "smg", "rifle", "shotgun", "launcher", "crossbow" ]
   },
@@ -202,11 +202,11 @@
   {
     "id": "laser_sight",
     "type": "GUNMOD",
-    "name": "underbarrel laser sight",
+    "name": { "str": "underbarrel laser sight" },
     "description": "A visible-light laser that mounts under a firearm's barrel to enhance ease and speed of target acquisition.  Aside from increased weight, there are no drawbacks.",
     "weight": "120 g",
     "volume": "250 ml",
-    "integral_volume": 0,
+    "integral_volume": "0 ml",
     "price": 10000,
     "material": [ "plastic", "steel" ],
     "symbol": ":",
@@ -341,7 +341,7 @@
     "id": "masterkey_mod",
     "copy-from": "masterkey",
     "type": "GUNMOD",
-    "name": "modified masterkey shotgun",
+    "name": { "str": "modified masterkey shotgun" },
     "description": "A minimalist pump action shotgun, which can be mounted under the barrel of many rifles.  It allows a total of four shotgun shells to be loaded and fired.  This one was modified and customized to mount on pretty much any weapon other than pistols and pump-action guns, if you so want.",
     "mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ]
   },
@@ -364,7 +364,7 @@
   {
     "id": "pistol_bayonet",
     "type": "GUNMOD",
-    "name": "pistol bayonet",
+    "name": { "str": "pistol bayonet" },
     "description": "A pistol bayonet is a stabbing weapon that can be attached to the front of a handgun, allowing a melee attack to deal piercing damage.",
     "weight": "122 g",
     "volume": "250 ml",
@@ -410,7 +410,7 @@
   {
     "id": "u_shotgun",
     "type": "GUNMOD",
-    "name": "underslung shotgun",
+    "name": { "str": "underslung shotgun" },
     "description": "A short shotgun with 2 barrels, which can be mounted under the barrel of many rifles.  It allows two shotgun shells to be loaded and fired.",
     "weight": "1500 g",
     "volume": "750 ml",
@@ -428,7 +428,7 @@
     "id": "u_shotgun_mod",
     "copy-from": "u_shotgun",
     "type": "GUNMOD",
-    "name": "modified underslung shotgun",
+    "name": { "str": "modified underslung shotgun" },
     "description": "A short shotgun with 2 barrels, which can be mounted under the barrel of many rifles.  It allows two shotgun shells to be loaded and fired.  This one was modified and customized to mount on pretty much any weapon other than pistols, if you so want.",
     "mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ]
   },