Skip to content

Commit

Permalink
Check vitamins not powers
Browse files Browse the repository at this point in the history
  • Loading branch information
@Standing-Storm
Standing-Storm authored Aug 18, 2024
1 parent 1b5a260 commit 966c994
Showing 1 changed file with 5 additions and 74 deletions.
79 changes: 5 additions & 74 deletions data/mods/MindOverMatter/effectoncondition/eoc_misc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,30 +106,7 @@
{ "compare_string": [ "psi_stunned", { "context_val": "effect" } ] }
]
},
{
"or": [
{ "u_has_effect": "effect_biokin_overcome_pain" },
{ "u_has_effect": "effect_biokin_climate_control" },
{ "u_has_effect": "effect_biokin_hammerhand" },
{ "u_has_effect": "effect_biokin_enhance_mobility" },
{ "u_has_effect": "effect_clair_night_eyes" },
{ "u_has_effect": "effect_clair_speed_reader" },
{ "u_has_effect": "effect_electrokin_hacking_interface" },
{ "u_has_effect": "effect_electrokin_personal_battery" },
{ "u_has_effect": "effect_photokin_light_local" },
{ "u_has_effect": "effect_photokin_light_barrier" },
{ "u_has_effect": "effect_photokinetic_radio" },
{ "u_has_effect": "effect_pyrokinetic_fire_tool" },
{ "u_has_effect": "effect_pyrokinetic_torch_weld" },
{ "u_has_effect": "effect_pyrokinetic_cloak" },
{ "u_has_effect": "effect_telekinetic_strength" },
{ "u_has_effect": "effect_telekinetic_vehicle_lift" },
{ "u_has_effect": "effect_telekinetic_levitation" },
{ "u_has_effect": "effect_telepathic_learning_bonus" },
{ "u_has_effect": "effect_telepathic_morale" },
{ "u_has_effect": "effect_vita_health" }
]
}
{ "math": [ "u_vitamin('vitamin_maintained_powers')", ">=", "1" ] }
]
},
"effect": [
Expand All @@ -151,31 +128,8 @@
{ "compare_string": [ "psi_dazed_zap", { "context_val": "effect" } ] },
{ "compare_string": [ "downed", { "context_val": "effect" } ] }
]
},
{
"or": [
{ "u_has_effect": "effect_biokin_overcome_pain" },
{ "u_has_effect": "effect_biokin_climate_control" },
{ "u_has_effect": "effect_biokin_hammerhand" },
{ "u_has_effect": "effect_biokin_enhance_mobility" },
{ "u_has_effect": "effect_clair_night_eyes" },
{ "u_has_effect": "effect_clair_speed_reader" },
{ "u_has_effect": "effect_electrokin_hacking_interface" },
{ "u_has_effect": "effect_electrokin_personal_battery" },
{ "u_has_effect": "effect_photokin_light_local" },
{ "u_has_effect": "effect_photokin_light_barrier" },
{ "u_has_effect": "effect_photokinetic_radio" },
{ "u_has_effect": "effect_pyrokinetic_fire_tool" },
{ "u_has_effect": "effect_pyrokinetic_torch_weld" },
{ "u_has_effect": "effect_pyrokinetic_cloak" },
{ "u_has_effect": "effect_telekinetic_strength" },
{ "u_has_effect": "effect_telekinetic_vehicle_lift" },
{ "u_has_effect": "effect_telekinetic_levitation" },
{ "u_has_effect": "effect_telepathic_learning_bonus" },
{ "u_has_effect": "effect_telepathic_morale" },
{ "u_has_effect": "effect_vita_health" }
]
}
},
{ "math": [ "u_vitamin('vitamin_maintained_powers')", ">=", "1" ] }
]
},
"effect": [
Expand Down Expand Up @@ -264,31 +218,8 @@
{ "compare_string": [ "effect_psi_null", { "context_val": "effect" } ] },
{ "compare_string": [ "effect_psi_null_unbound", { "context_val": "effect" } ] }
]
},
{
"or": [
{ "u_has_effect": "effect_biokin_overcome_pain" },
{ "u_has_effect": "effect_biokin_climate_control" },
{ "u_has_effect": "effect_biokin_hammerhand" },
{ "u_has_effect": "effect_biokin_enhance_mobility" },
{ "u_has_effect": "effect_clair_night_eyes" },
{ "u_has_effect": "effect_clair_speed_reader" },
{ "u_has_effect": "effect_electrokin_hacking_interface" },
{ "u_has_effect": "effect_electrokin_personal_battery" },
{ "u_has_effect": "effect_photokin_light_local" },
{ "u_has_effect": "effect_photokin_light_barrier" },
{ "u_has_effect": "effect_photokinetic_radio" },
{ "u_has_effect": "effect_pyrokinetic_fire_tool" },
{ "u_has_effect": "effect_pyrokinetic_torch_weld" },
{ "u_has_effect": "effect_pyrokinetic_cloak" },
{ "u_has_effect": "effect_telekinetic_strength" },
{ "u_has_effect": "effect_telekinetic_vehicle_lift" },
{ "u_has_effect": "effect_telekinetic_levitation" },
{ "u_has_effect": "effect_telepathic_learning_bonus" },
{ "u_has_effect": "effect_telepathic_morale" },
{ "u_has_effect": "effect_vita_health" }
]
}
},
{ "math": [ "u_vitamin('vitamin_maintained_powers')", ">=", "1" ] }
]
},
"effect": [ { "run_eocs": [ "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" ] } ]
Expand Down

0 comments on commit 966c994

Please sign in to comment.