Move ammo_type to arrays

CleverRaven · May 6, 2020 · 7e2c59c · 7e2c59c
1 parent 1f672da
commit 7e2c59c
Show file tree

Hide file tree

Showing 46 changed files with 200 additions and 209 deletions.
diff --git a/data/json/items/battery.json b/data/json/items/battery.json
@@ -30,7 +30,7 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
+    "ammo_type": [ "battery" ],
     "capacity": 50,
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
@@ -49,7 +49,7 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "green",
-    "ammo_type": "battery",
+    "ammo_type": [ "battery" ],
     "count": 500,
     "capacity": 500,
     "looks_like": "battery",
@@ -68,7 +68,7 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
+    "ammo_type": [ "battery" ],
     "count": 100,
     "capacity": 100,
     "looks_like": "battery",
@@ -88,7 +88,7 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
+    "ammo_type": [ "battery" ],
     "capacity": 100,
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
@@ -106,7 +106,7 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
+    "ammo_type": [ "battery" ],
     "capacity": 150,
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
@@ -125,7 +125,7 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "green",
-    "ammo_type": "battery",
+    "ammo_type": [ "battery" ],
     "count": 1000,
     "capacity": 1000,
     "looks_like": "battery",
@@ -144,7 +144,7 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
+    "ammo_type": [ "battery" ],
     "count": 300,
     "capacity": 300,
     "looks_like": "battery",
@@ -164,7 +164,7 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
+    "ammo_type": [ "battery" ],
     "capacity": 500,
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
@@ -182,7 +182,7 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
+    "ammo_type": [ "battery" ],
     "capacity": 600,
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
@@ -201,7 +201,7 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "green",
-    "ammo_type": "battery",
+    "ammo_type": [ "battery" ],
     "count": 5000,
     "capacity": 5000,
     "looks_like": "battery",
@@ -220,7 +220,7 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
+    "ammo_type": [ "battery" ],
     "count": 1200,
     "capacity": 1200,
     "looks_like": "battery",
@@ -240,7 +240,7 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
+    "ammo_type": [ "battery" ],
     "capacity": 1000,
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
@@ -258,7 +258,7 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
+    "ammo_type": [ "battery" ],
     "capacity": 1250,
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
@@ -277,7 +277,7 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "green",
-    "ammo_type": "battery",
+    "ammo_type": [ "battery" ],
     "count": 10000,
     "capacity": 10000,
     "looks_like": "battery",
@@ -296,7 +296,7 @@
     "material": [ "superalloy", "plastic" ],
     "symbol": "=",
     "color": "red",
-    "ammo_type": "battery",
+    "ammo_type": [ "battery" ],
     "count": 100000,
     "capacity": 100000,
     "looks_like": "battery",
@@ -315,7 +315,7 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
+    "ammo_type": [ "battery" ],
     "count": 2500,
     "capacity": 2500,
     "looks_like": "battery",

diff --git a/data/json/items/magazine/12mm.json b/data/json/items/magazine/12mm.json
@@ -12,7 +12,7 @@
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
-    "ammo_type": "12mm",
+    "ammo_type": [ "12mm" ],
     "capacity": 20,
     "reliability": 10,
     "flags": [ "MAG_COMPACT" ]

diff --git a/data/json/items/magazine/20x60mm.json b/data/json/items/magazine/20x60mm.json
@@ -12,7 +12,7 @@
     "material": [ "superalloy", "plastic" ],
     "symbol": "#",
     "color": "dark_gray",
-    "ammo_type": "20x66mm",
+    "ammo_type": [ "20x66mm" ],
     "capacity": 10,
     "reliability": 10,
     "reload_time": 60,
@@ -31,7 +31,7 @@
     "material": [ "superalloy", "plastic" ],
     "symbol": "#",
     "color": "dark_gray",
-    "ammo_type": "20x66mm",
+    "ammo_type": [ "20x66mm" ],
     "capacity": 20,
     "reliability": 10,
     "reload_time": 60,
@@ -50,7 +50,7 @@
     "material": [ "superalloy", "plastic" ],
     "symbol": "#",
     "color": "dark_gray",
-    "ammo_type": "20x66mm",
+    "ammo_type": [ "20x66mm" ],
     "capacity": 40,
     "reliability": 10,
     "reload_time": 70,

diff --git a/data/json/items/magazine/22.json b/data/json/items/magazine/22.json
@@ -12,7 +12,7 @@
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
-    "ammo_type": "22",
+    "ammo_type": [ "22" ],
     "capacity": 8,
     "flags": [ "SPEEDLOADER" ]
   },
@@ -29,7 +29,7 @@
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
-    "ammo_type": "22",
+    "ammo_type": [ "22" ],
     "capacity": 165,
     "reliability": 7,
     "reload_time": 150,
@@ -48,7 +48,7 @@
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
-    "ammo_type": "22",
+    "ammo_type": [ "22" ],
     "capacity": 19,
     "flags": [ "SPEEDLOADER" ]
   },
@@ -65,7 +65,7 @@
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
-    "ammo_type": "22",
+    "ammo_type": [ "22" ],
     "capacity": 10,
     "reliability": 9,
     "flags": [ "MAG_COMPACT" ]
@@ -83,7 +83,7 @@
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
-    "ammo_type": "22",
+    "ammo_type": [ "22" ],
     "capacity": 25,
     "reliability": 8,
     "flags": [ "MAG_COMPACT" ]
@@ -101,7 +101,7 @@
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
-    "ammo_type": "22",
+    "ammo_type": [ "22" ],
     "capacity": 10,
     "reliability": 9,
     "reload_time": 160,
