Merge pull request #40264 from ymber/fix_mags

Fix multiple assignments in generic magazines
CleverRaven · May 6, 2020 · 687ca3f · 687ca3f
2 parents e3fc8c9 + 1736f4b
commit 687ca3f
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 15 deletions.
diff --git a/data/mods/Generic_Guns/magazines/pistol.json b/data/mods/Generic_Guns/magazines/pistol.json
@@ -5,25 +5,22 @@
     "type": "MAGAZINE",
     "name": { "str": "pistol magazine" },
     "description": "A flush fitting magazine for use with pistols and submachine guns.  Holds 15 rounds of standard pistol ammo.",
-    "ammo_type": [ "ammo_pistol" ],
-    "delete": { "ammo_type": "9mm" }
+    "ammo_type": [ "ammo_pistol" ]
   },
   {
     "id": "pistol_smg_mag",
     "copy-from": "glockbigmag",
     "type": "MAGAZINE",
     "name": { "str": "SMG magazine" },
     "description": "A long stick magazine for use with pistols and submachine guns.  Holds 30 rounds of standard pistol ammo.",
-    "ammo_type": [ "ammo_pistol" ],
-    "delete": { "ammo_type": "9mm" }
+    "ammo_type": [ "ammo_pistol" ]
   },
   {
     "id": "pistol_speedloader",
     "copy-from": "44_speedloader6",
     "type": "MAGAZINE",
     "name": { "str": "revolver speedloader" },
     "description": "A 'speedloader', a metal block capable of holding and releasing ammunition to aid in loading revolvers.  Accepts 6 standard or magnum pistol cartridges.",
-    "ammo_type": [ "ammo_pistol", "ammo_pistol_magnum" ],
-    "delete": { "ammo_type": "44" }
+    "ammo_type": [ "ammo_pistol", "ammo_pistol_magnum" ]
   }
 ]
diff --git a/data/mods/Generic_Guns/magazines/pistol_magnum.json b/data/mods/Generic_Guns/magazines/pistol_magnum.json
@@ -5,7 +5,6 @@
     "type": "MAGAZINE",
     "name": { "str": "magnum pistol magazine" },
     "description": "An 8 round magazine for use with semi-automatic magnum pistols.",
-    "delete": { "ammo_type": "44" },
     "ammo_type": [ "ammo_pistol", "ammo_pistol_magnum" ]
   }
 ]
diff --git a/data/mods/Generic_Guns/magazines/pistol_tiny.json b/data/mods/Generic_Guns/magazines/pistol_tiny.json
@@ -5,7 +5,6 @@
     "type": "MAGAZINE",
     "name": "target pistol magazine",
     "description": "A flush fitting magazine for use with target pistols, capable of feeding 10 tiny pistol cartridges.",
-    "ammo_type": [ "ammo_pistol_tiny" ],
-    "delete": { "ammo_type": "22" }
+    "ammo_type": [ "ammo_pistol_tiny" ]
   }
 ]
diff --git a/data/mods/Generic_Guns/magazines/rifle.json b/data/mods/Generic_Guns/magazines/rifle.json
@@ -5,7 +5,6 @@
     "type": "MAGAZINE",
     "name": { "str": "ammo belt" },
     "description": "An ammo belt consisting of metal linkages which separate from the belt upon firing.  Holds rifle ammunition.",
-    "delete": { "ammo_type": "308" },
     "ammo_type": [ "ammo_rifle" ],
     "capacity": 500,
     "count": 100,
@@ -19,7 +18,6 @@
     "material": "aluminum",
     "name": "standard rifle magazine",
     "description": "A 30 round standard capacity magazine for service rifles, cheaper than the cost of a meal due to its adoption by nearly every other common rifle.  They're made of aluminum and were originally meant to be dispsoable, so they're not the most durable; don't let them get damaged.",
-    "delete": { "ammo_type": "308" },
     "ammo_type": [ "ammo_rifle" ]
   },
   {
@@ -28,7 +26,6 @@
     "type": "MAGAZINE",
     "name": { "str": "compact rifle magazine" },
     "description": "A short 5 round steel magazine compatible with nearly every common rifle.  Although it has a low capacity it is easy to store and quick to reload.",
-    "delete": { "ammo_type": "308" },
     "ammo_type": [ "ammo_rifle" ]
   }
 ]
diff --git a/data/mods/Generic_Guns/magazines/rifle_huge.json b/data/mods/Generic_Guns/magazines/rifle_huge.json
@@ -16,7 +16,6 @@
     "copy-from": "m107a1mag",
     "name": { "str": "anti-materiel rifle magazine" },
     "description": "A huge 10 round magazine for anti-materiel rifles.",
-    "delete": { "ammo_type": "50" },
     "ammo_type": [ "ammo_rifle_huge" ]
   }
 ]
diff --git a/data/mods/Generic_Guns/magazines/shot.json b/data/mods/Generic_Guns/magazines/shot.json
@@ -8,7 +8,6 @@
     "material": "plastic",
     "reliability": 6,
     "description": "An 8 round box magazine for tactical shotguns.  Shotshells tend to not work well in box magazines due to their plastic hulls and the compression from the magazine spring.",
-    "delete": { "ammo_type": "shot" },
     "ammo_type": [ "ammo_shot" ]
   },
   {
@@ -17,7 +16,6 @@
     "name": "shotgun speedloader",
     "type": "MAGAZINE",
     "description": "A shotshell 'speedloader', a long plastic tube with a prominent plastic follower.  You can feed 6 shotshells into an appropriately modified shotgun by pushing the follower against the shotgun's loading port.  Bulky, but sees use in competition occasionally.",
-    "delete": { "ammo_type": "shot" },
     "ammo_type": [ "ammo_shot" ]
   }
 ]