Gun barrel length to string

CleverRaven · Feb 10, 2020 · 19069c2 · 19069c2
1 parent 315d8a5
commit 19069c2
Show file tree

Hide file tree

Showing 17 changed files with 30 additions and 30 deletions.
diff --git a/data/json/items/gun/20x66mm.json b/data/json/items/gun/20x66mm.json
@@ -22,7 +22,7 @@
     "dispersion": 285,
     "durability": 9,
     "clip_size": 5,
-    "barrel_length": 3,
+    "barrel_length": "750 ml",
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "grip", 1 ],

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
@@ -20,7 +20,7 @@
     "durability": 8,
     "min_cycle_recoil": 1350,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
-    "barrel_length": 1,
+    "barrel_length": "250 ml",
     "built_in_mods": [ "folding_stock" ],
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
@@ -173,7 +173,7 @@
     "description": "Leadworks LLC's bullpup L523 platform utilizes the ubiquitous 5.56 round in multiple applications, and is designed to part-swap quickly, safely, and effectively from one to the next.  The designated-shootist rifle incorporates a specially-designed extended barrel with integral bipod and foregrip, along with an integral 8x optic, and trades selective-fire for the Leadworks gyro-stabilization system.  Like the rest of the family, though, it doesn't accept third-party modifications.",
     "price": 580000,
     "durability": 9,
-    "barrel_length": 3,
+    "barrel_length": "750 ml",
     "modes": [ [ "DEFAULT", "semi-auto", 1 ] ],
     "relative": { "//": "Volume, range, and bullpup all point to a very large barrel on this one.", "weight": 1200, "volume": 4 },
     "delete": { "modes": [ [ "AUTO", "auto", 3 ] ] },
@@ -384,7 +384,7 @@
     "dispersion": 100,
     "durability": 8,
     "min_cycle_recoil": 1350,
-    "barrel_length": 2,
+    "barrel_length": "500 ml",
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],

diff --git a/data/json/items/gun/3006.json b/data/json/items/gun/3006.json
@@ -96,7 +96,7 @@
     "durability": 8,
     "blackpowder_tolerance": 60,
     "clip_size": 5,
-    "barrel_length": 1,
+    "barrel_length": "250 ml",
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],
@@ -135,7 +135,7 @@
     "durability": 8,
     "min_cycle_recoil": 3420,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
-    "barrel_length": 4,
+    "barrel_length": "1000 ml",
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],

diff --git a/data/json/items/gun/300BLK.json b/data/json/items/gun/300BLK.json
@@ -20,7 +20,7 @@
     "durability": 8,
     "min_cycle_recoil": 1700,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
-    "barrel_length": 1,
+    "barrel_length": "250 ml",
     "built_in_mods": [ "folding_stock" ],
     "magazines": [ [ "300blk", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },

diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json
@@ -138,7 +138,7 @@
     "min_cycle_recoil": 425,
     "modes": [ [ "DEFAULT", "burst", 5 ] ],
     "loudness": 25,
-    "barrel_length": 1,
+    "barrel_length": "250 ml",
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "barrel", 1 ],

diff --git a/data/json/items/gun/410shot.json b/data/json/items/gun/410shot.json
@@ -14,7 +14,7 @@
     "material": [ "steel", "plastic" ],
     "dispersion": 395,
     "durability": 7,
-    "barrel_length": 3,
+    "barrel_length": "750 ml",
     "magazine_well": 1,
     "ammo": "410shot",
     "magazines": [ [ "410shot", [ "saiga410mag_10rd", "saiga410mag_30rd" ] ] ],

diff --git a/data/json/items/gun/45.json b/data/json/items/gun/45.json
@@ -217,7 +217,7 @@
     "min_cycle_recoil": 456,
     "modes": [ [ "DEFAULT", "burst", 5 ] ],
     "loudness": 25,
-    "barrel_length": 1,
+    "barrel_length": "250 ml",
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "barrel", 1 ],
@@ -279,7 +279,7 @@
     "durability": 7,
     "min_cycle_recoil": 540,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
-    "barrel_length": 2,
+    "barrel_length": "500 ml",
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "barrel", 1 ],

diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json
@@ -106,7 +106,7 @@
     "dispersion": 80,
     "durability": 7,
     "reload": 400,
-    "barrel_length": 5,
+    "barrel_length": "1250 ml",
     "default_mods": [ "bipod", "rifle_scope", "muzzle_brake" ],
     "magazine_well": 1,
     "magazines": [ [ "50", [ "as50mag" ] ] ],
@@ -131,7 +131,7 @@
     "dispersion": 50,
     "durability": 8,
     "reload": 450,
-    "barrel_length": 5,
+    "barrel_length": "1250 ml",
     "default_mods": [ "recoil_stock", "bipod", "rifle_scope", "muzzle_brake" ],
     "magazine_well": 1,
     "magazines": [ [ "50", [ "tac50mag" ] ] ],
@@ -155,7 +155,7 @@
     "ranged_damage": -5,
     "dispersion": 110,
     "durability": 8,
