Gun barrel length to string (#37738)

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

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json
@@ -22,7 +22,7 @@
     "durability": 6,
     "min_cycle_recoil": 39,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ],
-    "barrel_length": 1,
+    "barrel_length": "250 ml",
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "barrel", 1 ],
@@ -140,7 +140,7 @@
     "loudness": 25,
     "clip_size": 1,
     "reload": 200,
-    "barrel_length": 2,
+    "barrel_length": "500 ml",
     "valid_mod_locations": [
       [ "accessories", 2 ],
       [ "muzzle", 1 ],
@@ -215,7 +215,7 @@
     "dispersion": 110,
     "durability": 8,
     "min_cycle_recoil": 39,
-    "barrel_length": 2,
+    "barrel_length": "500 ml",
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
@@ -350,7 +350,7 @@
     "loudness": 25,
     "clip_size": 1,
     "reload": 200,
-    "barrel_length": 4,
+    "barrel_length": "1000 ml",
     "valid_mod_locations": [
       [ "accessories", 2 ],
       [ "muzzle", 1 ],

diff --git a/data/json/items/gun/3006.json b/data/json/items/gun/3006.json
@@ -21,7 +21,7 @@
     "dispersion": 90,
     "durability": 7,
     "blackpowder_tolerance": 24,
-    "barrel_length": 2,
+    "barrel_length": "500 ml",
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],
@@ -203,7 +203,7 @@
     "loudness": 25,
     "clip_size": 1,
     "reload": 200,
-    "barrel_length": 4,
+    "barrel_length": "1000 ml",
     "valid_mod_locations": [
       [ "accessories", 2 ],
       [ "muzzle", 1 ],

diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json
@@ -112,7 +112,7 @@
     "loudness": 25,
     "clip_size": 1,
     "reload": 200,
-    "barrel_length": 3,
+    "barrel_length": "750 ml",
     "valid_mod_locations": [
       [ "accessories", 2 ],
       [ "muzzle", 1 ],

diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json
@@ -63,7 +63,7 @@
     "loudness": 25,
     "clip_size": 1,
     "reload": 200,
-    "barrel_length": 3,
+    "barrel_length": "750 ml",
     "valid_mod_locations": [
       [ "accessories", 2 ],
       [ "muzzle", 1 ],

diff --git a/data/json/items/gun/44.json b/data/json/items/gun/44.json
@@ -98,7 +98,7 @@
     "loudness": 25,
     "clip_size": 1,
     "reload": 200,
-    "barrel_length": 3,
+    "barrel_length": "750 ml",
     "valid_mod_locations": [
       [ "accessories", 2 ],
       [ "muzzle", 1 ],

diff --git a/data/json/items/gun/45.json b/data/json/items/gun/45.json
@@ -179,7 +179,7 @@
     "loudness": 25,
     "clip_size": 1,
     "reload": 200,
-    "barrel_length": 3,
+    "barrel_length": "750 ml",
     "valid_mod_locations": [
       [ "accessories", 2 ],
       [ "muzzle", 1 ],

diff --git a/data/json/items/gun/460.json b/data/json/items/gun/460.json
@@ -83,7 +83,7 @@
     "durability": 9,
     "blackpowder_tolerance": 32,
     "clip_size": 12,
-    "barrel_length": 2,
+    "barrel_length": "500 ml",
     "built_in_mods": [ "lead_holo_sight", "lead_laser_sight" ],
     "valid_mod_locations": [
       [ "accessories", 2 ],

diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json
@@ -264,7 +264,7 @@
     "dispersion": 180,
     "durability": 7,
     "min_cycle_recoil": 450,
-    "barrel_length": 1,
+    "barrel_length": "250 ml",
     "built_in_mods": [ "folding_stock" ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
@@ -390,7 +390,7 @@
     "loudness": 25,
     "clip_size": 1,
     "reload": 200,
-    "barrel_length": 3,
+    "barrel_length": "750 ml",
     "valid_mod_locations": [
       [ "accessories", 2 ],
       [ "muzzle", 1 ],