Skip to content
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
14 changes: 5 additions & 9 deletions data/json/bionics.json
Original file line number Diff line number Diff line change
Expand Up @@ -1110,19 +1110,15 @@
"id": "bio_hydraulics",
"type": "bionic",
"name": { "str": "Hydraulic Muscles" },
"description": "While activated, your muscles will be greatly enhanced, increasing your strength by 20.",
"description": "While activated, your muscles will be greatly enhanced, setting your strength to 20.",
"occupied_bodyparts": [ [ "torso", 10 ], [ "arm_l", 8 ], [ "arm_r", 8 ], [ "leg_l", 10 ], [ "leg_r", 10 ] ],
"flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
"enchantments": [
{
"condition": "ACTIVE",
"ench_effects": [ { "effect": "bio_hydraulics_eff", "intensity": 1 } ],
"values": [ { "value": "STRENGTH", "add": 20 } ]
}
],
"enchantments": [ { "condition": "ACTIVE", "ench_effects": [ { "effect": "bio_hydraulics_eff", "intensity": 1 } ] } ],
"act_cost": "10 kJ",
"react_cost": "10 kJ",
"time": "1 s"
"time": "1 s",
"activated_eocs": [ "EOC_bio_hydraulics_activated" ],
"deactivated_eocs": [ "EOC_bio_hydraulics_deactivated" ]
},
{
"id": "bio_infrared",
Expand Down
6 changes: 6 additions & 0 deletions data/json/effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -3772,6 +3772,12 @@
"id": "bio_hydraulics_eff",
"//": "used so bio_hydraulics could detect bionic is going off. remove if enchantments could produce sound each second or eoc could check you have active bionic"
},
{
"type": "effect_type",
"id": "effect_bio_hydraulics_active",
"rating": "good",
"enchantments": [ { "values": [ { "value": "STRENGTH", "add": { "math": [ "20 - u_bio_hydraulics_strength_adjustment" ] } } ] } ]
},
{
"type": "effect_type",
"id": "crushed",
Expand Down
13 changes: 13 additions & 0 deletions data/json/effects_on_condition/bionic_active_eocs.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,19 @@
{ "run_eocs": "EOC_bio_hydraulics_act", "time_in_future": 1 }
]
},
{
"type": "effect_on_condition",
"id": "EOC_bio_hydraulics_activated",
"effect": [
{ "math": [ "u_bio_hydraulics_strength_adjustment = u_val('strength')" ] },
{ "u_add_effect": "effect_bio_hydraulics_active", "duration": "PERMANENT" }
]
},
{
"type": "effect_on_condition",
"id": "EOC_bio_hydraulics_deactivated",
"effect": [ { "u_lose_effect": "effect_bio_hydraulics_active" } ]
},
{
"type": "effect_on_condition",
"id": "EOC_bio_blood_filter",
Expand Down
Loading