-    "barrel_length": 5,
+    "barrel_length": "1250 ml",
     "default_mods": [ "bipod", "rifle_scope", "muzzle_brake" ],
     "clip_size": 1,
     "flags": [ "NEVER_JAMS", "RELOAD_ONE" ]

diff --git a/data/json/items/gun/545x39.json b/data/json/items/gun/545x39.json
@@ -20,7 +20,7 @@
     "dispersion": 150,
     "durability": 8,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
-    "barrel_length": 1,
+    "barrel_length": "250 ml",
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],
@@ -57,7 +57,7 @@
     "skill": "rifle",
     "dispersion": 150,
     "durability": 7,
-    "barrel_length": 1,
+    "barrel_length": "250 ml",
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "2 rd.", 2 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 4 ],

diff --git a/data/json/items/gun/5x50.json b/data/json/items/gun/5x50.json
@@ -20,7 +20,7 @@
     "ranged_damage": 10,
     "dispersion": 220,
     "durability": 9,
-    "barrel_length": 1,
+    "barrel_length": "250 ml",
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "5 rd.", 5 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],

diff --git a/data/json/items/gun/700nx.json b/data/json/items/gun/700nx.json
@@ -20,7 +20,7 @@
     "durability": 8,
     "clip_size": 1,
     "reload": 600,
-    "barrel_length": 4,
+    "barrel_length": "1000 ml",
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "grip", 1 ],

diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json
@@ -19,7 +19,7 @@
     "dispersion": 180,
     "durability": 9,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
-    "barrel_length": 1,
+    "barrel_length": "250 ml",
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],
@@ -97,7 +97,7 @@
     "dispersion": 90,
     "durability": 8,
     "clip_size": 10,
-    "barrel_length": 2,
+    "barrel_length": "500 ml",
     "built_in_mods": [ "inter_bayonet" ],
     "valid_mod_locations": [
       [ "accessories", 4 ],

diff --git a/data/json/items/gun/762x25.json b/data/json/items/gun/762x25.json
@@ -21,7 +21,7 @@
     "dispersion": 120,
     "durability": 8,
     "min_cycle_recoil": 270,
-    "barrel_length": 2,
+    "barrel_length": "500 ml",
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],

diff --git a/data/json/items/gun/8x40mm.json b/data/json/items/gun/8x40mm.json
@@ -56,7 +56,7 @@
     "dispersion": 10,
     "durability": 9,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 2 ] ],
-    "barrel_length": 3,
+    "barrel_length": "750 ml",
     "built_in_mods": [ "riv_scope", "riv_suppressor" ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
@@ -128,7 +128,7 @@
     "durability": 9,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ],
     "reload": 400,
-    "barrel_length": 6,
+    "barrel_length": "1500 ml",
     "magazine_well": 6,
     "valid_mod_locations": [ [ "barrel", 1 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "rail", 1 ], [ "sights", 1 ], [ "sling", 1 ], [ "stock", 1 ] ],
     "magazines": [ [ "8x40mm", [ "8x40_500_mag", "8x40_250_mag" ] ] ],
@@ -189,7 +189,7 @@
     "dispersion": 70,
     "durability": 9,
     "reload": 200,
-    "barrel_length": 2,
+    "barrel_length": "500 ml",
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "4 rd.", 4 ], [ "AUTO", "auto", 6 ] ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
@@ -226,7 +226,7 @@
     "dispersion": 30,
     "durability": 9,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
-    "barrel_length": 2,
+    "barrel_length": "500 ml",
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "grip", 1 ],

diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json
@@ -62,7 +62,7 @@
     "dispersion": 180,
     "durability": 10,
     "min_cycle_recoil": 450,
-    "barrel_length": 1,
+    "barrel_length": "250 ml",
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],
@@ -427,7 +427,7 @@
     "min_cycle_recoil": 380,
     "modes": [ [ "DEFAULT", "burst", 5 ] ],
     "loudness": 25,
-    "barrel_length": 1,
+    "barrel_length": "250 ml",
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "barrel", 1 ],

diff --git a/data/json/items/gun/combination.json b/data/json/items/gun/combination.json
@@ -21,7 +21,7 @@
     "blackpowder_tolerance": 56,
     "clip_size": 1,
     "loudness": 25,
-    "barrel_length": 2,
+    "barrel_length": "500 ml",
     "built_in_mods": [ "combination_gun_shotgun" ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
     "valid_mod_locations": [
@@ -62,7 +62,7 @@
     "blackpowder_tolerance": 60,
     "clip_size": 1,
     "loudness": 25,
-    "barrel_length": 2,
+    "barrel_length": "500 ml",
     "built_in_mods": [ "combination_gun_shotgun_pipe" ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
     "valid_mod_locations": [

diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json
@@ -311,7 +311,7 @@
     "sight_dispersion": 750,
     "clip_size": 4,
     "price": 53800,
-    "barrel_length": 0,
+    "barrel_length": "0 ml",
     "built_in_mods": [ "breacher_grip" ],
     "valid_mod_locations": [
       [ "accessories", 4 ],