Merge pull request #35727 from Rail-Runner/magfix

Minor magazine tweaks

data/json/items/classes/magazine.json

@@ -12,6 +12,6 @@
     "rigid": false,
     "reliability": 6,
     "armor_data": { "covers": [ "TORSO" ], "coverage": 5 },
-    "flags": [ "MAG_BELT", "MAG_DESTROY", "BELTED", "OVERSIZE" ]
+    "flags": [ "MAG_BELT", "MAG_DESTROY", "BELTED", "OVERSIZE", "WATER_FRIENDLY" ]
   }
 ]

data/json/items/magazine/223.json

@@ -18,7 +18,7 @@
     "id": "belt223",
     "copy-from": "magazine_belt",
     "type": "MAGAZINE",
-    "name": "ammo belt 5.56x45mm",
+    "name": "5.56x45mm ammo belt",
     "ammo_type": "223",
     "capacity": 500,
     "count": 100,

data/json/items/magazine/3006.json

@@ -2,7 +2,7 @@
   {
     "id": "3006_clip",
     "type": "MAGAZINE",
-    "name": "rifle clip - .30-06",
+    "name": ".30-06 clip",
     "//": "Provisional.",
     "description": "A tiny piece of grooved metal designed to allow a shooter to quickly load a bolt-action rifle.",
     "weight": "40 g",
@@ -34,7 +34,7 @@
   {
     "id": "garandclip",
     "type": "MAGAZINE",
-    "name": "M1 Garand Clip",
+    "name": "M1 Garand clip",
     "description": "A light-weight en-bloc clip for use with the M1 Garand that will be ejected after the last round is fired.",
     "weight": "30 g",
     "volume": "250 ml",

data/json/items/magazine/308.json

@@ -3,7 +3,7 @@
     "id": "belt308",
     "copy-from": "magazine_belt",
     "type": "MAGAZINE",
-    "name": "ammo belt 7.62x51mm",
+    "name": "7.62x51mm ammo belt",
     "ammo_type": "308",
     "capacity": 500,
     "count": 100,

data/json/items/magazine/357sig.json

@@ -2,7 +2,7 @@
   {
     "id": "p226mag_15rd_357sig",
     "type": "MAGAZINE",
-    "name": "P226 magazine .357 SIG",
+    "name": "P226 .357 SIG magazine",
     "description": "A 15 round double stack box magazine for a SIG P226 chambered for .357 SIG rounds.",
     "weight": "150 g",
     "volume": "250 ml",
@@ -18,7 +18,7 @@
   {
     "id": "p320mag_14rd_357sig",
     "type": "MAGAZINE",
-    "name": "P320 magazine .357 SIG",
+    "name": "P320 .357 SIG magazine",
     "description": "A 14 round double stack box magazine for the SIG Sauer P320.",
     "weight": "105 g",
     "volume": "250 ml",

data/json/items/magazine/380.json

@@ -66,7 +66,7 @@
   {
     "id": "hptcf380mag_8rd",
     "type": "MAGAZINE",
-    "name": "CF-380 magazine",
+    "name": "CF-380 8-round magazine",
     "description": "An 8-round steel box magazine for use with the Hi-Point CF-380.",
     "weight": "110 g",
     "volume": "236 ml",
@@ -82,7 +82,7 @@
   {
     "id": "hptcf380mag_10rd",
     "type": "MAGAZINE",
-    "name": "CF-380 magazine",
+    "name": "CF-380 10-round magazine",
     "description": "A 10-round steel box magazine for use with the Hi-Point CF-380.",
     "weight": "110 g",
     "volume": "236 ml",

data/json/items/magazine/40.json

@@ -83,7 +83,7 @@
   {
     "id": "bhp40mag",
     "type": "MAGAZINE",
-    "name": "Hi-Power magazine .40 S&W",
+    "name": "Hi-Power .40 S&W magazine",
     "description": "A 10 round steel box magazine for the Browning Hi-Power .40 S&W.",
     "weight": "120 g",
     "volume": "185 ml",
@@ -99,7 +99,7 @@
   {
     "id": "ppq40mag_10rd",
     "type": "MAGAZINE",
-    "name": "PPQ magazine .40 S&W",
+    "name": "PPQ .40 S&W 10-round magazine",
     "description": "A 10 round steel box magazine for the Walther PPQ .40 S&W.",
     "weight": "80 g",
     "volume": "200 ml",
@@ -115,7 +115,7 @@
   {
     "id": "ppq40mag_12rd",
     "type": "MAGAZINE",
-    "name": "PPQ magazine .40 S&W",
+    "name": "PPQ .40 S&W 12-round magazine",
     "description": "A 12 round steel box magazine for the Walther PPQ .40 S&W.",
     "weight": "80 g",
     "volume": "200 ml",
@@ -131,7 +131,7 @@
   {
     "id": "ppq40mag_14rd",
     "type": "MAGAZINE",
-    "name": "PPQ magazine .40 S&W",
+    "name": "PPQ .40 S&W 14-round magazine",
     "description": "A 14 round steel box magazine for the Walther PPQ .40 S&W.",
     "weight": "80 g",
     "volume": "200 ml",

data/json/items/magazine/45.json

@@ -179,7 +179,7 @@
   {
     "id": "ppq45mag",
     "type": "MAGAZINE",
-    "name": "PPQ magazine .45 ACP",
+    "name": "PPQ .45 ACP magazine",
     "description": "A 12 round steel box magazine for the Walther PPQ .45 ACP.",
     "weight": "80 g",
     "volume": "240 ml",

data/json/items/magazine/50.json

@@ -3,7 +3,7 @@
     "id": "belt50",
     "copy-from": "magazine_belt",
     "type": "MAGAZINE",
-    "name": "ammo belt .50 BMG",
+    "name": ".50 BMG ammo belt",
     "ammo_type": "50",
     "capacity": 100,
     "count": 100,
@@ -31,7 +31,7 @@
   {
     "id": "as50mag",
     "type": "MAGAZINE",
-    "name": "AS50 Magazine",
+    "name": "AS50 magazine",
     "description": "10-Round box magazine for Accuracy International AS50.",
     "weight": "750 g",
     "volume": "500 ml",

data/json/items/magazine/762.json

@@ -2,7 +2,7 @@
   {
     "id": "762x39_clip",
     "type": "MAGAZINE",
-    "name": "rifle clip - 7.62x39mm",
+    "name": "7.62x39mm clip",
     "//": "Provisional.",
     "description": "A tiny piece of grooved metal designed to allow a shooter to quickly load a bolt-action rifle.",
     "weight": "40 g",

data/json/items/magazine/762R.json

@@ -2,7 +2,7 @@
   {
     "id": "762R_clip",
     "type": "MAGAZINE",
-    "name": "rifle clip - 7.62x54mmR",
+    "name": "7.62x54mmR clip",
     "//": "Provisional.",
     "description": "A tiny piece of grooved metal designed to allow a shooter to quickly load a bolt-action rifle.",
     "weight": "40 g",

data/json/items/magazine/9mm.json

@@ -67,7 +67,7 @@
   {
     "id": "glock17_17",
     "type": "MAGAZINE",
-    "name": "Glock 17 magazine - 17 rd",
+    "name": "Glock 17 17-round magazine",
     "description": "Made for the Glock 17, this magazine holds 17 rounds.",
     "weight": "105 g",
     "volume": "250 ml",
@@ -84,7 +84,7 @@
   {
     "id": "glock17_22",
     "type": "MAGAZINE",
-    "name": "Glock 17 magazine - 22 rd",
+    "name": "Glock 17 22-round magazine",
     "description": "Made for the Glock 17, this magazine holds 22 rounds.",
     "weight": "105 g",
     "volume": "500 ml",
@@ -100,7 +100,7 @@
   {
     "id": "glock_drum_50rd",
     "type": "MAGAZINE",
-    "name": "Glock Drum magazine - 50 rd",
+    "name": "Glock 50-round drum magazine",
     "description": "Made to fit most Glock pistols.  This drum magazine holds 50 rounds.",
     "weight": "100 g",
     "volume": "500 ml",
@@ -111,12 +111,12 @@
     "ammo_type": "9mm",
     "capacity": 50,
     "reliability": 8,
-    "flags": [ "BULKY" ]
+    "flags": [ "MAG_BULKY" ]
   },
   {
     "id": "glock_drum_100rd",
     "type": "MAGAZINE",
-    "name": "Glock Drum magazine - 100 rd",
+    "name": "Glock 100-round drum magazine",
     "description": "Made to fit most Glock pistols.  This drum magazine holds 100 rounds.",
     "weight": "100 g",
     "volume": "1 L",
@@ -127,7 +127,7 @@
     "ammo_type": "9mm",
     "capacity": 100,
     "reliability": 8,
-    "flags": [ "BULKY" ]
+    "flags": [ "MAG_BULKY" ]
   },
   {
     "id": "lw21mag",
@@ -312,7 +312,7 @@
   {
     "id": "p320mag_17rd_9x19mm",
     "type": "MAGAZINE",
-    "name": "P320 magazine 9x19mm",
+    "name": "P320 9x19mm magazine",
     "description": "A 17 round double stack box magazine for the SIG Sauer P320.",
     "weight": "105 g",
     "volume": "250 ml",
@@ -329,7 +329,7 @@
   {
     "id": "bhp9mag_13rd",
     "type": "MAGAZINE",
-    "name": "Hi-Power magazine 9x19mm",
+    "name": "Hi-Power 9x19mm 13-round magazine",
     "description": "A 13 round steel box magazine for the Browning Hi-Power 9x19mm.",
     "weight": "100 g",
     "volume": "191 ml",
@@ -345,7 +345,7 @@
   {
     "id": "bhp9mag_15rd",
     "type": "MAGAZINE",
-    "name": "Hi-Power magazine 9x19mm",
+    "name": "Hi-Power 9x19mm 15-round magazine",
     "description": "A 15 round steel box magazine for the Browning Hi-Power 9x19mm.",
     "weight": "100 g",
     "volume": "191 ml",
@@ -377,7 +377,7 @@
   {
     "id": "ppq9mag_10rd",
     "type": "MAGAZINE",
-    "name": "PPQ magazine 9x19mm",
+    "name": "PPQ 9x19mm 10-round magazine",
     "description": "A 10 round steel box magazine for the Walther PPQ 9mm.",
     "weight": "80 g",
     "volume": "207 ml",
@@ -393,7 +393,7 @@
   {
     "id": "ppq9mag_15rd",
     "type": "MAGAZINE",
-    "name": "PPQ magazine 9x19mm",
+    "name": "PPQ 9x19mm 15-round magazine",
     "description": "A 15 round steel box magazine for the Walther PPQ 9mm.",
     "weight": "80 g",
     "volume": "207 ml",
@@ -409,7 +409,7 @@
   {
     "id": "ppq9mag_17rd",
     "type": "MAGAZINE",
-    "name": "PPQ magazine 9x19mm",
+    "name": "PPQ 9x19mm 17-round magazine",
     "description": "A 17 round steel box magazine for the Walther PPQ 9mm.",
     "weight": "80 g",
     "volume": "207 ml",
@@ -425,7 +425,7 @@
   {
     "id": "hptc9mag_8rd",
     "type": "MAGAZINE",
-    "name": "C-9 magazine",
+    "name": "C-9 8-round magazine",
     "description": "An 8-round steel box magazine for use with the Hi-Point C-9.",
     "weight": "110 g",
     "volume": "284 ml",
@@ -441,7 +441,7 @@
   {
     "id": "hptc9mag_10rd",
     "type": "MAGAZINE",
-    "name": "C-9 magazine",
+    "name": "C-9 10-round magazine",
     "description": "A 10-round steel box magazine for use with the Hi-Point C-9.",
     "weight": "110 g",
     "volume": "284 ml",
@@ -457,7 +457,7 @@
   {
     "id": "hptc9mag_15rd",
     "type": "MAGAZINE",
-    "name": "C-9 magazine",
+    "name": "C-9 15-round magazine",
     "description": "A 15-round steel box magazine for use with the Hi-Point C-9.",
     "weight": "110 g",
     "volume": "284 ml",
@@ -473,7 +473,7 @@
   {
     "id": "cz75mag_12rd",
     "type": "MAGAZINE",
-    "name": "CZ 75 magazine",
+    "name": "CZ 75 12-round magazine",
     "description": "A 12-round steel box magazine for use with the CZ 75.",
     "weight": "100 g",
     "volume": "230 ml",
@@ -489,7 +489,7 @@
   {
     "id": "cz75mag_20rd",
     "type": "MAGAZINE",
-    "name": "CZ 75 magazine",
+    "name": "CZ 75 20-round magazine",
     "description": "A 20-round steel box magazine for use with the CZ 75.",
     "weight": "100 g",
     "volume": "230 ml",
@@ -505,7 +505,7 @@
   {
     "id": "cz75mag_26rd",
     "type": "MAGAZINE",
-    "name": "CZ 75 magazine",
+    "name": "CZ 75 26-round magazine",
     "description": "A 26-round steel box magazine for use with the CZ 75.",
     "weight": "100 g",
     "volume": "230 ml",

data/json/items/magazine/liquid.json

@@ -29,7 +29,8 @@
     "ammo_type": "flammable",
     "capacity": 500,
     "reliability": 9,
-    "reload_time": 3
+    "reload_time": 3,
+    "flags": [ "MAG_BULKY" ]
   },
   {
     "id": "rm4502",

data/json/items/magazine/shot.json

@@ -47,7 +47,7 @@
     "capacity": 20,
     "reliability": 5,
     "armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 2 },
-    "flags": [ "MAG_EJECT", "BELTED", "OVERSIZE" ]
+    "flags": [ "MAG_EJECT", "BELTED", "OVERSIZE", "WATER_FRIENDLY" ]
   },
   {
     "id": "shot_speedloader6",