diff --git a/data/json/items/gun/20x66mm.json b/data/json/items/gun/20x66mm.json
index 7acc32f148499..0758ca553462f 100644
--- a/data/json/items/gun/20x66mm.json
+++ b/data/json/items/gun/20x66mm.json
@@ -55,7 +55,7 @@
     "skill": "shotgun",
     "dispersion": 335,
     "durability": 9,
-    "burst": 4,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 2 ] ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "grip", 1 ],
diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json
index d5a7c35764921..dddea2ae55977 100644
--- a/data/json/items/gun/22.json
+++ b/data/json/items/gun/22.json
@@ -21,7 +21,7 @@
     "dispersion": 280,
     "durability": 6,
     "min_cycle_recoil": 39,
-    "burst": 20,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ],
     "barrel_length": 1,
     "valid_mod_locations": [
       [ "accessories", 3 ],
@@ -176,7 +176,7 @@
     "durability": 9,
     "blackpowder_tolerance": 24,
     "min_cycle_recoil": 39,
-    "burst": 20,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ],
     "reload": 500,
     "valid_mod_locations": [
       [ "accessories", 3 ],
diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index 26f1819dcf47c..fa463b758e29c 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -19,7 +19,7 @@
     "dispersion": 150,
     "durability": 8,
     "min_cycle_recoil": 1350,
-    "burst": 11,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "barrel_length": 1,
     "built_in_mods": [ "folding_stock" ],
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
@@ -66,7 +66,7 @@
     "dispersion": 180,
     "durability": 8,
     "min_cycle_recoil": 1350,
-    "burst": 14,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
   {
@@ -88,7 +88,7 @@
     "dispersion": 150,
     "durability": 8,
     "min_cycle_recoil": 1350,
-    "burst": 13,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
   {
@@ -152,7 +152,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 carbine model incorporates Leadworks' proprietary gyro-stabilization technology and includes a red-dot sight and an integral laser sight.  Additionally it comes with underslung shotgun for close range encounters.  Like the rest of the family, doesn't accept third-party modifications.",
     "price": 520000,
     "durability": 9,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "relative": { "weight": 400 },
     "built_in_mods": [ "lead_red_dot_sight", "lead_barrel_small", "lead_laser_sight", "lead_u_shotgun", "lead_stabilizer" ],
     "valid_mod_locations": [
@@ -253,7 +253,7 @@
     "durability": 7,
     "min_cycle_recoil": 1350,
     "reload": 400,
-    "modes": [ [ "DEFAULT", "auto", 12 ] ],
+    "modes": [ [ "DEFAULT", "burst", 4 ] ],
     "built_in_mods": [ "bipod" ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
@@ -277,7 +277,7 @@
     "name": "M27 IAR",
     "description": "A H&K416 carbine outfitted with a heavier barrel to enable higher amounts of suppressive fire while retaining a good degree of mobility.",
     "weight": "3495 g",
-    "burst": 13,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ],
     "relative": { "ranged_damage": 1, "durability": 1 }
   },
@@ -301,7 +301,7 @@
     "dispersion": 180,
     "durability": 6,
     "min_cycle_recoil": 1350,
-    "burst": 14,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
   {
@@ -422,7 +422,7 @@
     "dispersion": 150,
     "durability": 8,
     "min_cycle_recoil": 1350,
-    "burst": 10,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
   {
@@ -442,7 +442,7 @@
     "dispersion": 180,
     "durability": 9,
     "min_cycle_recoil": 1350,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 12 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 4 ] ],
     "built_in_mods": [ "folding_stock" ],
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
@@ -465,7 +465,7 @@
     "dispersion": 140,
     "durability": 8,
     "min_cycle_recoil": 1350,
-    "burst": 12,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "built_in_mods": [ "grip" ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
diff --git a/data/json/items/gun/3006.json b/data/json/items/gun/3006.json
index 034ab5b4ccf84..993ddb3df9221 100644
--- a/data/json/items/gun/3006.json
+++ b/data/json/items/gun/3006.json
@@ -135,7 +135,7 @@
     "dispersion": 180,
     "durability": 8,
     "min_cycle_recoil": 3420,
-    "burst": 8,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "barrel_length": 4,
     "valid_mod_locations": [
       [ "accessories", 4 ],
diff --git a/data/json/items/gun/300BLK.json b/data/json/items/gun/300BLK.json
index 9635f03f038a0..95459c058ae58 100644
--- a/data/json/items/gun/300BLK.json
+++ b/data/json/items/gun/300BLK.json
@@ -19,7 +19,7 @@
     "dispersion": 150,
     "durability": 8,
     "min_cycle_recoil": 1700,
-    "burst": 11,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "barrel_length": 1,
     "built_in_mods": [ "folding_stock" ],
     "magazines": [ [ "300blk", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
diff --git a/data/json/items/gun/308.json b/data/json/items/gun/308.json
index 1e2acb7406771..b302b3adf86f0 100644
--- a/data/json/items/gun/308.json
+++ b/data/json/items/gun/308.json
@@ -20,7 +20,7 @@
     "dispersion": 150,
     "durability": 8,
     "min_cycle_recoil": 2700,
-    "burst": 12,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "barrel_length": 2,
     "magazines": [ [ "308", [ "falmag", "falbigmag" ] ] ]
   },
@@ -45,7 +45,7 @@
     "dispersion": 150,
     "min_cycle_recoil": 2700,
     "durability": 8,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 10 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 4 ] ],
     "magazines": [ [ "308", [ "g3mag", "g3bigmag" ] ] ]
   },
   {
@@ -87,7 +87,7 @@
     "weight": "4820 g",
     "price": 195000,
     "material": [ "steel", "plastic" ],
-    "burst": 12,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],
@@ -161,7 +161,7 @@
     "durability": 9,
     "min_cycle_recoil": 2700,
     "reload": 400,
-    "modes": [ [ "DEFAULT", "auto", 11 ] ],
+    "modes": [ [ "DEFAULT", "burst", 4 ] ],
     "built_in_mods": [ "bipod" ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
@@ -199,7 +199,7 @@
     "durability": 7,
     "min_cycle_recoil": 2700,
     "reload": 400,
-    "modes": [ [ "DEFAULT", "auto", 11 ] ],
+    "modes": [ [ "DEFAULT", "burst", 4 ] ],
     "built_in_mods": [ "bipod" ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
@@ -354,7 +354,7 @@
     "dispersion": 180,
     "durability": 8,
     "min_cycle_recoil": 2700,
-    "burst": 10,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "default_mods": [ "adjustable_stock" ],
     "magazines": [ [ "308", [ "hk417mag_20rd", "hk417mag_10rd" ] ] ]
   },
diff --git a/data/json/items/gun/32.json b/data/json/items/gun/32.json
index ec4e4463113ff..1667b4d01f7c5 100644
--- a/data/json/items/gun/32.json
+++ b/data/json/items/gun/32.json
@@ -58,7 +58,7 @@
     "dispersion": 360,
     "durability": 6,
     "min_cycle_recoil": 135,
-    "burst": 14,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "built_in_mods": [ "folding_stock" ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
diff --git a/data/json/items/gun/380.json b/data/json/items/gun/380.json
index b9d788e70c41d..1650d4c0c0f2d 100644
--- a/data/json/items/gun/380.json
+++ b/data/json/items/gun/380.json
@@ -12,7 +12,7 @@
     "bashing": 5,
     "ammo": "380",
     "min_cycle_recoil": 270,
-    "burst": 23,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ],
     "magazines": [ [ "380", [ "mac11mag" ] ] ]
   },
   {
diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json
index 018279dc6c6e4..afd179307586a 100644
--- a/data/json/items/gun/40.json
+++ b/data/json/items/gun/40.json
@@ -137,7 +137,7 @@
     "durability": 4,
     "blackpowder_tolerance": 24,
     "min_cycle_recoil": 425,
-    "modes": [ [ "DEFAULT", "auto", 10 ] ],
+    "modes": [ [ "DEFAULT", "burst", 5 ] ],
     "loudness": 25,
     "barrel_length": 1,
     "valid_mod_locations": [
diff --git a/data/json/items/gun/40mm.json b/data/json/items/gun/40mm.json
index 843b24f6484ba..8d535c4bf967d 100644
--- a/data/json/items/gun/40mm.json
+++ b/data/json/items/gun/40mm.json
@@ -106,7 +106,7 @@
       [ "rail mount", 1 ],
       [ "underbarrel mount", 1 ]
     ],
-    "modes": [ [ "DEFAULT", "semi-auto", 1, "NPC_AVOID" ], [ "AUTO", "auto", 6, "NPC_AVOID" ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1, "NPC_AVOID" ] ],
     "magazines": [ [ "40mm", [ "belt40mm" ] ] ],
     "flags": [ "MOUNTED_GUN" ]
   },
diff --git a/data/json/items/gun/45.json b/data/json/items/gun/45.json
index 37828cda8bf6d..081546905bd71 100644
--- a/data/json/items/gun/45.json
+++ b/data/json/items/gun/45.json
@@ -19,7 +19,7 @@
     "dispersion": 280,
     "durability": 7,
     "min_cycle_recoil": 540,
-    "burst": 20,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "barrel", 1 ],
@@ -59,7 +59,7 @@
     "dispersion": 240,
     "durability": 8,
     "min_cycle_recoil": 540,
-    "burst": 10,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "barrel", 1 ],
@@ -134,7 +134,7 @@
     "dispersion": 520,
     "durability": 7,
     "min_cycle_recoil": 540,
-    "burst": 18,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "built_in_mods": [ "wire_stock" ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
@@ -215,7 +215,7 @@
     "durability": 4,
     "blackpowder_tolerance": 24,
     "min_cycle_recoil": 456,
-    "modes": [ [ "DEFAULT", "auto", 10 ] ],
+    "modes": [ [ "DEFAULT", "burst", 5 ] ],
     "loudness": 25,
     "barrel_length": 1,
     "valid_mod_locations": [
@@ -278,7 +278,7 @@
     "dispersion": 360,
     "durability": 7,
     "min_cycle_recoil": 540,
-    "burst": 10,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "barrel_length": 2,
     "valid_mod_locations": [
       [ "accessories", 3 ],
diff --git a/data/json/items/gun/46.json b/data/json/items/gun/46.json
index c6ffb9a53b7e9..45dac19c34820 100644
--- a/data/json/items/gun/46.json
+++ b/data/json/items/gun/46.json
@@ -19,7 +19,7 @@
     "dispersion": 260,
     "durability": 8,
     "min_cycle_recoil": 81,
-    "burst": 16,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "built_in_mods": [ "wire_stock" ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json
index 7ac7b250b1cf5..b34f088fda80c 100644
--- a/data/json/items/gun/50.json
+++ b/data/json/items/gun/50.json
@@ -46,7 +46,7 @@
     "durability": 8,
     "reload": 400,
     "barrel_length": 5,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 8 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],
diff --git a/data/json/items/gun/545x39.json b/data/json/items/gun/545x39.json
index 97512d3af50a3..8f3fac8ea789c 100644
--- a/data/json/items/gun/545x39.json
+++ b/data/json/items/gun/545x39.json
@@ -19,7 +19,7 @@
     "skill": "rifle",
     "dispersion": 150,
     "durability": 8,
-    "burst": 10,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "barrel_length": 1,
     "valid_mod_locations": [
       [ "accessories", 4 ],
@@ -58,7 +58,7 @@
     "dispersion": 150,
     "durability": 7,
     "barrel_length": 1,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "2 rd.", 2 ], [ "AUTO", "auto", 10 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "2 rd.", 2 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],
diff --git a/data/json/items/gun/57.json b/data/json/items/gun/57.json
index 97b55f78efa00..0c2e2d8b7edd8 100644
--- a/data/json/items/gun/57.json
+++ b/data/json/items/gun/57.json
@@ -56,7 +56,7 @@
     "dispersion": 260,
     "durability": 8,
     "min_cycle_recoil": 81,
-    "burst": 15,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "barrel", 1 ],
diff --git a/data/json/items/gun/5x50.json b/data/json/items/gun/5x50.json
index 937892ca1e024..f26e0aaedb6cc 100644
--- a/data/json/items/gun/5x50.json
+++ b/data/json/items/gun/5x50.json
@@ -21,7 +21,7 @@
     "dispersion": 220,
     "durability": 9,
     "barrel_length": 1,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "5 rd.", 5 ], [ "AUTO", "auto", 10 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "5 rd.", 5 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "barrel", 1 ],
@@ -58,7 +58,7 @@
     "skill": "pistol",
     "dispersion": 280,
     "durability": 9,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "2 rd.", 2 ], [ "AUTO", "auto", 5 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "2 rd.", 2 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "brass catcher", 1 ],
diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json
index 11da7fff34ef9..745915174ea58 100644
--- a/data/json/items/gun/762.json
+++ b/data/json/items/gun/762.json
@@ -18,7 +18,7 @@
     "skill": "rifle",
     "dispersion": 180,
     "durability": 9,
-    "burst": 10,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "barrel_length": 1,
     "valid_mod_locations": [
       [ "accessories", 4 ],
@@ -58,7 +58,7 @@
     "skill": "rifle",
     "dispersion": 160,
     "durability": 9,
-    "burst": 12,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "barrel_length": 1,
     "default_mods": [ "folding_stock" ],
     "valid_mod_locations": [
diff --git a/data/json/items/gun/762x25.json b/data/json/items/gun/762x25.json
index f6b3979bb6af7..7b3aad011a54b 100644
--- a/data/json/items/gun/762x25.json
+++ b/data/json/items/gun/762x25.json
@@ -22,7 +22,7 @@
     "durability": 8,
     "min_cycle_recoil": 270,
     "barrel_length": 2,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 15 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "barrel", 1 ],
diff --git a/data/json/items/gun/8x40mm.json b/data/json/items/gun/8x40mm.json
index fb7011a9d64e1..f169ff2fcf163 100644
--- a/data/json/items/gun/8x40mm.json
+++ b/data/json/items/gun/8x40mm.json
@@ -55,7 +55,7 @@
     "ranged_damage": 10,
     "dispersion": 10,
     "durability": 9,
-    "burst": 2,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 2 ] ],
     "barrel_length": 3,
     "built_in_mods": [ "riv_scope", "riv_suppressor" ],
     "valid_mod_locations": [
@@ -90,7 +90,7 @@
     "skill": "smg",
     "dispersion": 120,
     "durability": 9,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "grip", 1 ],
