Move all ammo attributes to arrays

CleverRaven · May 6, 2020 · 1f672da · 1f672da
1 parent 771188a
commit 1f672da
Show file tree

Hide file tree

Showing 107 changed files with 452 additions and 463 deletions.
diff --git a/data/json/items/basecamp.json b/data/json/items/basecamp.json
@@ -6,7 +6,7 @@
     "name": { "str": "basecamp charcoal smoker" },
     "description": "A fake charcoal smoker used for basecamps.",
     "sub": "char_smoker",
-    "ammo": "charcoal",
+    "ammo": [ "charcoal" ],
     "max_charges": 2000
   },
   {
@@ -16,7 +16,7 @@
     "name": { "str": "basecamp fireplace" },
     "description": "A fake fireplace used for basecamps.",
     "sub": "hotplate",
-    "ammo": "tinder",
+    "ammo": [ "tinder" ],
     "max_charges": 50000,
     "charge_factor": 25
   },
@@ -27,7 +27,7 @@
     "name": { "str": "basecamp forge" },
     "description": "A fake forge used for basecamps.",
     "sub": "char_forge",
-    "ammo": "charcoal",
+    "ammo": [ "charcoal" ],
     "max_charges": 2000
   },
   {
@@ -37,7 +37,7 @@
     "name": { "str": "basecamp kiln" },
     "description": "A fake kiln used for basecamps.",
     "sub": "char_kiln",
-    "ammo": "charcoal",
+    "ammo": [ "charcoal" ],
     "max_charges": 2000
   },
   {
@@ -47,7 +47,7 @@
     "name": { "str": "basecamp stove" },
     "description": "A fake stove used for basecamps.",
     "sub": "hotplate",
-    "ammo": "tinder",
+    "ammo": [ "tinder" ],
     "max_charges": 50000,
     "charge_factor": 10
   },

diff --git a/data/json/items/classes/gun.json b/data/json/items/classes/gun.json
@@ -15,7 +15,7 @@
     "reload_noise": "slosh.",
     "name": { "str": "base flamethrower" },
     "skill": "launcher",
-    "ammo": "flammable",
+    "ammo": [ "flammable" ],
     "ammo_effects": [ "FLARE" ],
     "reload": 4,
     "flags": [ "FIRE_100", "NEVER_JAMS", "FIRESTARTER" ],
@@ -175,7 +175,7 @@
     "type": "GUN",
     "name": { "str": "base shotgun" },
     "skill": "shotgun",
-    "ammo": "shot",
+    "ammo": [ "shot" ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],

diff --git a/data/json/items/fake.json b/data/json/items/fake.json
@@ -112,7 +112,7 @@
     "material": "steel",
     "flags": [ "REACH_ATTACK" ],
     "skill": "archery",
-    "ammo": "arrow",
+    "ammo": [ "arrow" ],
     "weight": "340 g",
     "volume": "1500 ml",
     "bashing": 6,

diff --git a/data/json/items/generic.json b/data/json/items/generic.json
@@ -2506,7 +2506,7 @@
       50000,
       100000
     ],
