Skip to content

Commit b82d6bd

Browse files
Hydraulic Muscles now sets your strength to a fixed value (#83025)
1 parent f5ef073 commit b82d6bd

File tree

3 files changed

+24
-9
lines changed

3 files changed

+24
-9
lines changed

data/json/bionics.json

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,19 +1110,15 @@
11101110
"id": "bio_hydraulics",
11111111
"type": "bionic",
11121112
"name": { "str": "Hydraulic Muscles" },
1113-
"description": "While activated, your muscles will be greatly enhanced, increasing your strength by 20.",
1113+
"description": "While activated, your muscles will be greatly enhanced, setting your strength to 20.",
11141114
"occupied_bodyparts": [ [ "torso", 10 ], [ "arm_l", 8 ], [ "arm_r", 8 ], [ "leg_l", 10 ], [ "leg_r", 10 ] ],
11151115
"flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
1116-
"enchantments": [
1117-
{
1118-
"condition": "ACTIVE",
1119-
"ench_effects": [ { "effect": "bio_hydraulics_eff", "intensity": 1 } ],
1120-
"values": [ { "value": "STRENGTH", "add": 20 } ]
1121-
}
1122-
],
1116+
"enchantments": [ { "condition": "ACTIVE", "ench_effects": [ { "effect": "bio_hydraulics_eff", "intensity": 1 } ] } ],
11231117
"act_cost": "10 kJ",
11241118
"react_cost": "10 kJ",
1125-
"time": "1 s"
1119+
"time": "1 s",
1120+
"activated_eocs": [ "EOC_bio_hydraulics_activated" ],
1121+
"deactivated_eocs": [ "EOC_bio_hydraulics_deactivated" ]
11261122
},
11271123
{
11281124
"id": "bio_infrared",

data/json/effects.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3772,6 +3772,12 @@
37723772
"id": "bio_hydraulics_eff",
37733773
"//": "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"
37743774
},
3775+
{
3776+
"type": "effect_type",
3777+
"id": "effect_bio_hydraulics_active",
3778+
"rating": "good",
3779+
"enchantments": [ { "values": [ { "value": "STRENGTH", "add": { "math": [ "20 - u_bio_hydraulics_strength_adjustment" ] } } ] } ]
3780+
},
37753781
{
37763782
"type": "effect_type",
37773783
"id": "crushed",

data/json/effects_on_condition/bionic_active_eocs.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,19 @@
6161
{ "run_eocs": "EOC_bio_hydraulics_act", "time_in_future": 1 }
6262
]
6363
},
64+
{
65+
"type": "effect_on_condition",
66+
"id": "EOC_bio_hydraulics_activated",
67+
"effect": [
68+
{ "math": [ "u_bio_hydraulics_strength_adjustment = u_val('strength')" ] },
69+
{ "u_add_effect": "effect_bio_hydraulics_active", "duration": "PERMANENT" }
70+
]
71+
},
72+
{
73+
"type": "effect_on_condition",
74+
"id": "EOC_bio_hydraulics_deactivated",
75+
"effect": [ { "u_lose_effect": "effect_bio_hydraulics_active" } ]
76+
},
6477
{
6578
"type": "effect_on_condition",
6679
"id": "EOC_bio_blood_filter",

0 commit comments

Comments
 (0)