@@ -126,7 +126,7 @@
     "ranged_damage": 10,
     "dispersion": 90,
     "durability": 9,
-    "burst": 30,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ],
     "reload": 400,
     "barrel_length": 6,
     "magazine_well": 6,
@@ -153,7 +153,7 @@
     "ranged_damage": 5,
     "dispersion": 50,
     "durability": 9,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "grip", 1 ],
@@ -190,7 +190,7 @@
     "durability": 9,
     "reload": 200,
     "barrel_length": 2,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "4 rd.", 4 ], [ "AUTO", "auto", 20 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "4 rd.", 4 ], [ "AUTO", "auto", 6 ] ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],
@@ -225,7 +225,7 @@
     "ranged_damage": 10,
     "dispersion": 30,
     "durability": 9,
-    "burst": 10,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "barrel_length": 2,
     "valid_mod_locations": [
       [ "accessories", 4 ],
diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json
index 64b19618a6007..274a0b74924df 100644
--- a/data/json/items/gun/9mm.json
+++ b/data/json/items/gun/9mm.json
@@ -22,7 +22,7 @@
     "dispersion": 280,
     "durability": 6,
     "min_cycle_recoil": 450,
-    "burst": 13,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "barrel", 1 ],
@@ -128,7 +128,7 @@
     "durability": 8,
     "min_cycle_recoil": 450,
     "blackpowder_tolerance": 32,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 13 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "barrel", 1 ],
