From 1f672da916710ac6443b320a81c550b1b7a8487f Mon Sep 17 00:00:00 2001 From: ymber Date: Wed, 6 May 2020 09:38:04 +0100 Subject: [PATCH] Move all ammo attributes to arrays --- data/json/items/basecamp.json | 10 ++-- data/json/items/classes/gun.json | 4 +- data/json/items/fake.json | 2 +- data/json/items/generic.json | 2 +- data/json/items/generic/toys_and_sports.json | 4 +- data/json/items/gun/12mm.json | 2 +- data/json/items/gun/20x66mm.json | 6 +-- data/json/items/gun/22.json | 20 ++++---- data/json/items/gun/223.json | 34 ++++++------- data/json/items/gun/270win.json | 2 +- data/json/items/gun/300.json | 6 +-- data/json/items/gun/3006.json | 12 ++--- data/json/items/gun/300BLK.json | 4 +- data/json/items/gun/308.json | 26 +++++----- data/json/items/gun/32.json | 8 ++-- data/json/items/gun/357sig.json | 4 +- data/json/items/gun/36paper.json | 2 +- data/json/items/gun/38.json | 8 ++-- data/json/items/gun/380.json | 12 ++--- data/json/items/gun/38super.json | 4 +- data/json/items/gun/40.json | 20 ++++---- data/json/items/gun/40x46mm.json | 12 ++--- data/json/items/gun/40x53mm.json | 2 +- data/json/items/gun/410shot.json | 4 +- data/json/items/gun/44.json | 10 ++-- data/json/items/gun/44paper.json | 4 +- data/json/items/gun/45.json | 22 ++++----- data/json/items/gun/45colt.json | 4 +- data/json/items/gun/46.json | 2 +- data/json/items/gun/50.json | 10 ++-- data/json/items/gun/500.json | 4 +- data/json/items/gun/545x39.json | 4 +- data/json/items/gun/57.json | 4 +- data/json/items/gun/5x50.json | 4 +- data/json/items/gun/66mm.json | 2 +- data/json/items/gun/700nx.json | 2 +- data/json/items/gun/762.json | 10 ++-- data/json/items/gun/762R.json | 2 +- data/json/items/gun/762x25.json | 4 +- data/json/items/gun/84x246mm.json | 4 +- data/json/items/gun/8x40mm.json | 16 +++---- data/json/items/gun/9mm.json | 48 +++++++++---------- data/json/items/gun/9x18.json | 4 +- data/json/items/gun/atgm.json | 2 +- data/json/items/gun/bio.json | 2 +- data/json/items/gun/blunderbuss.json | 2 +- data/json/items/gun/chemical_spray.json | 2 +- data/json/items/gun/combination.json | 4 +- data/json/items/gun/flintlock.json | 4 +- data/json/items/gun/monster_gun.json | 2 +- data/json/items/gun/nail.json | 2 +- data/json/items/gun/paintball.json | 2 +- data/json/items/gun/shot.json | 2 +- data/json/items/gun/signal_flare.json | 2 +- data/json/items/melee/bludgeons.json | 6 +-- data/json/items/melee/misc.json | 2 +- data/json/items/melee/swords_and_blades.json | 14 +++--- data/json/items/obsolete.json | 36 +++++++------- data/json/items/ranged/archery.json | 20 ++++---- data/json/items/ranged/crossbows.json | 14 +++--- data/json/items/ranged/energy.json | 4 +- data/json/items/ranged/launchers.json | 8 ++-- data/json/items/ranged/pneumatic.json | 2 +- data/json/items/ranged/slings.json | 8 ++-- data/json/items/ranged/spearguns.json | 8 ++-- data/json/items/tool/cooking.json | 38 +++++++-------- data/json/items/tool/electronics.json | 32 ++++++------- data/json/items/tool/fire.json | 10 ++-- data/json/items/tool/fishing.json | 2 +- data/json/items/tool/landscaping.json | 2 +- data/json/items/tool/lighting.json | 18 +++---- data/json/items/tool/med.json | 6 +-- data/json/items/tool/metalworking.json | 4 +- data/json/items/tool/misc.json | 8 ++-- data/json/items/tool/pets.json | 2 +- data/json/items/tool/radio_tools.json | 10 ++-- data/json/items/tool/science.json | 38 +++++++-------- data/json/items/tool/smoking.json | 2 +- data/json/items/tool/tailoring.json | 10 ++-- data/json/items/tool/toileteries.json | 6 +-- data/json/items/tool/woodworking.json | 6 +-- data/json/items/tool/workshop.json | 30 ++++++------ data/json/items/vehicle/utilities.json | 2 +- data/json/obsolete.json | 2 +- data/legacy/1/obsolete.json | 6 +-- data/mods/Aftershock/items/bioparts.json | 2 +- data/mods/Aftershock/items/tools.json | 4 +- data/mods/Aftershock/items/weapons.json | 10 ++-- data/mods/CRT_EXPANSION/items/crt_gun.json | 14 +++--- data/mods/CRT_EXPANSION/items/crt_tools.json | 2 +- data/mods/CrazyCataclysm/crazy_items.json | 10 ++-- .../Generic_Guns/firearms/black_powder.json | 6 +-- data/mods/Generic_Guns/firearms/grenade.json | 8 ++-- data/mods/Generic_Guns/firearms/pistol.json | 14 +++--- .../Generic_Guns/firearms/pistol_tiny.json | 6 +-- data/mods/Generic_Guns/firearms/rifle.json | 12 ++--- .../Generic_Guns/firearms/rifle_huge.json | 6 +-- data/mods/Generic_Guns/firearms/rocket.json | 4 +- data/mods/Generic_Guns/firearms/shot.json | 10 ++-- data/mods/Magiclysm/items/enchanted_misc.json | 2 +- .../Magiclysm/items/enchanted_ranged.json | 2 +- .../mods/Magiclysm/items/enchanted_wands.json | 2 +- data/mods/Magiclysm/items/obsolete.json | 4 +- data/mods/Magiclysm/items/tools.json | 2 +- data/mods/TEST_DATA/items.json | 4 +- src/item_factory.cpp | 18 +------ tools/json_tools/adjust_values.py | 21 ++++---- 107 files changed, 452 insertions(+), 463 deletions(-) diff --git a/data/json/items/basecamp.json b/data/json/items/basecamp.json index 3c3402902b5a2..404038bba36b1 100644 --- 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 index b7396c6e8a3e0..283b85699b02e 100644 --- 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 index 4459361c224a5..1726265fdec54 100644 --- 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 index ca7a4a79b6d8f..f472dc1eaa70f 100644 --- 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 index 66948469c4310..8a81360a0d16f 100644 --- 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 index d75a287e29292..05ca317c29eed 100644 --- 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 index a9010753bf53b..a1f948923949f 100644 --- 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 index a7c65e63129c2..bd36d540182b8 100644 --- 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 index 5a63aef38dc7f..fef6ab5e8eabb 100644 --- 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 index b1cf270de0b81..6e1bf4efa9fac 100644 --- 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, diff --git a/data/json/items/gun/300.json b/data/json/items/gun/300.json index 47b6ac2dacd4e..d26c97469cbd3 100644 --- a/data/json/items/gun/300.json +++ b/data/json/items/gun/300.json @@ -14,7 +14,7 @@ "to_hit": -1, "bashing": 12, "material": [ "steel", "plastic" ], - "ammo": "300", + "ammo": [ "300" ], "dispersion": 90, "durability": 8, "min_cycle_recoil": 4770, @@ -38,7 +38,7 @@ "bashing": 12, "material": [ "steel", "wood" ], "color": "brown", - "ammo": "300", + "ammo": [ "300" ], "dispersion": 110, "durability": 8, "blackpowder_tolerance": 24, @@ -61,7 +61,7 @@ "bashing": 12, "material": [ "steel", "wood" ], "color": "brown", - "ammo": "300", + "ammo": [ "300" ], "dispersion": 90, "durability": 8, "blackpowder_tolerance": 24, diff --git a/data/json/items/gun/3006.json b/data/json/items/gun/3006.json index 7b3cebc105c2e..b008cedfcdc58 100644 --- a/data/json/items/gun/3006.json +++ b/data/json/items/gun/3006.json @@ -15,7 +15,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "brown", - "ammo": "3006", + "ammo": [ "3006" ], "skill": "rifle", "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 90, @@ -55,7 +55,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "brown", - "ammo": "3006", + "ammo": [ "3006" ], "skill": "rifle", "dispersion": 150, "durability": 8, @@ -92,7 +92,7 @@ "bashing": 12, "material": [ "steel", "wood" ], "color": "brown", - "ammo": "3006", + "ammo": [ "3006" ], "dispersion": 120, "durability": 8, "blackpowder_tolerance": 60, @@ -131,7 +131,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "dark_gray", - "ammo": "3006", + "ammo": [ "3006" ], "skill": "rifle", "dispersion": 180, "durability": 8, @@ -170,7 +170,7 @@ "bashing": 12, "material": [ "steel", "plastic" ], "color": "brown", - "ammo": "3006", + "ammo": [ "3006" ], "dispersion": 90, "durability": 8, "blackpowder_tolerance": 24, @@ -195,7 +195,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "brown", - "ammo": "3006", + "ammo": [ "3006" ], "skill": "rifle", "ranged_damage": { "damage_type": "bullet", "amount": -2 }, "dispersion": 550, diff --git a/data/json/items/gun/300BLK.json b/data/json/items/gun/300BLK.json index 09233a3aa16a1..253b364462d38 100644 --- a/data/json/items/gun/300BLK.json +++ b/data/json/items/gun/300BLK.json @@ -15,7 +15,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": "300blk", + "ammo": [ "300blk" ], "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 150, "durability": 8, @@ -60,7 +60,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "light_gray", - "ammo": "300blk", + "ammo": [ "300blk" ], "dispersion": 140, "durability": 8, "min_cycle_recoil": 1700, diff --git a/data/json/items/gun/308.json b/data/json/items/gun/308.json index bc6fd9a122d2d..27aad29479074 100644 --- a/data/json/items/gun/308.json +++ b/data/json/items/gun/308.json @@ -15,7 +15,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "dark_gray", - "ammo": "308", + "ammo": [ "308" ], "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 150, "durability": 8, @@ -40,7 +40,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "dark_gray", - "ammo": "308", + "ammo": [ "308" ], "ranged_damage": { "damage_type": "bullet", "amount": -2 }, "dispersion": 150, "min_cycle_recoil": 2700, @@ -64,7 +64,7 @@ "material": "hardsteel", "symbol": "(", "color": "dark_gray", - "ammo": "308", + "ammo": [ "308" ], "skill": "rifle", "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 200, @@ -120,7 +120,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "brown", - "ammo": "308", + "ammo": [ "308" ], "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 110, "durability": 8, @@ -158,7 +158,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": "308", + "ammo": [ "308" ], "dispersion": 200, "durability": 9, "min_cycle_recoil": 2700, @@ -196,7 +196,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": "308", + "ammo": [ "308" ], "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 180, "durability": 7, @@ -236,7 +236,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "brown", - "ammo": "308", + "ammo": [ "308" ], "ranged_damage": { "damage_type": "bullet", "amount": -5 }, "dispersion": 550, "durability": 6, @@ -275,7 +275,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "brown", - "ammo": "308", + "ammo": [ "308" ], "dispersion": 90, "durability": 9, "blackpowder_tolerance": 24, @@ -291,7 +291,7 @@ "name": { "str_sp": "FN SCAR-H" }, "description": "A highly accurate and modular battle rifle specially designed for the United States Special Operations Command. The 'H' in its name stands for heavy, as it uses the powerful .308 round.", "weight": "3640 g", - "ammo": "308", + "ammo": [ "308" ], "ranged_damage": { "damage_type": "bullet", "amount": -3 }, "min_cycle_recoil": 2700, "magazines": [ [ "308", [ "scarhmag", "scarhbigmag", "scarhmag_30rd", "scarh_makeshiftmag" ] ] ] @@ -312,7 +312,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "blue", - "ammo": "308", + "ammo": [ "308" ], "dispersion": 85, "durability": 9, "min_cycle_recoil": 2700, @@ -351,7 +351,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": "308", + "ammo": [ "308" ], "ranged_damage": { "damage_type": "bullet", "amount": -4 }, "dispersion": 180, "durability": 8, @@ -376,7 +376,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": "308", + "ammo": [ "308" ], "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 120, "durability": 8, @@ -400,7 +400,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": "308", + "ammo": [ "308" ], "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 150, "durability": 7, diff --git a/data/json/items/gun/32.json b/data/json/items/gun/32.json index 38949bc529d69..954cb16fb6f7a 100644 --- a/data/json/items/gun/32.json +++ b/data/json/items/gun/32.json @@ -15,7 +15,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "dark_gray", - "ammo": "32", + "ammo": [ "32" ], "skill": "pistol", "dispersion": 480, "durability": 8, @@ -53,7 +53,7 @@ "material": "steel", "symbol": "(", "color": "dark_gray", - "ammo": "32", + "ammo": [ "32" ], "skill": "smg", "dispersion": 360, "durability": 6, @@ -93,7 +93,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "light_gray", - "ammo": "32", + "ammo": [ "32" ], "skill": "pistol", "dispersion": 480, "durability": 8, @@ -129,7 +129,7 @@ "bashing": 1, "material": [ "steel", "plastic", "aluminum" ], "color": "dark_gray", - "ammo": "32", + "ammo": [ "32" ], "dispersion": 480, "durability": 8, "min_cycle_recoil": 135, diff --git a/data/json/items/gun/357sig.json b/data/json/items/gun/357sig.json index 1864efbb55970..5824eae93821b 100644 --- a/data/json/items/gun/357sig.json +++ b/data/json/items/gun/357sig.json @@ -15,7 +15,7 @@ "material": [ "steel", "aluminum", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": "357sig", + "ammo": [ "357sig" ], "dispersion": 480, "durability": 7, "magazines": [ [ "357sig", [ "p226mag_12rd_357sig" ] ] ] @@ -47,7 +47,7 @@ "bashing": 8, "material": [ "plastic", "steel" ], "color": "dark_gray", - "ammo": "357sig", + "ammo": [ "357sig" ], "dispersion": 480, "durability": 6, "magazines": [ [ "357sig", [ "p320mag_13rd_357sig" ] ] ] diff --git a/data/json/items/gun/36paper.json b/data/json/items/gun/36paper.json index 60539bfd20b1b..5a762c00da7cb 100644 --- a/data/json/items/gun/36paper.json +++ b/data/json/items/gun/36paper.json @@ -13,7 +13,7 @@ "to_hit": -1, "bashing": 8, "material": [ "steel", "wood" ], - "ammo": "36paper", + "ammo": [ "36paper" ], "dispersion": 450, "durability": 7, "blackpowder_tolerance": 96, diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json index ef6992a7c876a..340e2a7fceacd 100644 --- a/data/json/items/gun/38.json +++ b/data/json/items/gun/38.json @@ -16,7 +16,7 @@ "material": [ "steel" ], "symbol": "(", "color": "brown", - "ammo": "38", + "ammo": [ "38" ], "skill": "pistol", "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 620, @@ -83,7 +83,7 @@ "bashing": 9, "material": [ "steel", "wood" ], "color": "dark_gray", - "ammo": "38", + "ammo": [ "38" ], "dispersion": 480, "durability": 8, "blackpowder_tolerance": 56, @@ -105,7 +105,7 @@ "bashing": 10, "material": [ "steel", "wood" ], "color": "brown", - "ammo": "38", + "ammo": [ "38" ], "skill": "rifle", "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "dispersion": 550, @@ -144,7 +144,7 @@ "material": [ "steel", "aluminum", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": "38", + "ammo": [ "38" ], "ranged_damage": { "damage_type": "bullet", "amount": -2 }, "dispersion": 480, "durability": 10, diff --git a/data/json/items/gun/380.json b/data/json/items/gun/380.json index 51cb87871a4a8..61e5a5dd07201 100644 --- a/data/json/items/gun/380.json +++ b/data/json/items/gun/380.json @@ -11,7 +11,7 @@ "price": 160000, "price_postapoc": 2500, "bashing": 5, - "ammo": "380", + "ammo": [ "380" ], "min_cycle_recoil": 270, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ], "magazines": [ [ "380", [ "mac11mag" ] ] ] @@ -26,7 +26,7 @@ "volume": "151ml", "price": 25000, "price_postapoc": 1750, - "ammo": "380", + "ammo": [ "380" ], "min_cycle_recoil": 270, "magazines": [ [ "380", [ "kp3atmag" ] ] ] }, @@ -45,7 +45,7 @@ "bashing": 1, "material": [ "steel" ], "color": "dark_gray", - "ammo": "380", + "ammo": [ "380" ], "dispersion": 480, "durability": 7, "min_cycle_recoil": 270, @@ -66,7 +66,7 @@ "bashing": 1, "material": [ "steel", "plastic" ], "color": "dark_gray", - "ammo": "380", + "ammo": [ "380" ], "dispersion": 480, "durability": 8, "min_cycle_recoil": 270, @@ -87,7 +87,7 @@ "bashing": 8, "material": [ "plastic", "steel", "zinc" ], "color": "dark_gray", - "ammo": "380", + "ammo": [ "380" ], "dispersion": 480, "durability": 7, "magazines": [ [ "380", [ "hptcf380mag_8rd", "hptcf380mag_10rd" ] ] ] @@ -108,7 +108,7 @@ "material": [ "steel", "aluminum" ], "symbol": "(", "color": "dark_gray", - "ammo": "380", + "ammo": [ "380" ], "dispersion": 480, "durability": 7, "min_cycle_recoil": 225, diff --git a/data/json/items/gun/38super.json b/data/json/items/gun/38super.json index 00221c70a2c53..6988f623e5130 100644 --- a/data/json/items/gun/38super.json +++ b/data/json/items/gun/38super.json @@ -14,7 +14,7 @@ "bashing": 12, "material": "steel", "color": "light_gray", - "ammo": "38super", + "ammo": [ "38super" ], "dispersion": 520, "durability": 7, "min_cycle_recoil": 225, @@ -52,7 +52,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "light_gray", - "ammo": "38super", + "ammo": [ "38super" ], "dispersion": 480, "durability": 7, "magazines": [ [ "38super", [ "m1911mag_10rd_38super" ] ] ] diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json index d8b89c2a0fa33..886ac539e6ee7 100644 --- a/data/json/items/gun/40.json +++ b/data/json/items/gun/40.json @@ -14,7 +14,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": "40", + "ammo": [ "40" ], "range": 1, "dispersion": 480, "durability": 7, @@ -37,7 +37,7 @@ "material": [ "plastic", "steel" ], "symbol": "(", "color": "dark_gray", - "ammo": "40", + "ammo": [ "40" ], "skill": "pistol", "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "dispersion": 480, @@ -75,7 +75,7 @@ "material": [ "plastic", "steel" ], "symbol": "(", "color": "dark_gray", - "ammo": "40", + "ammo": [ "40" ], "range": 1, "dispersion": 480, "durability": 7, @@ -97,7 +97,7 @@ "bashing": 10, "material": [ "steel", "wood" ], "color": "brown", - "ammo": "40", + "ammo": [ "40" ], "skill": "rifle", "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "dispersion": 550, @@ -136,7 +136,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": "40", + "ammo": [ "40" ], "skill": "pistol", "dispersion": 480, "durability": 7, @@ -173,7 +173,7 @@ "bashing": 10, "material": "steel", "color": "dark_gray", - "ammo": "40", + "ammo": [ "40" ], "ranged_damage": { "damage_type": "bullet", "amount": -4 }, "dispersion": 590, "durability": 4, @@ -213,7 +213,7 @@ "material": [ "steel" ], "symbol": "(", "color": "dark_gray", - "ammo": "40", + "ammo": [ "40" ], "skill": "pistol", "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 620, @@ -284,7 +284,7 @@ "bashing": 8, "material": [ "plastic", "steel" ], "color": "dark_gray", - "ammo": "40", + "ammo": [ "40" ], "dispersion": 480, "durability": 8, "magazines": [ [ "40", [ "bhp40mag" ] ] ] @@ -303,7 +303,7 @@ "bashing": 8, "material": [ "plastic", "steel" ], "color": "dark_gray", - "ammo": "40", + "ammo": [ "40" ], "dispersion": 480, "durability": 9, "magazines": [ [ "40", [ "ppq40mag_10rd", "ppq40mag_12rd", "ppq40mag_14rd" ] ] ] @@ -323,7 +323,7 @@ "bashing": 8, "material": [ "plastic", "steel", "zinc" ], "color": "dark_gray", - "ammo": "40", + "ammo": [ "40" ], "dispersion": 480, "durability": 7, "magazines": [ [ "40", [ "hptjcpmag" ] ] ] diff --git a/data/json/items/gun/40x46mm.json b/data/json/items/gun/40x46mm.json index 8c2e10d21106f..587ab946459a5 100644 --- a/data/json/items/gun/40x46mm.json +++ b/data/json/items/gun/40x46mm.json @@ -13,7 +13,7 @@ "to_hit": -3, "bashing": 12, "material": [ "steel", "wood" ], - "ammo": "40x46mm", + "ammo": [ "40x46mm" ], "dispersion": 550, "durability": 6, "clip_size": 1, @@ -44,7 +44,7 @@ "bashing": 6, "material": "steel", "symbol": "(", - "ammo": "40x46mm", + "ammo": [ "40x46mm" ], "dispersion": 270, "durability": 9, "clip_size": 1, @@ -64,7 +64,7 @@ "to_hit": -3, "bashing": 12, "material": [ "steel", "wood" ], - "ammo": "40x46mm", + "ammo": [ "40x46mm" ], "ranged_damage": { "damage_type": "bullet", "amount": 3 }, "dispersion": 150, "durability": 8, @@ -95,7 +95,7 @@ "to_hit": -3, "bashing": 12, "material": "steel", - "ammo": "40x46mm", + "ammo": [ "40x46mm" ], "dispersion": 270, "durability": 8, "clip_size": 6, @@ -126,7 +126,7 @@ "to_hit": -1, "bashing": 8, "material": [ "superalloy", "ceramic" ], - "ammo": "40x46mm", + "ammo": [ "40x46mm" ], "dispersion": 140, "durability": 9, "clip_size": 4, @@ -168,7 +168,7 @@ "to_hit": -1, "bashing": 14, "material": "steel", - "ammo": "40x46mm", + "ammo": [ "40x46mm" ], "range": 30, "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "dispersion": 300, diff --git a/data/json/items/gun/40x53mm.json b/data/json/items/gun/40x53mm.json index 70ff08f63fd2d..9ec1be57f1c27 100644 --- a/data/json/items/gun/40x53mm.json +++ b/data/json/items/gun/40x53mm.json @@ -13,7 +13,7 @@ "to_hit": -1, "bashing": 14, "material": "steel", - "ammo": "40x53mm", + "ammo": [ "40x53mm" ], "range": 30, "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "dispersion": 180, diff --git a/data/json/items/gun/410shot.json b/data/json/items/gun/410shot.json index d1a90c543a6c2..3dd3a9ce18a4e 100644 --- a/data/json/items/gun/410shot.json +++ b/data/json/items/gun/410shot.json @@ -16,7 +16,7 @@ "dispersion": 395, "durability": 7, "barrel_length": "750 ml", - "ammo": "410shot", + "ammo": [ "410shot" ], "magazines": [ [ "410shot", [ "saiga410mag_10rd", "saiga410mag_30rd" ] ] ], "flags": [ "NEVER_JAMS" ] }, @@ -31,6 +31,6 @@ "volume": "1748 ml", "price_postapoc": 2000, "blackpowder_tolerance": 80, - "ammo": "410shot" + "ammo": [ "410shot" ] } ] diff --git a/data/json/items/gun/44.json b/data/json/items/gun/44.json index 4b2098ffefc6d..b0ff6217d18ec 100644 --- a/data/json/items/gun/44.json +++ b/data/json/items/gun/44.json @@ -15,7 +15,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "light_gray", - "ammo": "44", + "ammo": [ "44" ], "skill": "pistol", "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 480, @@ -52,7 +52,7 @@ "bashing": 12, "material": [ "steel", "wood" ], "color": "dark_gray", - "ammo": "44", + "ammo": [ "44" ], "ranged_damage": { "damage_type": "bullet", "amount": 2 }, "dispersion": 180, "durability": 8, @@ -88,7 +88,7 @@ "bashing": 10, "material": [ "steel", "wood" ], "color": "brown", - "ammo": "44", + "ammo": [ "44" ], "skill": "rifle", "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "dispersion": 550, @@ -127,7 +127,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "dark_gray", - "ammo": "44", + "ammo": [ "44" ], "dispersion": 280, "durability": 8, "blackpowder_tolerance": 56, @@ -160,7 +160,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": "44", + "ammo": [ "44" ], "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 280, "durability": 8, diff --git a/data/json/items/gun/44paper.json b/data/json/items/gun/44paper.json index c8320d8f61dc3..e21d9fa232dc7 100644 --- a/data/json/items/gun/44paper.json +++ b/data/json/items/gun/44paper.json @@ -13,7 +13,7 @@ "to_hit": -1, "bashing": 8, "material": [ "steel", "wood" ], - "ammo": "44paper", + "ammo": [ "44paper" ], "dispersion": 400, "durability": 7, "blackpowder_tolerance": 96, @@ -34,7 +34,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "brown", - "ammo": "44paper", + "ammo": [ "44paper" ], "dispersion": 420, "durability": 6, "blackpowder_tolerance": 56, diff --git a/data/json/items/gun/45.json b/data/json/items/gun/45.json index b87af5e5d2a90..c777119496fb2 100644 --- a/data/json/items/gun/45.json +++ b/data/json/items/gun/45.json @@ -15,7 +15,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": "45", + "ammo": [ "45" ], "skill": "smg", "dispersion": 280, "durability": 7, @@ -54,7 +54,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": "45", + "ammo": [ "45" ], "skill": "smg", "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "dispersion": 240, @@ -95,7 +95,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "light_gray", - "ammo": "45", + "ammo": [ "45" ], "dispersion": 480, "durability": 7, "min_cycle_recoil": 540, @@ -132,7 +132,7 @@ "material": "steel", "symbol": "(", "color": "dark_gray", - "ammo": "45", + "ammo": [ "45" ], "skill": "smg", "dispersion": 520, "durability": 7, @@ -172,7 +172,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "brown", - "ammo": "45", + "ammo": [ "45" ], "skill": "rifle", "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "dispersion": 550, @@ -211,7 +211,7 @@ "bashing": 10, "material": "steel", "color": "dark_gray", - "ammo": "45", + "ammo": [ "45" ], "ranged_damage": { "damage_type": "bullet", "amount": -4 }, "dispersion": 590, "durability": 4, @@ -252,7 +252,7 @@ "material": [ "steel" ], "symbol": "(", "color": "dark_gray", - "ammo": "45", + "ammo": [ "45" ], "ranged_damage": { "damage_type": "bullet", "amount": 2 }, "dispersion": 620, "durability": 7, @@ -276,7 +276,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "brown", - "ammo": "45", + "ammo": [ "45" ], "skill": "smg", "ranged_damage": { "damage_type": "bullet", "amount": 2 }, "dispersion": 360, @@ -307,7 +307,7 @@ "type": "GUN", "name": { "str": "USP .45" }, "weight": "930 g", - "ammo": "45", + "ammo": [ "45" ], "price_postapoc": 2500, "ranged_damage": 0, "built_in_mods": [ "match_trigger" ], @@ -339,7 +339,7 @@ "bashing": 8, "material": [ "plastic", "steel" ], "color": "dark_gray", - "ammo": "45", + "ammo": [ "45" ], "dispersion": 480, "durability": 9, "magazines": [ [ "45", [ "ppq45mag" ] ] ] @@ -359,7 +359,7 @@ "bashing": 8, "material": [ "plastic", "steel", "zinc" ], "color": "dark_gray", - "ammo": "45", + "ammo": [ "45" ], "dispersion": 480, "durability": 7, "magazines": [ [ "45", [ "hptjhpmag" ] ] ] diff --git a/data/json/items/gun/45colt.json b/data/json/items/gun/45colt.json index 5238b45f452e4..3fd47dc71ea6c 100644 --- a/data/json/items/gun/45colt.json +++ b/data/json/items/gun/45colt.json @@ -49,7 +49,7 @@ "bashing": 12, "material": [ "steel", "wood" ], "color": "brown", - "ammo": "45colt", + "ammo": [ "45colt" ], "ranged_damage": { "damage_type": "bullet", "amount": 5 }, "dispersion": 180, "durability": 7, @@ -72,7 +72,7 @@ "to_hit": -1, "bashing": 8, "material": [ "steel", "wood" ], - "ammo": "45colt", + "ammo": [ "45colt" ], "dispersion": 360, "durability": 8, "clip_size": 6, diff --git a/data/json/items/gun/46.json b/data/json/items/gun/46.json index 687dbd06a5c65..467804e6161c7 100644 --- a/data/json/items/gun/46.json +++ b/data/json/items/gun/46.json @@ -15,7 +15,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": "46", + "ammo": [ "46" ], "skill": "smg", "dispersion": 260, "durability": 8, diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json index 5be88095736a1..fc8ccb4c8a2fd 100644 --- a/data/json/items/gun/50.json +++ b/data/json/items/gun/50.json @@ -14,7 +14,7 @@ "to_hit": -1, "bashing": 12, "material": "steel", - "ammo": "50", + "ammo": [ "50" ], "range": 100, "ranged_damage": { "damage_type": "bullet", "amount": -5 }, "dispersion": 130, @@ -38,7 +38,7 @@ "to_hit": -1, "bashing": 12, "material": "steel", - "ammo": "50", + "ammo": [ "50" ], "skill": "rifle", "range": 110, "dispersion": 250, @@ -109,7 +109,7 @@ "to_hit": -1, "bashing": 13, "material": "steel", - "ammo": "50", + "ammo": [ "50" ], "range": 115, "ranged_damage": { "damage_type": "bullet", "amount": -5 }, "dispersion": 80, @@ -134,7 +134,7 @@ "to_hit": -1, "bashing": 12, "material": "steel", - "ammo": "50", + "ammo": [ "50" ], "range": 45, "ranged_damage": { "damage_type": "bullet", "amount": -5 }, "dispersion": 50, @@ -159,7 +159,7 @@ "to_hit": -1, "bashing": 12, "material": "steel", - "ammo": "50", + "ammo": [ "50" ], "range": 45, "ranged_damage": { "damage_type": "bullet", "amount": -5 }, "dispersion": 110, diff --git a/data/json/items/gun/500.json b/data/json/items/gun/500.json index 4ccb00b0a9c08..6e02e8ace88b5 100644 --- a/data/json/items/gun/500.json +++ b/data/json/items/gun/500.json @@ -14,7 +14,7 @@ "bashing": 12, "material": [ "steel", "wood" ], "color": "dark_gray", - "ammo": "500", + "ammo": [ "500" ], "ranged_damage": { "damage_type": "bullet", "amount": 2 }, "dispersion": 180, "durability": 8, @@ -51,7 +51,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "light_gray", - "ammo": "500", + "ammo": [ "500" ], "dispersion": 280, "durability": 8, "blackpowder_tolerance": 56, diff --git a/data/json/items/gun/545x39.json b/data/json/items/gun/545x39.json index 031698233e20b..619b62cfb7faa 100644 --- a/data/json/items/gun/545x39.json +++ b/data/json/items/gun/545x39.json @@ -16,7 +16,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "brown", - "ammo": "545x39", + "ammo": [ "545x39" ], "skill": "rifle", "dispersion": 150, "durability": 8, @@ -55,7 +55,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "brown", - "ammo": "545x39", + "ammo": [ "545x39" ], "skill": "rifle", "dispersion": 150, "durability": 7, diff --git a/data/json/items/gun/57.json b/data/json/items/gun/57.json index 9894d2d45277d..1a1508633e527 100644 --- a/data/json/items/gun/57.json +++ b/data/json/items/gun/57.json @@ -15,7 +15,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "light_gray", - "ammo": "57", + "ammo": [ "57" ], "skill": "pistol", "ranged_damage": { "damage_type": "bullet", "amount": -2 }, "dispersion": 440, @@ -52,7 +52,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "light_gray", - "ammo": "57", + "ammo": [ "57" ], "skill": "smg", "dispersion": 260, "durability": 8, diff --git a/data/json/items/gun/5x50.json b/data/json/items/gun/5x50.json index 3c88dd3572b10..0c6f3163e0c7a 100644 --- a/data/json/items/gun/5x50.json +++ b/data/json/items/gun/5x50.json @@ -15,7 +15,7 @@ "material": [ "superalloy", "ceramic" ], "symbol": "(", "color": "dark_gray", - "ammo": "5x50", + "ammo": [ "5x50" ], "skill": "smg", "range": 10, "ranged_damage": { "damage_type": "bullet", "amount": 10 }, @@ -55,7 +55,7 @@ "material": [ "superalloy", "ceramic" ], "symbol": "(", "color": "dark_gray", - "ammo": "5x50", + "ammo": [ "5x50" ], "skill": "pistol", "dispersion": 280, "durability": 9, diff --git a/data/json/items/gun/66mm.json b/data/json/items/gun/66mm.json index 5b3d5af47e741..8a0f3a36748b0 100644 --- a/data/json/items/gun/66mm.json +++ b/data/json/items/gun/66mm.json @@ -11,7 +11,7 @@ "price_postapoc": 4000, "material": "steel", "skill": "launcher", - "ammo": "m235", + "ammo": [ "m235" ], "weight": "5220 g", "volume": "6 L", "reload_noise_volume": 10, diff --git a/data/json/items/gun/700nx.json b/data/json/items/gun/700nx.json index 1d13370deea6e..c6e802dff4d75 100644 --- a/data/json/items/gun/700nx.json +++ b/data/json/items/gun/700nx.json @@ -15,7 +15,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "light_blue", - "ammo": "700nx", + "ammo": [ "700nx" ], "skill": "rifle", "dispersion": 90, "durability": 8, diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json index 4035275174de0..8d9a38b938c36 100644 --- a/data/json/items/gun/762.json +++ b/data/json/items/gun/762.json @@ -15,7 +15,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "brown", - "ammo": "762", + "ammo": [ "762" ], "skill": "rifle", "dispersion": 180, "durability": 9, @@ -53,7 +53,7 @@ "material": "steel", "symbol": "(", "color": "blue", - "ammo": "762", + "ammo": [ "762" ], "skill": "rifle", "dispersion": 160, "durability": 9, @@ -92,7 +92,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "brown", - "ammo": "762", + "ammo": [ "762" ], "skill": "rifle", "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "dispersion": 90, @@ -132,7 +132,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "brown", - "ammo": "762", + "ammo": [ "762" ], "skill": "rifle", "dispersion": 180, "durability": 8, @@ -168,7 +168,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "brown", - "ammo": "762", + "ammo": [ "762" ], "skill": "pistol", "dispersion": 240, "ranged_damage": { "damage_type": "bullet", "amount": -5 }, diff --git a/data/json/items/gun/762R.json b/data/json/items/gun/762R.json index e3c0084f0c841..0be2dcde02be2 100644 --- a/data/json/items/gun/762R.json +++ b/data/json/items/gun/762R.json @@ -56,7 +56,7 @@ "bashing": 12, "material": [ "steel", "wood" ], "color": "brown", - "ammo": "762R", + "ammo": [ "762R" ], "range": 3, "dispersion": 90, "durability": 10, diff --git a/data/json/items/gun/762x25.json b/data/json/items/gun/762x25.json index 01ed2492ac5d1..df891e2c3e8ae 100644 --- a/data/json/items/gun/762x25.json +++ b/data/json/items/gun/762x25.json @@ -15,7 +15,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "brown", - "ammo": "762x25", + "ammo": [ "762x25" ], "skill": "smg", "range": 2, "ranged_damage": { "damage_type": "bullet", "amount": 2 }, @@ -55,7 +55,7 @@ "to_hit": -2, "bashing": 10, "material": [ "steel", "plastic" ], - "ammo": "762x25", + "ammo": [ "762x25" ], "dispersion": 225, "durability": 7, "min_cycle_recoil": 270, diff --git a/data/json/items/gun/84x246mm.json b/data/json/items/gun/84x246mm.json index 72537b2c9c060..e28dacee2e9ca 100644 --- a/data/json/items/gun/84x246mm.json +++ b/data/json/items/gun/84x246mm.json @@ -13,7 +13,7 @@ "material": "steel", "flags": [ "RELOAD_ONE", "BACKBLAST", "NEVER_JAMS" ], "skill": "launcher", - "ammo": "84x246mm", + "ammo": [ "84x246mm" ], "weight": "6900 g", "volume": "4500 ml", "bashing": 8, @@ -39,7 +39,7 @@ "name": { "str": "AT4" }, "description": "Mil-Spec rocket launcher. An 84-mm unguided, portable, single-shot recoilless smoothbore weapon used primarily by the US military.", "extend": { "flags": [ "FIRE_TWOHAND", "NO_REPAIR" ] }, - "ammo": "84x246mm", + "ammo": [ "84x246mm" ], "weight": "6803 g", "volume": "3500 ml", "price_postapoc": 6000, diff --git a/data/json/items/gun/8x40mm.json b/data/json/items/gun/8x40mm.json index ea46a805b122e..e0ecbad4ae4ff 100644 --- a/data/json/items/gun/8x40mm.json +++ b/data/json/items/gun/8x40mm.json @@ -16,7 +16,7 @@ "material": [ "superalloy", "ceramic" ], "symbol": "(", "color": "dark_gray", - "ammo": "8x40mm", + "ammo": [ "8x40mm" ], "skill": "pistol", "dispersion": 175, "durability": 9, @@ -50,7 +50,7 @@ "material": [ "superalloy", "ceramic" ], "symbol": "(", "color": "dark_gray", - "ammo": "8x40mm", + "ammo": [ "8x40mm" ], "skill": "rifle", "range": 20, "ranged_damage": { "damage_type": "bullet", "amount": 10 }, @@ -88,7 +88,7 @@ "material": [ "superalloy", "ceramic" ], "symbol": "(", "color": "dark_gray", - "ammo": "8x40mm", + "ammo": [ "8x40mm" ], "skill": "smg", "dispersion": 120, "durability": 9, @@ -122,7 +122,7 @@ "material": [ "superalloy", "ceramic" ], "symbol": "(", "color": "dark_gray", - "ammo": "8x40mm", + "ammo": [ "8x40mm" ], "skill": "rifle", "range": -6, "ranged_damage": { "damage_type": "bullet", "amount": 10 }, @@ -150,7 +150,7 @@ "material": [ "superalloy", "ceramic" ], "symbol": "(", "color": "dark_gray", - "ammo": "8x40mm", + "ammo": [ "8x40mm" ], "skill": "rifle", "ranged_damage": { "damage_type": "bullet", "amount": 5 }, "dispersion": 50, @@ -185,7 +185,7 @@ "material": [ "superalloy", "ceramic" ], "symbol": "(", "color": "dark_gray", - "ammo": "8x40mm", + "ammo": [ "8x40mm" ], "skill": "rifle", "ranged_damage": { "damage_type": "bullet", "amount": 5 }, "dispersion": 70, @@ -221,7 +221,7 @@ "material": [ "superalloy", "ceramic" ], "symbol": "(", "color": "dark_gray", - "ammo": "8x40mm", + "ammo": [ "8x40mm" ], "skill": "rifle", "ranged_damage": { "damage_type": "bullet", "amount": 10 }, "dispersion": 30, @@ -257,7 +257,7 @@ "material": [ "superalloy", "ceramic" ], "symbol": "(", "color": "dark_gray", - "ammo": "8x40mm", + "ammo": [ "8x40mm" ], "skill": "pistol", "ranged_damage": { "damage_type": "bullet", "amount": 10 }, "dispersion": 175, diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json index 2f54d5bacfcf1..b73547e763a8b 100644 --- a/data/json/items/gun/9mm.json +++ b/data/json/items/gun/9mm.json @@ -14,7 +14,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": "9mm", + "ammo": [ "9mm" ], "range": 1, "dispersion": 480, "durability": 7, @@ -38,7 +38,7 @@ "material": "steel", "symbol": "(", "color": "dark_gray", - "ammo": "9mm", + "ammo": [ "9mm" ], "skill": "smg", "ranged_damage": { "damage_type": "bullet", "amount": 2 }, "dispersion": 280, @@ -78,7 +78,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": "9mm", + "ammo": [ "9mm" ], "skill": "rifle", "range": 20, "ranged_damage": { "damage_type": "bullet", "amount": 2 }, @@ -119,7 +119,7 @@ "material": [ "plastic", "steel" ], "symbol": "(", "color": "dark_gray", - "ammo": "9mm", + "ammo": [ "9mm" ], "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 480, "durability": 6, @@ -143,7 +143,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": "9mm", + "ammo": [ "9mm" ], "skill": "smg", "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "dispersion": 240, @@ -283,7 +283,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": "9mm", + "ammo": [ "9mm" ], "skill": "rifle", "range": 18, "ranged_damage": { "damage_type": "bullet", "amount": 3 }, @@ -323,7 +323,7 @@ "material": [ "steel", "aluminum" ], "symbol": "(", "color": "dark_gray", - "ammo": "9mm", + "ammo": [ "9mm" ], "range": 1, "dispersion": 480, "durability": 7, @@ -345,7 +345,7 @@ "material": [ "plastic", "steel" ], "symbol": "(", "color": "dark_gray", - "ammo": "9mm", + "ammo": [ "9mm" ], "range": 1, "dispersion": 440, "durability": 7, @@ -369,7 +369,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "brown", - "ammo": "9mm", + "ammo": [ "9mm" ], "skill": "rifle", "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "dispersion": 550, @@ -408,7 +408,7 @@ "bashing": 10, "material": "steel", "color": "dark_gray", - "ammo": "9mm", + "ammo": [ "9mm" ], "ranged_damage": { "damage_type": "bullet", "amount": -3 }, "dispersion": 590, "durability": 4, @@ -447,7 +447,7 @@ "material": "steel", "symbol": "[", "color": "dark_gray", - "ammo": "9mm", + "ammo": [ "9mm" ], "skill": "smg", "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "dispersion": 360, @@ -484,7 +484,7 @@ "material": "steel", "symbol": "(", "color": "dark_gray", - "ammo": "9mm", + "ammo": [ "9mm" ], "skill": "smg", "dispersion": 520, "durability": 6, @@ -523,7 +523,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": "9mm", + "ammo": [ "9mm" ], "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 400, "durability": 9, @@ -547,7 +547,7 @@ "bashing": 10, "material": "steel", "color": "dark_gray", - "ammo": "9mm", + "ammo": [ "9mm" ], "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "dispersion": 360, "durability": 7, @@ -585,13 +585,13 @@ "bashing": 8, "material": [ "plastic", "steel" ], "color": "dark_gray", - "ammo": "9mm", + "ammo": [ "9mm" ], "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 480, "durability": 6, "blackpowder_tolerance": 48, "min_cycle_recoil": 380, - "//": "Glock 17s cannot load a 15 round magazine. See http://guns-of-fun.com/portals/0/LiveContent/Mounts/Glock-Mags-Comp.jpg and #33038", + "//": "Glock 17s cannot load magazines shorter than the standard 17rd magazine.", "magazines": [ [ "9mm", [ "glock17_17", "glock17_22", "glock_drum_50rd", "glock_drum_100rd", "glockbigmag" ] ] ] }, { @@ -618,7 +618,7 @@ "price": 18000, "price_postapoc": 2000, "bashing": 2, - "ammo": "9mm", + "ammo": [ "9mm" ], "min_cycle_recoil": 450, "magazines": [ [ "9mm", [ "kpf9mag" ] ] ] }, @@ -637,7 +637,7 @@ "bashing": 8, "material": [ "plastic", "steel" ], "color": "dark_gray", - "ammo": "9mm", + "ammo": [ "9mm" ], "dispersion": 480, "durability": 6, "min_cycle_recoil": 450, @@ -658,7 +658,7 @@ "bashing": 8, "material": [ "plastic", "steel" ], "color": "dark_gray", - "ammo": "9mm", + "ammo": [ "9mm" ], "dispersion": 480, "durability": 8, "magazines": [ [ "9mm", [ "bhp9mag_13rd", "bhp9mag_15rd" ] ] ] @@ -678,7 +678,7 @@ "bashing": 8, "material": [ "plastic", "steel" ], "color": "dark_gray", - "ammo": "9mm", + "ammo": [ "9mm" ], "dispersion": 480, "durability": 8, "magazines": [ [ "9mm", [ "p38mag" ] ] ] @@ -697,7 +697,7 @@ "bashing": 8, "material": [ "plastic", "steel" ], "color": "dark_gray", - "ammo": "9mm", + "ammo": [ "9mm" ], "dispersion": 480, "durability": 9, "magazines": [ [ "9mm", [ "ppq9mag_10rd", "ppq9mag_15rd", "ppq9mag_17rd" ] ] ] @@ -717,7 +717,7 @@ "bashing": 8, "material": [ "plastic", "steel", "zinc" ], "color": "dark_gray", - "ammo": "9mm", + "ammo": [ "9mm" ], "dispersion": 480, "durability": 7, "magazines": [ [ "9mm", [ "hptc9mag_8rd", "hptc9mag_10rd", "hptc9mag_15rd" ] ] ] @@ -737,7 +737,7 @@ "bashing": 8, "material": [ "plastic", "steel" ], "color": "dark_gray", - "ammo": "9mm", + "ammo": [ "9mm" ], "dispersion": 480, "durability": 8, "magazines": [ [ "9mm", [ "cz75mag_12rd", "cz75mag_20rd", "cz75mag_26rd" ] ] ] @@ -757,7 +757,7 @@ "bashing": 8, "material": [ "plastic", "steel" ], "color": "dark_gray", - "ammo": "9mm", + "ammo": [ "9mm" ], "dispersion": 480, "durability": 8, "magazines": [ [ "9mm", [ "ccpmag" ] ] ] diff --git a/data/json/items/gun/9x18.json b/data/json/items/gun/9x18.json index cac3da2efbd32..cb032ac54ca70 100644 --- a/data/json/items/gun/9x18.json +++ b/data/json/items/gun/9x18.json @@ -15,7 +15,7 @@ "bashing": 9, "material": [ "steel", "plastic" ], "color": "dark_gray", - "ammo": "9x18", + "ammo": [ "9x18" ], "dispersion": 480, "durability": 6, "min_cycle_recoil": 270, @@ -43,7 +43,7 @@ "//": "Total unloaded weight of gun 1451.496 grams, rounded to 1451. Current weight of folding stock 200 grams.", "description": "A version of the Skorpion submachine gun chambered in 9x18mm Makarov, with a slightly longer barrel than the original design.", "weight": "1440 g", - "ammo": "9x18", + "ammo": [ "9x18" ], "min_cycle_recoil": 270, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ], "magazines": [ [ "9x18", [ "skorpion82mag" ] ] ] diff --git a/data/json/items/gun/atgm.json b/data/json/items/gun/atgm.json index 975f733aef8ff..7c4e9b0075bb0 100644 --- a/data/json/items/gun/atgm.json +++ b/data/json/items/gun/atgm.json @@ -13,7 +13,7 @@ "to_hit": -6, "bashing": 12, "material": "steel", - "ammo": "atgm", + "ammo": [ "atgm" ], "skill": "launcher", "range": 15, "dispersion": 50, diff --git a/data/json/items/gun/bio.json b/data/json/items/gun/bio.json index 69b9216d8b776..4663db1df120f 100644 --- a/data/json/items/gun/bio.json +++ b/data/json/items/gun/bio.json @@ -13,7 +13,7 @@ "symbol": "(", "color": "magenta", "skill": "shotgun", - "ammo": "shot", + "ammo": [ "shot" ], "//": "Damage is using a 6 inch barrel.", "ranged_damage": { "damage_type": "bullet", "amount": -11 }, "dispersion": 855, diff --git a/data/json/items/gun/blunderbuss.json b/data/json/items/gun/blunderbuss.json index 625056fb7683b..2ab908efb4552 100644 --- a/data/json/items/gun/blunderbuss.json +++ b/data/json/items/gun/blunderbuss.json @@ -15,7 +15,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "brown", - "ammo": "blunderbuss", + "ammo": [ "blunderbuss" ], "skill": "shotgun", "dispersion": 855, "durability": 3, diff --git a/data/json/items/gun/chemical_spray.json b/data/json/items/gun/chemical_spray.json index cfb8d5119a9b6..0b4a67c22b58c 100644 --- a/data/json/items/gun/chemical_spray.json +++ b/data/json/items/gun/chemical_spray.json @@ -16,7 +16,7 @@ "material": [ "steel", "plastic" ], "flags": [ "FIRE_50", "NEVER_JAMS", "NON-FOULING" ], "skill": "launcher", - "ammo": "chemical_spray", + "ammo": [ "chemical_spray" ], "dispersion": 300, "durability": 6, "magazines": [ [ "chemical_spray", [ "pressurized_tank_chem" ] ] ], diff --git a/data/json/items/gun/combination.json b/data/json/items/gun/combination.json index bfe8d37a3f86e..af1afd2025f1f 100644 --- a/data/json/items/gun/combination.json +++ b/data/json/items/gun/combination.json @@ -13,7 +13,7 @@ "material": [ "steel", "wood" ], "flags": [ "NEVER_JAMS", "RELOAD_EJECT" ], "skill": "rifle", - "ammo": "3006", + "ammo": [ "3006" ], "weight": "4200 g", "volume": "3 L", "bashing": 12, @@ -53,7 +53,7 @@ "material": [ "steel", "wood" ], "flags": [ "NEVER_JAMS", "RELOAD_EJECT" ], "skill": "shotgun", - "ammo": "3006", + "ammo": [ "3006" ], "weight": "2267 g", "volume": "2 L", "price_postapoc": 1250, diff --git a/data/json/items/gun/flintlock.json b/data/json/items/gun/flintlock.json index ca83d77ae8aa2..9c06191ce0be9 100644 --- a/data/json/items/gun/flintlock.json +++ b/data/json/items/gun/flintlock.json @@ -49,7 +49,7 @@ "material": [ "iron", "wood" ], "symbol": "(", "color": "brown", - "ammo": "flintlock", + "ammo": [ "flintlock" ], "skill": "pistol", "range": 2, "ranged_damage": { "damage_type": "bullet", "amount": 2 }, @@ -84,7 +84,7 @@ "material": [ "iron", "wood" ], "symbol": "(", "color": "brown", - "ammo": "flintlock", + "ammo": [ "flintlock" ], "skill": "rifle", "range": 6, "ranged_damage": { "damage_type": "bullet", "amount": 10 }, diff --git a/data/json/items/gun/monster_gun.json b/data/json/items/gun/monster_gun.json index b4b83dc72cf4d..97fd85416ce30 100644 --- a/data/json/items/gun/monster_gun.json +++ b/data/json/items/gun/monster_gun.json @@ -18,7 +18,7 @@ "RELOAD_AND_SHOOT" ], "skill": "pistol", - "ammo": "barb", + "ammo": [ "barb" ], "clip_size": 1, "weight": "540 g", "volume": "750ml", diff --git a/data/json/items/gun/nail.json b/data/json/items/gun/nail.json index 0d449870592bd..b4629c5082b80 100644 --- a/data/json/items/gun/nail.json +++ b/data/json/items/gun/nail.json @@ -15,7 +15,7 @@ "material": [ "plastic", "steel" ], "symbol": "(", "color": "yellow", - "ammo": "nail", + "ammo": [ "nail" ], "skill": "pistol", "dispersion": 800, "durability": 8, diff --git a/data/json/items/gun/paintball.json b/data/json/items/gun/paintball.json index a290581305624..bb7423ba2a4b9 100644 --- a/data/json/items/gun/paintball.json +++ b/data/json/items/gun/paintball.json @@ -13,7 +13,7 @@ "material": [ "aluminum", "plastic" ], "flags": [ "NEVER_JAMS", "NON-FOULING" ], "skill": "smg", - "ammo": "paintball", + "ammo": [ "paintball" ], "weight": "1600 g", "volume": "1250 ml", "bashing": 5, diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json index 43f8dc54047b5..3f2ba5100dc4b 100644 --- a/data/json/items/gun/shot.json +++ b/data/json/items/gun/shot.json @@ -15,7 +15,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "brown", - "ammo": "shot", + "ammo": [ "shot" ], "ranged_damage": { "damage_type": "bullet", "amount": -11 }, "dispersion": 900, "durability": 6, diff --git a/data/json/items/gun/signal_flare.json b/data/json/items/gun/signal_flare.json index 86430e5ab364e..851cac13a9897 100644 --- a/data/json/items/gun/signal_flare.json +++ b/data/json/items/gun/signal_flare.json @@ -13,7 +13,7 @@ "material": [ "plastic", "steel" ], "symbol": "(", "color": "light_red", - "ammo": "signal_flare", + "ammo": [ "signal_flare" ], "skill": "pistol", "dispersion": 600, "durability": 7, diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index c26eba79bfe58..473cb4acab792 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -534,7 +534,7 @@ "material": [ "superalloy", "steel" ], "symbol": "/", "color": "light_gray", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "techniques": [ "WBLOCK_1", "RAPID" ], "use_action": { @@ -963,7 +963,7 @@ "material": [ "wood", "iron" ], "symbol": "/", "color": "brown", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 100, "qualities": [ [ "HAMMER", 1 ] ], "techniques": [ "WBLOCK_2", "RAPID", "SWEEP" ], @@ -991,7 +991,7 @@ "material": [ "plastic", "steel" ], "symbol": "/", "color": "dark_gray", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "techniques": [ "WBLOCK_2", "RAPID" ], "use_action": "SHOCKTONFA_OFF", diff --git a/data/json/items/melee/misc.json b/data/json/items/melee/misc.json index 5bd89b8af6532..e04de04b8410d 100644 --- a/data/json/items/melee/misc.json +++ b/data/json/items/melee/misc.json @@ -67,7 +67,7 @@ "material": [ "plastic", "aluminum" ], "symbol": ";", "color": "dark_gray", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 100, "use_action": "TAZER", "magazines": [ diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index 463c885476ecb..a098d9a3a1fc4 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -1089,7 +1089,7 @@ "copy-from": "fencing_foil_sharpened", "name": { "str": "electrified foil" }, "description": "The modifications made to this fencing foil may not be sporting, but they might give you an edge in this final competition. Extra effort has been made to insulate the grip and a high voltage stun gun has been attached to the guard, wired through the electronic scoring circuit to the tip. Thrusting the sharpened tip into a foe and activating the momentary switch will deliver a painful electric shock.", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 100, "price_postapoc": 1250, "use_action": "TAZER", @@ -1109,7 +1109,7 @@ "looks_like": "fencing_epee", "name": { "str": "electrified épée" }, "description": "The modifications made to this fencing épée may not be sporting, but they might give you an edge in this final competition. Extra effort has been made to insulate the grip and a high voltage stun gun has been attached to the guard, wired through the electronic scoring circuit to the tip. Thrusting the sharpened tip into a foe and activating the momentary switch will deliver a painful electric shock.", - "ammo": "battery", + "ammo": [ "battery" ], "price_postapoc": 1250, "charges_per_use": 100, "use_action": "TAZER", @@ -1129,7 +1129,7 @@ "looks_like": "fencing_sabre", "name": { "str": "electrified saber" }, "description": "The modifications made to this fencing saber may not be sporting, but they might give you an edge in this final competition. Extra effort has been made to insulate the grip and a high voltage stun gun has been attached to the guard, wired to the tip along the saber's groove. Thrusting the sharpened tip into a foe and activating the momentary switch will deliver a painful electric shock.", - "ammo": "battery", + "ammo": [ "battery" ], "price_postapoc": 1250, "charges_per_use": 100, "use_action": "TAZER", @@ -1533,7 +1533,7 @@ "material": [ "plastic", "steel" ], "symbol": "/", "color": "red", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "max_charges": 800, "charges_per_use": 5, "techniques": [ "WBLOCK_1", "SPIN", "SWEEP" ], @@ -1570,7 +1570,7 @@ "material": [ "plastic", "steel" ], "symbol": "/", "color": "red", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 5, "techniques": [ "WBLOCK_1", "SPIN", "SWEEP" ], "use_action": "ECS_LAJATANG_OFF", @@ -1648,7 +1648,7 @@ "material": [ "steel", "aluminum" ], "symbol": "/", "color": "light_gray", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "charges_per_use": 5, "max_charges": 450, "use_action": "COMBATSAW_OFF", @@ -1685,7 +1685,7 @@ "material": [ "steel", "aluminum" ], "symbol": "/", "color": "light_gray", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 5, "use_action": "E_COMBATSAW_OFF", "techniques": [ "WBLOCK_1", "SWEEP" ], diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json index 0224e2950ffe6..38e103d11e081 100644 --- a/data/json/items/obsolete.json +++ b/data/json/items/obsolete.json @@ -950,7 +950,7 @@ "material": "steel", "symbol": ",", "color": "light_gray", - "ammo": "tinder", + "ammo": [ "tinder" ], "max_charges": 100, "charges_per_use": 25, "turns_per_charge": 300, @@ -1222,7 +1222,7 @@ "price": 99999999, "material": "steel", "skill": "launcher", - "ammo": "120mm", + "ammo": [ "120mm" ], "weight": "2500 g", "volume": "2500 ml", "bashing": 6, @@ -1311,7 +1311,7 @@ "material": [ "steel", "plastic" ], "symbol": "/", "color": "light_gray", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "charges_per_use": 1, "max_charges": 50, "use_action": { @@ -1367,7 +1367,7 @@ "material": "steel", "symbol": "/", "color": "dark_gray", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "charges_per_use": 1, "max_charges": 50, "techniques": "WBLOCK_2", @@ -1399,7 +1399,7 @@ "material": "steel", "symbol": "/", "color": "red", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "max_charges": 50, "turns_per_charge": 30, "revert_to": "firemachete_off", @@ -1434,7 +1434,7 @@ "material": "steel", "symbol": "/", "color": "light_gray", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "charges_per_use": 1, "max_charges": 50, "techniques": [ "RAPID", "WBLOCK_2" ], @@ -1463,7 +1463,7 @@ "material": "steel", "symbol": "/", "color": "red", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "max_charges": 50, "turns_per_charge": 30, "revert_to": "firekatana_off", @@ -1496,7 +1496,7 @@ "material": "steel", "symbol": "/", "color": "light_gray", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "charges_per_use": 1, "max_charges": 50, "techniques": "WBLOCK_2", @@ -1547,7 +1547,7 @@ "material": "steel", "symbol": "/", "color": "light_gray", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "charges_per_use": 1, "max_charges": 50, "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ], @@ -1577,7 +1577,7 @@ "material": "steel", "symbol": "/", "color": "red", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "max_charges": 50, "turns_per_charge": 30, "revert_to": "zweifire_off", @@ -1757,7 +1757,7 @@ "material": [ "steel", "aluminum" ], "symbol": "(", "color": "light_gray", - "ammo": "223", + "ammo": [ "223" ], "range": -6, "ranged_damage": { "damage_type": "bullet", "amount": -16 }, "dispersion": 380, @@ -2000,7 +2000,7 @@ "material": [ "steel", "wood" ], "flags": [ "STR_RELOAD", "RELOAD_ONE", "NON-FOULING" ], "skill": "rifle", - "ammo": "pebble", + "ammo": [ "pebble" ], "weight": "4211 g", "volume": "2750 ml", "bashing": 8, @@ -2038,7 +2038,7 @@ "material": [ "steel", "wood" ], "flags": [ "RELOAD_ONE", "STR_RELOAD", "NON-FOULING" ], "skill": "rifle", - "ammo": "bolt", + "ammo": [ "bolt" ], "weight": "3110 g", "volume": "3 L", "bashing": 12, @@ -2074,7 +2074,7 @@ "material": [ "steel", "wood" ], "flags": [ "RELOAD_ONE", "STR_RELOAD", "NON-FOULING" ], "skill": "shotgun", - "ammo": "shotcanister", + "ammo": [ "shotcanister" ], "weight": "3410 g", "volume": "2500 ml", "price_postapoc": 12000, @@ -2113,7 +2113,7 @@ "material": [ "aluminum", "wood" ], "flags": [ "STR_RELOAD", "NEVER_JAMS" ], "skill": "launcher", - "ammo": "mininuke_mod", + "ammo": [ "mininuke_mod" ], "weight": "11260 g", "volume": "2750 ml", "bashing": 12, @@ -2141,7 +2141,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": "metal_rail", + "ammo": [ "metal_rail" ], "skill": "rifle", "range": 40, "ranged_damage": { "damage_type": "stab", "amount": 40 }, @@ -2179,7 +2179,7 @@ "material": [ "steel", "wood" ], "symbol": "(", "color": "brown", - "ammo": "metal_rail", + "ammo": [ "metal_rail" ], "skill": "rifle", "dispersion": 90, "durability": 6, @@ -2212,7 +2212,7 @@ "to_hit": -2, "bashing": 10, "material": [ "copper", "steel" ], - "ammo": "nail", + "ammo": [ "nail" ], "skill": "rifle", "range": 12, "ranged_damage": { "damage_type": "stab", "amount": 4, "armor_penetration": 20 }, diff --git a/data/json/items/ranged/archery.json b/data/json/items/ranged/archery.json index 542df63294c05..97fb6434c01a3 100644 --- a/data/json/items/ranged/archery.json +++ b/data/json/items/ranged/archery.json @@ -369,7 +369,7 @@ "loudness": 8, "skill": "archery", "min_strength": 6, - "ammo": "arrow", + "ammo": [ "arrow" ], "weight": "1360 g", "volume": "2500 ml", "price_postapoc": 50, @@ -395,7 +395,7 @@ "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", "WATER_FRIENDLY" ], "skill": "archery", "min_strength": 8, - "ammo": "arrow", + "ammo": [ "arrow" ], "weight": "340 g", "volume": "1500 ml", "price_postapoc": 500, @@ -424,7 +424,7 @@ "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON" ], "skill": "archery", "min_strength": 9, - "ammo": "arrow", + "ammo": [ "arrow" ], "weight": "907 g", "volume": "1500 ml", "price_postapoc": 3500, @@ -494,7 +494,7 @@ "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", "WATER_FRIENDLY" ], "skill": "archery", "min_strength": 12, - "ammo": "arrow", + "ammo": [ "arrow" ], "weight": "400 g", "volume": "1750 ml", "price_postapoc": 3000, @@ -523,7 +523,7 @@ "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", "WATER_FRIENDLY" ], "skill": "archery", "min_strength": 9, - "ammo": "arrow", + "ammo": [ "arrow" ], "weight": "540 g", "volume": "2500 ml", "price_postapoc": 2000, @@ -551,7 +551,7 @@ "material": [ "wood" ], "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", "WATER_FRIENDLY" ], "skill": "archery", - "ammo": "arrow", + "ammo": [ "arrow" ], "min_strength": 9, "weight": "400 g", "volume": "1500 ml", @@ -581,7 +581,7 @@ "flags": [ "FIRE_TWOHAND", "STR_DRAW", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", "WATER_FRIENDLY" ], "skill": "archery", "min_strength": 11, - "ammo": "arrow", + "ammo": [ "arrow" ], "weight": "600 g", "volume": "3500 ml", "price_postapoc": 5000, @@ -609,7 +609,7 @@ "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", "WATER_FRIENDLY" ], "skill": "archery", "min_strength": 9, - "ammo": "arrow", + "ammo": [ "arrow" ], "weight": "680 g", "volume": "3500 ml", "price_postapoc": 3000, @@ -656,7 +656,7 @@ "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT" ], "skill": "archery", "min_strength": 15, - "ammo": "arrow", + "ammo": [ "arrow" ], "weight": "2000 g", "volume": "4 L", "price_postapoc": 3000, @@ -684,7 +684,7 @@ "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", "WATER_FRIENDLY" ], "skill": "archery", "min_strength": 8, - "ammo": "arrow", + "ammo": [ "arrow" ], "weight": "450 g", "volume": "2 L", "price_postapoc": 6000, diff --git a/data/json/items/ranged/crossbows.json b/data/json/items/ranged/crossbows.json index 9767d91d30a43..b0a8c082ad74a 100644 --- a/data/json/items/ranged/crossbows.json +++ b/data/json/items/ranged/crossbows.json @@ -295,7 +295,7 @@ "material": [ "wood", "iron" ], "flags": [ "STR_RELOAD", "PRIMITIVE_RANGED_WEAPON" ], "skill": "rifle", - "ammo": "pebble", + "ammo": [ "pebble" ], "weight": "1906 g", "volume": "1250 ml", "bashing": 9, @@ -332,7 +332,7 @@ "material": [ "steel", "plastic" ], "flags": [ "PRIMITIVE_RANGED_WEAPON" ], "skill": "pistol", - "ammo": "bolt", + "ammo": [ "bolt" ], "weight": "900 g", "volume": "500 ml", "bashing": 4, @@ -369,7 +369,7 @@ "flags": "PRIMITIVE_RANGED_WEAPON", "skill": "rifle", "min_strength": 8, - "ammo": "bolt", + "ammo": [ "bolt" ], "weight": "2728 g", "volume": "1500 ml", "bashing": 11, @@ -399,7 +399,7 @@ "flags": "PRIMITIVE_RANGED_WEAPON", "skill": "rifle", "min_strength": 9, - "ammo": "bolt", + "ammo": [ "bolt" ], "weight": "3500 g", "volume": "1750 ml", "bashing": 11, @@ -438,7 +438,7 @@ "flags": "PRIMITIVE_RANGED_WEAPON", "skill": "rifle", "min_strength": 7, - "ammo": "bolt", + "ammo": [ "bolt" ], "weight": "3000 g", "volume": "1750 ml", "price_postapoc": 6000, @@ -477,7 +477,7 @@ "material": [ "iron", "wood" ], "flags": [ "FIRE_TWOHAND", "PRIMITIVE_RANGED_WEAPON", "TRADER_AVOID" ], "skill": "rifle", - "ammo": "bolt", + "ammo": [ "bolt" ], "weight": "6803 g", "volume": "5 L", "price_postapoc": 4000, @@ -506,7 +506,7 @@ "material": [ "steel", "wood" ], "flags": [ "FIRE_TWOHAND", "PRIMITIVE_RANGED_WEAPON", "TRADER_AVOID" ], "skill": "smg", - "ammo": "bolt", + "ammo": [ "bolt" ], "weight": "3628 g", "volume": "2500 ml", "price_postapoc": 6000, diff --git a/data/json/items/ranged/energy.json b/data/json/items/ranged/energy.json index 5f63f6385ebc4..d1789fb7cfda9 100644 --- a/data/json/items/ranged/energy.json +++ b/data/json/items/ranged/energy.json @@ -14,7 +14,7 @@ "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING" ], "ups_charges": 100, "skill": "rifle", - "ammo": "plasma", + "ammo": [ "plasma" ], "weight": "10500 g", "volume": "4L", "price_postapoc": 10000, @@ -52,7 +52,7 @@ "ups_charges": 5, "ammo_effects": [ "PLASMA", "EXPLOSIVE_SMALL", "FLAME" ], "skill": "rifle", - "ammo": "plasma", + "ammo": [ "plasma" ], "weight": "4535 g", "volume": "3750 ml", "price_postapoc": 8000, diff --git a/data/json/items/ranged/launchers.json b/data/json/items/ranged/launchers.json index 9a89ef1177888..2e519c04950b2 100644 --- a/data/json/items/ranged/launchers.json +++ b/data/json/items/ranged/launchers.json @@ -12,7 +12,7 @@ "material": "aluminum", "flags": [ "NO_UNLOAD", "NO_RELOAD", "BACKBLAST", "NEVER_JAMS", "TRADER_AVOID" ], "skill": "launcher", - "ammo": "66mm", + "ammo": [ "66mm" ], "weight": "700 g", "volume": "2500 ml", "price_postapoc": 3500, @@ -46,7 +46,7 @@ "material": [ "steel", "wood" ], "flags": [ "BACKBLAST", "NEVER_JAMS" ], "skill": "launcher", - "ammo": "RPG-7", + "ammo": [ "RPG-7" ], "weight": "7000 g", "volume": "4500 ml", "bashing": 10, @@ -77,7 +77,7 @@ "price": 5000, "material": "steel", "skill": "launcher", - "ammo": "homebrew_rocket", + "ammo": [ "homebrew_rocket" ], "weight": "7430 g", "volume": "5 L", "price_postapoc": 500, @@ -104,7 +104,7 @@ "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NO_RELOAD", "NON-FOULING" ], "ammo_effects": [ "JET", "BEANBAG", "NEVER_MISFIRES", "RECOVER_10" ], "skill": "launcher", - "ammo": "water", + "ammo": [ "water" ], "weight": "24500 g", "volume": "12500 ml", "price_postapoc": 500, diff --git a/data/json/items/ranged/pneumatic.json b/data/json/items/ranged/pneumatic.json index 789bb920e58bd..d2c436bf720f0 100644 --- a/data/json/items/ranged/pneumatic.json +++ b/data/json/items/ranged/pneumatic.json @@ -14,7 +14,7 @@ "material": [ "aluminum", "wood" ], "flags": [ "NEVER_JAMS", "NON-FOULING" ], "skill": "rifle", - "ammo": "BB", + "ammo": [ "BB" ], "weight": "1723 g", "volume": "1500 ml", "bashing": 9, diff --git a/data/json/items/ranged/slings.json b/data/json/items/ranged/slings.json index d15f4ae4ce222..5a6fa9208e29d 100644 --- a/data/json/items/ranged/slings.json +++ b/data/json/items/ranged/slings.json @@ -12,7 +12,7 @@ "material": "leather", "flags": [ "RELOAD_AND_SHOOT", "NEVER_JAMS", "PRIMITIVE_RANGED_WEAPON", "BELT_CLIP" ], "skill": "throw", - "ammo": "pebble", + "ammo": [ "pebble" ], "weight": "96 g", "volume": "250 ml", "price_postapoc": 250, @@ -35,7 +35,7 @@ "material": "wood", "flags": [ "RELOAD_AND_SHOOT", "NEVER_JAMS", "PRIMITIVE_RANGED_WEAPON", "BELT_CLIP" ], "skill": "archery", - "ammo": "pebble", + "ammo": [ "pebble" ], "weight": "254 g", "volume": "250 ml", "price_postapoc": 50, @@ -70,7 +70,7 @@ ], "techniques": [ "WBLOCK_2", "RAPID", "SWEEP" ], "skill": "throw", - "ammo": "rock", + "ammo": [ "rock" ], "weight": "2000 g", "volume": "3 L", "price_postapoc": 250, @@ -94,7 +94,7 @@ "material": [ "steel", "plastic" ], "flags": [ "RELOAD_AND_SHOOT", "NEVER_JAMS", "PRIMITIVE_RANGED_WEAPON", "BELT_CLIP" ], "skill": "archery", - "ammo": "pebble", + "ammo": [ "pebble" ], "weight": "322 g", "volume": "500 ml", "price_postapoc": 250, diff --git a/data/json/items/ranged/spearguns.json b/data/json/items/ranged/spearguns.json index fbd5101d13de4..4c41105832d1a 100644 --- a/data/json/items/ranged/spearguns.json +++ b/data/json/items/ranged/spearguns.json @@ -76,7 +76,7 @@ "material": [ "plastic", "steel" ], "flags": [ "RELOAD_ONE", "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NON-FOULING" ], "skill": "rifle", - "ammo": "fishspear", + "ammo": [ "fishspear" ], "weight": "3460 g", "volume": "2 L", "bashing": 8, @@ -112,7 +112,7 @@ "material": [ "wood", "plastic" ], "flags": [ "RELOAD_ONE", "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NEVER_JAMS", "NON-FOULING" ], "skill": "rifle", - "ammo": "fishspear", + "ammo": [ "fishspear" ], "weight": "3060 g", "volume": "2 L", "bashing": 8, @@ -147,7 +147,7 @@ "material": [ "wood", "plastic" ], "flags": [ "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NEVER_JAMS", "NON-FOULING" ], "skill": "pistol", - "ammo": "fishspear", + "ammo": [ "fishspear" ], "weight": "840 g", "volume": "1 L", "bashing": 7, @@ -179,7 +179,7 @@ "material": [ "wood", "plastic" ], "flags": [ "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NEVER_JAMS", "NON-FOULING" ], "skill": "rifle", - "ammo": "fishspear", + "ammo": [ "fishspear" ], "weight": "2100 g", "volume": "1750 ml", "bashing": 7, diff --git a/data/json/items/tool/cooking.json b/data/json/items/tool/cooking.json index 2b3ef4fed1572..1f281bf9c2aa4 100644 --- a/data/json/items/tool/cooking.json +++ b/data/json/items/tool/cooking.json @@ -79,7 +79,7 @@ "material": [ "steel", "plastic" ], "symbol": "/", "color": "yellow", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 5, "use_action": "CARVER_OFF", "flags": [ "SHEATH_SWORD", "NONCONDUCTIVE" ], @@ -139,7 +139,7 @@ "material": "steel", "symbol": ";", "color": "light_gray", - "ammo": "charcoal", + "ammo": [ "charcoal" ], "max_charges": 200, "flags": [ "ALLOWS_REMOTE_USE" ] }, @@ -157,7 +157,7 @@ "material": "steel", "symbol": ";", "color": "green", - "ammo": "charcoal", + "ammo": [ "charcoal" ], "sub": "hotplate", "initial_charges": 50, "max_charges": 50, @@ -229,7 +229,7 @@ "material": [ "plastic" ], "symbol": ";", "color": "light_gray", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 10, "qualities": [ [ "BOIL", 1 ] ], "use_action": "HOTPLATE", @@ -254,7 +254,7 @@ "material": [ "plastic" ], "symbol": ";", "color": "blue", - "ammo": "battery", + "ammo": [ "battery" ], "flags": [ "ALLOWS_REMOTE_USE" ], "magazines": [ [ @@ -300,7 +300,7 @@ "material": "aluminum", "symbol": ";", "color": "light_gray", - "ammo": "esbit", + "ammo": [ "esbit" ], "sub": "hotplate", "initial_charges": 50, "max_charges": 50, @@ -349,7 +349,7 @@ "material": [ "iron" ], "symbol": "%", "color": "white", - "ammo": "battery", + "ammo": [ "battery" ], "flags": [ "ALLOWS_REMOTE_USE" ], "magazines": [ [ @@ -372,7 +372,7 @@ "material": "steel", "symbol": ";", "color": "green", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "sub": "hotplate", "initial_charges": 500, "max_charges": 500, @@ -427,7 +427,7 @@ "material": "steel", "symbol": ",", "color": "light_gray", - "ammo": "tinder", + "ammo": [ "tinder" ], "max_charges": 100, "charges_per_use": 25, "use_action": "HOTPLATE" @@ -446,7 +446,7 @@ "material": [ "aluminum", "plastic" ], "symbol": ";", "color": "green", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 5, "use_action": "HOTPLATE", "magazines": [ @@ -539,7 +539,7 @@ "material": [ "aluminum", "plastic" ], "symbol": ";", "color": "white", - "ammo": "battery", + "ammo": [ "battery" ], "flags": [ "ALLOWS_REMOTE_USE" ], "magazines": [ [ @@ -562,7 +562,7 @@ "material": [ "aluminum", "plastic" ], "symbol": ";", "color": "green", - "ammo": "battery", + "ammo": [ "battery" ], "sub": "hotplate", "charges_per_use": 5, "qualities": [ [ "COOK", 2 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ], @@ -646,7 +646,7 @@ "material": [ "superalloy", "ceramic" ], "symbol": ";", "color": "green", - "ammo": "battery", + "ammo": [ "battery" ], "sub": "hotplate", "charges_per_use": 5, "qualities": [ [ "COOK", 2 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ], @@ -687,7 +687,7 @@ "material": [ "steel", "plastic" ], "symbol": ";", "color": "red", - "ammo": "battery", + "ammo": [ "battery" ], "power_draw": 1500000, "qualities": [ [ "CONTAIN", 1 ] ], "use_action": "MULTICOOKER", @@ -720,7 +720,7 @@ "material": "steel", "symbol": ";", "color": "green", - "ammo": "lamp_oil", + "ammo": [ "lamp_oil" ], "sub": "hotplate", "initial_charges": 800, "max_charges": 800, @@ -781,7 +781,7 @@ "material": "aluminum", "symbol": ";", "color": "light_gray", - "ammo": "conc_alcohol", + "ammo": [ "conc_alcohol" ], "sub": "hotplate", "initial_charges": 500, "max_charges": 500, @@ -908,7 +908,7 @@ "material": [ "steel", "glass" ], "symbol": ";", "color": "brown", - "ammo": "lamp_oil", + "ammo": [ "lamp_oil" ], "sub": "hotplate", "max_charges": 800, "charges_per_use": 1, @@ -947,7 +947,7 @@ "material": [ "aluminum", "plastic" ], "symbol": ";", "color": "white", - "ammo": "battery", + "ammo": [ "battery" ], "flags": [ "ALLOWS_REMOTE_USE" ], "magazines": [ [ @@ -987,7 +987,7 @@ "material": [ "plastic", "steel" ], "symbol": ";", "color": "light_blue", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "use_action": "WATER_PURIFIER", "flags": [ "ALLOWS_REMOTE_USE" ], diff --git a/data/json/items/tool/electronics.json b/data/json/items/tool/electronics.json index c46510a3d2e50..890f3abc0bbdb 100644 --- a/data/json/items/tool/electronics.json +++ b/data/json/items/tool/electronics.json @@ -13,7 +13,7 @@ "material": [ "aluminum", "plastic" ], "symbol": ";", "color": "light_green", - "ammo": "plutonium", + "ammo": [ "plutonium" ], "max_charges": 2500, "flags": [ "IS_UPS" ] }, @@ -30,7 +30,7 @@ "material": [ "plastic", "steel" ], "symbol": ";", "color": "yellow", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 5, "use_action": "CAMERA", "magazines": [ @@ -61,7 +61,7 @@ "material": [ "plastic", "steel" ], "symbol": ";", "color": "yellow", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 5, "use_action": "CAMERA", "flags": [ "CAMERA_PRO", "ALWAYS_TWOHAND" ], @@ -92,7 +92,7 @@ "material": [ "plastic", "aluminum" ], "symbol": ";", "color": "light_gray", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "use_action": { "target": "cell_phone_flashlight", @@ -140,7 +140,7 @@ "material": [ "plastic", "aluminum" ], "symbol": ",", "color": "yellow", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 2, "use_action": "ROBOTCONTROL", "magazines": [ @@ -197,7 +197,7 @@ "material": "plastic", "symbol": ";", "color": "blue", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "use_action": "EINKTABLETPC", "flags": [ "WATCH" ], @@ -231,7 +231,7 @@ "material": [ "plastic", "aluminum" ], "symbol": ",", "color": "green", - "ammo": "battery", + "ammo": [ "battery" ], "magazines": [ [ "battery", @@ -260,7 +260,7 @@ "material": [ "plastic", "aluminum" ], "symbol": ";", "color": "green", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "use_action": "GEIGER", "magazines": [ @@ -302,7 +302,7 @@ "material": "plastic", "symbol": ":", "color": "light_gray", - "ammo": "battery", + "ammo": [ "battery" ], "use_action": "HAND_CRANK", "magazines": [ [ @@ -333,7 +333,7 @@ "price": 75000, "price_postapoc": 250, "bashing": 6, - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "use_action": [ "EINKTABLETPC", @@ -377,7 +377,7 @@ "material": [ "aluminum", "plastic" ], "symbol": ";", "color": "dark_gray", - "ammo": "battery", + "ammo": [ "battery" ], "use_action": "MP3", "charges_per_use": 1, "magazines": [ @@ -420,7 +420,7 @@ "material": [ "plastic", "aluminum" ], "symbol": ";", "color": "yellow", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "use_action": "NOISE_EMITTER_OFF", "flags": [ "RADIO_MODABLE" ], @@ -462,7 +462,7 @@ "material": [ "plastic" ], "symbol": ";", "color": "light_gray", - "ammo": "battery", + "ammo": [ "battery" ], "use_action": "PORTABLE_GAME", "magazines": [ [ @@ -492,7 +492,7 @@ "looks_like": "cell_phone", "symbol": ";", "color": "light_gray", - "ammo": "battery", + "ammo": [ "battery" ], "initial_charges": 110, "max_charges": 120, "charges_per_use": 1, @@ -550,7 +550,7 @@ "material": [ "aluminum", "plastic" ], "symbol": ";", "color": "light_gray", - "ammo": "battery", + "ammo": [ "battery" ], "magazines": [ [ "battery", [ "heavy_plus_battery_cell", "heavy_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] ] ], @@ -568,7 +568,7 @@ "material": [ "aluminum", "plastic" ], "symbol": ";", "color": "dark_gray", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 10, "use_action": "VIBE", "magazines": [ diff --git a/data/json/items/tool/fire.json b/data/json/items/tool/fire.json index c962b32ddd039..ef4739f96a145 100644 --- a/data/json/items/tool/fire.json +++ b/data/json/items/tool/fire.json @@ -11,7 +11,7 @@ "material": "steel", "symbol": ",", "color": "light_gray", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 5, "use_action": { "type": "firestarter" }, "magazines": [ @@ -149,7 +149,7 @@ "material": "aluminum", "symbol": ",", "color": "light_gray", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "initial_charges": 25, "max_charges": 50, "charges_per_use": 1, @@ -179,7 +179,7 @@ "material": "aluminum", "symbol": ",", "color": "light_gray", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "initial_charges": 25, "max_charges": 50, "charges_per_use": 1, @@ -209,7 +209,7 @@ "material": "steel", "symbol": ",", "color": "light_gray", - "ammo": "tinder", + "ammo": [ "tinder" ], "max_charges": 100, "use_action": { "target": "tinderbox_on", @@ -234,7 +234,7 @@ "material": "steel", "symbol": ",", "color": "light_gray", - "ammo": "tinder", + "ammo": [ "tinder" ], "max_charges": 100, "turns_per_charge": 600, "revert_to": "tinderbox", diff --git a/data/json/items/tool/fishing.json b/data/json/items/tool/fishing.json index 41ec78c6b2d58..d18f0ba6cdb9c 100644 --- a/data/json/items/tool/fishing.json +++ b/data/json/items/tool/fishing.json @@ -12,7 +12,7 @@ "material": "plastic", "symbol": ";", "color": "green", - "ammo": "fish_bait", + "ammo": [ "fish_bait" ], "max_charges": 5, "use_action": "FISH_TRAP" }, diff --git a/data/json/items/tool/landscaping.json b/data/json/items/tool/landscaping.json index 905e16e336306..63a2b0a58a354 100644 --- a/data/json/items/tool/landscaping.json +++ b/data/json/items/tool/landscaping.json @@ -141,7 +141,7 @@ "material": [ "steel", "plastic" ], "symbol": "/", "color": "green", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "max_charges": 600, "charges_per_use": 5, "use_action": "TRIMMER_OFF", diff --git a/data/json/items/tool/lighting.json b/data/json/items/tool/lighting.json index 63887894d1a71..49318327ef0c6 100644 --- a/data/json/items/tool/lighting.json +++ b/data/json/items/tool/lighting.json @@ -151,7 +151,7 @@ "symbol": ";", "color": "green", "charges_per_use": 1, - "ammo": "battery", + "ammo": [ "battery" ], "use_action": { "type": "transform", "target": "electric_lantern_on", @@ -199,7 +199,7 @@ "price": 500, "price_postapoc": 100, "charges_per_use": 1, - "ammo": "battery", + "ammo": [ "battery" ], "use_action": { "type": "transform", "msg": "You turn the flashlight on.", @@ -247,7 +247,7 @@ "material": [ "glass", "iron" ], "symbol": ";", "color": "yellow", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "initial_charges": 500, "max_charges": 500, "charges_per_use": 1, @@ -380,7 +380,7 @@ "symbol": ";", "color": "blue", "charges_per_use": 1, - "ammo": "battery", + "ammo": [ "battery" ], "use_action": { "type": "transform", "msg": "You turn the heavy duty flashlight on.", @@ -452,7 +452,7 @@ "copy-from": "lightstrip_base", "description": "This is a light-emitting circuit that can be wired directly to a battery. It provides some weak light and can't be turned off until the battery dies.", "color": "white", - "ammo": "battery", + "ammo": [ "battery" ], "use_action": { "target": "lightstrip", "msg": "You irreversibly activate the lightstrip.", @@ -489,7 +489,7 @@ "material": [ "glass", "iron" ], "symbol": ";", "color": "yellow", - "ammo": "lamp_oil", + "ammo": [ "lamp_oil" ], "initial_charges": 750, "max_charges": 750, "charges_per_use": 1, @@ -528,7 +528,7 @@ "color": "red", "material": [ "copper", "glass" ], "charges_per_use": 1, - "ammo": "weldgas", + "ammo": [ "weldgas" ], "use_action": { "type": "transform", "msg": "You light the %s.", @@ -561,7 +561,7 @@ "material": [ "plastic", "aluminum" ], "symbol": ";", "color": "white", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "use_action": { "target": "reading_light_on", @@ -598,7 +598,7 @@ "material": [ "plastic", "aluminum" ], "symbol": "&", "color": "blue", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "use_action": { "target": "smart_lamp_on", diff --git a/data/json/items/tool/med.json b/data/json/items/tool/med.json index 13ed28577ba67..217a5847c2c7b 100644 --- a/data/json/items/tool/med.json +++ b/data/json/items/tool/med.json @@ -12,7 +12,7 @@ "material": [ "glass" ], "symbol": "!", "color": "cyan", - "ammo": "anesthetic", + "ammo": [ "anesthetic" ], "initial_charges": 3000, "max_charges": 3000, "flags": [ "IRREPLACEABLE_CONSUMABLE" ], @@ -36,7 +36,7 @@ "flags": [ "ALLOWS_REMOTE_USE" ], "power_draw": 1500000, "looks_like": "microwave", - "ammo": "battery", + "ammo": [ "battery" ], "magazines": [ [ "battery", [ "heavy_plus_battery_cell", "heavy_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] ] ] @@ -72,7 +72,7 @@ "material": [ "ceramic", "superalloy" ], "symbol": ",", "color": "light_gray", - "ammo": "ampoule", + "ammo": [ "ampoule" ], "initial_charges": 2, "max_charges": 2, "charges_per_use": 1, diff --git a/data/json/items/tool/metalworking.json b/data/json/items/tool/metalworking.json index 3fadd3a74df24..cef7d4dec354f 100644 --- a/data/json/items/tool/metalworking.json +++ b/data/json/items/tool/metalworking.json @@ -64,7 +64,7 @@ "material": "steel", "symbol": ";", "color": "dark_gray", - "ammo": "charcoal", + "ammo": [ "charcoal" ], "sub": "forge", "max_charges": 500, "flags": [ "ALLOWS_REMOTE_USE" ] @@ -150,7 +150,7 @@ "material": [ "steel", "plastic" ], "symbol": ";", "color": "light_gray", - "ammo": "battery", + "ammo": [ "battery" ], "flags": [ "ALLOWS_REMOTE_USE" ], "magazines": [ [ "battery", [ "heavy_battery_cell", "heavy_plus_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] ] diff --git a/data/json/items/tool/misc.json b/data/json/items/tool/misc.json index 3b05393149295..b7d879665020a 100644 --- a/data/json/items/tool/misc.json +++ b/data/json/items/tool/misc.json @@ -98,7 +98,7 @@ "price": 2500, "price_postapoc": 100, "material": "plastic", - "ammo": "battery", + "ammo": [ "battery" ], "magazines": [ [ "battery", @@ -129,7 +129,7 @@ "price": 2500, "price_postapoc": 100, "material": "plastic", - "ammo": "battery", + "ammo": [ "battery" ], "power_draw": 9000, "revert_to": "dab_pen", "magazines": [ @@ -364,7 +364,7 @@ "material": "steel", "symbol": ";", "color": "brown", - "ammo": "battery", + "ammo": [ "battery" ], "flags": [ "ALLOWS_REMOTE_USE" ], "use_action": { "target": "large_space_heater_on", @@ -583,7 +583,7 @@ "material": "steel", "symbol": ";", "color": "brown", - "ammo": "battery", + "ammo": [ "battery" ], "flags": [ "ALLOWS_REMOTE_USE" ], "use_action": { "target": "small_space_heater_on", diff --git a/data/json/items/tool/pets.json b/data/json/items/tool/pets.json index 54d1076f4ac00..155aef4f5373a 100644 --- a/data/json/items/tool/pets.json +++ b/data/json/items/tool/pets.json @@ -63,7 +63,7 @@ "symbol": ";", "color": "dark_gray", "qualities": [ [ "SHEAR", 3 ] ], - "ammo": "battery", + "ammo": [ "battery" ], "initial_charges": 100, "max_charges": 100, "charges_per_use": 25 diff --git a/data/json/items/tool/radio_tools.json b/data/json/items/tool/radio_tools.json index 673813358d6ce..56dfda2091dee 100644 --- a/data/json/items/tool/radio_tools.json +++ b/data/json/items/tool/radio_tools.json @@ -22,7 +22,7 @@ "description": "A remote control for RC cars, with joystick to steer the car and colorful buttons that don't seem to do anything. Perhaps they were for the deluxe model?", "symbol": "#", "color": "yellow", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "turns_per_charge": 5, "proportional": { "weight": 0.21, "volume": 0.25, "price": 0.2 }, @@ -49,7 +49,7 @@ "name": { "str": "RC car" }, "description": "A remote-controlled car. Fun for young and old alike.", "symbol": "#", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "proportional": { "weight": 0.73, "volume": 0.75, "price": 0.8 }, "use_action": "RADIOCAR", @@ -96,7 +96,7 @@ "material": [ "plastic", "aluminum" ], "symbol": ";", "color": "light_gray", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "use_action": "RADIO_OFF", "magazines": [ @@ -138,7 +138,7 @@ "material": [ "plastic", "aluminum" ], "symbol": ";", "color": "green", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "flags": [ "TWO_WAY_RADIO" ], "magazines": [ @@ -169,7 +169,7 @@ "material": "plastic", "symbol": "#", "color": "yellow", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "turns_per_charge": 10, "use_action": "REMOTEVEH", diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json index 47380d8b848a1..6ade64bd77ec3 100644 --- a/data/json/items/tool/science.json +++ b/data/json/items/tool/science.json @@ -49,7 +49,7 @@ "material": [ "glass", "cotton" ], "symbol": ";", "color": "light_gray", - "ammo": "battery", + "ammo": [ "battery" ], "sub": "hotplate", "charges_per_use": 1, "qualities": [ [ "DISTILL", 1 ], [ "CHEM", 3 ], [ "BOIL", 1 ] ], @@ -89,7 +89,7 @@ "price_postapoc": 750, "material": [ "steel", "copper", "plastic" ], "symbol": ";", - "ammo": "battery", + "ammo": [ "battery" ], "magazines": [ [ "battery", @@ -104,7 +104,7 @@ "description": "A small 0.9 cubic foot vacuum oven used to purge residual solvents out of liquids and solid. Looks kind of like a microwave.", "looks_like": "microwave", "weight": "40860 g", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "magazines": [ [ "battery", [ "large_storage_battery", "storage_battery" ] ] ], "volume": "27 L", @@ -128,7 +128,7 @@ "to_hit": -10, "bashing": 10, "material": "steel", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "magazines": [ [ "battery", [ "large_storage_battery", "storage_battery" ] ] ], "symbol": "E", @@ -154,7 +154,7 @@ "price": 100000, "to_hit": -10, "bashing": 10, - "ammo": "battery", + "ammo": [ "battery" ], "power_draw": 120000, "revert_to": "vac_oven_small_full", "charges_per_use": 1, @@ -184,7 +184,7 @@ "price": 100000, "to_hit": -10, "bashing": 10, - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "magazines": [ [ "battery", [ "large_storage_battery", "storage_battery" ] ] ], "material": "steel", @@ -207,7 +207,7 @@ "bashing": 40, "material": "steel", "flags": [ "ALLOWS_REMOTE_USE" ], - "ammo": "battery", + "ammo": [ "battery" ], "power_draw": 1500000, "charges_per_use": 1, "use_action": { @@ -255,7 +255,7 @@ "bashing": 40, "material": "steel", "flags": [ "ALLOWS_REMOTE_USE", "TRADER_AVOID" ], - "ammo": "battery", + "ammo": [ "battery" ], "power_draw": 1500000, "revert_to": "closed_loop_extractor_small", "charges_per_use": 1, @@ -303,7 +303,7 @@ "symbol": "E", "color": "dark_gray", "flags": [ "ALLOWS_REMOTE_USE", "TRADER_AVOID" ], - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "magazines": [ [ @@ -350,7 +350,7 @@ "symbol": "E", "color": "dark_gray", "flags": [ "ALLOWS_REMOTE_USE", "TRADER_AVOID" ], - "ammo": "battery", + "ammo": [ "battery" ], "power_draw": 1500000, "revert_to": "closed_loop_extractor_large", "charges_per_use": 1, @@ -446,7 +446,7 @@ "bashing": 10, "material": "iron", "flags": [ "ALLOWS_REMOTE_USE" ], - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "use_action": { "target": "vac_pump_on", @@ -491,7 +491,7 @@ "to_hit": -5, "bashing": 10, "material": "iron", - "ammo": "battery", + "ammo": [ "battery" ], "power_draw": 600000, "charges_per_use": 1, "flags": [ "TRADER_AVOID", "ALLOWS_REMOTE_USE" ], @@ -727,7 +727,7 @@ "material": [ "plastic", "aluminum" ], "symbol": ";", "color": "light_gray", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 5, "use_action": "WEATHER_TOOL", "flags": [ "THERMOMETER", "HYGROMETER", "BAROMETER" ], @@ -756,7 +756,7 @@ "volume": "5 L", "price": 25000, "price_postapoc": 1000, - "ammo": "battery", + "ammo": [ "battery" ], "to_hit": -5, "bashing": 2, "material": [ "plastic", "steel" ], @@ -796,7 +796,7 @@ "volume": "2 L", "price": 8000, "price_postapoc": 500, - "ammo": "battery", + "ammo": [ "battery" ], "to_hit": -5, "bashing": 2, "material": [ "plastic", "steel" ], @@ -835,7 +835,7 @@ "volume": "1500 ml", "price": 6000, "price_postapoc": 250, - "ammo": "battery", + "ammo": [ "battery" ], "to_hit": -5, "bashing": 2, "material": [ "plastic", "glass" ], @@ -866,7 +866,7 @@ "volume": "1500 ml", "price": 6000, "price_postapoc": 250, - "ammo": "battery", + "ammo": [ "battery" ], "to_hit": -5, "bashing": 2, "material": [ "plastic" ], @@ -897,7 +897,7 @@ "volume": "1500 ml", "price": 6000, "price_postapoc": 250, - "ammo": "battery", + "ammo": [ "battery" ], "to_hit": -5, "bashing": 2, "material": [ "plastic", "glass" ], @@ -1119,7 +1119,7 @@ "looks_like": "t_centrifuge", "symbol": "n", "color": "white", - "ammo": "battery", + "ammo": [ "battery" ], "qualities": [ [ "CONCENTRATE", 1 ] ], "magazines": [ [ diff --git a/data/json/items/tool/smoking.json b/data/json/items/tool/smoking.json index ca361297667f6..e2a40bda3054e 100644 --- a/data/json/items/tool/smoking.json +++ b/data/json/items/tool/smoking.json @@ -13,7 +13,7 @@ "material": "steel", "symbol": "!", "color": "white", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "power_draw": 7500, "use_action": "ECIG", diff --git a/data/json/items/tool/tailoring.json b/data/json/items/tool/tailoring.json index 93afa92b8003c..5760db0eb696f 100644 --- a/data/json/items/tool/tailoring.json +++ b/data/json/items/tool/tailoring.json @@ -75,7 +75,7 @@ "material": "bone", "symbol": ";", "color": "white", - "ammo": "thread", + "ammo": [ "thread" ], "sub": "sewing_kit", "max_charges": 200, "charges_per_use": 1, @@ -103,7 +103,7 @@ "material": "steel", "symbol": ";", "color": "light_gray", - "ammo": "thread", + "ammo": [ "thread" ], "sub": "sewing_kit", "max_charges": 200, "charges_per_use": 1, @@ -131,7 +131,7 @@ "material": "wood", "symbol": ";", "color": "brown", - "ammo": "thread", + "ammo": [ "thread" ], "sub": "sewing_kit", "max_charges": 200, "charges_per_use": 1, @@ -160,7 +160,7 @@ "material": [ "plastic", "steel" ], "symbol": ",", "color": "red", - "ammo": "thread", + "ammo": [ "thread" ], "initial_charges": 50, "max_charges": 200, "charges_per_use": 1, @@ -268,7 +268,7 @@ "material": [ "plastic", "steel" ], "symbol": ";", "color": "red", - "ammo": "thread", + "ammo": [ "thread" ], "sub": "sewing_kit", "initial_charges": 50, "max_charges": 400, diff --git a/data/json/items/tool/toileteries.json b/data/json/items/tool/toileteries.json index 3c67c3d1a4c5d..350a0ea38fabe 100644 --- a/data/json/items/tool/toileteries.json +++ b/data/json/items/tool/toileteries.json @@ -46,7 +46,7 @@ "material": [ "plastic", "aluminum" ], "symbol": ";", "color": "yellow", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 10, "use_action": "HAIRKIT", "magazines": [ [ "battery", [ "light_minus_battery_cell", "light_minus_atomic_battery_cell", "light_minus_disposable_cell" ] ] ] @@ -110,7 +110,7 @@ "material": "plastic", "symbol": ";", "color": "white", - "ammo": "soap", + "ammo": [ "soap" ], "initial_charges": 5, "max_charges": 10, "charges_per_use": 1, @@ -161,7 +161,7 @@ "material": [ "leather", "glass" ], "symbol": ";", "color": "brown", - "ammo": "soap", + "ammo": [ "soap" ], "max_charges": 10, "charges_per_use": 1, "use_action": "SHAVEKIT" diff --git a/data/json/items/tool/woodworking.json b/data/json/items/tool/woodworking.json index a0acf43777f52..0c7408aec6813 100644 --- a/data/json/items/tool/woodworking.json +++ b/data/json/items/tool/woodworking.json @@ -32,7 +32,7 @@ "material": [ "steel", "plastic" ], "symbol": "/", "color": "red", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "charges_per_use": 5, "max_charges": 450, "techniques": "SWEEP", @@ -71,7 +71,7 @@ "material": [ "steel", "plastic" ], "symbol": "/", "color": "yellow", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 5, "use_action": { "target": "circsaw_on", "msg": "You turn on the circular saw.", "active": true, "type": "transform" }, "flags": [ "NONCONDUCTIVE" ], @@ -151,7 +151,7 @@ "material": [ "steel", "plastic" ], "symbol": "/", "color": "red", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 5, "techniques": "SWEEP", "use_action": "ELEC_CHAINSAW_OFF", diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json index 6bb2a2469ade1..ed9d7e6d48a9e 100644 --- a/data/json/items/tool/workshop.json +++ b/data/json/items/tool/workshop.json @@ -72,7 +72,7 @@ "symbol": "/", "color": "yellow", "qualities": [ [ "GRIND", 2 ] ], - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "power_draw": 800000, "flags": [ "NONCONDUCTIVE" ], @@ -97,7 +97,7 @@ "material": "steel", "symbol": ";", "color": "dark_gray", - "ammo": "charcoal", + "ammo": [ "charcoal" ], "max_charges": 1000, "flags": [ "ALLOWS_REMOTE_USE" ] }, @@ -183,7 +183,7 @@ "material": "steel", "symbol": "$", "color": "dark_gray", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 20, "qualities": [ [ "CONTAIN", 1 ] ], "use_action": "HOTPLATE", @@ -209,7 +209,7 @@ "material": [ "plastic", "steel" ], "symbol": ";", "color": "yellow", - "ammo": "battery", + "ammo": [ "battery" ], "qualities": [ [ "DRILL", 3 ], [ "SCREW", 1 ] ], "magazines": [ [ @@ -250,7 +250,7 @@ "material": "steel", "symbol": ";", "color": "light_gray", - "ammo": "battery", + "ammo": [ "battery" ], "initial_charges": 3500, "max_charges": 7000, "charges_per_use": 3500, @@ -389,7 +389,7 @@ "material": "steel", "symbol": ";", "color": "light_gray", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "max_charges": 400, "charges_per_use": 10, "use_action": "JACKHAMMER", @@ -409,7 +409,7 @@ "material": "steel", "symbol": ";", "color": "dark_gray", - "ammo": "battery", + "ammo": [ "battery" ], "flags": [ "ALLOWS_REMOTE_USE" ], "magazines": [ [ "battery", [ "heavy_battery_cell", "heavy_plus_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] ] @@ -429,7 +429,7 @@ "material": [ "steel", "aluminum" ], "symbol": ";", "color": "dark_gray", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 25, "qualities": [ [ "HAMMER_FINE", 1 ], @@ -516,7 +516,7 @@ "material": [ "steel", "plastic" ], "symbol": ";", "color": "light_gray", - "ammo": "tape", + "ammo": [ "tape" ], "max_charges": 200, "charges_per_use": 5, "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 2 ], [ "AXE", 1 ], [ "SAW_W", 2 ], [ "BUTCHER", -90 ] ], @@ -580,7 +580,7 @@ "material": [ "steel", "plastic" ], "symbol": ";", "color": "red", - "ammo": "weldgas", + "ammo": [ "weldgas" ], "charges_per_use": 4, "use_action": "OXYTORCH", "qualities": [ [ "WELD", 2 ] ], @@ -669,7 +669,7 @@ "material": [ "steel", "plastic" ], "symbol": ";", "color": "light_gray", - "ammo": "battery", + "ammo": [ "battery" ], "flags": [ "TRADER_AVOID" ], "magazines": [ [ @@ -754,7 +754,7 @@ "material": [ "steel", "plastic" ], "symbol": ";", "color": "light_gray", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 100, "qualities": [ [ "HAMMER_FINE", 1 ], @@ -792,7 +792,7 @@ "material": "iron", "symbol": ",", "color": "light_gray", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "use_action": [ { @@ -946,7 +946,7 @@ "material": "steel", "symbol": ";", "color": "red", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 5, "qualities": [ [ "WELD", 2 ] ], "use_action": [ @@ -982,7 +982,7 @@ "material": "steel", "symbol": ";", "color": "light_red", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 10, "qualities": [ [ "WELD", 1 ] ], "use_action": [ diff --git a/data/json/items/vehicle/utilities.json b/data/json/items/vehicle/utilities.json index 4950c115dd771..f08361537a3d8 100644 --- a/data/json/items/vehicle/utilities.json +++ b/data/json/items/vehicle/utilities.json @@ -31,7 +31,7 @@ "category": "veh_parts", "price": 90000, "price_postapoc": 5000, - "ammo": "plutonium", + "ammo": [ "plutonium" ], "max_charges": 10000 }, { diff --git a/data/json/obsolete.json b/data/json/obsolete.json index d8768b733d059..257582ac5e71a 100644 --- a/data/json/obsolete.json +++ b/data/json/obsolete.json @@ -469,7 +469,7 @@ "flags": [ "NEVER_JAMS" ], "ups_charges": 5, "skill": "rifle", - "ammo": "fusion", + "ammo": [ "fusion" ], "weight": "2267 g", "volume": "3500 ml", "bashing": 10, diff --git a/data/legacy/1/obsolete.json b/data/legacy/1/obsolete.json index 503a06392825b..7af812b0248ad 100644 --- a/data/legacy/1/obsolete.json +++ b/data/legacy/1/obsolete.json @@ -109,7 +109,7 @@ "material": [ "iron", "wood" ], "flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ], "skill": "shotgun", - "ammo": "shot", + "ammo": [ "shot" ], "weight": 1814, "volume": 4, "bashing": 12, @@ -144,7 +144,7 @@ "material": [ "iron", "wood" ], "flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ], "skill": "shotgun", - "ammo": "shot", + "ammo": [ "shot" ], "weight": 1133, "volume": 6, "bashing": 12, @@ -448,7 +448,7 @@ "material": "wood", "flags": [ "RELOAD_AND_SHOOT", "NEVER_JAMS", "PRIMITIVE_RANGED_WEAPON" ], "skill": "archery", - "ammo": "dart", + "ammo": [ "dart" ], "weight": 440, "volume": 4, "bashing": 8, diff --git a/data/mods/Aftershock/items/bioparts.json b/data/mods/Aftershock/items/bioparts.json index 01f84d6acbfec..4e5562bb1857f 100644 --- a/data/mods/Aftershock/items/bioparts.json +++ b/data/mods/Aftershock/items/bioparts.json @@ -89,7 +89,7 @@ "weight": "5140 g", "volume": "1500 ml", "price": 400000, - "ammo": "acidic_bore", + "ammo": [ "acidic_bore" ], "to_hit": -1, "bashing": 4, "material": [ "alien_resin" ], diff --git a/data/mods/Aftershock/items/tools.json b/data/mods/Aftershock/items/tools.json index 3b046308ef960..b6ae692fc0bdd 100644 --- a/data/mods/Aftershock/items/tools.json +++ b/data/mods/Aftershock/items/tools.json @@ -141,7 +141,7 @@ "symbol": "/", "looks_like": "circsaw_off", "color": "light_red", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "max_charges": 500, "charges_per_use": 1, "use_action": { "target": "afs_power_cutter_on", "msg": "You rev up the power cutter!", "active": true, "type": "transform" }, @@ -176,7 +176,7 @@ "symbol": "/", "looks_like": "circsaw_off", "color": "yellow", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "max_charges": 500, "charges_per_use": 1, "use_action": { "target": "afs_murdersaw_on", "msg": "You rev up the murdersaw!", "active": true, "type": "transform" }, diff --git a/data/mods/Aftershock/items/weapons.json b/data/mods/Aftershock/items/weapons.json index 1ea37965d17d8..b0bcf2fec5978 100644 --- a/data/mods/Aftershock/items/weapons.json +++ b/data/mods/Aftershock/items/weapons.json @@ -12,7 +12,7 @@ "symbol": "[", "looks_like": "flashlight", "color": "light_gray", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "use_action": { "menu_text": "Activate", @@ -51,7 +51,7 @@ "material": [ "superalloy", "diamond" ], "symbol": "[", "color": "light_blue", - "ammo": "battery", + "ammo": [ "battery" ], "turns_per_charge": 10, "cutting": 40, "to_hit": 2, @@ -149,7 +149,7 @@ "looks_like": "bio_int_enhancer", "color": "magenta", "skill": "launcher", - "ammo": "40x46mm", + "ammo": [ "40x46mm" ], "dispersion": 290, "durability": 6, "clip_size": 1, @@ -170,7 +170,7 @@ "symbol": "(", "looks_like": "american_180", "color": "magenta", - "ammo": "battery", + "ammo": [ "battery" ], "skill": "rifle", "range": 10, "ranged_damage": { "damage_type": "heat", "amount": 10 }, @@ -196,7 +196,7 @@ "price": 99999999, "material": "steel", "skill": "launcher", - "ammo": "120mm", + "ammo": [ "120mm" ], "weight": "2500 g", "volume": "2500 ml", "bashing": 6, diff --git a/data/mods/CRT_EXPANSION/items/crt_gun.json b/data/mods/CRT_EXPANSION/items/crt_gun.json index dec62707f69ee..4715816d68e5b 100644 --- a/data/mods/CRT_EXPANSION/items/crt_gun.json +++ b/data/mods/CRT_EXPANSION/items/crt_gun.json @@ -150,7 +150,7 @@ "dispersion": 150, "durability": 10, "loudness": 30, - "ammo": "9mm", + "ammo": [ "9mm" ], "clip_size": 18, "reload": 150, "built_in_mods": [ "crt_cqb_si_shotgun" ], @@ -205,7 +205,7 @@ "material": [ "steel", "plastic" ], "flags": [ "STR_RELOAD", "NON-FOULING", "NON-FOULING" ], "skill": "rifle", - "ammo": "pellets", + "ammo": [ "pellets" ], "weight": "5023 g", "volume": "2 L", "bashing": 10, @@ -241,7 +241,7 @@ "durability": 10, "loudness": -150, "ups_charges": 40, - "ammo": "plasma", + "ammo": [ "plasma" ], "clip_size": 12, "reload": 170, "valid_mod_locations": [ [ "accessories", 1 ], [ "grip", 1 ], [ "sights", 1 ] ], @@ -268,7 +268,7 @@ "dispersion": 220, "durability": 10, "loudness": 12, - "ammo": "nail", + "ammo": [ "nail" ], "clip_size": 25, "reload": 200, "valid_mod_locations": [ [ "accessories", 1 ], [ "grip", 1 ], [ "sights", 1 ] ], @@ -296,7 +296,7 @@ "durability": 10, "loudness": -55, "ups_charges": 100, - "ammo": "plasma", + "ammo": [ "plasma" ], "clip_size": 5, "reload": 320, "modes": [ [ "DEFAULT", "semi-auto", 1 ] ], @@ -324,7 +324,7 @@ "dispersion": 150, "durability": 10, "loudness": 10, - "ammo": "pulsesb", + "ammo": [ "pulsesb" ], "clip_size": 175, "reload": 15, "modes": [ [ "BURST", "3 rd.", 3 ] ], @@ -352,7 +352,7 @@ "durability": 10, "loudness": 10, "ups_charges": 10, - "ammo": "pulsesb", + "ammo": [ "pulsesb" ], "clip_size": 8, "reload": 450, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "REACH", "em field saw", 5, [ "MELEE", "REACH_ATTACK" ] ] ], diff --git a/data/mods/CRT_EXPANSION/items/crt_tools.json b/data/mods/CRT_EXPANSION/items/crt_tools.json index 839f6a4f83115..469aafc9c2ebd 100644 --- a/data/mods/CRT_EXPANSION/items/crt_tools.json +++ b/data/mods/CRT_EXPANSION/items/crt_tools.json @@ -12,7 +12,7 @@ "material": [ "superalloy", "ceramic" ], "symbol": ";", "color": "green", - "ammo": "battery", + "ammo": [ "battery" ], "sub": "hotplate", "initial_charges": 75, "max_charges": 75, diff --git a/data/mods/CrazyCataclysm/crazy_items.json b/data/mods/CrazyCataclysm/crazy_items.json index 4bbb2db91a9a7..16d2d910da862 100644 --- a/data/mods/CrazyCataclysm/crazy_items.json +++ b/data/mods/CrazyCataclysm/crazy_items.json @@ -91,7 +91,7 @@ "bashing": 8, "material": [ "plastic", "steel", "zinc" ], "color": "dark_gray", - "ammo": "9mm", + "ammo": [ "9mm" ], "dispersion": 480, "durability": 7, "magazines": [ [ "9mm", [ "hptc9mag_8rd", "hptc9mag_10rd", "hptc9mag_15rd" ] ] ] @@ -110,7 +110,7 @@ "material": "steel", "symbol": "/", "color": "light_gray", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "charges_per_use": 1, "max_charges": 50, "techniques": [ "RAPID", "WBLOCK_2" ], @@ -139,7 +139,7 @@ "material": "steel", "symbol": "/", "color": "red", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "max_charges": 50, "turns_per_charge": 30, "revert_to": "firekatana_off", @@ -172,7 +172,7 @@ "material": "steel", "symbol": "/", "color": "light_gray", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "charges_per_use": 1, "max_charges": 50, "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ], @@ -202,7 +202,7 @@ "material": "steel", "symbol": "/", "color": "red", - "ammo": "gasoline", + "ammo": [ "gasoline" ], "max_charges": 50, "turns_per_charge": 30, "revert_to": "zweifire_off", diff --git a/data/mods/Generic_Guns/firearms/black_powder.json b/data/mods/Generic_Guns/firearms/black_powder.json index c11e3529e2dfc..0e4485710262a 100644 --- a/data/mods/Generic_Guns/firearms/black_powder.json +++ b/data/mods/Generic_Guns/firearms/black_powder.json @@ -4,7 +4,7 @@ "copy-from": "pistol_flintlock", "type": "GUN", "name": { "str": "antique pistol" }, - "ammo": "ammo_black_powder", + "ammo": [ "ammo_black_powder" ], "description": "This antiquated single shot pistol would complete a pirate's outfit nicely. While its loading may be slow, it does not require brass casings to fire, and is theoretically sustainable. Range and accuracy are hampered by lack of rifling, but this old design is still plenty lethal.", "clip_size": 1 }, @@ -13,7 +13,7 @@ "copy-from": "colt_army", "type": "GUN", "name": { "str": "antique revolver" }, - "ammo": "ammo_black_powder", + "ammo": [ "ammo_black_powder" ], "description": "This is an old revolver designed during the period of westward expansion. Black powder paper cartridges must be loaded for each shot, which is a fairly lengthy process. Despite its age, this type of weapon would perform adequately against most two-legged threats.", "clip_size": 6 }, @@ -22,7 +22,7 @@ "copy-from": "rifle_flintlock", "type": "GUN", "name": { "str": "antique musket" }, - "ammo": "ammo_black_powder", + "ammo": [ "ammo_black_powder" ], "description": "An antique design, this smoothbore long arm would look more at home on a pre-1850's battlefield than in your hands in the cataclysm. Its loading may be slow, but it does not require brass casings to fire, and is theoretically sustainable to fire. Range and accuracy are hampered by lack of rifling, but this time-tested design is plenty lethal.", "clip_size": 1 } diff --git a/data/mods/Generic_Guns/firearms/grenade.json b/data/mods/Generic_Guns/firearms/grenade.json index 8dae10c0be6b7..d458b7ea9b056 100644 --- a/data/mods/Generic_Guns/firearms/grenade.json +++ b/data/mods/Generic_Guns/firearms/grenade.json @@ -4,7 +4,7 @@ "copy-from": "m79", "type": "GUN", "name": { "str": "grenade launcher" }, - "ammo": "ammo_grenade", + "ammo": [ "ammo_grenade" ], "description": "An older single shot grenade launcher, looking something like a sawn off shotgun. Though it's mostly been replaced by underbarrel launchers, dedicated models like this have seen use by law enforcement and riot personnel. Still deadly against hard or soft targets, depending on what cartridges are available.", "clip_size": 1 }, @@ -13,7 +13,7 @@ "copy-from": "mark19", "type": "GUN", "name": { "str": "automatic grenade launcher" }, - "ammo": "ammo_grenade", + "ammo": [ "ammo_grenade" ], "description": "This large, clumsy looking launcher looks like the offspring of a machine gun and a mortar; its bore is huge, and its action is just as massive. A huge belt of grenade cartridges loads into its tray, allowing several grenades to be launched in rapid succession. If one grenade fired from this isn't enough to solve your problems, surely a dozen more are. This must be mounted on a frame to be fired, and reloading is a bit slow.", "magazines": [ [ "ammo_grenade", [ "grenade_belt" ] ] ] }, @@ -23,7 +23,7 @@ "type": "GUN", "name": { "str": "grenade pistol" }, "//": "more like granadepistole", - "ammo": "ammo_grenade", + "ammo": [ "ammo_grenade" ], "description": "A stubby single shot pistol with a large bore barrel, suitable for launching grenades or flares. This is a slightly more convenient way to transport a grenade launcher than mounted to one's rifle, a practice more common among special forces. In more recent years, variants were sold commercially to ostensibly launch flares. With the right cartridges, this would be devastating against hard or soft targets. This could be attached to a suitable rifle, if so desired.", "clip_size": 1, "use_action": { @@ -38,7 +38,7 @@ "copy-from": "mgl", "type": "GUN", "name": { "str": "revolver grenade launcher" }, - "ammo": "ammo_grenade", + "ammo": [ "ammo_grenade" ], "description": "Looking something like a large revolver from a cartoon this launcher is capable of firing six grenades in rapid succession. Its huge cylinder is wound by a clock spring, which hastens firing, but slows reloading, as it must be re-wound. Needless to say, six well placed shots is an incredible amount of firepower, depending on the cartridges loaded.", "clip_size": 6 } diff --git a/data/mods/Generic_Guns/firearms/pistol.json b/data/mods/Generic_Guns/firearms/pistol.json index 9694b5d03c45d..d495c6e504765 100644 --- a/data/mods/Generic_Guns/firearms/pistol.json +++ b/data/mods/Generic_Guns/firearms/pistol.json @@ -4,7 +4,7 @@ "copy-from": "henry_big_boy", "type": "GUN", "name": { "str": "cowboy carbine" }, - "ammo": "ammo_pistol", + "ammo": [ "ammo_pistol" ], "description": "Since the early days of western expansion, when ammunition supply was infrequent, shooters sought to share ammo between their sidearms and long arms. This tube magazine lever action carbine allows the shooter to reduce the number of calibers carried and squeeze more power from their pistol ammunition.", "clip_size": 10 }, @@ -13,7 +13,7 @@ "copy-from": "glock_18c", "type": "GUN", "name": { "str": "machine pistol" }, - "ammo": "ammo_pistol", + "ammo": [ "ammo_pistol" ], "description": "This pistol is a tiny machinegun you can stuff into a holster, with which you could dump its magazine at a blistering rate into any close range foes. Machine pistols mostly see use by vehicle crewmen or bodygaurds of VIPs. Due to its preposterous rate of fire it is difficult to control.", "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] }, @@ -22,7 +22,7 @@ "copy-from": "glock_19", "type": "GUN", "name": { "str": "defensive pistol" }, - "ammo": "ammo_pistol", + "ammo": [ "ammo_pistol" ], "description": "A modern pistol fit for duty, military service, or personal defense, with a detachable box magazine and a reliable action. Though its chambering is capable of meeting FBI penetration minimums, the lack of a shoulder stock limits its utility.", "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] }, @@ -31,7 +31,7 @@ "copy-from": "cx4", "type": "GUN", "name": "survivalist carbine", - "ammo": "ammo_pistol", + "ammo": [ "ammo_pistol" ], "description": "These small carbines share ammunition and magazines with common pistols, offering a more controllable carbine than a normal rifle, while also reducing ammunition costs. Because of their compatibility, they pair well with duty pistols, allowing one to transition to a more stable weapon without carrying extra ammo or magazines.", "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] }, @@ -40,7 +40,7 @@ "copy-from": "model_10_revolver", "type": "GUN", "name": { "str": "police revolver" }, - "ammo": "ammo_pistol", + "ammo": [ "ammo_pistol" ], "description": "Revolvers like this, chambered for standard defensive calibers, were a favorite of police departments for nearly a century, up until the 1986 Miami shootout. Afterwards, the slow reloading and shooting of revolvers were considered liabilities; still, this model's accuracy and moderate recoil make for a serviceable sidearm, and there are no magazines for you to lose or damage.", "clip_size": 6, "magazines": [ [ "ammo_pistol", [ "pistol_speedloader" ] ] ] @@ -50,7 +50,7 @@ "copy-from": "hk_mp5", "type": "GUN", "name": "submachine gun", - "ammo": "ammo_pistol", + "ammo": [ "ammo_pistol" ], "description": "Chambered in common pistol ammunition, this compact long arm is perfect for trench raiders, vehicular crewmen, SWAT teams and special forces. Though not as accurate as a proper rifle, especially at longer ranges, it is very controllable in automatic fire. It feeds from detachable box magazines, which are easy to unload into close range targets.", "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] }, @@ -59,7 +59,7 @@ "copy-from": "smg_9mm", "type": "GUN", "name": "survivor subgun", - "ammo": "ammo_pistol", + "ammo": [ "ammo_pistol" ], "description": "A crudely constructed fully automatic submachinegun, accepting standard pistol and submachine gun magazines. The heavy bolt makes accurate fire difficult, and its questionable construction makes for poor reliability and longevity. Similar designs of desperation from the Second World War served their nations well enough, so this should be good for zombies... right? Accepts standard pistol ammunition.", "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] } diff --git a/data/mods/Generic_Guns/firearms/pistol_tiny.json b/data/mods/Generic_Guns/firearms/pistol_tiny.json index 7b02d8a67d271..7bef997cca47b 100644 --- a/data/mods/Generic_Guns/firearms/pistol_tiny.json +++ b/data/mods/Generic_Guns/firearms/pistol_tiny.json @@ -4,7 +4,7 @@ "copy-from": "marlin_9a", "type": "GUN", "name": { "str": "plinker carbine" }, - "ammo": "ammo_pistol_tiny", + "ammo": [ "ammo_pistol_tiny" ], "description": "With near non-existent recoil and inexpensive ammunition, rifles like this one are popular introductory firearms. It has a built in magazine, capable of holding an impressive amount of its small cartridges. You could take small game with this, but anything bigger might not even notice.", "clip_size": 19, "magazines": [ ] @@ -14,7 +14,7 @@ "copy-from": "sw_22", "type": "GUN", "name": "target pistol", - "ammo": "ammo_pistol_tiny", + "ammo": [ "ammo_pistol_tiny" ], "description": "This medium sized pistol fires cheap and plentiful plinking ammo, and is exceptionally popular for practice or target shooting. This pistol is unsuited for taking on anything but small game, as it is meant to poke holes in paper. Accepts box magazines.", "magazines": [ [ "ammo_pistol_tiny", [ "pistol_tiny_mag" ] ] ] }, @@ -23,7 +23,7 @@ "copy-from": "moss_brownie", "type": "GUN", "name": "zip gun", - "ammo": "ammo_pistol_tiny", + "ammo": [ "ammo_pistol_tiny" ], "description": "A crude single shot firearm made from improvised or homemade components, chambered for tiny plinking ammunition. Zip guns like these often turned up in the hands of criminals and insurgents. There's no extractor, so it might be slow to reload, and its construction leaves its longevity in question.", "clip_size": 1 } diff --git a/data/mods/Generic_Guns/firearms/rifle.json b/data/mods/Generic_Guns/firearms/rifle.json index 800ba088a67a2..816590d9b0cdf 100644 --- a/data/mods/Generic_Guns/firearms/rifle.json +++ b/data/mods/Generic_Guns/firearms/rifle.json @@ -4,7 +4,7 @@ "copy-from": "hk417_13", "type": "GUN", "name": { "str": "assault rifle" }, - "ammo": "ammo_rifle", + "ammo": [ "ammo_rifle" ], "description": "The products of decades of improvement, rifle such as this are handy, reliable, and adaptable. An 'assault rifle', it is capable of providing both accurate semi-automatic fire and bursts of automatic fire. Short of large creatures and light vehicles, this should take care of most of your problems out to several hundred meters.", "magazines": [ [ "ammo_rifle", [ "rifle_mag", "rifle_sniper_mag" ] ] ] }, @@ -13,7 +13,7 @@ "copy-from": "m240", "type": "GUN", "name": { "str": "light machine gun" }, - "ammo": "ammo_rifle", + "ammo": [ "ammo_rifle" ], "description": "The light machine gun is a formidable implement for suppressive fire, an important part of squad tactics. Its belt feed allows for hundreds of rounds to be loaded, and its heavy components can withstand long bursts of fire. While perhaps not as precise as a service rifle, a light machinegun does allow for a considerable amount of energy to be sent down range. Slow to reload.", "magazines": [ [ "ammo_rifle", [ "rifle_belt" ] ] ] }, @@ -22,7 +22,7 @@ "copy-from": "rifle_308", "type": "GUN", "name": { "str": "pipe rifle" }, - "ammo": "ammo_rifle", + "ammo": [ "ammo_rifle" ], "description": "A crude longarm chambered in standard rifle ammunition, reinforced near the chamber. It holds a single a round and has a crude assembly to fire it. There's no extractor, so it might be slow to reload, and its construction makes for poor reliability and longevity.", "clip_size": 1, "magazines": [ ] @@ -32,7 +32,7 @@ "copy-from": "surv_carbine_223", "type": "GUN", "name": "survivor carbine", - "ammo": "ammo_rifle", + "ammo": [ "ammo_rifle" ], "description": "A crudely constructed carbine chambered for standard rifle ammo, fed from service rifle magazines. It locks with a rudimentary lever action system. The high pressures involved and questionable construction make for less than ideal durability and reliability, but this should still be a serviceable weapon, provided you can stay accurate with it.", "magazines": [ [ "ammo_rifle", [ "rifle_mag", "rifle_sniper_mag" ] ] ] }, @@ -41,7 +41,7 @@ "copy-from": "m2010", "type": "GUN", "name": "sniper rifle", - "ammo": "ammo_rifle", + "ammo": [ "ammo_rifle" ], "description": "Sniper rifles fill military, police and civilian needs for precise, accurate fire. Modern examples feature detachable magazines and various mounting interfaces for optics and supports. With care and practice, all should be quite capable of eliminating bipedal threats from very safe ranges. ", "magazines": [ [ "ammo_rifle", [ "rifle_sniper_mag", "rifle_mag" ] ] ] }, @@ -50,7 +50,7 @@ "copy-from": "ar10", "type": "GUN", "name": "sporter carbine", - "ammo": "ammo_rifle", + "ammo": [ "ammo_rifle" ], "description": "Though often mislabeled an asssault rifle, this common, cheap magazine fed carbine isn't capable of automatic fire. While almost as effective as a proper rifle, the wider variety of components and varying levels of maintenance make these less reliable than their military brethren. These rifles are just as adequate for taking on anything smaller than large game, however.", "magazines": [ [ "ammo_rifle", [ "rifle_mag", "rifle_sniper_mag" ] ] ] } diff --git a/data/mods/Generic_Guns/firearms/rifle_huge.json b/data/mods/Generic_Guns/firearms/rifle_huge.json index e4f6a109ef1a3..08ce4d35a56c7 100644 --- a/data/mods/Generic_Guns/firearms/rifle_huge.json +++ b/data/mods/Generic_Guns/firearms/rifle_huge.json @@ -4,7 +4,7 @@ "copy-from": "m107a1", "type": "GUN", "name": { "str": "anti-materiel rifle" }, - "ammo": "ammo_rifle_huge", + "ammo": [ "ammo_rifle_huge" ], "description": "Large, intimidating, and overbuilt, this hefty rifle fires huge projectiles with relative precision. Though it resembles a sniper rifle, this anti-material weapon is best suited for blinding tanks, shooting at aircraft, or destroying explosives. It feeds from comically oversized magazines.", "magazines": [ [ "ammo_rifle_huge", [ "rifle_huge_amr_mag" ] ] ] }, @@ -13,7 +13,7 @@ "copy-from": "trex_gun", "type": "GUN", "name": { "str": "elephant rifle" }, - "ammo": "ammo_rifle_huge", + "ammo": [ "ammo_rifle_huge" ], "description": "Elegantly engraved, with deep glossy blued steel and figured wood, this break-action double rifle is almost too nice to shoot. Your shoulder might beg you not to; the chambers are almost wide enough for two fingers and the recoil is monstruous. You could probably kill anything with this, especially if you were to fire both barrels at once.", "modes": [ [ "DEFAULT", "single", 1 ], [ "DOUBLE", "double", 2 ] ], "extend": { "flags": [ "RELOAD_ONE" ] }, @@ -24,7 +24,7 @@ "copy-from": "m2browning", "type": "GUN", "name": { "str": "heavy machine gun" }, - "ammo": "ammo_rifle_huge", + "ammo": [ "ammo_rifle_huge" ], "description": "This large, ungainly belt-fed machine gun fires huge projectiles, originally intended for turn of the century anti-vehicular use. While no longer suitable for modern tanks or aircraft, thinner skinned vehicles or drones are just as susceptible, as are any other 'smaller' threats. Slow to reload, incredibly loud, and must be mounted to be fired.", "magazines": [ [ "ammo_rifle_huge", [ "rifle_huge_belt" ] ] ] } diff --git a/data/mods/Generic_Guns/firearms/rocket.json b/data/mods/Generic_Guns/firearms/rocket.json index aa83dfa2798ff..53d8758a88c89 100644 --- a/data/mods/Generic_Guns/firearms/rocket.json +++ b/data/mods/Generic_Guns/firearms/rocket.json @@ -4,7 +4,7 @@ "copy-from": "AT4", "type": "GUN", "name": { "str": "disposable rocket launcher" }, - "ammo": "ammo_rocket", + "ammo": [ "ammo_rocket" ], "description": "Constructed of fiberglass, with crude plastic sights and a titanium barrel, this is a launcher for a single rocket. Though not as effective as other anti-armor weapons, the true value in this disposable rocket launcher is its portability and lack of dead weight once expended. Has a backblast, so make sure nothing you mind destroying is behind you.", "clip_size": 1 }, @@ -13,7 +13,7 @@ "copy-from": "m3_carlgustav", "type": "GUN", "name": { "str": "recoilless rocket launcher" }, - "ammo": "ammo_rocket", + "ammo": [ "ammo_rocket" ], "description": "This heavy, gigantic rifled tube features a complex optical sight and can launch a wide variety of payloads, including rockets or laser guided missiles. Depending on the warhead loaded, such weapons are effective against older tanks, most vehicles, bunkers and personnel. These are meant to be operated by a two-man crew, so reloading might be a bit slow. Its recoilless design allows for superior range and damage, but it produces tremendous backblast, so make sure nothing you mind destroying is behind you.", "clip_size": 1, "default_mods": [ "acog_scope" ] diff --git a/data/mods/Generic_Guns/firearms/shot.json b/data/mods/Generic_Guns/firearms/shot.json index 6602819739eee..4ae342b3de072 100644 --- a/data/mods/Generic_Guns/firearms/shot.json +++ b/data/mods/Generic_Guns/firearms/shot.json @@ -4,7 +4,7 @@ "copy-from": "shotgun_d", "type": "GUN", "name": { "str": "double-barrel shotgun" }, - "ammo": "ammo_shot", + "ammo": [ "ammo_shot" ], "description": "An old-fashioned double barreled shotgun, with a trigger for each barrel. Follow up shots are incredibly quick with this, but reloading is a bit slow. Shotshells come in many varieties, and shotguns are suitable for anything from some large game to small birds." }, { @@ -12,7 +12,7 @@ "copy-from": "pipe_double_shotgun", "type": "GUN", "name": { "str": "double-barrel pipe shotgun" }, - "ammo": "ammo_shot", + "ammo": [ "ammo_shot" ], "description": "A crudely handmade double barreled shotgun, with a trigger for each barrel. Follow up shots are incredibly quick with this, but reloading is slow, as there are no extractors or ejectors. Shotshells come in many varieties, and shotguns are suitable for anything from some large game to small birds." }, { @@ -20,7 +20,7 @@ "copy-from": "remington_870", "type": "GUN", "name": "sporting shotgun", - "ammo": "ammo_shot", + "ammo": [ "ammo_shot" ], "description": "A simple, popular design, sporting shotguns are used by law enforcement, civilians and occasionally militaries. Its internal magazine is small by modern standards, and reloading can be quite slow. Shotshells come in many varieties, and shotguns are suitable for anything from some large game to small birds.", "clip_size": 6 }, @@ -29,7 +29,7 @@ "copy-from": "saiga_12", "type": "GUN", "name": "tactical shotgun", - "ammo": "ammo_shot", + "ammo": [ "ammo_shot" ], "description": "A detachable magazine fed shotgun, mostly oriented towards overly enthusiastic civilians. Featuring rails and a menacing black appearance, this sort of shotgun doesn't really look like it has a sporting use. The magazines reduce lengthy reloading times associated with shotguns. Though known for being somewhat finicky, these can be tuned to run with some reliability.", "magazines": [ [ "ammo_shot", [ "shot_mag" ] ] ] }, @@ -38,6 +38,6 @@ "copy-from": "bio_shotgun_gun", "type": "GUN", "name": { "str": "bionic shotgun" }, - "ammo": "ammo_shot" + "ammo": [ "ammo_shot" ] } ] diff --git a/data/mods/Magiclysm/items/enchanted_misc.json b/data/mods/Magiclysm/items/enchanted_misc.json index ba03821a3b2ce..585a84ea9f8ab 100644 --- a/data/mods/Magiclysm/items/enchanted_misc.json +++ b/data/mods/Magiclysm/items/enchanted_misc.json @@ -180,7 +180,7 @@ "material": [ "glass" ], "symbol": ";", "color": "red", - "ammo": "thread", + "ammo": [ "thread" ], "initial_charges": 500, "max_charges": 1000, "artifact_data": { "charge_type": "ARTC_TIME" } diff --git a/data/mods/Magiclysm/items/enchanted_ranged.json b/data/mods/Magiclysm/items/enchanted_ranged.json index acc086957cea2..c1c78ee57bf68 100644 --- a/data/mods/Magiclysm/items/enchanted_ranged.json +++ b/data/mods/Magiclysm/items/enchanted_ranged.json @@ -81,7 +81,7 @@ "clip_size": 3, "range": -4, "modes": [ [ "DEFAULT", "single", 1 ] ], - "ammo": "shot", + "ammo": [ "shot" ], "reload": 200, "barrel_length": 2, "valid_mod_locations": [ [ "mechanism", 1 ] ], diff --git a/data/mods/Magiclysm/items/enchanted_wands.json b/data/mods/Magiclysm/items/enchanted_wands.json index 2d6b9781afcda..1e80593a5ce6b 100644 --- a/data/mods/Magiclysm/items/enchanted_wands.json +++ b/data/mods/Magiclysm/items/enchanted_wands.json @@ -13,7 +13,7 @@ "color": "brown", "flags": [ "BELT_CLIP", "NONCONDUCTIVE" ], "charges_per_use": 1, - "ammo": "crystallized_mana", + "ammo": [ "crystallized_mana" ], "magazines": [ [ "crystallized_mana", [ "small_mana_crystal" ] ] ] }, { diff --git a/data/mods/Magiclysm/items/obsolete.json b/data/mods/Magiclysm/items/obsolete.json index 46afd7fff9492..6496ccb544324 100644 --- a/data/mods/Magiclysm/items/obsolete.json +++ b/data/mods/Magiclysm/items/obsolete.json @@ -13,7 +13,7 @@ "symbol": "|", "color": "brown", "charges_per_use": 1, - "ammo": "crystallized_mana", + "ammo": [ "crystallized_mana" ], "use_action": { "type": "cast_spell", "spell_id": "fireball", "no_fail": true, "level": 5, "need_wielding": true }, "magazines": [ [ "crystallized_mana", [ "small_mana_crystal" ] ] ] }, @@ -31,7 +31,7 @@ "symbol": "|", "color": "brown", "charges_per_use": 1, - "ammo": "crystallized_mana", + "ammo": [ "crystallized_mana" ], "use_action": { "type": "cast_spell", "spell_id": "magic_missile", "no_fail": true, "level": 10, "need_wielding": true }, "magazines": [ [ "crystallized_mana", [ "small_mana_crystal" ] ] ] } diff --git a/data/mods/Magiclysm/items/tools.json b/data/mods/Magiclysm/items/tools.json index 4e91ad32be1ae..93b61da61479b 100644 --- a/data/mods/Magiclysm/items/tools.json +++ b/data/mods/Magiclysm/items/tools.json @@ -32,7 +32,7 @@ "material": "demon_chitin", "symbol": ";", "color": "red", - "ammo": "alumentum", + "ammo": [ "alumentum" ], "sub": "forge", "max_charges": 500, "flags": [ "ALLOWS_REMOTE_USE" ] diff --git a/data/mods/TEST_DATA/items.json b/data/mods/TEST_DATA/items.json index b622fa8cb59af..56b182c779f11 100644 --- a/data/mods/TEST_DATA/items.json +++ b/data/mods/TEST_DATA/items.json @@ -249,7 +249,7 @@ "material": "iron", "symbol": ",", "color": "light_gray", - "ammo": "battery", + "ammo": [ "battery" ], "charges_per_use": 1, "use_action": [ { @@ -379,7 +379,7 @@ "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON" ], "skill": "archery", "min_strength": 6, - "ammo": "arrow", + "ammo": [ "arrow" ], "weight": "907 g", "volume": "1500 ml", "bashing": 8, diff --git a/src/item_factory.cpp b/src/item_factory.cpp index f615c9ce1ab59..8391e2a73be57 100644 --- a/src/item_factory.cpp +++ b/src/item_factory.cpp @@ -1556,15 +1556,7 @@ void Item_factory::load( islot_gun &slot, const JsonObject &jo, const std::strin } assign( jo, "skill", slot.skill_used, strict ); - if( jo.has_array( "ammo" ) ) { - slot.ammo.clear(); - for( const std::string id : jo.get_array( "ammo" ) ) { - slot.ammo.insert( ammotype( id ) ); - } - } else if( jo.has_string( "ammo" ) ) { - slot.ammo.clear(); - slot.ammo.insert( ammotype( jo.get_string( "ammo" ) ) ); - } + assign( jo, "ammo", slot.ammo, strict ); assign( jo, "range", slot.range, strict ); // Damage instance assign reader handles pierce assign( jo, "ranged_damage", slot.damage, strict, damage_instance( DT_NULL, -20, -20, -20, -20 ) ); @@ -1661,13 +1653,7 @@ void Item_factory::load( islot_tool &slot, const JsonObject &jo, const std::stri { bool strict = src == "dda"; - if( jo.has_array( "ammo" ) ) { - for( const std::string id : jo.get_array( "ammo" ) ) { - slot.ammo_id.insert( ammotype( id ) ); - } - } else if( jo.has_string( "ammo" ) ) { - slot.ammo_id.insert( ammotype( jo.get_string( "ammo" ) ) ); - } + assign( jo, "ammo", slot.ammo_id, strict ); assign( jo, "max_charges", slot.max_charges, strict, 0 ); assign( jo, "initial_charges", slot.def_charges, strict, 0 ); assign( jo, "charges_per_use", slot.charges_per_use, strict, 0 ); diff --git a/tools/json_tools/adjust_values.py b/tools/json_tools/adjust_values.py index e3b956a3fde13..b7cb081a8ca89 100755 --- a/tools/json_tools/adjust_values.py +++ b/tools/json_tools/adjust_values.py @@ -6,19 +6,21 @@ args = argparse.ArgumentParser() args.add_argument("dir", action="store", help="specify json directory") -args.add_argument("key", action="store", help="specify key") -args.add_argument("factor", type=int, action="store", help="specify factor") args_dict = vars(args.parse_args()) def gen_new(path): + change = False with open(path, "r") as json_file: json_data = json.load(json_file) for jo in json_data: - if args_dict["key"] in jo: - val = jo[args_dict["key"]] // args_dict["factor"] - jo[args_dict["key"]] = f"{val} m" - return json_data + if "ammo" in jo and type(jo["ammo"]) != list and ( + jo["type"] == "TOOL" or jo["type"] == "GUN"): + ammo_list = [jo["ammo"]] + jo["ammo"] = ammo_list + change = True + + return json_data if change else None for root, directories, filenames in os.walk(args_dict["dir"]): @@ -26,6 +28,7 @@ def gen_new(path): path = os.path.join(root, filename) if path.endswith(".json"): new = gen_new(path) - with open(path, "w") as jf: - json.dump(new, jf) - os.system(f"../format/json_formatter.cgi {path}") + if new != None: + with open(path, "w") as jf: + json.dump(new, jf, ensure_ascii=False) + os.system(f"./tools/format/json_formatter.cgi {path}")