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] Price Related Bug-smashing #79036

Merged
merged 7 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions data/mods/Aftershock/items/armor/military_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
"type": "ARMOR",
"name": { "str": "IPAV armor" },
"description": "Multipurpose military armor for the torso and upper arms, intended to protect against a wide variety of ballistic or direct energy attacks. Made from a single piece of ablative carbide that keeps it relatively lightweight and completely disposable.",
"category": "armor",
"price": "5 kUSD 500 USD",
"weight": "7 kg",
"volume": "8 L",
"symbol": "[",
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Aftershock/items/grenades.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
"looks_like": "grenade_emp",
"name": "electroshock grenade",
"description": "This is an electronic weapon that will emit a short-ranged electric field. When activated, you'll have five turns before it starts doing so; throwing it before that would be a good idea.",
"price": "350 USD",
"use_action": {
"menu_text": "Pull pin",
"need_wielding": true,
Expand Down Expand Up @@ -138,8 +139,7 @@
"description": "This is a military-grade cryo hand grenade. Once it explodes it spreads exotic highly-radioactive shrapnel. Use this item to pull the pin and light the fuse. You will then have five seconds before it explodes; throwing it would be a good idea.",
"weight": "397 g",
"volume": "250 ml",
"price": "15 USD",
"price_postapoc": "10 USD",
"price": "450 USD",
"to_hit": -1,
"material": [ "steel", "plastic" ],
"symbol": "*",
Expand Down
42 changes: 42 additions & 0 deletions data/mods/aftershock_exoplanet/price_overrides/grenades.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
[
{
"id": "smokebomb",
"type": "GENERIC",
"name": { "str": "smoke bomb" },
"copy-from": "smokebomb",
"price": "150 USD",
"price_postapoc": "150 USD"
},
{
"id": "grenade_emp",
"type": "TOOL",
"name": { "str": "EMP grenade" },
"copy-from": "grenade_emp",
"price": "500 USD",
"price_postapoc": "500 USD"
},
{
"id": "grenade",
"type": "TOOL",
"name": { "str": "grenade" },
"copy-from": "grenade",
"price": "350 USD",
"price_postapoc": "350 USD"
},
{
"id": "grenade_inc",
"type": "TOOL",
"name": { "str": "incendiary grenade" },
"copy-from": "grenade_inc",
"price": "450 USD",
"price_postapoc": "450 USD"
},
{
"id": "scrambler",
"type": "TOOL",
"name": { "str": "scrambler grenade" },
"copy-from": "scrambler",
"price": "800 USD",
"price_postapoc": "800 USD"
}
]
Loading