@@ -166,7 +166,7 @@
       [ "sling", 1 ],
       [ "stock", 1 ]
     ],
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 12 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 4 ] ],
     "built_in_mods": [ "mp5sd_suppressor" ]
   },
   {
@@ -300,7 +300,7 @@
     "//": "The M93R can go through up to 110 rounds in six seconds, FWIW.",
     "description": "A selective-firing 9x19mm handgun introduced by Leadworks LLC's, L39B provides accurate single-shot placement as well as controllable short-range firepower with its three-round burst mode.  Users praised its accuracy and fearsome appearance.  Comes with built in red dot and laser sights.  Similar to other Leadworks products it doesn't accept third-party modifications.",
     "price": 95000,
-    "burst": 3,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ] ],
     "relative": { "weight": 130, "durability": -1 }
   },
   {
@@ -424,7 +424,7 @@
     "durability": 4,
     "blackpowder_tolerance": 24,
     "min_cycle_recoil": 380,
-    "modes": [ [ "DEFAULT", "auto", 10 ] ],
+    "modes": [ [ "DEFAULT", "burst", 5 ] ],
     "loudness": 25,
     "barrel_length": 1,
     "valid_mod_locations": [
@@ -463,7 +463,7 @@
     "durability": 5,
     "blackpowder_tolerance": 24,
     "min_cycle_recoil": 450,
-    "modes": [ [ "DEFAULT", "auto", 10 ] ],
+    "modes": [ [ "DEFAULT", "burst", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 2 ],
       [ "muzzle", 1 ],
@@ -498,7 +498,7 @@
     "dispersion": 520,
     "durability": 6,
     "min_cycle_recoil": 450,
-    "modes": [ [ "DEFAULT", "auto", 8 ] ],
+    "modes": [ [ "DEFAULT", "burst", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "barrel", 1 ],
@@ -563,7 +563,7 @@
     "dispersion": 360,
     "durability": 7,
     "min_cycle_recoil": 450,
-    "burst": 10,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "built_in_mods": [ "folding_stock" ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
@@ -613,7 +613,7 @@
     "name": "Glock 18C",
     "description": "A selective fire variation on the Glock 17, originally designed for Austria's EKO Cobra unit.  It has compensator cuts along its barrel to make recoil more manageable.",
     "price": 100000,
-    "burst": 20,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ],
     "built_in_mods": [ "barrel_ported" ]
   },
   {
diff --git a/data/json/items/gun/9x18.json b/data/json/items/gun/9x18.json
index e155c4b755702..6a3fd5e7c56a2 100644
--- a/data/json/items/gun/9x18.json
+++ b/data/json/items/gun/9x18.json
@@ -45,7 +45,7 @@
     "weight": "1251 g",
     "ammo": "9x18",
     "min_cycle_recoil": 270,
-    "burst": 15,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "magazines": [ [ "9x18", [ "skorpion82mag" ] ] ]
   }
 ]
diff --git a/data/json/items/gun/flammable.json b/data/json/items/gun/flammable.json
index 9f6c3fe949bd0..df307bda7cee2 100644
--- a/data/json/items/gun/flammable.json
+++ b/data/json/items/gun/flammable.json
@@ -15,7 +15,7 @@
     "range": 6,
     "dispersion": 300,
     "durability": 8,
-    "burst": 4,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 1 ],
       [ "grip", 1 ],
@@ -44,7 +44,7 @@
     "ranged_damage": 10,
     "dispersion": 240,
     "durability": 9,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [ [ "accessories", 4 ], [ "rail", 1 ], [ "grip", 1 ], [ "sling", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ],
     "extend": { "flags": [ "FIRE_20", "MODE_BURST", "NON-FOULING" ] },
     "delete": { "flags": [ "FIRE_100" ] },
diff --git a/data/json/items/gun/nail.json b/data/json/items/gun/nail.json
index a0f4bef0763f7..a09a46bbdde22 100644
--- a/data/json/items/gun/nail.json
+++ b/data/json/items/gun/nail.json
@@ -66,7 +66,7 @@
     "to_hit": -1,
     "bashing": 12,
     "skill": "rifle",
-    "burst": 10,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 0,
     "valid_mod_locations": [
       [ "accessories", 4 ],
diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json
index 9a6976a52a830..5ddab3e6d5176 100644
--- a/data/json/items/gun/shot.json
+++ b/data/json/items/gun/shot.json
@@ -16,7 +16,7 @@
     "color": "dark_gray",
     "dispersion": 450,
     "durability": 6,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "loudness": 25,
     "reload": 400,
     "barrel_length": 3,
@@ -71,7 +71,7 @@
     "material": [ "aluminum", "steel" ],
     "dispersion": 855,
     "durability": 6,
-    "burst": 6,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 6,
     "reload": 110,
     "valid_mod_locations": [
diff --git a/data/json/items/gun/ups.json b/data/json/items/gun/ups.json
index d1e9e103af7d1..dac0f19ddc8b5 100644
--- a/data/json/items/gun/ups.json
+++ b/data/json/items/gun/ups.json
@@ -20,7 +20,7 @@
     "pierce": 20,
     "dispersion": 10,
     "durability": 10,
-    "burst": 3,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "loudness": 23,
     "ups_charges": 70,
     "reload": 0,
@@ -159,7 +159,7 @@
     "pierce": 15,
     "dispersion": 10,
     "durability": 8,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "loudness": 12,
     "ups_charges": 40,
     "reload": 0,
diff --git a/data/json/items/gunmod/mechanism.json b/data/json/items/gunmod/mechanism.json
index 4449567615b9a..ec40ec110a2a9 100644
--- a/data/json/items/gunmod/mechanism.json
+++ b/data/json/items/gunmod/mechanism.json
@@ -37,7 +37,7 @@
     "//install_time": "5 m",
     "dispersion_modifier": 10,
     "//durability_modifier": -1,
-    "mode_modifier": [ [ "AUTO", "auto", 13 ] ],
+    "mode_modifier": [ [ "AUTO", "auto", 4 ] ],
     "min_skills": [ [ "rifle", 2 ] ]
   },
   {
diff --git a/data/json/items/ranged.json b/data/json/items/ranged.json
index 54c7adf7995bb..f6689732d7a0d 100644
--- a/data/json/items/ranged.json
+++ b/data/json/items/ranged.json
@@ -214,7 +214,7 @@
     "ranged_damage": 5,
     "dispersion": 60,
     "durability": 8,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 25,
     "reload": 700,
     "valid_mod_locations": [
@@ -326,7 +326,7 @@
     "range": 15,
     "dispersion": 75,
     "durability": 7,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 15,
     "reload": 6000,
     "loudness": 18,
@@ -666,7 +666,7 @@
     "to_hit": -3,
     "dispersion": 300,
     "durability": 5,
-    "burst": 1,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ] ],
     "clip_size": 1,
     "reload": 800,
     "loudness": 200,
@@ -693,7 +693,7 @@
     "range": 10,
     "dispersion": 450,
     "durability": 10,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "burst", 4 ] ],
     "clip_size": 100,
     "reload": 0,
     "valid_mod_locations": [ [ "sling", 1 ] ]
diff --git a/data/mods/EW_Pack/ew_weapons.json b/data/mods/EW_Pack/ew_weapons.json
index 0138feee38c46..67069b1431814 100644
--- a/data/mods/EW_Pack/ew_weapons.json
+++ b/data/mods/EW_Pack/ew_weapons.json
@@ -18,7 +18,7 @@
     "to_hit": -1,
     "dispersion": 75,
     "durability": 9,
-    "burst": 12,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 12 ] ],
     "default_mods": [ "red_dot_sight" ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
@@ -145,7 +145,7 @@
     "price": 420000,
     "dispersion": 120,
     "durability": 6,
-    "burst": 8
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 8 ] ]
   },
   {
     "id": "cw-24m_hack",
@@ -157,7 +157,7 @@
     "price": 420000,
     "dispersion": 120,
     "durability": 6,
-    "burst": 8
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 8 ] ]
   },
   {
     "id": "cwd-63",
@@ -213,7 +213,7 @@
     "dispersion": 150,
     "sight_dispersion": 150,
     "durability": 8,
-    "burst": 30,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 30 ] ],
     "clip_size": 90,
     "reload": 300,
     "valid_mod_locations": [ [ "accessories", 2 ], [ "magazine", 2 ], [ "sling", 1 ], [ "underbarrel", 1 ] ],
