From 485ac7d96db1b7fdc4fb7a16438fef0891bf4a12 Mon Sep 17 00:00:00 2001
From: ymber <mtaylor1252dev@gmail.com>
Date: Sat, 22 Jun 2019 16:24:27 +0100
Subject: [PATCH] fix shotgun itemgroups

---
 data/json/itemgroups/ammo.json | 4 ++--
 data/json/itemgroups/guns.json | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/data/json/itemgroups/ammo.json b/data/json/itemgroups/ammo.json
index 05cf227d1f452..227c4799c3c5f 100644
--- a/data/json/itemgroups/ammo.json
+++ b/data/json/itemgroups/ammo.json
@@ -224,7 +224,7 @@
     "type": "item_group",
     "id": "ammo_shotgun_common",
     "//": "Shotgun ammo commonly owned by citizens and found in many locations.",
-    "items": [ [ "shot_00", 100 ], [ "shot_bird", 70 ], [ "shot_dragon", 10 ], [ "410shot_000", 50 ] ]
+    "items": [ [ "shot_00", 100 ], [ "shot_bird", 70 ], [ "shot_slug", 70 ], [ "410shot_000", 50 ] ]
   },
   {
     "type": "item_group",
@@ -235,7 +235,7 @@
       [ "20x66_flare", 10 ],
       [ "20x66_shot", 40 ],
       [ "20x66_slug", 20 ],
-      [ "shot_slug", 100 ],
+      [ "shot_dragon", 10 ],
       [ "shot_beanbag", 20 ]
     ]
   },
diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json
index 89b72b3fcc7dd..fd7fd8fc26f73 100644
--- a/data/json/itemgroups/guns.json
+++ b/data/json/itemgroups/guns.json
@@ -287,7 +287,8 @@
     "//": "Military specification shotguns only ever found at military sites.",
     "items": [
       { "item": "l_def_12", "prob": 100, "charges-min": 0, "charges-max": 8 },
-      { "item": "rm20", "prob": 20, "charges-min": 0, "charges-max": 20 }
+      { "item": "rm20", "prob": 20, "charges-min": 0, "charges-max": 20 },
+      { "item": "m1014", "prob": 100, "charges-min": 0, "charges-max": 8 }
     ]
   },
   {