@@ -120,7 +120,7 @@
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
-    "ammo_type": "22",
+    "ammo_type": [ "22" ],
     "capacity": 10,
     "reliability": 9,
     "flags": [ "MAG_COMPACT" ]
@@ -138,7 +138,7 @@
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
-    "ammo_type": "22",
+    "ammo_type": [ "22" ],
     "capacity": 6,
     "reliability": 6,
     "flags": [ "MAG_COMPACT" ]
@@ -156,7 +156,7 @@
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
-    "ammo_type": "22",
+    "ammo_type": [ "22" ],
     "capacity": 10,
     "reliability": 8,
     "flags": [ "MAG_COMPACT" ]

diff --git a/data/json/items/magazine/223.json b/data/json/items/magazine/223.json
@@ -5,7 +5,7 @@
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": "5.56x45mm ammo belt" },
-    "ammo_type": "223",
+    "ammo_type": [ "223" ],
     "capacity": 500,
     "count": 100,
     "default_ammo": "556",
@@ -24,7 +24,7 @@
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
-    "ammo_type": "223",
+    "ammo_type": [ "223" ],
     "capacity": 25,
     "reliability": 8,
     "flags": [ "MAG_COMPACT" ]
@@ -42,7 +42,7 @@
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
-    "ammo_type": "223",
+    "ammo_type": [ "223" ],
     "capacity": 5,
     "reliability": 9,
     "flags": [ "MAG_COMPACT" ]
@@ -72,7 +72,7 @@
     "type": "MAGAZINE",
     "name": { "str": "Ruger .223 10-round magazine" },
     "description": "A compact 10-round box magazine used with the Ruger Mini-14 rifle.",
-    "ammo_type": "223"
+    "ammo_type": [ "223" ]
   },
   {
     "id": "ruger20",
@@ -81,7 +81,7 @@
     "type": "MAGAZINE",
     "name": { "str": "Ruger .223 20-round magazine" },
     "description": "A 20-round box magazine used with the Ruger Mini-14 rifle.",
-    "ammo_type": "223"
+    "ammo_type": [ "223" ]
   },
   {
     "id": "ruger30",
@@ -96,7 +96,7 @@
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
-    "ammo_type": "223",
+    "ammo_type": [ "223" ],
     "capacity": 30,
     "reliability": 8,
     "flags": [ "MAG_COMPACT" ]
@@ -108,7 +108,7 @@
     "type": "MAGAZINE",
     "name": { "str": "Ruger .223 90-round snail drum magazine" },
     "description": "A bulky 90-round snail drum magazine for use with the Ruger Mini-14 rifle.",
-    "ammo_type": "223"
+    "ammo_type": [ "223" ]
   },
   {
     "id": "ruger100",
@@ -117,7 +117,7 @@
     "type": "MAGAZINE",
     "name": { "str": "Ruger .223 100-round double drum magazine" },
     "description": "A bulky 100-round double drum magazine for use with the Ruger Mini-14 rifle.",
-    "ammo_type": "223"
+    "ammo_type": [ "223" ]
   },
   {
     "id": "stanag5",
@@ -326,7 +326,7 @@
     "type": "MAGAZINE",
     "name": { "str": "G36 30-round magazine" },
     "description": "A standard capacity box magazine for use with the G36 assault rifle.",
-    "ammo_type": "223"
+    "ammo_type": [ "223" ]
   },
   {
     "id": "g36mag_100rd",
@@ -335,7 +335,7 @@
     "type": "MAGAZINE",
     "name": { "str": "G36 100-round double drum magazine" },
     "description": "A bulky 100-round double drum magazine for use with the G36 assault rifle.",
-    "ammo_type": "223"
+    "ammo_type": [ "223" ]
   },
   {
     "id": "augmag_10rd",
@@ -345,7 +345,7 @@
     "name": { "str": "AUG 10-round magazine" },
     "description": "A compact 10-round box magazine for use with the Steyr AUG assault rifle.",
     "material": [ "steel", "plastic" ],
-    "ammo_type": "223"
+    "ammo_type": [ "223" ]
   },
   {
     "id": "augmag_30rd",
@@ -355,7 +355,7 @@
     "name": { "str": "AUG 30-round magazine" },
     "description": "A standard capacity 30-round box magazine for use with the Steyr AUG assault rifle.",
     "material": [ "steel", "plastic" ],
-    "ammo_type": "223"
+    "ammo_type": [ "223" ]
   },
   {
     "id": "augmag_42rd",
@@ -369,7 +369,7 @@
     "material": [ "steel", "plastic" ],
     "symbol": "#",
     "color": "light_gray",
-    "ammo_type": "223",
+    "ammo_type": [ "223" ],
     "capacity": 42,
     "reliability": 7,
     "flags": [ "MAG_COMPACT" ]
@@ -382,7 +382,7 @@
     "name": { "str": "AUG 100-round double drum magazine" },
     "description": "A bulky 100-round double drum magazine for use with the Steyr AUG assault rifle.",
     "material": [ "steel", "plastic" ],
-    "ammo_type": "223"
+    "ammo_type": [ "223" ]
   },
   {
     "id": "survivor223mag",
@@ -410,6 +410,6 @@
     "price_postapoc": 50,
     "name": { "str": "Ruger makeshift magazine" },
     "description": "An improvised 5-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 the Ruger Mini-14 rifle.",
-    "ammo_type": "223"
+    "ammo_type": [ "223" ]
   }
 ]