diff --git a/data/mods/Tanks/items.json b/data/mods/Tanks/items.json
index 7475d6b7f1a9b..d683a37cb5729 100644
--- a/data/mods/Tanks/items.json
+++ b/data/mods/Tanks/items.json
@@ -368,7 +368,7 @@
     "dispersion": 0,
     "sight_dispersion": 10,
     "durability": 8,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "reload": 700,
     "loudness": 175,
     "magazines": [ [ "30mm", [ "belt30mm" ] ] ]
diff --git a/data/mods/blazemod/blaze_blob.json b/data/mods/blazemod/blaze_blob.json
index b44eeceb9e533..bc7591332281f 100644
--- a/data/mods/blazemod/blaze_blob.json
+++ b/data/mods/blazemod/blaze_blob.json
@@ -138,7 +138,7 @@
     "pierce": 15,
     "sight_dispersion": 150,
     "durability": 10,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "clip_size": 50,
     "ammo_effects": [ "WIDE" ],
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NO_BOOM" ]
@@ -343,7 +343,7 @@
     "pierce": 20,
     "sight_dispersion": 150,
     "durability": 10,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "clip_size": 50,
     "ammo_effects": [ "WIDE" ],
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ]
@@ -690,7 +690,7 @@
     "pierce": 15,
     "sight_dispersion": 150,
     "durability": 10,
