Merge pull request #31738 from ymber/shotgun_fixes

fix shotgun itemgroups
CleverRaven · Jun 23, 2019 · 0db43cf · 0db43cf
2 parents e421845 + 485ac7d
commit 0db43cf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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 }
     ]
   },
   {