Skip to content

Commit

Permalink
Aftershock: Magazine flag audit (#73348)
Browse files Browse the repository at this point in the history
* Aftershock: Magazine flag audit

* Remember voltaics
  • Loading branch information
John-Candlebury committed Apr 28, 2024
1 parent 58f64c0 commit 99b4944
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
1 change: 1 addition & 0 deletions data/mods/Aftershock/items/magazine/25mm.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"color": "dark_gray",
"ammo_type": [ "afs_25mm" ],
"reload_time": 60,
"flags": [ "MAG_BULKY" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "afs_25mm": 40 } } ]
}
]
2 changes: 1 addition & 1 deletion data/mods/Aftershock/items/magazine/alien.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"ammo_type": [ "battery" ],
"capacity": 4500,
"looks_like": "battery",
"flags": [ "NO_SALVAGE", "NO_UNLOAD" ],
"flags": [ "NO_SALVAGE", "NO_UNLOAD", "MAG_BULKY" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 4500 } } ]
}
]
6 changes: 3 additions & 3 deletions data/mods/Aftershock/items/magazine/energy_cell.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"symbol": "#",
"color": "light_gray",
"ammo_type": [ "battery" ],
"flags": [ "NO_UNLOAD", "RECHARGE" ],
"flags": [ "NO_UNLOAD", "RECHARGE", "MAG_COMPACT" ],
"capacity": 1500,
"reload_time": 3,
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 1500 } } ]
Expand Down Expand Up @@ -42,7 +42,7 @@
"price_postapoc": "50 USD",
"capacity": 600,
"reload_time": 5,
"flags": [ "NO_UNLOAD" ],
"flags": [ "NO_UNLOAD", "MAG_COMPACT" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 600 } } ]
},
{
Expand All @@ -57,7 +57,7 @@
"capacity": 15000,
"count": 15000,
"reload_time": 5,
"flags": [ "NO_UNLOAD" ],
"flags": [ "NO_UNLOAD", "MAG_COMPACT" ],
"default_ammo": "afs_battery_plus",
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 15000 } } ]
}
Expand Down
6 changes: 3 additions & 3 deletions data/mods/Aftershock/items/magazine/plasma.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"symbol": "o",
"color": "light_blue",
"ammo_type": [ "afs_shydrogen" ],
"flags": [ "NO_UNLOAD", "NO_RELOAD" ],
"flags": [ "NO_UNLOAD", "NO_RELOAD", "MAG_COMPACT" ],
"capacity": 4,
"reload_time": 10,
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "airtight": true, "ammo_restriction": { "afs_shydrogen": 4 } } ]
Expand All @@ -32,7 +32,7 @@
"symbol": "o",
"color": "light_blue",
"ammo_type": [ "afs_shydrogen" ],
"flags": [ "NO_UNLOAD", "NO_RELOAD" ],
"flags": [ "NO_UNLOAD", "NO_RELOAD", "MAG_COMPACT" ],
"capacity": 4,
"reload_time": 10,
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "airtight": true, "ammo_restriction": { "afs_shydrogen": 20 } } ]
Expand All @@ -51,7 +51,7 @@
"symbol": "o",
"color": "light_red",
"ammo_type": [ "afs_shydrogen" ],
"flags": [ "NO_UNLOAD", "NO_RELOAD" ],
"flags": [ "NO_UNLOAD", "NO_RELOAD", "MAG_COMPACT" ],
"capacity": 40,
"reload_time": 40,
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "airtight": true, "ammo_restriction": { "afs_shydrogen": 40 } } ]
Expand Down
1 change: 1 addition & 0 deletions data/mods/Aftershock/items/magazine/voltaic.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"volume": "125 ml",
"price": "3 kUSD",
"price_postapoc": "3 kUSD",
"flags": [ "MAG_COMPACT" ],
"capacity": 500,
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 1500 } } ]
}
Expand Down

0 comments on commit 99b4944

Please sign in to comment.