Skip to content

Commit

Permalink
feat(balance): craftable power armor accessories, rework non-craftabl…
Browse files Browse the repository at this point in the history 
…e accessories, update exo-suits (#4974)

* feat(balance): craftable power armor accessories, rework non-craftable accessories, update exo-suits

* smolfixes
  • Loading branch information
@chaosvolt
chaosvolt authored Jul 11, 2024
1 parent ea85a3c commit 9740ca8
Show file tree
Hide file tree
Showing 8 changed files with 384 additions and 262 deletions.
8 changes: 3 additions & 5 deletions data/json/itemgroups/Clothing_Gear/clothing.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2006,11 +2006,9 @@
"items": [
[ "power_armor_frame", 25 ],
[ "power_armor_chest_rig", 25 ],
[ "power_armor_back_holster", 10 ],
[ "power_armor_holster", 10 ],
[ "power_armor_bscabbard", 10 ],
[ "power_armor_scabbard", 10 ],
[ "power_armor_sheath", 10 ]
[ "power_armor_back_hardpoint", 20 ],
[ "power_armor_leg_hardpoint", 20 ],
[ "power_armor_canteen", 10 ]
]
},
{
Expand Down
313 changes: 250 additions & 63 deletions data/json/items/armor/power_armor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -413,13 +413,13 @@
"encumbrance": 5,
"storage": "40 L",
"material_thickness": 10,
"flags": [ "POWERARMOR_MOD", "COMPACT", "WATERPROOF", "STURDY", "BELTED", "ONLY_ONE" ]
"flags": [ "POWERARMOR_MOD", "COMPACT", "STURDY", "BELTED", "ONLY_ONE" ]
},
{
"id": "power_armor_back_holster",
"id": "power_armor_back_hardpoint",
"type": "ARMOR",
"name": { "str": "power armor back holster" },
"description": "A heavy duty holster using a combination of clamps and rail interfaces to comfortably hold rifles, shotguns, smgs and even launchers of various sizes. Designed to interface with a military exoskeleton. Activate to holster/draw a gun.",
"name": { "str": "power armor weapon rack" },
"description": "A heavy duty set of clamps and rail interfaces, secured to the back. Can comfortably hold blades or firearms of various sizes. Designed to interface with a military exoskeleton. Activate to holster/draw a blade or gun.",
"looks_like": "back_holster",
"weight": "360 g",
"volume": "1250 ml",
Expand All @@ -436,15 +436,16 @@
"max_volume": "10 L",
"min_volume": "1500 ml",
"draw_cost": 150,
"flags": [ "SHEATH_SWORD", "SHEATH_AXE" ],
"skills": [ "smg", "shotgun", "rifle", "launcher" ]
},
"flags": [ "POWERARMOR_MOD", "COMPACT", "WATERPROOF", "BELTED", "NO_QUICKDRAW", "ONLY_ONE" ]
"flags": [ "POWERARMOR_MOD", "COMPACT", "BELTED", "NO_QUICKDRAW", "ONLY_ONE" ]
},
{
"id": "power_armor_holster",
"id": "power_armor_leg_hardpoint",
"type": "ARMOR",
"name": { "str": "power armor holster" },
"description": "A heavy duty holster that uses a combination of seals and rail interfaces to comfortably hold various sizes of pistol or similar guns. Designed to interface with a military exoskeleton. Activate to holster/draw a small pistol.",
"name": { "str": "power armor leg mount" },
"description": "A set of seals and rail interfaces to comfortably hold a wide range of firearms and tools. Designed to interface with a military exoskeleton, clipped to the leg. Activate to holster/draw a blade, tool, or gun.",
"looks_like": "holster",
"weight": "330 g",
"volume": "500 ml",
Expand All @@ -456,8 +457,14 @@
"covers": [ "leg_either" ],
"coverage": 5,
"material_thickness": 1,
"use_action": { "type": "holster", "max_volume": "1 L", "min_volume": "250 ml", "skills": [ "pistol", "smg", "shotgun" ] },
"flags": [ "POWERARMOR_MOD", "COMPACT", "WATERPROOF", "STURDY", "WAIST" ]
"use_action": {
"type": "holster",
"max_volume": "3 L",
"min_volume": "250 ml",
"flags": [ "SHEATH_KNIFE", "SHEATH_SWORD", "BELT_CLIP" ],
"skills": [ "pistol", "smg", "shotgun", "rifle" ]
},
"flags": [ "POWERARMOR_MOD", "COMPACT", "STURDY", "WAIST" ]
},
{
"id": "power_armor_chest_rig",
Expand Down Expand Up @@ -487,75 +494,255 @@
"draw_cost": 80,
"flags": [ "MAG_COMPACT", "MAG_BULKY", "MAG_BELT" ]
},
"flags": [ "POWERARMOR_MOD", "COMPACT", "WATERPROOF", "STURDY", "BELTED", "WAIST" ]
"flags": [ "POWERARMOR_MOD", "COMPACT", "STURDY", "WAIST" ]
},
{
"id": "power_armor_back_holster",
"copy-from": "back_holster",
"type": "ARMOR",
"name": { "str": "power armor back holster" },
"description": "A leather holster, big enough for a rifle or other large gun. Designed to be strapped to the back, it's been converted to clip onto power armor. Activate to holster/draw a gun.",
"//": "Modified versions of standard accessories gain steel submaterial if absent, double encumbrance, +500 weight, and power armor mod flag.",
"material": [ "leather", "steel" ],
"encumbrance": 10,
"relative": { "weight": "500 g" },
"extend": { "flags": [ "POWERARMOR_MOD" ] }
},
{
"id": "power_armor_holster",
"copy-from": "holster",
"type": "ARMOR",
"name": { "str": "power armor holster" },
"description": "A leather strap worn on the hip for holding pistol sized guns. It's been converted to clip onto power armor. Activate to holster/draw a gun.",
"material": [ "leather", "steel" ],
"encumbrance": 4,
"relative": { "weight": "500 g" },
"extend": { "flags": [ "POWERARMOR_MOD" ] }
},
{
"id": "power_armor_bscabbard",
"copy-from": "bscabbard",
"type": "ARMOR",
"name": { "str": "power armor back scabbard" },
"description": "A set of clamps and fittings designed to accommodate a variety of large bladed weaponry. Designed to interface with a military exoskeleton. Activate to sheath/draw a sword/axe.",
"looks_like": "bscabbard",
"weight": "1950 g",
"volume": "2250 ml",
"price": "800 USD",
"price_postapoc": "8 USD",
"bashing": 4,
"material": [ "rubber", "steel" ],
"symbol": "[",
"covers": [ "torso" ],
"color": "brown",
"coverage": 5,
"material_thickness": 1,
"use_action": {
"type": "holster",
"holster_prompt": "Sheath sword",
"holster_msg": "You sheath your %s",
"max_volume": "3750 ml",
"draw_cost": 150,
"flags": [ "SHEATH_SWORD", "SHEATH_AXE" ]
},
"flags": [ "POWERARMOR_MOD", "COMPACT", "WATERPROOF", "STURDY", "BELTED", "ONLY_ONE" ]
"description": "A leather scabbard, big enough for almost any sword. Designed to be strapped to the back, it's been converted to clip onto power armor. Activate to sheath/draw a sword.",
"material": [ "leather", "wood", "steel" ],
"encumbrance": 6,
"max_encumbrance": 10,
"relative": { "weight": "500 g" },
"extend": { "flags": [ "POWERARMOR_MOD" ] }
},
{
"id": "power_armor_scabbard",
"type": "ARMOR",
"copy-from": "scabbard",
"type": "ARMOR",
"name": { "str": "power armor scabbard" },
"description": "A set of clamps and fittings to accommodate a variety of swords and similar weaponry. Designed to interface with a military exoskeleton. Activate to sheathe/draw a sword.",
"looks_like": "scabbard",
"weight": "1550 g",
"price": "600 USD",
"price_postapoc": "6 USD",
"material": [ "rubber", "steel" ],
"coverage": 3,
"rigid": true,
"encumbrance": 0,
"flags": [ "POWERARMOR_MOD", "COMPACT", "WATERPROOF", "STURDY", "WAIST" ]
"description": "A large, adjustable sheath for holding swords and other large blades. It's been converted to clip onto power armor. Activate to sheathe/draw a weapon.",
"material": [ "leather", "wood", "steel" ],
"encumbrance": 4,
"max_encumbrance": 8,
"relative": { "weight": "500 g" },
"extend": { "flags": [ "POWERARMOR_MOD" ] }
},
{
"id": "power_armor_sheath",
"copy-from": "sheath",
"type": "ARMOR",
"name": { "str": "power armor sheath" },
"description": "A set of clamps and fittings to accommodate a variety of knives and similar blades. Designed to interface with a military exoskeleton. Activate to sheathe/draw a weapon.",
"looks_like": "sheath",
"weight": "300 g",
"volume": "500 ml",
"price": "500 USD",
"price_postapoc": "5 USD",
"material": [ "rubber", "steel" ],
"symbol": "|",
"color": "brown",
"covers": [ "leg_either" ],
"coverage": 5,
"material_thickness": 1,
"description": "A leather sheath for holding knives and other small blades. It's been converted to clip onto power armor. Activate to sheathe/draw a weapon.",
"material": [ "leather", "steel" ],
"encumbrance": 2,
"relative": { "weight": "500 g" },
"extend": { "flags": [ "POWERARMOR_MOD" ] }
},
{
"id": "exosuit_survivor",
"type": "TOOL_ARMOR",
"category": "armor",
"name": { "str": "survivor armored exo-suit" },
"description": "Although power armor took the world's militaries by storm, not everyone has access to it. This particular suit is cobbled together from scavenged materials, but it works for what it is.",
"weight": "34 kg",
"volume": "34 L",
"price_postapoc": "100 USD",
"material": [ "steel", "kevlar" ],
"symbol": "[",
"looks_like": "power_armor_light",
"color": "light_gray",
"covers": [ "torso", "arms", "hands", "legs", "feet" ],
"coverage": 95,
"encumbrance": 40,
"warmth": 20,
"material_thickness": 7,
"environmental_protection": 3,
"max_charges": 500,
"ammo": "battery",
"relic_data": {
"passive_effects": [
{
"has": "WORN",
"condition": "ACTIVE",
"values": [ { "value": "STRENGTH", "add": 2 }, { "value": "SPEED", "add": 15 } ]
}
]
},
"use_action": {
"type": "holster",
"holster_prompt": "Sheath knife",
"holster_msg": "You sheath your %s",
"max_volume": "750 ml",
"draw_cost": 80,
"flags": [ "SHEATH_KNIFE" ]
"type": "transform",
"msg": "The %s engages.",
"target": "exosuit_survivor_on",
"active": true,
"need_worn": true,
"need_charges": 1
},
"flags": [ "USE_UPS", "NAT_UPS", "STURDY", "NO_UNLOAD", "NO_RELOAD", "BELTED", "COMPACT", "POWERARMOR_COMPATIBLE", "ONLY_ONE" ]
},
{
"id": "exosuit_survivor_on",
"copy-from": "exosuit_survivor",
"repairs_like": "exosuit_survivor",
"type": "TOOL_ARMOR",
"name": { "str_sp": "survivor armored exo-suit (active)" },
"description": "Although power armor took the world's militaries by storm, not everyone has access to it. This particular suit is cobbled together from scavenged materials, but it works for what it is. It is currently turned on, activate it to turn it off.",
"extend": { "flags": [ "HEAVY_WEAPON_SUPPORT", "TRADER_AVOID" ] },
"power_draw": 500000,
"revert_to": "exosuit_survivor",
"use_action": { "type": "transform", "menu_text": "Turn off", "msg": "The %s disengages.", "target": "exosuit_survivor" },
"encumbrance": 10,
"weight_capacity_bonus": "34 kg"
},
{
"id": "exosuit_military",
"type": "TOOL_ARMOR",
"category": "armor",
"looks_like": "dimensional_anchor",
"name": { "str": "military exo-suit" },
"description": "Although power armor took the world's militaries by storm, the technologies used to make them also allowed for smaller, less protective external rigging that rely on UPS to boost strength, ones designed for operatives or light infantry.",
"weight": "20 kg",
"volume": "25 L",
"price": "7 kUSD",
"price_postapoc": "150 USD",
"material": [ "superalloy" ],
"symbol": "[",
"color": "light_gray",
"covers": [ "torso", "arms", "hands", "legs", "feet" ],
"coverage": 35,
"encumbrance": 30,
"storage": "7 L",
"warmth": 10,
"material_thickness": 8,
"max_charges": 500,
"ammo": "battery",
"relic_data": {
"passive_effects": [
{
"has": "WORN",
"condition": "ACTIVE",
"values": [ { "value": "STRENGTH", "add": 4 }, { "value": "SPEED", "add": 25 } ]
}
]
},
"flags": [ "POWERARMOR_MOD", "COMPACT", "WATERPROOF", "STURDY", "WAIST" ]
"use_action": {
"type": "transform",
"msg": "The %s engages.",
"target": "exosuit_military_on",
"active": true,
"need_worn": true,
"need_charges": 1
},
"flags": [
"USE_UPS",
"NAT_UPS",
"COMPACT",
"STURDY",
"NO_UNLOAD",
"NO_RELOAD",
"BELTED",
"ONLY_ONE",
"POWERARMOR_COMPATIBLE",
"OVERSIZE",
"ALLOWS_NATURAL_ATTACKS"
]
},
{
"id": "exosuit_military_on",
"copy-from": "exosuit_military",
"repairs_like": "exosuit_military",
"type": "TOOL_ARMOR",
"name": { "str": "military exo-suit (active)", "str_pl": "military exo-suits (active)" },
"description": "Although power armor took the world's militaries by storm, the technologies used to make them also allowed for smaller, more personalized suits of armor that rely on UPS, ones designed for operatives or light infantry rather than heavy infantry. It is currently turned on, activate it to turn it off.",
"extend": { "flags": [ "HEAVY_WEAPON_SUPPORT", "ELECTRIC_IMMUNE", "TRADER_AVOID" ] },
"power_draw": 350000,
"revert_to": "exosuit_military",
"use_action": { "type": "transform", "menu_text": "Turn off", "msg": "The %s disengages.", "target": "exosuit_military" },
"covers": [ "torso", "arms", "hands", "legs", "feet" ],
"encumbrance": 5,
"weight_capacity_bonus": "20 kg"
},
{
"id": "exosuit_industrial",
"type": "TOOL_ARMOR",
"category": "armor",
"name": { "str": "industrial exo-suit" },
"description": "Although power armor took the world's militaries by storm, the technologies used to make them also allowed for smaller, industrial powered suits meant for heavy lifting.",
"weight": "25 kg",
"volume": "30 L",
"price": "7 kUSD",
"price_postapoc": "150 USD",
"material": [ "steel" ],
"symbol": "[",
"looks_like": "dimensional_anchor",
"color": "light_gray",
"covers": [ "torso", "arms", "hands", "legs", "feet" ],
"coverage": 35,
"encumbrance": 30,
"storage": "15 L",
"warmth": 10,
"material_thickness": 8,
"max_charges": 500,
"ammo": "battery",
"relic_data": {
"passive_effects": [
{
"has": "WORN",
"condition": "ACTIVE",
"values": [ { "value": "STRENGTH", "add": 6 }, { "value": "SPEED", "add": 10 } ]
}
]
},
"use_action": {
"type": "transform",
"msg": "The %s engages.",
"target": "exosuit_industrial_on",
"active": true,
"need_worn": true,
"need_charges": 1
},
"flags": [
"USE_UPS",
"NAT_UPS",
"STURDY",
"ELECTRIC_IMMUNE",
"NO_UNLOAD",
"NO_RELOAD",
"COMPACT",
"BELTED",
"ONLY_ONE",
"POWERARMOR_COMPATIBLE",
"OVERSIZE",
"ALLOWS_NATURAL_ATTACKS"
]
},
{
"id": "exosuit_industrial_on",
"copy-from": "exosuit_industrial",
"repairs_like": "exosuit_industrial",
"type": "TOOL_ARMOR",
"name": { "str": "industrial exo-suit (active)", "str_pl": "industrial exo-suits (active)" },
"description": "Although power armor took the world's militaries by storm, the technologies used to make them also allowed for industrial powered suits meant for heavy lifting. It is currently turned on, activate it to turn it off.",
"extend": { "flags": [ "HEAVY_WEAPON_SUPPORT", "TRADER_AVOID" ] },
"power_draw": 350000,
"revert_to": "exosuit_industrial",
"use_action": { "type": "transform", "menu_text": "Turn off", "msg": "The %s disengages.", "target": "exosuit_industrial" },
"covers": [ "torso", "arms", "hands", "legs", "feet" ],
"encumbrance": 5,
"weight_capacity_bonus": "25 kg"
}
]
Loading

0 comments on commit 9740ca8

Please sign in to comment.