From 4e4aca2de9674bf473ed4361bcf6daa4eaf6be77 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Thu, 6 Feb 2020 03:12:55 +0100 Subject: [PATCH] Gun barrel length to string (#37738) * Gun barrel length to string * Correct volumes * Actual volumes based on testing from master --- data/json/items/gun/22.json | 6 +++--- data/json/items/gun/223.json | 2 +- data/json/items/gun/3006.json | 4 ++-- data/json/items/gun/38.json | 2 +- data/json/items/gun/40.json | 2 +- data/json/items/gun/44.json | 2 +- data/json/items/gun/45.json | 2 +- data/json/items/gun/460.json | 2 +- data/json/items/gun/9mm.json | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index 1bc6e5e48784b..4c1117779bedd 100644 --- 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 index ff8bea8d88307..f23097f240a77 100644 --- 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 index 18f877dede134..ea19a5c02a4f5 100644 --- 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 index 9ba6620436d25..c8142275079d6 100644 --- 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 index 68e7ee35a7490..55136b2df5219 100644 --- 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 index 162da16e8edff..124b43769b8b0 100644 --- 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 index f920b05560d37..3ce10b03d8566 100644 --- 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 index bc9a063a86242..43f10639246e3 100644 --- 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 index b0c511375d7c7..17935ea2ee4b9 100644 --- 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 ],