-    "ammo": "money"
+    "ammo": [ "money" ]
   },
   {
     "id": "robofac_test_data",

diff --git a/data/json/items/generic/toys_and_sports.json b/data/json/items/generic/toys_and_sports.json
@@ -12,7 +12,7 @@
     "material": "plastic",
     "symbol": "|",
     "color": "pink",
-    "ammo": "battery",
+    "ammo": [ "battery" ],
     "charges_per_use": 1,
     "turns_per_charge": 20,
     "use_action": "DOLLCHAT",
@@ -44,7 +44,7 @@
     "material": "plastic",
     "symbol": "|",
     "color": "pink",
-    "ammo": "battery",
+    "ammo": [ "battery" ],
     "charges_per_use": 1,
     "turns_per_charge": 20,
     "use_action": "DOLLCHAT",

diff --git a/data/json/items/gun/12mm.json b/data/json/items/gun/12mm.json
@@ -13,7 +13,7 @@
     "to_hit": -1,
     "bashing": 12,
     "material": "steel",
-    "ammo": "12mm",
+    "ammo": [ "12mm" ],
     "skill": "rifle",
     "range": 60,
     "dispersion": 45,

diff --git a/data/json/items/gun/20x66mm.json b/data/json/items/gun/20x66mm.json
@@ -16,7 +16,7 @@
     "material": [ "superalloy", "ceramic" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": "20x66mm",
+    "ammo": [ "20x66mm" ],
     "skill": "shotgun",
     "range": 6,
     "ranged_damage": { "damage_type": "bullet", "amount": 4 },
@@ -53,7 +53,7 @@
     "material": [ "superalloy", "ceramic" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": "20x66mm",
+    "ammo": [ "20x66mm" ],
     "skill": "shotgun",
     "dispersion": 335,
     "durability": 9,
@@ -88,7 +88,7 @@
     "material": [ "superalloy", "ceramic" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": "20x66mm",
+    "ammo": [ "20x66mm" ],
     "skill": "pistol",
     "dispersion": 400,
     "durability": 9,

diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json
@@ -15,7 +15,7 @@
     "material": "steel",
     "symbol": "(",
     "color": "light_gray",
-    "ammo": "22",
+    "ammo": [ "22" ],
     "skill": "smg",
     "ranged_damage": { "damage_type": "bullet", "amount": 4 },
     "dispersion": 280,
@@ -56,7 +56,7 @@
     "material": [ "iron", "wood" ],
     "symbol": "(",
     "color": "brown",
-    "ammo": "22",
+    "ammo": [ "22" ],
     "skill": "rifle",
     "ranged_damage": { "damage_type": "bullet", "amount": 5 },
     "dispersion": 90,
@@ -96,7 +96,7 @@
     "bashing": 1,
     "material": [ "steel", "wood" ],
     "color": "dark_gray",
-    "ammo": "22",
+    "ammo": [ "22" ],
     "ranged_damage": { "damage_type": "bullet", "amount": -2 },
     "dispersion": 520,
     "durability": 6,
@@ -131,7 +131,7 @@
     "material": [ "steel", "wood" ],
     "symbol": "(",
     "color": "brown",
-    "ammo": "22",
+    "ammo": [ "22" ],
     "skill": "rifle",
     "ranged_damage": { "damage_type": "bullet", "amount": 1 },
     "dispersion": 550,
@@ -170,7 +170,7 @@
     "material": [ "steel", "wood" ],
     "symbol": "(",
     "color": "brown",
-    "ammo": "22",
+    "ammo": [ "22" ],
     "skill": "rifle",
     "ranged_damage": { "damage_type": "bullet", "amount": 4 },
     "dispersion": 110,
@@ -201,7 +201,7 @@
     "type": "GUN",
     "name": { "str_sp": "Ruger LCR .22" },
     "weight": "420 g",
-    "ammo": "22",
+    "ammo": [ "22" ],
     "clip_size": 8,
     "magazines": [ [ "22", [ "22_speedloader8" ] ] ]
   },
@@ -221,7 +221,7 @@
     "material": [ "aluminum", "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": "22",
+    "ammo": [ "22" ],
     "skill": "pistol",
     "ranged_damage": { "damage_type": "bullet", "amount": -1 },
     "dispersion": 480,
@@ -258,7 +258,7 @@
     "bashing": 9,
     "material": [ "aluminum", "steel", "plastic" ],
     "color": "dark_gray",
-    "ammo": "22",
+    "ammo": [ "22" ],
     "dispersion": 480,
     "durability": 7,
     "min_cycle_recoil": 39,
@@ -279,7 +279,7 @@
     "bashing": 1,
     "material": [ "budget_steel" ],
     "color": "dark_gray",
-    "ammo": "22",
+    "ammo": [ "22" ],
     "dispersion": 600,
     "durability": 5,
     "min_cycle_recoil": 39,
@@ -301,7 +301,7 @@
     "bashing": 4,
     "material": [ "plastic", "zinc" ],
     "color": "dark_gray",
-    "ammo": "22",
+    "ammo": [ "22" ],
     "dispersion": 480,
     "durability": 7,
     "min_cycle_recoil": 39,

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
@@ -15,7 +15,7 @@
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": "223",
+    "ammo": [ "223" ],
     "ranged_damage": { "damage_type": "bullet", "amount": -1 },
     "dispersion": 150,
     "durability": 8,
@@ -60,7 +60,7 @@
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": "223",
+    "ammo": [ "223" ],
     "dispersion": 150,
     "durability": 7,
     "min_cycle_recoil": 1350,
@@ -101,7 +101,7 @@
     "material": [ "steel", "aluminum" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": "223",
+    "ammo": [ "223" ],
     "range": -6,
     "ranged_damage": { "damage_type": "bullet", "amount": -9 },
     "dispersion": 380,
@@ -124,7 +124,7 @@
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": "223",
+    "ammo": [ "223" ],
     "ranged_damage": { "damage_type": "bullet", "amount": -2 },
     "dispersion": 180,
     "durability": 8,
@@ -161,7 +161,7 @@
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": "223",
+    "ammo": [ "223" ],
     "ranged_damage": { "damage_type": "stab", "amount": -2 },
     "dispersion": 150,
     "durability": 9,
@@ -196,7 +196,7 @@
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": "223",
+    "ammo": [ "223" ],
     "ranged_damage": { "damage_type": "bullet", "amount": -2 },
     "dispersion": 180,
     "durability": 8,
@@ -239,7 +239,7 @@
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": "223",
+    "ammo": [ "223" ],
     "dispersion": 150,
     "durability": 8,
     "min_cycle_recoil": 1350,
@@ -262,7 +262,7 @@
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": "223",
+    "ammo": [ "223" ],
     "dispersion": 200,
     "durability": 7,
     "min_cycle_recoil": 1350,
@@ -350,7 +350,7 @@
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": "223",
+    "ammo": [ "223" ],
     "ranged_damage": { "damage_type": "bullet", "amount": -2 },
     "dispersion": 180,
     "durability": 6,
@@ -393,7 +393,7 @@
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": "223",
+    "ammo": [ "223" ],
     "dispersion": 150,
     "durability": 7,
     "min_cycle_recoil": 1350,
@@ -435,7 +435,7 @@
     "material": [ "steel", "aluminum" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": "223",
+    "ammo": [ "223" ],
     "range": -6,
     "ranged_damage": { "damage_type": "bullet", "amount": -11 },
     "dispersion": 380,
@@ -459,7 +459,7 @@
     "material": [ "steel", "wood" ],
     "symbol": "(",
     "color": "brown",
-    "ammo": "223",
+    "ammo": [ "223" ],
     "skill": "rifle",
     "ranged_damage": { "damage_type": "bullet", "amount": -2 },
     "dispersion": 550,
@@ -498,7 +498,7 @@
     "material": [ "steel", "wood" ],
     "symbol": "(",
     "color": "brown",
-    "ammo": "223",
+    "ammo": [ "223" ],
     "ranged_damage": { "damage_type": "bullet", "amount": 1 },
     "dispersion": 100,
     "durability": 8,
@@ -536,7 +536,7 @@
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": "223",
+    "ammo": [ "223" ],
     "ranged_damage": { "damage_type": "bullet", "amount": -2 },
     "dispersion": 150,
     "durability": 8,
@@ -577,7 +577,7 @@
     "to_hit": -1,
     "bashing": 10,
     "material": [ "steel", "plastic" ],
-    "ammo": "223",
+    "ammo": [ "223" ],
     "dispersion": 180,
     "durability": 9,
     "min_cycle_recoil": 1350,
@@ -620,7 +620,7 @@
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "light_gray",
-    "ammo": "223",
+    "ammo": [ "223" ],
     "dispersion": 140,
     "durability": 8,
     "min_cycle_recoil": 1350,
@@ -659,7 +659,7 @@
     "material": [ "steel", "wood" ],
     "symbol": "(",
     "color": "brown",
-    "ammo": "223",
+    "ammo": [ "223" ],
     "ranged_damage": { "damage_type": "bullet", "amount": -4 },
     "dispersion": 550,
     "durability": 6,

diff --git a/data/json/items/gun/270win.json b/data/json/items/gun/270win.json
@@ -14,7 +14,7 @@
     "bashing": 12,
     "material": [ "steel", "wood" ],
     "color": "brown",
-    "ammo": "270win",
+    "ammo": [ "270win" ],
     "dispersion": 70,
     "durability": 8,
     "blackpowder_tolerance": 24,
-Original file line number
+Diff line change
@@ Expand Up / @@ -2506,7 +2506,7 @@ @@
 ,
         ],
-        "ammo": "money"
+        "ammo": [ "money" ]
       },
       {
         "id": "robofac_test_data",
@@ Expand Down @@