Merge pull request #44316 from arijust/generic_guns_ammo_fix

[Generic Guns] Add pocket data to all magazines.

data/mods/Generic_Guns/magazines/pistol.json

@@ -5,22 +5,25 @@
     "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" ]
+    "ammo_type": [ "ammo_pistol" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "ammo_pistol": 15 } } ]
   },
   {
     "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" ]
+    "ammo_type": [ "ammo_pistol" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "ammo_pistol": 30 } } ]
   },
   {
     "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" ]
+    "ammo_type": [ "ammo_pistol", "ammo_pistol_magnum" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "ammo_pistol": 6, "ammo_pistol_magnum": 6 } } ]
   }
 ]

data/mods/Generic_Guns/magazines/pistol_magnum.json

@@ -5,6 +5,7 @@
     "type": "MAGAZINE",
     "name": { "str": "magnum pistol magazine" },
     "description": "An 8 round magazine for use with semi-automatic magnum pistols.",
-    "ammo_type": [ "ammo_pistol", "ammo_pistol_magnum" ]
+    "ammo_type": [ "ammo_pistol", "ammo_pistol_magnum" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "ammo_pistol_magnum": 8 } } ]
   }
 ]

data/mods/Generic_Guns/magazines/pistol_tiny.json

@@ -5,6 +5,7 @@
     "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" ]
+    "ammo_type": [ "ammo_pistol_tiny" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "ammo_pistol_tiny": 10 } } ]
   }
 ]

data/mods/Generic_Guns/magazines/rifle.json

@@ -19,14 +19,16 @@
     "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.",
-    "ammo_type": [ "ammo_rifle" ]
+    "ammo_type": [ "ammo_rifle" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "ammo_rifle": 30 } } ]
   },
   {
     "id": "rifle_sniper_mag",
     "copy-from": "m2010mag",
     "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.",
-    "ammo_type": [ "ammo_rifle" ]
+    "ammo_type": [ "ammo_rifle" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "ammo_rifle": 5 } } ]
   }
 ]

data/mods/Generic_Guns/magazines/rifle_huge.json

@@ -17,6 +17,7 @@
     "copy-from": "m107a1mag",
     "name": { "str": "anti-materiel rifle magazine" },
     "description": "A huge 10 round magazine for anti-materiel rifles.",
-    "ammo_type": [ "ammo_rifle_huge" ]
+    "ammo_type": [ "ammo_rifle_huge" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "ammo_rifle_huge": 10 } } ]
   }
 ]

data/mods/Generic_Guns/magazines/shot.json

@@ -16,6 +16,7 @@
     "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.",
-    "ammo_type": [ "ammo_shot" ]
+    "ammo_type": [ "ammo_shot" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "ammo_shot": 6 } } ]
   }
 ]