Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move all ammo attributes to arrays #40208

Merged
merged 2 commits into from
May 6, 2020
Merged

Move all ammo attributes to arrays #40208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
985a1c7
Move all ammo attributes to arrays
May 6, 2020
16956ac
Move ammo_type to arrays
May 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions data/json/items/basecamp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
{
Expand All @@ -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
},
Expand All @@ -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
},
{
Expand All @@ -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
},
{
Expand All @@ -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
},
Expand Down
32 changes: 16 additions & 16 deletions data/json/items/battery.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"material": [ "iron", "plastic" ],
"symbol": "=",
"color": "yellow",
"ammo_type": "battery",
"ammo_type": [ "battery" ],
"capacity": 50,
"looks_like": "battery",
"flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
Expand All @@ -49,7 +49,7 @@
"material": [ "iron", "plastic" ],
"symbol": "=",
"color": "green",
"ammo_type": "battery",
"ammo_type": [ "battery" ],
"count": 500,
"capacity": 500,
"looks_like": "battery",
Expand All @@ -68,7 +68,7 @@
"material": [ "iron", "plastic" ],
"symbol": "=",
"color": "yellow",
"ammo_type": "battery",
"ammo_type": [ "battery" ],
"count": 100,
"capacity": 100,
"looks_like": "battery",
Expand All @@ -88,7 +88,7 @@
"material": [ "iron", "plastic" ],
"symbol": "=",
"color": "yellow",
"ammo_type": "battery",
"ammo_type": [ "battery" ],
"capacity": 100,
"looks_like": "battery",
"flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
Expand All @@ -106,7 +106,7 @@
"material": [ "iron", "plastic" ],
"symbol": "=",
"color": "yellow",
"ammo_type": "battery",
"ammo_type": [ "battery" ],
"capacity": 150,
"looks_like": "battery",
"flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
Expand All @@ -125,7 +125,7 @@
"material": [ "iron", "plastic" ],
"symbol": "=",
"color": "green",
"ammo_type": "battery",
"ammo_type": [ "battery" ],
"count": 1000,
"capacity": 1000,
"looks_like": "battery",
Expand All @@ -144,7 +144,7 @@
"material": [ "iron", "plastic" ],
"symbol": "=",
"color": "yellow",
"ammo_type": "battery",
"ammo_type": [ "battery" ],
"count": 300,
"capacity": 300,
"looks_like": "battery",
Expand All @@ -164,7 +164,7 @@
"material": [ "iron", "plastic" ],
"symbol": "=",
"color": "yellow",
"ammo_type": "battery",
"ammo_type": [ "battery" ],
"capacity": 500,
"looks_like": "battery",
"flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
Expand All @@ -182,7 +182,7 @@
"material": [ "iron", "plastic" ],
"symbol": "=",
"color": "yellow",
"ammo_type": "battery",
"ammo_type": [ "battery" ],
"capacity": 600,
"looks_like": "battery",
"flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
Expand All @@ -201,7 +201,7 @@
"material": [ "iron", "plastic" ],
"symbol": "=",
"color": "green",
"ammo_type": "battery",
"ammo_type": [ "battery" ],
"count": 5000,
"capacity": 5000,
"looks_like": "battery",
Expand All @@ -220,7 +220,7 @@
"material": [ "iron", "plastic" ],
"symbol": "=",
"color": "yellow",
"ammo_type": "battery",
"ammo_type": [ "battery" ],
"count": 1200,
"capacity": 1200,
"looks_like": "battery",
Expand All @@ -240,7 +240,7 @@
"material": [ "iron", "plastic" ],
"symbol": "=",
"color": "yellow",
"ammo_type": "battery",
"ammo_type": [ "battery" ],
"capacity": 1000,
"looks_like": "battery",
"flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
Expand All @@ -258,7 +258,7 @@
"material": [ "iron", "plastic" ],
"symbol": "=",
"color": "yellow",
"ammo_type": "battery",
"ammo_type": [ "battery" ],
"capacity": 1250,
"looks_like": "battery",
"flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
Expand All @@ -277,7 +277,7 @@
"material": [ "iron", "plastic" ],
"symbol": "=",
"color": "green",
"ammo_type": "battery",
"ammo_type": [ "battery" ],
"count": 10000,
"capacity": 10000,
"looks_like": "battery",
Expand All @@ -296,7 +296,7 @@
"material": [ "superalloy", "plastic" ],
"symbol": "=",
"color": "red",
"ammo_type": "battery",
"ammo_type": [ "battery" ],
"count": 100000,
"capacity": 100000,
"looks_like": "battery",
Expand All @@ -315,7 +315,7 @@
"material": [ "iron", "plastic" ],
"symbol": "=",
"color": "yellow",
"ammo_type": "battery",
"ammo_type": [ "battery" ],
"count": 2500,
"capacity": 2500,
"looks_like": "battery",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/classes/gun.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ],
Expand Down Expand Up @@ -175,7 +175,7 @@
"type": "GUN",
"name": { "str": "base shotgun" },
"skill": "shotgun",
"ammo": "shot",
"ammo": [ "shot" ],
"valid_mod_locations": [
[ "accessories", 4 ],
[ "barrel", 1 ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/fake.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"material": "steel",
"flags": [ "REACH_ATTACK" ],
"skill": "archery",
"ammo": "arrow",
"ammo": [ "arrow" ],
"weight": "340 g",
"volume": "1500 ml",
"bashing": 6,
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/generic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2506,7 +2506,7 @@
50000,
100000
],
"ammo": "money"
"ammo": [ "money" ]
},
{
"id": "robofac_test_data",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/generic/toys_and_sports.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"material": "plastic",
"symbol": "|",
"color": "pink",
"ammo": "battery",
"ammo": [ "battery" ],
"charges_per_use": 1,
"turns_per_charge": 20,
"use_action": "DOLLCHAT",
Expand Down Expand Up @@ -44,7 +44,7 @@
"material": "plastic",
"symbol": "|",
"color": "pink",
"ammo": "battery",
"ammo": [ "battery" ],
"charges_per_use": 1,
"turns_per_charge": 20,
"use_action": "DOLLCHAT",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/12mm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"to_hit": -1,
"bashing": 12,
"material": "steel",
"ammo": "12mm",
"ammo": [ "12mm" ],
"skill": "rifle",
"range": 60,
"dispersion": 45,
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/gun/20x66mm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down Expand Up @@ -53,7 +53,7 @@
"material": [ "superalloy", "ceramic" ],
"symbol": "(",
"color": "dark_gray",
"ammo": "20x66mm",
"ammo": [ "20x66mm" ],
"skill": "shotgun",
"dispersion": 335,
"durability": 9,
Expand Down Expand Up @@ -88,7 +88,7 @@
"material": [ "superalloy", "ceramic" ],
"symbol": "(",
"color": "dark_gray",
"ammo": "20x66mm",
"ammo": [ "20x66mm" ],
"skill": "pistol",
"dispersion": 400,
"durability": 9,
Expand Down
20 changes: 10 additions & 10 deletions data/json/items/gun/22.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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" ] ] ]
},
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -279,7 +279,7 @@
"bashing": 1,
"material": [ "budget_steel" ],
"color": "dark_gray",
"ammo": "22",
"ammo": [ "22" ],
"dispersion": 600,
"durability": 5,
"min_cycle_recoil": 39,
Expand All @@ -301,7 +301,7 @@
"bashing": 4,
"material": [ "plastic", "zinc" ],
"color": "dark_gray",
"ammo": "22",
"ammo": [ "22" ],
"dispersion": 480,
"durability": 7,
"min_cycle_recoil": 39,
Expand Down
Loading