Merge pull request #34218 from tenmillimaster/AS50

AS-50: SWAT only
CleverRaven · Sep 25, 2019 · 15af49a · 15af49a
2 parents 4d40271 + 27e8475
commit 15af49a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json
@@ -226,7 +226,6 @@
     "items": [
       { "item": "h&k416a5", "prob": 50, "charges-min": 0, "charges-max": 30 },
       { "item": "m107a1", "prob": 30, "charges-min": 0, "charges-max": 10 },
-      { "item": "as50", "prob": 20, "charges-min": 0, "charges-max": 10 },
       { "item": "m134", "prob": 10, "charges-min": 0, "charges-max": 100 },
       { "item": "m14ebr", "prob": 10, "charges-min": 0, "charges-max": 20 },
       { "item": "m2010", "prob": 20, "charges-min": 0, "charges-max": 5 },
@@ -489,6 +488,7 @@
       { "item": "hk_mp5sd", "prob": 5, "charges-min": 0, "charges-max": 30 },
       { "item": "m1014", "prob": 10, "charges-min": 0, "charges-max": 8 },
       { "item": "m4a1", "prob": 35, "charges-min": 0, "charges-max": 30 },
+      { "item": "as50", "prob": 5, "charges-min": 0, "charges-max": 10 },
       { "item": "hk417_13", "prob": 30, "charges-min": 0, "charges-max": 20 }
     ]
   },

diff --git a/data/json/itemgroups/magazines.json b/data/json/itemgroups/magazines.json
@@ -21,7 +21,6 @@
       [ "hk46mag", 15 ],
       [ "hk46bigmag", 5 ],
       [ "m107a1mag", 50 ],
-      [ "as50mag", 50 ],
       [ "m2010mag", 10 ],
       [ "scarhmag", 50 ],
       [ "scarhbigmag", 20 ],
@@ -93,6 +92,7 @@
       [ "ump45mag", 20 ],
       [ "usp45mag", 10 ],
       [ "usp9mag", 10 ],
+      [ "as50mag", 2 ],
       [ "hk417mag_20rd", 20 ]
     ]
   },