Add magazine looks_like for SMGs

CleverRaven · Feb 9, 2020 · 78705fb · 78705fb
1 parent cd226db
commit 78705fb
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 2 deletions.
diff --git a/data/json/items/magazine/22.json b/data/json/items/magazine/22.json
@@ -17,7 +17,7 @@
   },
   {
     "id": "360_200_mag",
-    "looks_like": "stanag30",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "RMRB200 .22 magazine",
     "description": "A 200 round box magazine for use with the RM360 rotary carbine.",
@@ -35,7 +35,7 @@
   },
   {
     "id": "360_400_mag",
-    "looks_like": "stanag30",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "RMRD400 .22 drum magazine",
     "description": "A 400 round drum magazine for use with the RM360 rotary carbine.",
@@ -53,6 +53,7 @@
   },
   {
     "id": "a180mag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "A-180 magazine",
     "description": "An unusually shaped pan magazine for the American-180.",

diff --git a/data/json/items/magazine/32.json b/data/json/items/magazine/32.json
@@ -35,6 +35,7 @@
   },
   {
     "id": "skorpion61mag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "Skorpion Vz. 61 magazine",
     "description": "A standard 20-round magazine for the Skorpion Vz. 61, in .32 ACP.",

diff --git a/data/json/items/magazine/380.json b/data/json/items/magazine/380.json
@@ -52,6 +52,7 @@
   },
   {
     "id": "mac11mag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "MAC-11 magazine",
     "description": "A cheap 32-round steel box magazine for use with the MAC-11 SMG.",

diff --git a/data/json/items/magazine/40.json b/data/json/items/magazine/40.json
@@ -69,6 +69,7 @@
   },
   {
     "id": "smg_40_mag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "makeshift .40 20-round magazine",
     "description": "An improvised magazine that is mostly compatible with a homemade 'Luty' submachinegun, with a simplified feed system.  It looks like it might feed 20 rounds of .40S&W.",

diff --git a/data/json/items/magazine/45.json b/data/json/items/magazine/45.json
@@ -35,6 +35,7 @@
   },
   {
     "id": "mac10mag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "MAC-10 magazine",
     "description": "A cheap 30-round steel box magazine for use with the MAC-10 SMG.",
@@ -51,6 +52,7 @@
   },
   {
     "id": "smg_45_mag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "MAC-10 makeshift magazine",
     "description": "An improvised 20-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with MAC-10 SMG.",
@@ -68,6 +70,7 @@
   },
   {
     "id": "tdi_mag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "TDI Vector magazine",
     "description": "A 30-round steel box magazine for use with the TDI Vector",
@@ -84,6 +87,7 @@
   },
   {
     "id": "thompson_bigmag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "Thompson extended magazine",
     "description": "An extended 30-round magazine for the Thompson submachine gun.",
@@ -101,6 +105,7 @@
   },
   {
     "id": "thompson_drum",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "Thompson drum magazine",
     "description": "A 50-round drum magazine for the Thompson submachine gun.  Made famous by gangsters, but the military preferred standard 20 and 30-round magazines due to greater reliability.",
@@ -118,6 +123,7 @@
   },
   {
     "id": "thompson_mag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "Thompson magazine",
     "description": "A standard 20-round magazine for the Thompson submachine gun.",
@@ -141,6 +147,7 @@
   },
   {
     "id": "ump45mag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "UMP45 magazine",
     "description": "A standard 25-round box magazine for use with the H&K UMP45 SMG.",

diff --git a/data/json/items/magazine/46.json b/data/json/items/magazine/46.json
@@ -1,6 +1,7 @@
 [
   {
     "id": "hk46bigmag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "H&K 4.6mm extended magazine",
     "description": "An extended 40-round magazine for use with H&K's proprietary 4.6x30mm round.",
@@ -17,6 +18,7 @@
   },
   {
     "id": "hk46mag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "H&K 4.6mm magazine",
     "description": "A standard capacity 20-round magazine for use with H&K's proprietary 4.6x30mm round.",

diff --git a/data/json/items/magazine/57.json b/data/json/items/magazine/57.json
@@ -18,6 +18,7 @@
   },
   {
     "id": "fnp90mag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "FN-P90 magazine",
     "description": "A factory issue translucent polymer box magazine that fits with the frame of the FN P90.",

diff --git a/data/json/items/magazine/5x50.json b/data/json/items/magazine/5x50.json
@@ -1,6 +1,7 @@
 [
   {
     "id": "5x50_100_mag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "RMFB100 5x50mm extended magazine",
     "description": "A 100 round box magazine for use with 5x50mm flechette firearms.",
@@ -18,6 +19,7 @@
   },
   {
     "id": "5x50_50_mag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "RMFB50 5x50mm magazine",
     "description": "A 50 round box magazine for use with 5x50mm flechette firearms.",

diff --git a/data/json/items/magazine/762x25.json b/data/json/items/magazine/762x25.json
@@ -1,6 +1,7 @@
 [
   {
     "id": "ppshdrum",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "PPSh 71-round drum magazine",
     "//": "Provisional.",
@@ -19,6 +20,7 @@
   },
   {
     "id": "ppshmag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "PPSh 35-round magazine",
     "description": "A 35-round box magazine for the PPSh-41.",

diff --git a/data/json/items/magazine/9mm.json b/data/json/items/magazine/9mm.json
@@ -17,6 +17,7 @@
   },
   {
     "id": "calicomag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "Calico magazine",
     "description": "A surprisingly compact 50-round helical magazine for use with the Calico M960 SMG.",
@@ -209,6 +210,7 @@
   },
   {
     "id": "mp5mag",
+    "//": "Tileset whitelist for SMG magazines",
     "type": "MAGAZINE",
     "name": "MP5 magazine",
     "description": "A standard capacity curved magazine for use with the H&K MP5 SMG.",
@@ -225,6 +227,7 @@
   },
   {
     "id": "stenmag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "STEN magazine",
     "description": "A double-column, single-feed 9x19mm magazine used by the STEN submachine gun, based off the magazines for the German MP-28 and later MP-40.",
@@ -241,6 +244,7 @@
   },
   {
     "id": "survivor9mm_mag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "makeshift STEN magazine",
     "description": "An improvised magazine that is mostly compatible with the STEN submachine gun, with a simplified feed system.",
@@ -258,6 +262,7 @@
   },
   {
     "id": "tec9mag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "TEC-9 magazine",
     "description": "A cheap and somewhat unreliable 32-round steel box magazine for use with the TEC-9 SMG.",
@@ -291,6 +296,7 @@
   },
   {
     "id": "uzimag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "UZI magazine",
     "description": "A standard 32-round steel box magazine for use with the UZI SMG.",

diff --git a/data/json/items/magazine/9x18.json b/data/json/items/magazine/9x18.json
@@ -18,6 +18,7 @@
   },
   {
     "id": "skorpion82mag",
+    "looks_like": "mp5mag",
     "type": "MAGAZINE",
     "name": "Skorpion Vz. 82 magazine",
     "description": "A standard 20-round magazine for the Skorpion Vz. 82, in 9x18mm Makarov.",