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.

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

Aftershock: Audit mod gun sizes #73357

Merged
merged 3 commits into from May 9, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion data/mods/Aftershock/items/gun/laser.json
Expand Up @@ -227,7 +227,8 @@
"overheat_threshold": 100,
"cooling_value": 1,
"heat_per_shot": 20,
"volume": "3 L",
"volume": "8 L"
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
"longest_side": "1065 mm",
"range": 37,
"modes": [ [ "DEFAULT", "pulse", 1 ], [ "BURST", "2s sequence", 2 ], [ "AUTO", "3s sequence", 3 ] ],
"extend": { "ammo_effects": [ "TACTICAL_LASER_EXPLOSION" ] },
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Aftershock/items/gun/plasma.json
Expand Up @@ -35,7 +35,7 @@
"description": "A heavy plasma railgun that easily defeats most forms of conventional armor and flash-incinerates anything behind it. Its large size and liability to overheat make it unsuitable for infantry use, but it is a common sight on military vehicles and in the hands of power-armored troops, especially when heavy armor is expected.",
"weight": "8500 g",
"volume": "4 L",
"longest_side": "45 cm",
"longest_side": "100 cm",
"price": "15 kUSD",
"price_postapoc": "15 kUSD",
"range": 15,
Expand Down Expand Up @@ -72,7 +72,7 @@
"description": "A short and stubby 2 gram plasma railgun occasionally used by espatiers as a hull breaching tool. Like larger plasma weapons, it propels toroids of plasma that detonate on contact, but its reduced size heavily hampers its range and damage output. Fired within an atmosphere, its very low range makes it dangerous to shooter and target alike.",
"weight": "2500 g",
"volume": "1 L",
"longest_side": "45 cm",
"longest_side": "30 cm",
"price": "350 USD",
"price_postapoc": "350 USD",
"range": 5,
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Aftershock/items/tools.json
Expand Up @@ -587,7 +587,7 @@
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "battery": 5000 } } ],
"relic_data": { "charge_info": { "recharge_type": "periodic", "time": "1 h", "regenerate_ammo": true } },
"material": [ "superalloy" ],
"flags": [ "DURABLE_MELEE" ],
"flags": [ "DURABLE_MELEE", "HEAVY_TOOL" ],
"melee_damage": { "bash": 5 }
},
{
Expand Down