Gun barrel length to string (#37754)

* Gun barrel length to string * Correct volumes * Actual volumes based on testing from master * Gun barrel length to string
CleverRaven · Feb 6, 2020 · 5719845 · 5719845
1 parent 37a3948
commit 5719845
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/data/json/items/gun/270win.json b/data/json/items/gun/270win.json
@@ -19,7 +19,7 @@
     "durability": 8,
     "blackpowder_tolerance": 24,
     "clip_size": 4,
-    "barrel_length": 3,
+    "barrel_length": "750 ml",
     "flags": [ "RELOAD_ONE", "NEVER_JAMS" ]
   }
 ]
diff --git a/data/json/items/gun/300.json b/data/json/items/gun/300.json
@@ -18,7 +18,7 @@
     "dispersion": 90,
     "durability": 8,
     "min_cycle_recoil": 4770,
-    "barrel_length": 2,
+    "barrel_length": "500 ml",
     "magazines": [ [ "300", [ "m2010mag" ] ] ],
     "flags": [ "NEVER_JAMS" ]
   },
@@ -43,7 +43,7 @@
     "durability": 8,
     "blackpowder_tolerance": 24,
     "clip_size": 3,
-    "barrel_length": 3,
+    "barrel_length": "750 ml",
     "flags": [ "RELOAD_ONE" ]
   },
   {
@@ -66,7 +66,7 @@
     "durability": 8,
     "blackpowder_tolerance": 24,
     "clip_size": 3,
-    "barrel_length": 3,
+    "barrel_length": "750 ml",
     "flags": [ "RELOAD_ONE" ]
   }
 ]
diff --git a/data/json/items/gun/3006.json b/data/json/items/gun/3006.json
@@ -174,7 +174,7 @@
     "durability": 8,
     "blackpowder_tolerance": 24,
     "clip_size": 4,
-    "barrel_length": 3,
+    "barrel_length": "750 ml",
     "flags": [ "RELOAD_ONE", "NEVER_JAMS" ]
   },
   {

diff --git a/data/json/items/gun/308.json b/data/json/items/gun/308.json
@@ -21,7 +21,7 @@
     "durability": 8,
     "min_cycle_recoil": 2700,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
-    "barrel_length": 2,
+    "barrel_length": "500 ml",
     "magazines": [ [ "308", [ "falmag", "falbigmag", "fal_makeshiftmag" ] ] ]
   },
   {
@@ -123,7 +123,7 @@
     "dispersion": 110,
     "durability": 8,
     "min_cycle_recoil": 2700,
-    "barrel_length": 2,
+    "barrel_length": "500 ml",
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],
@@ -238,7 +238,7 @@
     "durability": 6,
     "blackpowder_tolerance": 60,
     "reload": 200,
-    "barrel_length": 2,
+    "barrel_length": "500 ml",
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],
@@ -276,7 +276,7 @@
     "durability": 9,
     "blackpowder_tolerance": 24,
     "clip_size": 3,
-    "barrel_length": 3,
+    "barrel_length": "750 ml",
     "flags": [ "RELOAD_ONE", "NEVER_JAMS" ]
   },
   {
@@ -314,7 +314,7 @@
     "dispersion": 85,
     "durability": 9,
     "min_cycle_recoil": 2700,
-    "barrel_length": 2,
+    "barrel_length": "500 ml",
     "default_mods": [ "rifle_scope", "cheek_pad" ],
     "magazines": [ [ "308", [ "m14mag", "m14smallmag", "m14_makeshiftmag" ] ] ],
     "valid_mod_locations": [

diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json
@@ -19,7 +19,7 @@
     "ranged_damage": -5,
     "dispersion": 130,
     "durability": 8,
-    "barrel_length": 5,
+    "barrel_length": "1250 ml",
     "default_mods": [ "bipod", "rifle_scope", "muzzle_brake" ],
     "magazine_well": 1,
     "magazines": [ [ "50", [ "m107a1mag" ] ] ],
@@ -45,7 +45,7 @@
     "dispersion": 250,
     "durability": 8,
     "reload": 400,
-    "barrel_length": 5,
+    "barrel_length": "1250 ml",
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "valid_mod_locations": [
       [ "accessories", 4 ],

diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json
@@ -59,7 +59,7 @@
     "dispersion": 160,
     "durability": 9,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
-    "barrel_length": 1,
+    "barrel_length": "250 ml",
     "default_mods": [ "folding_stock" ],
     "valid_mod_locations": [
       [ "accessories", 4 ],

diff --git a/data/json/items/gun/762R.json b/data/json/items/gun/762R.json
@@ -53,7 +53,7 @@
     "dispersion": 90,
     "durability": 10,
     "clip_size": 5,
-    "barrel_length": 4,
+    "barrel_length": "1000 ml",
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],

diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json
@@ -186,7 +186,7 @@
     "looks_like": "mossberg_500",
     "default_mods": [ "sights_mount", "underbarrel_mount" ],
     "price": 70000,
-    "barrel_length": 0,
+    "barrel_length": "0 ml",
     "clip_size": 9
   },
   {