-    "burst": 20,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 20 ] ],
     "clip_size": 240,
     "ammo_effects": [ "WIDE" ],
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ]
@@ -1053,7 +1053,7 @@
     "pierce": 5,
     "sight_dispersion": 150,
     "durability": 10,
-    "burst": 3,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 36,
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ]
   },
@@ -1232,7 +1232,7 @@
     "dispersion": 450,
     "sight_dispersion": 150,
     "durability": 10,
-    "burst": 3,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 180,
     "ammo_effects": [ "INCENDIARY", "FLARE", "WIDE", "NO_BOOM", "STREAM" ],
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NO_BOOM", "FIRE_20" ]
diff --git a/data/mods/blazemod/blaze_test.json b/data/mods/blazemod/blaze_test.json
index 54264e03b47c7..3aedc2654d13f 100644
--- a/data/mods/blazemod/blaze_test.json
+++ b/data/mods/blazemod/blaze_test.json
@@ -859,7 +859,7 @@
     "dispersion": 300,
     "sight_dispersion": 150,
     "durability": 8,
-    "burst": 3,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 30,
     "reload": 40,
     "valid_mod_locations": [  ],
@@ -964,7 +964,7 @@
     "dispersion": 300,
     "sight_dispersion": 150,
     "durability": 8,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 250,
     "reload": 10,
     "valid_mod_locations": [  ],
