Magazine name to object (#38278)

CleverRaven · Feb 24, 2020 · d850c6e · d850c6e
1 parent e55bd75
commit d850c6e
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 25 deletions.
diff --git a/data/json/items/magazine/300.json b/data/json/items/magazine/300.json
@@ -3,7 +3,7 @@
     "id": "m2010mag",
     "looks_like": "stanag30",
     "type": "MAGAZINE",
-    "name": "M2010 ESR magazine",
+    "name": { "str": "M2010 ESR magazine" },
     "description": "A 5-round box magazine used by M2010 ESR sniper rifle.",
     "weight": "78 g",
     "volume": "250 ml",

diff --git a/data/json/items/magazine/357sig.json b/data/json/items/magazine/357sig.json
@@ -3,7 +3,7 @@
     "id": "p226mag_15rd_357sig",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
-    "name": "P226 .357 SIG magazine",
+    "name": { "str": "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",
@@ -20,7 +20,7 @@
     "id": "p320mag_14rd_357sig",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
-    "name": "P320 .357 SIG magazine",
+    "name": { "str": "P320 .357 SIG magazine" },
     "description": "A 14 round double stack box magazine for the SIG Sauer P320.",
     "weight": "105 g",
     "volume": "250 ml",

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

diff --git a/data/json/items/magazine/40.json b/data/json/items/magazine/40.json
@@ -106,7 +106,7 @@
     "id": "ppq40mag_10rd",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
-    "name": "PPQ .40 S&W 10-round magazine",
+    "name": { "str": "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",
@@ -123,7 +123,7 @@
     "id": "ppq40mag_12rd",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
-    "name": "PPQ .40 S&W 12-round magazine",
+    "name": { "str": "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",
@@ -140,7 +140,7 @@
     "id": "ppq40mag_14rd",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
-    "name": "PPQ .40 S&W 14-round magazine",
+    "name": { "str": "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",
@@ -157,7 +157,7 @@
     "id": "hptjcpmag",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
-    "name": "Model JCP magazine",
+    "name": { "str": "Model JCP magazine" },
     "description": "A 10-round steel box magazine for use with the Hi-Point Model JCP.",
     "weight": "110 g",
     "volume": "312 ml",

diff --git a/data/json/items/magazine/45.json b/data/json/items/magazine/45.json
@@ -37,7 +37,7 @@
     "id": "mac10mag",
     "looks_like": "mp5mag",
     "type": "MAGAZINE",
-    "name": "MAC-10 magazine",
+    "name": { "str": "MAC-10 magazine" },
     "description": "A cheap 30-round steel box magazine for use with the MAC-10 SMG.",
     "weight": "210 g",
     "volume": "500 ml",
@@ -54,7 +54,7 @@
     "id": "smg_45_mag",
     "looks_like": "mp5mag",
     "type": "MAGAZINE",
-    "name": "MAC-10 makeshift magazine",
+    "name": { "str": "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.",
     "weight": "300 g",
     "volume": "750 ml",
@@ -190,7 +190,7 @@
     "id": "ppq45mag",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
-    "name": "PPQ .45 ACP magazine",
+    "name": { "str": "PPQ .45 ACP magazine" },
     "description": "A 12 round steel box magazine for the Walther PPQ .45 ACP.",
     "weight": "80 g",
     "volume": "240 ml",
@@ -207,7 +207,7 @@
     "id": "hptjhpmag",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
-    "name": "Model JHP magazine",
+    "name": { "str": "Model JHP magazine" },
     "description": "A 9-round steel box magazine for use with the Hi-Point Model JHP.",
     "weight": "110 g",
     "volume": "353 ml",

diff --git a/data/json/items/magazine/66mm.json b/data/json/items/magazine/66mm.json
@@ -3,7 +3,7 @@
     "id": "m74_clip",
     "looks_like": "belt40mm",
     "type": "MAGAZINE",
-    "name": "M74 rocket clip",
+    "name": { "str": "M74 rocket clip" },
     "description": "This is a clip for the M202A1 FLASH that can hold 4 M74 incendiary rockets.",
     "weight": "200 g",
     "volume": "500 ml",

diff --git a/data/json/items/magazine/762x25.json b/data/json/items/magazine/762x25.json
@@ -3,7 +3,7 @@
     "id": "ppshdrum",
     "looks_like": "mp5mag",
     "type": "MAGAZINE",
-    "name": "PPSh 71-round drum magazine",
+    "name": { "str": "PPSh 71-round drum magazine" },
     "//": "Provisional.",
     "description": "A high-capacity drum magazine for the PPSh-41.",
     "weight": "1387 g",
@@ -22,7 +22,7 @@
     "id": "ppshmag",
     "looks_like": "mp5mag",
     "type": "MAGAZINE",
-    "name": "PPSh 35-round magazine",
+    "name": { "str": "PPSh 35-round magazine" },
     "description": "A 35-round box magazine for the PPSh-41.",
     "weight": "470 g",
     "volume": "500 ml",

diff --git a/data/json/items/magazine/9mm.json b/data/json/items/magazine/9mm.json
@@ -159,7 +159,7 @@
     "id": "m9bigmag",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
-    "name": "M9 extended magazine",
+    "name": { "str": "M9 extended magazine" },
     "description": "A 30-round extended magazine compatible with both the M9 handgun and some modern carbines.",
     "weight": "270 g",
     "volume": "500 ml",
@@ -177,7 +177,7 @@
     "id": "m9mag",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
-    "name": "M9 magazine",
+    "name": { "str": "M9 magazine" },
     "description": "A military issue 15-round box magazine originally intended for use with the Beretta M9 handgun.",
     "weight": "135 g",
     "volume": "250 ml",
@@ -194,7 +194,7 @@
     "id": "mp5bigmag",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
-    "name": "MP5 extended magazine",
+    "name": { "str": "MP5 extended magazine" },
     "description": "A drum magazine for use with the H&K MP5 SMG.  Much greater capacity but less reliable the factory specification magazine.",
     "weight": "350 g",
     "volume": "750 ml",
@@ -212,7 +212,7 @@
     "id": "mp5mag",
     "//": "Tileset whitelist for SMG magazines",
     "type": "MAGAZINE",
-    "name": "MP5 magazine",
+    "name": { "str": "MP5 magazine" },
     "description": "A standard capacity curved magazine for use with the H&K MP5 SMG.",
     "weight": "210 g",
     "volume": "500 ml",
@@ -332,7 +332,7 @@
     "id": "p320mag_17rd_9x19mm",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
-    "name": "P320 9x19mm magazine",
+    "name": { "str": "P320 9x19mm magazine" },
     "description": "A 17 round double stack box magazine for the SIG Sauer P320.",
     "weight": "105 g",
     "volume": "250 ml",
@@ -384,7 +384,7 @@
     "id": "p38mag",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
-    "name": "P38 magazine",
+    "name": { "str": "P38 magazine" },
     "description": "An 8 round steel box magazine for the Walther P38.",
     "weight": "70 g",
     "volume": "228 ml",
@@ -401,7 +401,7 @@
     "id": "ppq9mag_10rd",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
-    "name": "PPQ 9x19mm 10-round magazine",
+    "name": { "str": "PPQ 9x19mm 10-round magazine" },
     "description": "A 10 round steel box magazine for the Walther PPQ 9mm.",
     "weight": "80 g",
     "volume": "207 ml",
@@ -418,7 +418,7 @@
     "id": "ppq9mag_15rd",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
-    "name": "PPQ 9x19mm 15-round magazine",
+    "name": { "str": "PPQ 9x19mm 15-round magazine" },
     "description": "A 15 round steel box magazine for the Walther PPQ 9mm.",
     "weight": "80 g",
     "volume": "207 ml",
@@ -435,7 +435,7 @@
     "id": "ppq9mag_17rd",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
-    "name": "PPQ 9x19mm 17-round magazine",
+    "name": { "str": "PPQ 9x19mm 17-round magazine" },
     "description": "A 17 round steel box magazine for the Walther PPQ 9mm.",
     "weight": "80 g",
     "volume": "207 ml",

diff --git a/data/json/items/magazine/9x18.json b/data/json/items/magazine/9x18.json
@@ -3,7 +3,7 @@
     "id": "makarovmag",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
-    "name": "Makarov PM magazine",
+    "name": { "str": "Makarov PM magazine" },
     "description": "The standard magazine for the Pistolet Makarova, holds 8 rounds.",
     "weight": "60 g",
     "volume": "250 ml",