diff --git a/data/mods/blazemod/blaze_weapons.json b/data/mods/blazemod/blaze_weapons.json
index bfc2e8a314511..4d342188fb39c 100644
--- a/data/mods/blazemod/blaze_weapons.json
+++ b/data/mods/blazemod/blaze_weapons.json
@@ -20,7 +20,7 @@
     "pierce": 20,
     "sight_dispersion": 150,
     "durability": 9,
-    "burst": 3,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "reload": 150,
     "magazine_well": 1,
     "magazines": [ [ "bolt", [ "bolt_hopper" ] ] ],
@@ -98,7 +98,7 @@
     "ranged_damage": 60,
     "sight_dispersion": 150,
     "durability": 8,
-    "burst": 3,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 12,
     "reload": 750,
     "valid_mod_locations": [  ],
@@ -149,7 +149,7 @@
     "pierce": 20,
     "sight_dispersion": 150,
     "durability": 8,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "ups_charges": 29,
     "valid_mod_locations": [  ],
     "ammo_effects": [ "LASER", "WIDE" ],
@@ -229,7 +229,7 @@
     "pierce": 15,
     "sight_dispersion": 150,
     "durability": 8,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "reload": 150,
     "valid_mod_locations": [  ],
     "magazine_well": 1,
@@ -284,7 +284,7 @@
     "pierce": 5,
     "sight_dispersion": 150,
     "durability": 8,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "clip_size": 15,
     "reload": 750,
     "valid_mod_locations": [  ],
@@ -311,7 +311,7 @@
     "ranged_damage": 40,
     "sight_dispersion": 150,
     "durability": 8,
-    "burst": 3,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 12,
     "reload": 2500,
     "valid_mod_locations": [  ],
@@ -365,7 +365,7 @@
     "dispersion": 1300,
     "sight_dispersion": 150,
     "durability": 5,
-    "burst": 25,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 25 ] ],
     "ups_charges": 1,
     "reload": 150,
     "valid_mod_locations": [  ],
@@ -394,7 +394,7 @@
     "pierce": 15,
     "sight_dispersion": 150,
     "durability": 8,
-    "burst": 3,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 12,
     "reload": 750,
     "valid_mod_locations": [  ],
@@ -445,7 +445,7 @@
     "ranged_damage": 25,
     "sight_dispersion": 150,
     "durability": 9,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "magazine_well": 1,
     "magazines": [ [ "pebble", [ "pebble_hopper" ] ] ],
     "reload": 150,