From 0cd7f2839c6268b9191cc87f452abf236d347fcf Mon Sep 17 00:00:00 2001 From: Procyonae <45432782+Procyonae@users.noreply.github.com> Date: Wed, 13 Nov 2024 14:07:26 +0000 Subject: [PATCH] Lint /data/mods --- data/mods/Aftershock/EOC/esper_eoc.json | 4 +- .../EOC/esper_recipe_learning_eoc.json | 33 ++------ .../BombasticPerks/perkdata/forge_blood.json | 4 +- .../perkdata/undying_loyalty.json | 5 +- data/mods/BombasticPerks/perkmenu.json | 16 +--- data/mods/Isolation-Protocol/ui.json | 8 +- .../mutation_eocs/limb_changing_eocs.json | 4 +- .../mods/Magiclysm/items/enchanted_rings.json | 5 +- .../effectoncondition/eoc_learn_recipes.json | 60 ++++----------- .../eoc_mental_engineering.json | 16 +--- .../eoc_on_power_use_events.json | 13 +--- .../perkdata/burning_bright.json | 4 +- .../perkdata/clear_minded_channeling.json | 4 +- .../perkdata/phoenix_rising.json | 4 +- .../npcs/dialogue/generic_dialogue.json | 15 +--- .../powers/learning_eocs/biokinesis.json | 60 ++++----------- .../powers/learning_eocs/clairsentience.json | 56 ++++---------- .../powers/learning_eocs/electrokinesis.json | 35 ++------- .../powers/learning_eocs/photokinesis.json | 24 ++---- .../powers/learning_eocs/pyrokinesis.json | 34 ++------- .../powers/learning_eocs/telekinesis.json | 75 +++++-------------- .../powers/learning_eocs/telepathy.json | 44 +++-------- .../powers/learning_eocs/teleportation.json | 51 +++---------- .../powers/learning_eocs/vitakinesis.json | 41 +++------- .../powers/vitakinesis_eoc.json | 10 +-- data/mods/Sky_Island/dialog_statue.json | 16 +--- data/mods/Sky_Island/obelisk_selector.json | 4 +- data/mods/TEST_DATA/widgets.json | 54 +++---------- .../mods/Xedra_Evolved/effects/vampvirus.json | 20 +---- .../Xedra_Evolved/eocs/give_a_class_eoc.json | 8 +- .../eocs/magic_potential_eoc.json | 4 +- .../eocs/magic_weather_control.json | 8 +- .../playable_changeling_advancement_eocs.json | 5 +- .../Xedra_Evolved/mutations/mutations.json | 5 +- ...paraclesian_magic_terrain_adjustments.json | 4 +- .../mutations/paraclesians/sylph_eocs.json | 5 +- .../sylph_spell_learning_eocs.json | 10 +-- .../undine_spell_learning_eocs.json | 32 ++------ .../mutations/playable_changeling_eocs.json | 10 +-- .../spells/hedge_magic_eocs.json | 8 +- .../spells/lilin_spell_eocs.json | 20 +---- 41 files changed, 188 insertions(+), 650 deletions(-) diff --git a/data/mods/Aftershock/EOC/esper_eoc.json b/data/mods/Aftershock/EOC/esper_eoc.json index b4034fa511283..3de4bf0d62f31 100644 --- a/data/mods/Aftershock/EOC/esper_eoc.json +++ b/data/mods/Aftershock/EOC/esper_eoc.json @@ -57,9 +57,7 @@ { "type": "effect_on_condition", "id": "EOC_AFS_CONCENTRATION_COSTS_FOCUS", - "condition": { - "and": [ { "math": [ "u_vitamin('vitamin_afs_maintained_powers') > 0" ] }, { "math": [ "u_val('focus') >= 15" ] } ] - }, + "condition": { "and": [ { "math": [ "u_vitamin('vitamin_afs_maintained_powers') > 0" ] }, { "math": [ "u_val('focus') >= 15" ] } ] }, "effect": [ { "math": [ "u_val('focus')", "-=", "1" ] } ] }, { diff --git a/data/mods/Aftershock/EOC/esper_recipe_learning_eoc.json b/data/mods/Aftershock/EOC/esper_recipe_learning_eoc.json index 0069f0cc67fca..9e53770252926 100644 --- a/data/mods/Aftershock/EOC/esper_recipe_learning_eoc.json +++ b/data/mods/Aftershock/EOC/esper_recipe_learning_eoc.json @@ -27,10 +27,7 @@ "type": "effect_on_condition", "id": "EOC_CHECK_GAMEBEGIN_AFS_ELECTROKIN_RECIPE_SEE_ELECTRIC", "condition": { - "and": [ - { "u_has_trait": "AFS_ELECTROKINETIC" }, - { "math": [ "u_spell_level('afs_electrokinetic_see_electric') >= 0" ] } - ] + "and": [ { "u_has_trait": "AFS_ELECTROKINETIC" }, { "math": [ "u_spell_level('afs_electrokinetic_see_electric') >= 0" ] } ] }, "effect": [ { "u_learn_recipe": "practice_afs_electrokinetic_see_electric" } ] }, @@ -38,10 +35,7 @@ "type": "effect_on_condition", "id": "EOC_CHECK_GAMEBEGIN_AFS_ELECTROKIN_RECIPE_SHOCK_TOUCH", "condition": { - "and": [ - { "u_has_trait": "AFS_ELECTROKINETIC" }, - { "math": [ "u_spell_level('afs_electrokinetic_shock_touch') >= 0" ] } - ] + "and": [ { "u_has_trait": "AFS_ELECTROKINETIC" }, { "math": [ "u_spell_level('afs_electrokinetic_shock_touch') >= 0" ] } ] }, "effect": [ { "u_learn_recipe": "practice_afs_electrokinetic_shock_touch" } ] }, @@ -49,10 +43,7 @@ "type": "effect_on_condition", "id": "EOC_CHECK_GAMEBEGIN_AFS_ELECTROKIN_RECIPE_ZAP_ENEMIES", "condition": { - "and": [ - { "u_has_trait": "AFS_ELECTROKINETIC" }, - { "math": [ "u_spell_level('afs_electrokinetic_zap_enemies') >= 0" ] } - ] + "and": [ { "u_has_trait": "AFS_ELECTROKINETIC" }, { "math": [ "u_spell_level('afs_electrokinetic_zap_enemies') >= 0" ] } ] }, "effect": [ { "u_learn_recipe": "practice_afs_electrokinetic_zap_enemies" } ] }, @@ -71,10 +62,7 @@ "type": "effect_on_condition", "id": "EOC_CHECK_GAMEBEGIN_AFS_ELECTROKIN_RECIPE_PERSONAL_BATTERY", "condition": { - "and": [ - { "u_has_trait": "AFS_ELECTROKINETIC" }, - { "math": [ "u_spell_level('afs_electrokinetic_personal_battery') >= 0" ] } - ] + "and": [ { "u_has_trait": "AFS_ELECTROKINETIC" }, { "math": [ "u_spell_level('afs_electrokinetic_personal_battery') >= 0" ] } ] }, "effect": [ { "u_learn_recipe": "practice_afs_electrokinetic_personal_battery" } ] }, @@ -82,10 +70,7 @@ "type": "effect_on_condition", "id": "EOC_CHECK_GAMEBEGIN_AFS_ELECTROKIN_RECIPE_RECHARGE_VEHICLE", "condition": { - "and": [ - { "u_has_trait": "AFS_ELECTROKINETIC" }, - { "math": [ "u_spell_level('afs_electrokinetic_recharge_vehicle') >= 0" ] } - ] + "and": [ { "u_has_trait": "AFS_ELECTROKINETIC" }, { "math": [ "u_spell_level('afs_electrokinetic_recharge_vehicle') >= 0" ] } ] }, "effect": [ { "u_learn_recipe": "practice_afs_electrokinetic_recharge_vehicle" } ] }, @@ -121,17 +106,13 @@ { "type": "effect_on_condition", "id": "EOC_CHECK_GAMEBEGIN_AFS_TELEPATH_RECIPE_MIND_SENSE", - "condition": { - "and": [ { "u_has_trait": "AFS_TELEPATH" }, { "math": [ "u_spell_level('afs_telepathic_mind_sense') >= 0" ] } ] - }, + "condition": { "and": [ { "u_has_trait": "AFS_TELEPATH" }, { "math": [ "u_spell_level('afs_telepathic_mind_sense') >= 0" ] } ] }, "effect": [ { "u_learn_recipe": "practice_afs_telepathic_mind_sense" } ] }, { "type": "effect_on_condition", "id": "EOC_CHECK_GAMEBEGIN_AFS_TELEPATH_RECIPE_SUGGESTION", - "condition": { - "and": [ { "u_has_trait": "AFS_TELEPATH" }, { "math": [ "u_spell_level('afs_telepathic_suggestion') >= 0" ] } ] - }, + "condition": { "and": [ { "u_has_trait": "AFS_TELEPATH" }, { "math": [ "u_spell_level('afs_telepathic_suggestion') >= 0" ] } ] }, "effect": [ { "u_learn_recipe": "practice_afs_telepathic_suggestion" } ] }, { diff --git a/data/mods/BombasticPerks/perkdata/forge_blood.json b/data/mods/BombasticPerks/perkdata/forge_blood.json index d33e7efcc5f2f..d2fa18ebb6f3a 100644 --- a/data/mods/BombasticPerks/perkdata/forge_blood.json +++ b/data/mods/BombasticPerks/perkdata/forge_blood.json @@ -15,9 +15,7 @@ "run_eocs": [ { "id": "EOC_forge_blood_check_blood", - "condition": { - "and": [ { "math": [ "u_vitamin('blood') >= -15000" ] }, { "math": [ "u_vitamin('redcells') >= -15000" ] } ] - }, + "condition": { "and": [ { "math": [ "u_vitamin('blood') >= -15000" ] }, { "math": [ "u_vitamin('redcells') >= -15000" ] } ] }, "effect": [ { "npc_set_flag": "DURABLE_MELEE" }, { "npc_set_flag": "NO_REPAIR" }, diff --git a/data/mods/BombasticPerks/perkdata/undying_loyalty.json b/data/mods/BombasticPerks/perkdata/undying_loyalty.json index 6fdc6fe8a4d2a..c8d3e49069323 100644 --- a/data/mods/BombasticPerks/perkdata/undying_loyalty.json +++ b/data/mods/BombasticPerks/perkdata/undying_loyalty.json @@ -11,10 +11,7 @@ { "not": { "u_has_any_trait": [ "PRED1", "PRED2", "PRED3", "PRED4", "SAPIOVORE" ] } }, { "math": [ "u_characters_nearby('radius': 15, 'attitude': 'allies') > 0" ] }, { - "or": [ - { "math": [ "u_hp('head') / u_hp_max('head') <= 0.5" ] }, - { "math": [ "u_hp('torso') / u_hp_max('torso') <= 0.5" ] } - ] + "or": [ { "math": [ "u_hp('head') / u_hp_max('head') <= 0.5" ] }, { "math": [ "u_hp('torso') / u_hp_max('torso') <= 0.5" ] } ] } ] }, diff --git a/data/mods/BombasticPerks/perkmenu.json b/data/mods/BombasticPerks/perkmenu.json index a854fd710c399..67bfde2d7d06d 100644 --- a/data/mods/BombasticPerks/perkmenu.json +++ b/data/mods/BombasticPerks/perkmenu.json @@ -434,9 +434,7 @@ "condition": { "and": [ { "not": { "or": [ { "u_has_trait": "perk_way_closedfist" }, { "u_has_trait": "perk_way_pinchedfingers" } ] } }, - { - "and": [ { "math": [ "u_skill('unarmed') >= 2" ] }, { "math": [ "u_skill('cutting') >= 1" ] } ] - } + { "and": [ { "math": [ "u_skill('unarmed') >= 2" ] }, { "math": [ "u_skill('cutting') >= 1" ] } ] } ] } }, @@ -468,9 +466,7 @@ "condition": { "and": [ { "not": { "or": [ { "u_has_trait": "perk_way_openpalm" }, { "u_has_trait": "perk_way_pinchedfingers" } ] } }, - { - "and": [ { "math": [ "u_skill('unarmed') >= 2" ] }, { "math": [ "u_skill('bashing') >= 1" ] } ] - } + { "and": [ { "math": [ "u_skill('unarmed') >= 2" ] }, { "math": [ "u_skill('bashing') >= 1" ] } ] } ] } }, @@ -502,9 +498,7 @@ "condition": { "and": [ { "not": { "or": [ { "u_has_trait": "perk_way_closedfist" }, { "u_has_trait": "perk_way_openpalm" } ] } }, - { - "and": [ { "math": [ "u_skill('unarmed') >= 2" ] }, { "math": [ "u_skill('stabbing') >= 1" ] } ] - } + { "and": [ { "math": [ "u_skill('unarmed') >= 2" ] }, { "math": [ "u_skill('stabbing') >= 1" ] } ] } ] } }, @@ -560,9 +554,7 @@ "condition": { "and": [ { "not": { "u_has_trait": "perk_bloody_mess" } }, - { - "or": [ { "math": [ "u_skill('melee') >= 2" ] }, { "math": [ "u_skill('gun') >= 2" ] } ] - } + { "or": [ { "math": [ "u_skill('melee') >= 2" ] }, { "math": [ "u_skill('gun') >= 2" ] } ] } ] } }, diff --git a/data/mods/Isolation-Protocol/ui.json b/data/mods/Isolation-Protocol/ui.json index 28112af590a43..5e6bd40dca2be 100644 --- a/data/mods/Isolation-Protocol/ui.json +++ b/data/mods/Isolation-Protocol/ui.json @@ -64,17 +64,13 @@ "id": "wrong", "text": "Distorted", "color": "dark_gray", - "condition": { - "and": [ { "math": [ "u_ISO_CURRENT_LEVEL_DANGER >= 15" ] }, { "math": [ "u_ISO_CURRENT_LEVEL_DANGER < 20" ] } ] - } + "condition": { "and": [ { "math": [ "u_ISO_CURRENT_LEVEL_DANGER >= 15" ] }, { "math": [ "u_ISO_CURRENT_LEVEL_DANGER < 20" ] } ] } }, { "id": "bad", "text": "Unstable", "color": "magenta", - "condition": { - "and": [ { "math": [ "u_ISO_CURRENT_LEVEL_DANGER >= 20" ] }, { "math": [ "u_ISO_CURRENT_LEVEL_DANGER < 25" ] } ] - } + "condition": { "and": [ { "math": [ "u_ISO_CURRENT_LEVEL_DANGER >= 20" ] }, { "math": [ "u_ISO_CURRENT_LEVEL_DANGER < 25" ] } ] } }, { "id": "vbad", diff --git a/data/mods/Limb_WIP/mutation_eocs/limb_changing_eocs.json b/data/mods/Limb_WIP/mutation_eocs/limb_changing_eocs.json index 6f3c7e88d2f73..c68c170f95538 100644 --- a/data/mods/Limb_WIP/mutation_eocs/limb_changing_eocs.json +++ b/data/mods/Limb_WIP/mutation_eocs/limb_changing_eocs.json @@ -165,9 +165,7 @@ "//": "First-stage limb, single progress dream. Dynamically decide on failure snips/mutation category", "condition": { "and": [ - { - "or": [ { "math": [ "u_vitamin('mutagen_bird') >= 200" ] }, { "math": [ "u_vitamin('mutagen_raptor') >= 200" ] } ] - }, + { "or": [ { "math": [ "u_vitamin('mutagen_bird') >= 200" ] }, { "math": [ "u_vitamin('mutagen_raptor') >= 200" ] } ] }, { "math": [ "u_vitamin('mutagen') >= 300" ] }, { "math": [ "u_progress_pre_arm_feathers >= 1" ] }, { "u_has_effect": "sleep" }, diff --git a/data/mods/Magiclysm/items/enchanted_rings.json b/data/mods/Magiclysm/items/enchanted_rings.json index cc889cb1457f2..572a83ab951b8 100644 --- a/data/mods/Magiclysm/items/enchanted_rings.json +++ b/data/mods/Magiclysm/items/enchanted_rings.json @@ -565,10 +565,7 @@ "condition": { "math": [ "u_effect_intensity('effect_mring_sustenance') >= 25" ] }, "effect": [ { "if": { "math": [ "u_calories() <= 74999" ] }, "then": { "math": [ "u_calories()", "+=", "5" ] } }, - { - "if": { "math": [ "u_calories() <= 118000" ] }, - "then": { "math": [ "u_calories()", "+=", "7" ] } - }, + { "if": { "math": [ "u_calories() <= 118000" ] }, "then": { "math": [ "u_calories()", "+=", "7" ] } }, { "run_eocs": "EOC_MAGICLYSM_WEARING_RING_OF_SUSTENANCE_FOLLOW_UP", "time_in_future": 60 } ], "false_effect": [ { "run_eocs": "EOC_MAGICLYSM_WEARING_RING_OF_SUSTENANCE_FOLLOW_UP", "time_in_future": 60 } ] diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json b/data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json index 40ac58f68867a..9544f7a7724a8 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json @@ -283,33 +283,25 @@ { "type": "effect_on_condition", "id": "EOC_CHECK_GAMEBEGIN_ELECTROKIN_RECIPE_SEE_ELECTRIC", - "condition": { - "and": [ { "u_has_trait": "ELECTROKINETIC" }, { "math": [ "u_spell_level('electrokinetic_see_electric') >= 0" ] } ] - }, + "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, { "math": [ "u_spell_level('electrokinetic_see_electric') >= 0" ] } ] }, "effect": [ { "u_learn_recipe": "practice_electrokinetic_see_electric" } ] }, { "type": "effect_on_condition", "id": "EOC_CHECK_GAMEBEGIN_ELECTROKIN_RECIPE_SHOCK_TOUCH", - "condition": { - "and": [ { "u_has_trait": "ELECTROKINETIC" }, { "math": [ "u_spell_level('electrokinetic_shock_touch') >= 0" ] } ] - }, + "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, { "math": [ "u_spell_level('electrokinetic_shock_touch') >= 0" ] } ] }, "effect": [ { "u_learn_recipe": "practice_electrokinetic_shock_touch" } ] }, { "type": "effect_on_condition", "id": "EOC_CHECK_GAMEBEGIN_ELECTROKIN_RECIPE_ZAP_ENEMIES", - "condition": { - "and": [ { "u_has_trait": "ELECTROKINETIC" }, { "math": [ "u_spell_level('electrokinetic_zap_enemies') >= 0" ] } ] - }, + "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, { "math": [ "u_spell_level('electrokinetic_zap_enemies') >= 0" ] } ] }, "effect": [ { "u_learn_recipe": "practice_electrokinetic_zap_enemies" } ] }, { "type": "effect_on_condition", "id": "EOC_CHECK_GAMEBEGIN_ELECTROKIN_RECIPE_MELEE_ATTACKS", - "condition": { - "and": [ { "u_has_trait": "ELECTROKINETIC" }, { "math": [ "u_spell_level('electrokinetic_melee_attacks') >= 0" ] } ] - }, + "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, { "math": [ "u_spell_level('electrokinetic_melee_attacks') >= 0" ] } ] }, "effect": [ { "u_learn_recipe": "practice_electrokinetic_melee_attacks" } ] }, { @@ -339,17 +331,13 @@ { "type": "effect_on_condition", "id": "EOC_CHECK_GAMEBEGIN_ELECTROKIN_RECIPE_PARALYSIS", - "condition": { - "and": [ { "u_has_trait": "ELECTROKINETIC" }, { "math": [ "u_spell_level('electrokinetic_paralysis') >= 0" ] } ] - }, + "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, { "math": [ "u_spell_level('electrokinetic_paralysis') >= 0" ] } ] }, "effect": [ { "u_learn_recipe": "practice_electrokinetic_paralysis" } ] }, { "type": "effect_on_condition", "id": "EOC_CHECK_GAMEBEGIN_ELECTROKIN_RECIPE_REDUCE_PAIN", - "condition": { - "and": [ { "u_has_trait": "ELECTROKINETIC" }, { "math": [ "u_spell_level('electrokinetic_reduce_pain') >= 0" ] } ] - }, + "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, { "math": [ "u_spell_level('electrokinetic_reduce_pain') >= 0" ] } ] }, "effect": [ { "u_learn_recipe": "practice_electrokinetic_reduce_pain" } ] }, { @@ -371,25 +359,19 @@ { "type": "effect_on_condition", "id": "EOC_CHECK_GAMEBEGIN_ELECTROKIN_RECIPE_PAIN_IMMUNE", - "condition": { - "and": [ { "u_has_trait": "ELECTROKINETIC" }, { "math": [ "u_spell_level('electrokinetic_pain_immune') >= 0" ] } ] - }, + "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, { "math": [ "u_spell_level('electrokinetic_pain_immune') >= 0" ] } ] }, "effect": [ { "u_learn_recipe": "practice_electrokinetic_pain_immune" } ] }, { "type": "effect_on_condition", "id": "EOC_CHECK_GAMEBEGIN_ELECTROKIN_RECIPE_SPEED_BOOST", - "condition": { - "and": [ { "u_has_trait": "ELECTROKINETIC" }, { "math": [ "u_spell_level('electrokinetic_speed_boost') >= 0" ] } ] - }, + "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, { "math": [ "u_spell_level('electrokinetic_speed_boost') >= 0" ] } ] }, "effect": [ { "u_learn_recipe": "practice_electrokinetic_speed_boost" } ] }, { "type": "effect_on_condition", "id": "EOC_CHECK_GAMEBEGIN_ELECTROKIN_RECIPE_KILL_ROBOT", - "condition": { - "and": [ { "u_has_trait": "ELECTROKINETIC" }, { "math": [ "u_spell_level('electrokinetic_kill_robot') >= 0" ] } ] - }, + "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, { "math": [ "u_spell_level('electrokinetic_kill_robot') >= 0" ] } ] }, "effect": [ { "u_learn_recipe": "practice_electrokinetic_kill_robot" } ] }, { @@ -457,9 +439,7 @@ { "type": "effect_on_condition", "id": "EOC_CHECK_GAMEBEGIN_PHOTOKIN_RECIPE_CREATE_LIGHT", - "condition": { - "and": [ { "u_has_trait": "PHOTOKINETIC" }, { "math": [ "u_spell_level('photokinetic_create_light') >= 0" ] } ] - }, + "condition": { "and": [ { "u_has_trait": "PHOTOKINETIC" }, { "math": [ "u_spell_level('photokinetic_create_light') >= 0" ] } ] }, "effect": [ { "u_learn_recipe": "practice_photokinetic_create_light" } ] }, { @@ -489,9 +469,7 @@ { "type": "effect_on_condition", "id": "EOC_CHECK_GAMEBEGIN_PHOTOKIN_RECIPE_RAD_IMMUNITY", - "condition": { - "and": [ { "u_has_trait": "PHOTOKINETIC" }, { "math": [ "u_spell_level('photokinetic_rad_immunity') >= 0" ] } ] - }, + "condition": { "and": [ { "u_has_trait": "PHOTOKINETIC" }, { "math": [ "u_spell_level('photokinetic_rad_immunity') >= 0" ] } ] }, "effect": [ { "u_learn_recipe": "practice_photokinetic_rad_immunity" } ] }, { @@ -527,9 +505,7 @@ { "type": "effect_on_condition", "id": "EOC_CHECK_GAMEBEGIN_PHOTOKIN_RECIPE_INVISIBILITY", - "condition": { - "and": [ { "u_has_trait": "PHOTOKINETIC" }, { "math": [ "u_spell_level('photokinetic_invisibility') >= 0" ] } ] - }, + "condition": { "and": [ { "u_has_trait": "PHOTOKINETIC" }, { "math": [ "u_spell_level('photokinetic_invisibility') >= 0" ] } ] }, "effect": [ { "u_learn_recipe": "practice_photokinetic_invisibility" } ] }, { @@ -541,9 +517,7 @@ { "type": "effect_on_condition", "id": "EOC_CHECK_GAMEBEGIN_PHOTOKIN_RECIPE_BLINDING_GLARE", - "condition": { - "and": [ { "u_has_trait": "PHOTOKINETIC" }, { "math": [ "u_spell_level('photokinetic_blinding_glare') >= 0" ] } ] - }, + "condition": { "and": [ { "u_has_trait": "PHOTOKINETIC" }, { "math": [ "u_spell_level('photokinetic_blinding_glare') >= 0" ] } ] }, "effect": [ { "u_learn_recipe": "practice_photokinetic_light_blinding_glare" } ] }, { @@ -649,9 +623,7 @@ { "type": "effect_on_condition", "id": "EOC_CHECK_GAMEBEGIN_PYROKIN_RECIPE_FLAME_IMMUNITY", - "condition": { - "and": [ { "u_has_trait": "PYROKINETIC" }, { "math": [ "u_spell_level('pyrokinetic_flame_immunity') >= 0" ] } ] - }, + "condition": { "and": [ { "u_has_trait": "PYROKINETIC" }, { "math": [ "u_spell_level('pyrokinetic_flame_immunity') >= 0" ] } ] }, "effect": [ { "u_learn_recipe": "practice_pyrokinetic_flame_immunity" } ] }, { @@ -859,9 +831,7 @@ { "type": "effect_on_condition", "id": "EOC_CHECK_GAMEBEGIN_TELEPATH_RECIPE_ANIMAL_MIND_CONTROL", - "condition": { - "and": [ { "u_has_trait": "TELEPATH" }, { "math": [ "u_spell_level('telepathic_animal_mind_control') >= 0" ] } ] - }, + "condition": { "and": [ { "u_has_trait": "TELEPATH" }, { "math": [ "u_spell_level('telepathic_animal_mind_control') >= 0" ] } ] }, "effect": [ { "u_learn_recipe": "practice_telepathic_beastmaster" } ] }, { diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_mental_engineering.json b/data/mods/MindOverMatter/effectoncondition/eoc_mental_engineering.json index b086c8d2badf1..75f0ca45d7f29 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_mental_engineering.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_mental_engineering.json @@ -1678,9 +1678,7 @@ { "type": "effect_on_condition", "id": "EOC_TELEPATH_MENTAL_ENGINEERING_STRICT_HUMANITARIAN_02", - "condition": { - "and": [ { "math": [ "u_spell_level_sum('school': 'TELEPATH') >= 50" ] }, { "u_has_trait": "STRICT_HUMANITARIAN" } ] - }, + "condition": { "and": [ { "math": [ "u_spell_level_sum('school': 'TELEPATH') >= 50" ] }, { "u_has_trait": "STRICT_HUMANITARIAN" } ] }, "effect": [ { "run_eocs": "EOC_TELEPATH_MENTAL_ENGINEERING_MESSAGE" }, { @@ -1749,9 +1747,7 @@ { "type": "effect_on_condition", "id": "EOC_TELEPATH_MENTAL_ENGINEERING_SAVANT_01", - "condition": { - "and": [ { "math": [ "u_spell_level_sum('school': 'TELEPATH') >= 70" ] }, { "not": { "u_has_trait": "SAVANT" } } ] - }, + "condition": { "and": [ { "math": [ "u_spell_level_sum('school': 'TELEPATH') >= 70" ] }, { "not": { "u_has_trait": "SAVANT" } } ] }, "effect": [ { "run_eocs": "EOC_TELEPATH_MENTAL_ENGINEERING_MESSAGE" }, { @@ -2092,9 +2088,7 @@ { "type": "effect_on_condition", "id": "EOC_TELEPATH_MENTAL_ENGINEERING_SEASONAL_AFFECTIVE_02", - "condition": { - "and": [ { "math": [ "u_spell_level_sum('school': 'TELEPATH') >= 110" ] }, { "u_has_trait": "SEASONAL_AFFECTIVE" } ] - }, + "condition": { "and": [ { "math": [ "u_spell_level_sum('school': 'TELEPATH') >= 110" ] }, { "u_has_trait": "SEASONAL_AFFECTIVE" } ] }, "effect": [ { "run_eocs": "EOC_TELEPATH_MENTAL_ENGINEERING_MESSAGE" }, { @@ -2146,9 +2140,7 @@ { "type": "effect_on_condition", "id": "EOC_TELEPATH_MENTAL_ENGINEERING_STYLISH_01", - "condition": { - "and": [ { "math": [ "u_spell_level_sum('school': 'TELEPATH') >= 80" ] }, { "not": { "u_has_trait": "STYLISH" } } ] - }, + "condition": { "and": [ { "math": [ "u_spell_level_sum('school': 'TELEPATH') >= 80" ] }, { "not": { "u_has_trait": "STYLISH" } } ] }, "effect": [ { "run_eocs": "EOC_TELEPATH_MENTAL_ENGINEERING_MESSAGE" }, { diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json b/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json index 47423d188ac3a..e6dc51cefa10c 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json @@ -666,17 +666,13 @@ { "type": "effect_on_condition", "id": "EOC_CONCENTRATION_SUCCESS_REDUCE_FOCUS", - "condition": { - "and": [ { "math": [ "u_vitamin('vitamin_maintained_powers') > 0" ] }, { "math": [ "u_val('focus') >= 15" ] } ] - }, + "condition": { "and": [ { "math": [ "u_vitamin('vitamin_maintained_powers') > 0" ] }, { "math": [ "u_val('focus') >= 15" ] } ] }, "effect": [ { "math": [ "u_val('focus')", "-=", "1" ] } ] }, { "type": "effect_on_condition", "id": "EOC_CONCENTRATION_FAILURE_REDUCE_FOCUS", - "condition": { - "and": [ { "math": [ "u_vitamin('vitamin_maintained_powers') > 0" ] }, { "math": [ "u_val('focus') >= 20" ] } ] - }, + "condition": { "and": [ { "math": [ "u_vitamin('vitamin_maintained_powers') > 0" ] }, { "math": [ "u_val('focus') >= 20" ] } ] }, "effect": [ { "math": [ "u_val('focus')", "-=", "5" ] } ] }, { @@ -698,10 +694,7 @@ "eoc_type": "EVENT", "required_event": "spellcasting_finish", "condition": { - "and": [ - { "test_eoc": "EOC_CONDITION_SPELLCASTING_FINISH_TRAIT_AND_SCHOOL_LIST" }, - { "math": [ "u_val('focus') >= 15" ] } - ] + "and": [ { "test_eoc": "EOC_CONDITION_SPELLCASTING_FINISH_TRAIT_AND_SCHOOL_LIST" }, { "math": [ "u_val('focus') >= 15" ] } ] }, "effect": [ { "math": [ "u_val('focus')", "-=", "1" ] } ] }, diff --git a/data/mods/MindOverMatter/mod_interactions/bombastic_perks/perkdata/burning_bright.json b/data/mods/MindOverMatter/mod_interactions/bombastic_perks/perkdata/burning_bright.json index ee01b334bf51b..391fc59dbef10 100644 --- a/data/mods/MindOverMatter/mod_interactions/bombastic_perks/perkdata/burning_bright.json +++ b/data/mods/MindOverMatter/mod_interactions/bombastic_perks/perkdata/burning_bright.json @@ -17,9 +17,7 @@ "type": "effect_on_condition", "id": "EOC_PERK_BURNING_BRIGHT_ATTUNEMENT_MAINTAINED", "recurrence": [ "5 seconds", "15 seconds" ], - "condition": { - "and": [ { "u_has_trait": "perk_burning_bright" }, { "math": [ "u_vitamin('vitamin_maintained_powers') == 0" ] } ] - }, + "condition": { "and": [ { "u_has_trait": "perk_burning_bright" }, { "math": [ "u_vitamin('vitamin_maintained_powers') == 0" ] } ] }, "deactivate_condition": { "not": { "u_has_trait": "perk_burning_bright" } }, "effect": [ { "math": [ "u_vitamin('vitamin_psionic_drain')", "-=", "1" ] } ] } diff --git a/data/mods/MindOverMatter/mod_interactions/bombastic_perks/perkdata/clear_minded_channeling.json b/data/mods/MindOverMatter/mod_interactions/bombastic_perks/perkdata/clear_minded_channeling.json index 7d687d3ca0a96..271aa79012e31 100644 --- a/data/mods/MindOverMatter/mod_interactions/bombastic_perks/perkdata/clear_minded_channeling.json +++ b/data/mods/MindOverMatter/mod_interactions/bombastic_perks/perkdata/clear_minded_channeling.json @@ -7,9 +7,7 @@ "condition": { "and": [ { "u_has_trait": "perk_clear_minded_channeling" }, - { - "or": [ { "math": [ "u_pain() == 0" ] }, { "math": [ "u_vitamin('vitamin_maintained_powers') == 0" ] } ] - } + { "or": [ { "math": [ "u_pain() == 0" ] }, { "math": [ "u_vitamin('vitamin_maintained_powers') == 0" ] } ] } ] }, "effect": [ { "math": [ "u_spellcasting_adjustment('concentration', 'flag_whitelist': 'PSIONIC' )", "=", "-0.33" ] } ] diff --git a/data/mods/MindOverMatter/mod_interactions/bombastic_perks/perkdata/phoenix_rising.json b/data/mods/MindOverMatter/mod_interactions/bombastic_perks/perkdata/phoenix_rising.json index e963eea574212..398b5ef5bc4dd 100644 --- a/data/mods/MindOverMatter/mod_interactions/bombastic_perks/perkdata/phoenix_rising.json +++ b/data/mods/MindOverMatter/mod_interactions/bombastic_perks/perkdata/phoenix_rising.json @@ -4,9 +4,7 @@ "id": "EOC_PERK_PHOENIX_RISING", "eoc_type": "EVENT", "required_event": "opens_spellbook", - "condition": { - "and": [ { "u_has_trait": "perk_phoenix_rising" }, { "math": [ "u_vitamin('vitamin_psionic_drain') >= 155" ] } ] - }, + "condition": { "and": [ { "u_has_trait": "perk_phoenix_rising" }, { "math": [ "u_vitamin('vitamin_psionic_drain') >= 155" ] } ] }, "effect": [ { "math": [ diff --git a/data/mods/MindOverMatter/npcs/dialogue/generic_dialogue.json b/data/mods/MindOverMatter/npcs/dialogue/generic_dialogue.json index 2403ba4bf3554..de24bddfef3f7 100644 --- a/data/mods/MindOverMatter/npcs/dialogue/generic_dialogue.json +++ b/data/mods/MindOverMatter/npcs/dialogue/generic_dialogue.json @@ -111,10 +111,7 @@ { "text": "[Mood Stablization Check] You don't want to hurt me.", "condition": { - "and": [ - { "math": [ "u_spell_level('telepathic_morale') >= 1" ] }, - { "not": { "npc_has_trait": "NPC_TELEPATHY_IMMUNE" } } - ] + "and": [ { "math": [ "u_spell_level('telepathic_morale') >= 1" ] }, { "not": { "npc_has_trait": "NPC_TELEPATHY_IMMUNE" } } ] }, "trial": { "type": "CONDITION", @@ -184,10 +181,7 @@ { "text": "[Mood Stablization Check] I'm not going to hurt you.", "condition": { - "and": [ - { "math": [ "u_spell_level('telepathic_morale') >= 1" ] }, - { "not": { "npc_has_trait": "NPC_TELEPATHY_IMMUNE" } } - ] + "and": [ { "math": [ "u_spell_level('telepathic_morale') >= 1" ] }, { "not": { "npc_has_trait": "NPC_TELEPATHY_IMMUNE" } } ] }, "trial": { "type": "CONDITION", @@ -209,10 +203,7 @@ { "text": "[Mood Stablization Check] I'm not going to hurt you.", "condition": { - "and": [ - { "math": [ "u_spell_level('telepathic_morale') >= 1" ] }, - { "not": { "npc_has_trait": "NPC_TELEPATHY_IMMUNE" } } - ] + "and": [ { "math": [ "u_spell_level('telepathic_morale') >= 1" ] }, { "not": { "npc_has_trait": "NPC_TELEPATHY_IMMUNE" } } ] }, "trial": { "type": "CONDITION", diff --git a/data/mods/MindOverMatter/powers/learning_eocs/biokinesis.json b/data/mods/MindOverMatter/powers/learning_eocs/biokinesis.json index 3058d0c2959ff..b98dcd03ae9b0 100644 --- a/data/mods/MindOverMatter/powers/learning_eocs/biokinesis.json +++ b/data/mods/MindOverMatter/powers/learning_eocs/biokinesis.json @@ -26,9 +26,7 @@ { "not": { "u_know_recipe": "practice_biokin_breathe_skin" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "BIOKINETIC" } }, { "math": [ "u_spell_level('biokin_breathe_skin') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "BIOKINETIC" } }, { "math": [ "u_spell_level('biokin_breathe_skin') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_biokin_breathe_skin" }, @@ -60,9 +58,7 @@ { "not": { "u_know_recipe": "practice_biokin_flexibility" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "BIOKINETIC" } }, { "math": [ "u_spell_level('biokin_flexibility') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "BIOKINETIC" } }, { "math": [ "u_spell_level('biokin_flexibility') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_biokin_flexibility" }, @@ -156,9 +152,7 @@ { "not": { "u_know_recipe": "practice_biokin_armor_skin" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "BIOKINETIC" } }, { "math": [ "u_spell_level('biokin_armor_skin') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "BIOKINETIC" } }, { "math": [ "u_spell_level('biokin_armor_skin') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_biokin_armor_skin" }, @@ -200,9 +194,7 @@ { "not": { "u_know_recipe": "practice_biokin_climate_control" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "BIOKINETIC" } }, { "math": [ "u_spell_level('biokin_climate_control') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "BIOKINETIC" } }, { "math": [ "u_spell_level('biokin_climate_control') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_biokin_climate_control" }, @@ -229,10 +221,7 @@ { "and": [ { - "or": [ - { "math": [ "u_spell_level('biokin_dash') >= 8" ] }, - { "math": [ "u_spell_level('biokin_enhance_mobility') >= 6" ] } - ] + "or": [ { "math": [ "u_spell_level('biokin_dash') >= 8" ] }, { "math": [ "u_spell_level('biokin_enhance_mobility') >= 6" ] } ] }, { "math": [ "u_spell_level('biokin_breathe_skin') >= 5" ] } ] @@ -244,9 +233,7 @@ { "not": { "u_know_recipe": "practice_biokin_adrenaline" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "BIOKINETIC" } }, { "math": [ "u_spell_level('biokin_adrenaline') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "BIOKINETIC" } }, { "math": [ "u_spell_level('biokin_adrenaline') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_biokin_adrenaline" }, @@ -334,9 +321,7 @@ { "not": { "u_know_recipe": "practice_biokin_hammerhand" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "BIOKINETIC" } }, { "math": [ "u_spell_level('biokin_hammerhand') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "BIOKINETIC" } }, { "math": [ "u_spell_level('biokin_hammerhand') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_biokin_hammerhand" }, @@ -365,10 +350,7 @@ { "math": [ "u_spell_level('biokin_physical_enhance') >= 6" ] }, { "math": [ "u_spell_level('biokin_adrenaline') >= 8" ] }, { - "or": [ - { "math": [ "u_spell_level('biokin_dash') >= 8" ] }, - { "math": [ "u_spell_level('biokin_flexibility') >= 8" ] } - ] + "or": [ { "math": [ "u_spell_level('biokin_dash') >= 8" ] }, { "math": [ "u_spell_level('biokin_flexibility') >= 8" ] } ] } ] } @@ -379,9 +361,7 @@ { "not": { "u_know_recipe": "practice_biokin_reflex_enhance" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "BIOKINETIC" } }, { "math": [ "u_spell_level('biokin_reflex_enhance') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "BIOKINETIC" } }, { "math": [ "u_spell_level('biokin_reflex_enhance') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_biokin_reflex_enhance" }, @@ -428,9 +408,7 @@ { "not": { "u_know_recipe": "practice_biokin_sealed_system" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "BIOKINETIC" } }, { "math": [ "u_spell_level('biokin_sealed_system') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "BIOKINETIC" } }, { "math": [ "u_spell_level('biokin_sealed_system') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_biokin_sealed_system" }, @@ -503,10 +481,7 @@ { "math": [ "u_spell_level('biokin_physical_enhance') >= 10" ] }, { "math": [ "u_spell_level('biokin_reflex_enhance') >= 10" ] }, { - "or": [ - { "math": [ "u_spell_level('biokin_dash') >= 6" ] }, - { "math": [ "u_spell_level('biokin_adrenaline') >= 9" ] } - ] + "or": [ { "math": [ "u_spell_level('biokin_dash') >= 6" ] }, { "math": [ "u_spell_level('biokin_adrenaline') >= 9" ] } ] } ] } @@ -517,9 +492,7 @@ { "not": { "u_know_recipe": "practice_biokin_combat_dance" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "BIOKINETIC" } }, { "math": [ "u_spell_level('biokin_combat_dance') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "BIOKINETIC" } }, { "math": [ "u_spell_level('biokin_combat_dance') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_biokin_combat_dance" }, @@ -544,10 +517,7 @@ "or": [ { "test_eoc": "EOC_CONDITION_ODDS_OF_RANDOM_TIER_THREE_POWER_INSIGHT" }, { - "and": [ - { "math": [ "u_spell_level('biokin_combat_dance') >= 6" ] }, - { "math": [ "u_spell_level('biokin_dash') >= 12" ] } - ] + "and": [ { "math": [ "u_spell_level('biokin_combat_dance') >= 6" ] }, { "math": [ "u_spell_level('biokin_dash') >= 12" ] } ] } ] }, @@ -600,9 +570,7 @@ { "not": { "u_know_recipe": "practice_biokin_hurricane_blows" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "BIOKINETIC" } }, { "math": [ "u_spell_level('biokin_hurricane_blows') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "BIOKINETIC" } }, { "math": [ "u_spell_level('biokin_hurricane_blows') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_biokin_hurricane_blows" }, diff --git a/data/mods/MindOverMatter/powers/learning_eocs/clairsentience.json b/data/mods/MindOverMatter/powers/learning_eocs/clairsentience.json index 5cb8c669bf82f..2d0d5b643b997 100644 --- a/data/mods/MindOverMatter/powers/learning_eocs/clairsentience.json +++ b/data/mods/MindOverMatter/powers/learning_eocs/clairsentience.json @@ -16,9 +16,7 @@ { "not": { "u_know_recipe": "practice_clair_danger_sense" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "CLAIRSENTIENT" } }, { "math": [ "u_spell_level('clair_danger_sense') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "CLAIRSENTIENT" } }, { "math": [ "u_spell_level('clair_danger_sense') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_clair_danger_sense" }, @@ -55,9 +53,7 @@ { "not": { "u_know_recipe": "practice_clair_spot_weakness" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "CLAIRSENTIENT" } }, { "math": [ "u_spell_level('clair_spot_weakness') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "CLAIRSENTIENT" } }, { "math": [ "u_spell_level('clair_spot_weakness') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_clair_spot_weakness" }, @@ -94,9 +90,7 @@ { "not": { "u_know_recipe": "practice_clair_aura_sight" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "CLAIRSENTIENT" } }, { "math": [ "u_spell_level('clair_see_auras') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "CLAIRSENTIENT" } }, { "math": [ "u_spell_level('clair_see_auras') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_clair_aura_sight" }, @@ -215,9 +209,7 @@ { "not": { "u_know_recipe": "practice_clair_dodge_power" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "CLAIRSENTIENT" } }, { "math": [ "u_spell_level('clair_dodge_power') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "CLAIRSENTIENT" } }, { "math": [ "u_spell_level('clair_dodge_power') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_clair_dodge_power" }, @@ -255,9 +247,7 @@ { "not": { "u_know_recipe": "practice_clair_craft_bonus" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "CLAIRSENTIENT" } }, { "math": [ "u_spell_level('clair_craft_bonus') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "CLAIRSENTIENT" } }, { "math": [ "u_spell_level('clair_craft_bonus') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_clair_craft_bonus" }, @@ -289,9 +279,7 @@ { "not": { "u_know_recipe": "practice_clair_perfect_shot" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "CLAIRSENTIENT" } }, { "math": [ "u_spell_level('clair_perfect_shot') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "CLAIRSENTIENT" } }, { "math": [ "u_spell_level('clair_perfect_shot') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_clair_perfect_shot" }, @@ -319,10 +307,7 @@ "and": [ { "math": [ "u_spell_level('clair_voyance') >= 8" ] }, { - "or": [ - { "math": [ "u_spell_level('clair_danger_sense') >= 6" ] }, - { "math": [ "u_spell_level('clair_aura_sight') >= 6" ] } - ] + "or": [ { "math": [ "u_spell_level('clair_danger_sense') >= 6" ] }, { "math": [ "u_spell_level('clair_aura_sight') >= 6" ] } ] } ] } @@ -376,9 +361,7 @@ { "not": { "u_know_recipe": "practice_clair_clear_sight" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "CLAIRSENTIENT" } }, { "math": [ "u_spell_level('clair_clear_sight') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "CLAIRSENTIENT" } }, { "math": [ "u_spell_level('clair_clear_sight') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_clair_clear_sight" }, @@ -405,16 +388,10 @@ { "or": [ { - "and": [ - { "math": [ "u_spell_level('clair_clear_sight') >= 6" ] }, - { "math": [ "u_spell_level('clair_voyance') >= 9" ] } - ] + "and": [ { "math": [ "u_spell_level('clair_clear_sight') >= 6" ] }, { "math": [ "u_spell_level('clair_voyance') >= 9" ] } ] }, { - "and": [ - { "math": [ "u_spell_level('clair_see_map') >= 8" ] }, - { "math": [ "u_spell_level('clair_voyance') >= 9" ] } - ] + "and": [ { "math": [ "u_spell_level('clair_see_map') >= 8" ] }, { "math": [ "u_spell_level('clair_voyance') >= 9" ] } ] } ] } @@ -465,9 +442,7 @@ { "not": { "u_know_recipe": "practice_clair_group_tactics" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "CLAIRSENTIENT" } }, { "math": [ "u_spell_level('clair_group_tactics') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "CLAIRSENTIENT" } }, { "math": [ "u_spell_level('clair_group_tactics') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_clair_group_tactics" }, @@ -495,10 +470,7 @@ "and": [ { "math": [ "u_spell_level('clair_clear_sight') >= 5" ] }, { - "or": [ - { "math": [ "u_spell_level('clair_see_map') >= 8" ] }, - { "math": [ "u_spell_level('clair_voyance') >= 14" ] } - ] + "or": [ { "math": [ "u_spell_level('clair_see_map') >= 8" ] }, { "math": [ "u_spell_level('clair_voyance') >= 14" ] } ] } ] } @@ -509,9 +481,7 @@ { "not": { "u_know_recipe": "practice_clair_omniscience" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "CLAIRSENTIENT" } }, { "math": [ "u_spell_level('clair_omniscience') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "CLAIRSENTIENT" } }, { "math": [ "u_spell_level('clair_omniscience') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_clair_omniscience" }, diff --git a/data/mods/MindOverMatter/powers/learning_eocs/electrokinesis.json b/data/mods/MindOverMatter/powers/learning_eocs/electrokinesis.json index 1d3e9cf06a17b..f5ee4615cd042 100644 --- a/data/mods/MindOverMatter/powers/learning_eocs/electrokinesis.json +++ b/data/mods/MindOverMatter/powers/learning_eocs/electrokinesis.json @@ -22,10 +22,7 @@ ] }, "deactivate_condition": { - "or": [ - { "not": { "u_has_trait": "ELECTROKINETIC" } }, - { "math": [ "u_spell_level('electrokinetic_zap_enemies') >= 1" ] } - ] + "or": [ { "not": { "u_has_trait": "ELECTROKINETIC" } }, { "math": [ "u_spell_level('electrokinetic_zap_enemies') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, @@ -64,10 +61,7 @@ ] }, "deactivate_condition": { - "or": [ - { "not": { "u_has_trait": "ELECTROKINETIC" } }, - { "math": [ "u_spell_level('electrokinetic_melee_attacks') >= 1" ] } - ] + "or": [ { "not": { "u_has_trait": "ELECTROKINETIC" } }, { "math": [ "u_spell_level('electrokinetic_melee_attacks') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, @@ -153,10 +147,7 @@ ] }, "deactivate_condition": { - "or": [ - { "not": { "u_has_trait": "ELECTROKINETIC" } }, - { "math": [ "u_spell_level('electrokinetic_paralysis') >= 1" ] } - ] + "or": [ { "not": { "u_has_trait": "ELECTROKINETIC" } }, { "math": [ "u_spell_level('electrokinetic_paralysis') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, @@ -200,10 +191,7 @@ ] }, "deactivate_condition": { - "or": [ - { "not": { "u_has_trait": "ELECTROKINETIC" } }, - { "math": [ "u_spell_level('electrokinetic_reduce_pain') >= 1" ] } - ] + "or": [ { "not": { "u_has_trait": "ELECTROKINETIC" } }, { "math": [ "u_spell_level('electrokinetic_reduce_pain') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, @@ -374,10 +362,7 @@ ] }, "deactivate_condition": { - "or": [ - { "not": { "u_has_trait": "ELECTROKINETIC" } }, - { "math": [ "u_spell_level('electrokinetic_pain_immune') >= 1" ] } - ] + "or": [ { "not": { "u_has_trait": "ELECTROKINETIC" } }, { "math": [ "u_spell_level('electrokinetic_pain_immune') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, @@ -426,10 +411,7 @@ ] }, "deactivate_condition": { - "or": [ - { "not": { "u_has_trait": "ELECTROKINETIC" } }, - { "math": [ "u_spell_level('electrokinetic_speed_boost') >= 1" ] } - ] + "or": [ { "not": { "u_has_trait": "ELECTROKINETIC" } }, { "math": [ "u_spell_level('electrokinetic_speed_boost') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, @@ -517,10 +499,7 @@ ] }, "deactivate_condition": { - "or": [ - { "not": { "u_has_trait": "ELECTROKINETIC" } }, - { "math": [ "u_spell_level('electrokinetic_kill_robot') >= 1" ] } - ] + "or": [ { "not": { "u_has_trait": "ELECTROKINETIC" } }, { "math": [ "u_spell_level('electrokinetic_kill_robot') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, diff --git a/data/mods/MindOverMatter/powers/learning_eocs/photokinesis.json b/data/mods/MindOverMatter/powers/learning_eocs/photokinesis.json index cc65550b160ed..c05313b631cf3 100644 --- a/data/mods/MindOverMatter/powers/learning_eocs/photokinesis.json +++ b/data/mods/MindOverMatter/powers/learning_eocs/photokinesis.json @@ -17,10 +17,7 @@ ] }, "deactivate_condition": { - "or": [ - { "not": { "u_has_trait": "PHOTOKINETIC" } }, - { "math": [ "u_spell_level('photokinetic_light_up_enemy') >= 1" ] } - ] + "or": [ { "not": { "u_has_trait": "PHOTOKINETIC" } }, { "math": [ "u_spell_level('photokinetic_light_up_enemy') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, @@ -215,10 +212,7 @@ ] }, "deactivate_condition": { - "or": [ - { "not": { "u_has_trait": "PHOTOKINETIC" } }, - { "math": [ "u_spell_level('photokinetic_rad_immunity') >= 1" ] } - ] + "or": [ { "not": { "u_has_trait": "PHOTOKINETIC" } }, { "math": [ "u_spell_level('photokinetic_rad_immunity') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, @@ -384,9 +378,7 @@ { "not": { "u_know_recipe": "practice_photokinetic_radio" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "PHOTOKINETIC" } }, { "math": [ "u_spell_level('photokinetic_radio') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "PHOTOKINETIC" } }, { "math": [ "u_spell_level('photokinetic_radio') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_photokinetic_radio" }, @@ -478,10 +470,7 @@ ] }, "deactivate_condition": { - "or": [ - { "not": { "u_has_trait": "PHOTOKINETIC" } }, - { "math": [ "u_spell_level('photokinetic_invisibility') >= 1" ] } - ] + "or": [ { "not": { "u_has_trait": "PHOTOKINETIC" } }, { "math": [ "u_spell_level('photokinetic_invisibility') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, @@ -569,10 +558,7 @@ ] }, "deactivate_condition": { - "or": [ - { "not": { "u_has_trait": "PHOTOKINETIC" } }, - { "math": [ "u_spell_level('photokinetic_blinding_glare') >= 1" ] } - ] + "or": [ { "not": { "u_has_trait": "PHOTOKINETIC" } }, { "math": [ "u_spell_level('photokinetic_blinding_glare') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, diff --git a/data/mods/MindOverMatter/powers/learning_eocs/pyrokinesis.json b/data/mods/MindOverMatter/powers/learning_eocs/pyrokinesis.json index 58152177f06fd..13389df59ab5b 100644 --- a/data/mods/MindOverMatter/powers/learning_eocs/pyrokinesis.json +++ b/data/mods/MindOverMatter/powers/learning_eocs/pyrokinesis.json @@ -31,9 +31,7 @@ { "not": { "u_know_recipe": "practice_pyrokinetic_cauterize" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "PYROKINETIC" } }, { "math": [ "u_spell_level('pyrokinetic_cauterize') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "PYROKINETIC" } }, { "math": [ "u_spell_level('pyrokinetic_cauterize') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_pyrokinetic_cauterize" }, @@ -138,9 +136,7 @@ { "not": { "u_know_recipe": "practice_pyrokinetic_cloak" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "PYROKINETIC" } }, { "math": [ "u_spell_level('pyrokinetic_cloak') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "PYROKINETIC" } }, { "math": [ "u_spell_level('pyrokinetic_cloak') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_pyrokinetic_cloak" }, @@ -221,9 +217,7 @@ { "not": { "u_know_recipe": "practice_pyrokinetic_lance" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "PYROKINETIC" } }, { "math": [ "u_spell_level('pyrokinetic_lance') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "PYROKINETIC" } }, { "math": [ "u_spell_level('pyrokinetic_lance') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_pyrokinetic_lance" }, @@ -310,9 +304,7 @@ { "not": { "u_know_recipe": "practice_pyrokinetic_aura" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "PYROKINETIC" } }, { "math": [ "u_spell_level('pyrokinetic_aura') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "PYROKINETIC" } }, { "math": [ "u_spell_level('pyrokinetic_aura') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_pyrokinetic_aura" }, @@ -339,10 +331,7 @@ { "and": [ { - "or": [ - { "math": [ "u_spell_level('pyrokinetic_cloak') >= 10" ] }, - { "math": [ "u_spell_level('pyrokinetic_aura') >= 6" ] } - ] + "or": [ { "math": [ "u_spell_level('pyrokinetic_cloak') >= 10" ] }, { "math": [ "u_spell_level('pyrokinetic_aura') >= 6" ] } ] }, { "math": [ "u_spell_level('pyrokinetic_quell_flames') >= 9" ] } ] @@ -355,10 +344,7 @@ ] }, "deactivate_condition": { - "or": [ - { "not": { "u_has_trait": "PYROKINETIC" } }, - { "math": [ "u_spell_level('pyrokinetic_flame_immunity') >= 1" ] } - ] + "or": [ { "not": { "u_has_trait": "PYROKINETIC" } }, { "math": [ "u_spell_level('pyrokinetic_flame_immunity') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, @@ -406,9 +392,7 @@ { "not": { "u_know_recipe": "practice_pyrokinetic_blast" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "PYROKINETIC" } }, { "math": [ "u_spell_level('pyrokinetic_blast') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "PYROKINETIC" } }, { "math": [ "u_spell_level('pyrokinetic_blast') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_pyrokinetic_blast" }, @@ -455,9 +439,7 @@ { "not": { "u_know_recipe": "practice_pyrokinetic_aoe_blast" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "PYROKINETIC" } }, { "math": [ "u_spell_level('pyrokinetic_aoe_blast') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "PYROKINETIC" } }, { "math": [ "u_spell_level('pyrokinetic_aoe_blast') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_pyrokinetic_aoe_blast" }, diff --git a/data/mods/MindOverMatter/powers/learning_eocs/telekinesis.json b/data/mods/MindOverMatter/powers/learning_eocs/telekinesis.json index 3fbb41ed76004..e6390b8917190 100644 --- a/data/mods/MindOverMatter/powers/learning_eocs/telekinesis.json +++ b/data/mods/MindOverMatter/powers/learning_eocs/telekinesis.json @@ -16,9 +16,7 @@ { "not": { "u_know_recipe": "practice_telekinetic_noise" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "TELEKINETIC" } }, { "math": [ "u_spell_level('telekinetic_noise') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "TELEKINETIC" } }, { "math": [ "u_spell_level('telekinetic_noise') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_telekinetic_noise" }, @@ -40,10 +38,7 @@ "or": [ { "test_eoc": "EOC_CONDITION_ODDS_OF_RANDOM_TIER_ONE_POWER_INSIGHT" }, { - "or": [ - { "math": [ "u_spell_level('telekinetic_push') >= 4" ] }, - { "math": [ "u_spell_level('telekinetic_noise') >= 1" ] } - ] + "or": [ { "math": [ "u_spell_level('telekinetic_push') >= 4" ] }, { "math": [ "u_spell_level('telekinetic_noise') >= 1" ] } ] } ] }, @@ -52,9 +47,7 @@ { "not": { "u_know_recipe": "practice_telekinetic_slam_down" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "TELEKINETIC" } }, { "math": [ "u_spell_level('telekinetic_slam_down') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "TELEKINETIC" } }, { "math": [ "u_spell_level('telekinetic_slam_down') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_telekinetic_slam_down" }, @@ -79,10 +72,7 @@ "or": [ { "test_eoc": "EOC_CONDITION_ODDS_OF_RANDOM_TIER_ONE_POWER_INSIGHT" }, { - "and": [ - { "math": [ "u_spell_level('telekinetic_push') >= 5" ] }, - { "math": [ "u_spell_level('telekinetic_pull') >= 5" ] } - ] + "and": [ { "math": [ "u_spell_level('telekinetic_push') >= 5" ] }, { "math": [ "u_spell_level('telekinetic_pull') >= 5" ] } ] } ] }, @@ -91,9 +81,7 @@ { "not": { "u_know_recipe": "practice_telekinetic_momentum" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "TELEKINETIC" } }, { "math": [ "u_spell_level('telekinetic_momentum') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "TELEKINETIC" } }, { "math": [ "u_spell_level('telekinetic_momentum') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_telekinetic_momentum" }, @@ -125,9 +113,7 @@ { "not": { "u_know_recipe": "practice_telekinetic_slowfall" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "TELEKINETIC" } }, { "math": [ "u_spell_level('telekinetic_slowfall') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "TELEKINETIC" } }, { "math": [ "u_spell_level('telekinetic_slowfall') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_telekinetic_slowfall" }, @@ -164,9 +150,7 @@ { "not": { "u_know_recipe": "practice_telekinetic_wave" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "TELEKINETIC" } }, { "math": [ "u_spell_level('telekinetic_wave') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "TELEKINETIC" } }, { "math": [ "u_spell_level('telekinetic_wave') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_telekinetic_wave" }, @@ -237,10 +221,7 @@ { "and": [ { - "or": [ - { "math": [ "u_spell_level('telekinetic_pull') >= 6" ] }, - { "math": [ "u_spell_level('telekinetic_push') >= 6" ] } - ] + "or": [ { "math": [ "u_spell_level('telekinetic_pull') >= 6" ] }, { "math": [ "u_spell_level('telekinetic_push') >= 6" ] } ] }, { "math": [ "u_spell_level('telekinetic_momentum') >= 5" ] } ] @@ -252,9 +233,7 @@ { "not": { "u_know_recipe": "practice_telekinetic_strength" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "TELEKINETIC" } }, { "math": [ "u_spell_level('telekinetic_strength') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "TELEKINETIC" } }, { "math": [ "u_spell_level('telekinetic_strength') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_telekinetic_strength" }, @@ -281,10 +260,7 @@ { "and": [ { - "or": [ - { "math": [ "u_spell_level('telekinetic_wave') >= 4" ] }, - { "math": [ "u_spell_level('telekinetic_push') >= 8" ] } - ] + "or": [ { "math": [ "u_spell_level('telekinetic_wave') >= 4" ] }, { "math": [ "u_spell_level('telekinetic_push') >= 8" ] } ] }, { "math": [ "u_spell_level('telekinetic_slam_down') >= 6" ] } ] @@ -296,9 +272,7 @@ { "not": { "u_know_recipe": "practice_telekinetic_hammer" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "TELEKINETIC" } }, { "math": [ "u_spell_level('telekinetic_hammer') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "TELEKINETIC" } }, { "math": [ "u_spell_level('telekinetic_hammer') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_telekinetic_hammer" }, @@ -380,9 +354,7 @@ { "not": { "u_know_recipe": "practice_telekinetic_shield" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "TELEKINETIC" } }, { "math": [ "u_spell_level('telekinetic_shield') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "TELEKINETIC" } }, { "math": [ "u_spell_level('telekinetic_shield') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_telekinetic_shield" }, @@ -415,10 +387,7 @@ ] }, { - "or": [ - { "math": [ "u_spell_level('telekinetic_push') >= 10" ] }, - { "math": [ "u_spell_level('telekinetic_pull') >= 10" ] } - ] + "or": [ { "math": [ "u_spell_level('telekinetic_push') >= 10" ] }, { "math": [ "u_spell_level('telekinetic_pull') >= 10" ] } ] } ] } @@ -429,9 +398,7 @@ { "not": { "u_know_recipe": "practice_telekinetic_explosion" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "TELEKINETIC" } }, { "math": [ "u_spell_level('telekinetic_explosion') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "TELEKINETIC" } }, { "math": [ "u_spell_level('telekinetic_explosion') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_telekinetic_explosion" }, @@ -502,10 +469,7 @@ { "and": [ { - "or": [ - { "math": [ "u_spell_level('telekinetic_push') >= 15" ] }, - { "math": [ "u_spell_level('telekinetic_pull') >= 15" ] } - ] + "or": [ { "math": [ "u_spell_level('telekinetic_push') >= 15" ] }, { "math": [ "u_spell_level('telekinetic_pull') >= 15" ] } ] }, { "or": [ @@ -523,10 +487,7 @@ ] }, "deactivate_condition": { - "or": [ - { "not": { "u_has_trait": "TELEKINETIC" } }, - { "math": [ "u_spell_level('telekinetic_move_large_weight') >= 1" ] } - ] + "or": [ { "not": { "u_has_trait": "TELEKINETIC" } }, { "math": [ "u_spell_level('telekinetic_move_large_weight') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, @@ -575,9 +536,7 @@ { "not": { "u_know_recipe": "practice_telekinetic_aegis" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "TELEKINETIC" } }, { "math": [ "u_spell_level('telekinetic_aegis') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "TELEKINETIC" } }, { "math": [ "u_spell_level('telekinetic_aegis') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_telekinetic_aegis" }, diff --git a/data/mods/MindOverMatter/powers/learning_eocs/telepathy.json b/data/mods/MindOverMatter/powers/learning_eocs/telepathy.json index e60459861ff57..61ed92e80870b 100644 --- a/data/mods/MindOverMatter/powers/learning_eocs/telepathy.json +++ b/data/mods/MindOverMatter/powers/learning_eocs/telepathy.json @@ -53,9 +53,7 @@ { "not": { "u_know_recipe": "practice_telepathic_mesmerize" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "TELEPATH" } }, { "math": [ "u_spell_level('telepathic_mesmerize') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "TELEPATH" } }, { "math": [ "u_spell_level('telepathic_mesmerize') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_telepathic_mesmerize" }, @@ -162,10 +160,7 @@ ] }, "deactivate_condition": { - "or": [ - { "not": { "u_has_trait": "TELEPATH" } }, - { "math": [ "u_spell_level('telepathic_animal_mind_control') >= 1" ] } - ] + "or": [ { "not": { "u_has_trait": "TELEPATH" } }, { "math": [ "u_spell_level('telepathic_animal_mind_control') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, @@ -193,10 +188,7 @@ { "and": [ { - "or": [ - { "math": [ "u_spell_level('telepathic_blast') >= 6" ] }, - { "math": [ "u_spell_level('telepathic_morale') >= 6" ] } - ] + "or": [ { "math": [ "u_spell_level('telepathic_blast') >= 6" ] }, { "math": [ "u_spell_level('telepathic_morale') >= 6" ] } ] }, { "math": [ "u_spell_level('telepathic_morale') >= 4" ] } ] @@ -208,9 +200,7 @@ { "not": { "u_know_recipe": "practice_telepathic_confusion" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "TELEPATH" } }, { "math": [ "u_spell_level('telepathic_confusion') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "TELEPATH" } }, { "math": [ "u_spell_level('telepathic_confusion') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_telepathic_confusion" }, @@ -235,10 +225,7 @@ "or": [ { "test_eoc": "EOC_CONDITION_ODDS_OF_RANDOM_TIER_TWO_POWER_INSIGHT" }, { - "and": [ - { "math": [ "u_spell_level('telepathic_blast') >= 8" ] }, - { "math": [ "u_spell_level('telepathic_morale') >= 8" ] } - ] + "and": [ { "math": [ "u_spell_level('telepathic_blast') >= 8" ] }, { "math": [ "u_spell_level('telepathic_morale') >= 8" ] } ] } ] }, @@ -290,9 +277,7 @@ { "not": { "u_know_recipe": "practice_telepathic_invisibility" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "TELEPATH" } }, { "math": [ "u_spell_level('telepathic_invisibility') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "TELEPATH" } }, { "math": [ "u_spell_level('telepathic_invisibility') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_telepathic_invisibility" }, @@ -319,10 +304,7 @@ { "and": [ { - "or": [ - { "math": [ "u_spell_level('telepathic_blast') >= 11" ] }, - { "math": [ "u_spell_level('telepathic_fear') >= 7" ] } - ] + "or": [ { "math": [ "u_spell_level('telepathic_blast') >= 11" ] }, { "math": [ "u_spell_level('telepathic_fear') >= 7" ] } ] }, { "math": [ "u_spell_level('telepathic_shield') >= 5" ] } ] @@ -334,9 +316,7 @@ { "not": { "u_know_recipe": "practice_telepathic_scream" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "TELEPATH" } }, { "math": [ "u_spell_level('telepathic_blast_radius') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "TELEPATH" } }, { "math": [ "u_spell_level('telepathic_blast_radius') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_telepathic_scream" }, @@ -368,9 +348,7 @@ { "not": { "u_know_recipe": "practice_telepathic_beast_taming" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "TELEPATH" } }, { "math": [ "u_spell_level('telepathic_beast_taming') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "TELEPATH" } }, { "math": [ "u_spell_level('telepathic_beast_taming') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_telepathic_beast_taming" }, @@ -418,9 +396,7 @@ { "not": { "u_know_recipe": "practice_telepathic_mind_control" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "TELEPATH" } }, { "math": [ "u_spell_level('telepathic_mind_control') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "TELEPATH" } }, { "math": [ "u_spell_level('telepathic_mind_control') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_telepathic_mind_control" }, diff --git a/data/mods/MindOverMatter/powers/learning_eocs/teleportation.json b/data/mods/MindOverMatter/powers/learning_eocs/teleportation.json index f4d44855ce24c..fc5c19066a272 100644 --- a/data/mods/MindOverMatter/powers/learning_eocs/teleportation.json +++ b/data/mods/MindOverMatter/powers/learning_eocs/teleportation.json @@ -46,10 +46,7 @@ "or": [ { "test_eoc": "EOC_CONDITION_ODDS_OF_RANDOM_TIER_TWO_POWER_INSIGHT" }, { - "and": [ - { "math": [ "u_spell_level('teleport_phase') >= 10" ] }, - { "math": [ "u_spell_level('teleport_stride') >= 5" ] } - ] + "and": [ { "math": [ "u_spell_level('teleport_phase') >= 10" ] }, { "math": [ "u_spell_level('teleport_stride') >= 5" ] } ] } ] }, @@ -85,10 +82,7 @@ "or": [ { "test_eoc": "EOC_CONDITION_ODDS_OF_RANDOM_TIER_ONE_POWER_INSIGHT" }, { - "and": [ - { "math": [ "u_spell_level('teleport_phase') >= 4" ] }, - { "math": [ "u_spell_level('teleport_slow') >= 6" ] } - ] + "and": [ { "math": [ "u_spell_level('teleport_phase') >= 4" ] }, { "math": [ "u_spell_level('teleport_slow') >= 6" ] } ] } ] }, @@ -134,9 +128,7 @@ { "not": { "u_know_recipe": "practice_teleport_transpose" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "TELEPORTER" } }, { "math": [ "u_spell_level('teleport_transpose') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "TELEPORTER" } }, { "math": [ "u_spell_level('teleport_transpose') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_teleport_transpose" }, @@ -161,10 +153,7 @@ "or": [ { "test_eoc": "EOC_CONDITION_ODDS_OF_RANDOM_TIER_TWO_POWER_INSIGHT" }, { - "and": [ - { "math": [ "u_spell_level('teleport_phase') >= 5" ] }, - { "math": [ "u_spell_level('teleport_slow') >= 10" ] } - ] + "and": [ { "math": [ "u_spell_level('teleport_phase') >= 5" ] }, { "math": [ "u_spell_level('teleport_slow') >= 10" ] } ] } ] }, @@ -173,9 +162,7 @@ { "not": { "u_know_recipe": "practice_teleport_displacement" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "TELEPORTER" } }, { "math": [ "u_spell_level('teleport_displacement') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "TELEPORTER" } }, { "math": [ "u_spell_level('teleport_displacement') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_teleport_displacement" }, @@ -202,10 +189,7 @@ { "and": [ { - "or": [ - { "math": [ "u_spell_level('teleport_slow') >= 10" ] }, - { "math": [ "u_spell_level('teleport_transpose') >= 6" ] } - ] + "or": [ { "math": [ "u_spell_level('teleport_slow') >= 10" ] }, { "math": [ "u_spell_level('teleport_transpose') >= 6" ] } ] }, { "math": [ "u_spell_level('teleport_stride') >= 4" ] } ] @@ -217,9 +201,7 @@ { "not": { "u_know_recipe": "practice_teleport_collapse" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "TELEPORTER" } }, { "math": [ "u_spell_level('teleport_collapse') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "TELEPORTER" } }, { "math": [ "u_spell_level('teleport_collapse') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_teleport_collapse" }, @@ -246,10 +228,7 @@ { "and": [ { - "or": [ - { "math": [ "u_spell_level('teleport_stride') >= 8" ] }, - { "math": [ "u_spell_level('teleport_collapse') >= 6" ] } - ] + "or": [ { "math": [ "u_spell_level('teleport_stride') >= 8" ] }, { "math": [ "u_spell_level('teleport_collapse') >= 6" ] } ] }, { "math": [ "u_spell_level('teleport_phase') >= 10" ] } ] @@ -329,10 +308,7 @@ "or": [ { "test_eoc": "EOC_CONDITION_ODDS_OF_RANDOM_TIER_THREE_POWER_INSIGHT" }, { - "and": [ - { "math": [ "u_spell_level('teleport_stride') >= 10" ] }, - { "math": [ "u_spell_level('teleport_farstep') >= 10" ] } - ] + "and": [ { "math": [ "u_spell_level('teleport_stride') >= 10" ] }, { "math": [ "u_spell_level('teleport_farstep') >= 10" ] } ] } ] }, @@ -408,10 +384,7 @@ "or": [ { "test_eoc": "EOC_CONDITION_ODDS_OF_RANDOM_TIER_THREE_POWER_INSIGHT" }, { - "and": [ - { "math": [ "u_spell_level('teleport_summon') >= 10" ] }, - { "math": [ "u_spell_level('teleport_gateway') >= 10" ] } - ] + "and": [ { "math": [ "u_spell_level('teleport_summon') >= 10" ] }, { "math": [ "u_spell_level('teleport_gateway') >= 10" ] } ] } ] }, @@ -420,9 +393,7 @@ { "not": { "u_know_recipe": "practice_teleport_reality_tear" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "TELEPORTER" } }, { "math": [ "u_spell_level('teleport_reality_tear') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "TELEPORTER" } }, { "math": [ "u_spell_level('teleport_reality_tear') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_teleport_reality_tear" }, diff --git a/data/mods/MindOverMatter/powers/learning_eocs/vitakinesis.json b/data/mods/MindOverMatter/powers/learning_eocs/vitakinesis.json index 538ce522ec7f2..440aa30ae2906 100644 --- a/data/mods/MindOverMatter/powers/learning_eocs/vitakinesis.json +++ b/data/mods/MindOverMatter/powers/learning_eocs/vitakinesis.json @@ -50,9 +50,7 @@ { "not": { "u_know_recipe": "practice_vita_stop_bleeding" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "VITAKINETIC" } }, { "math": [ "u_spell_level('vita_stop_bleeding') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "VITAKINETIC" } }, { "math": [ "u_spell_level('vita_stop_bleeding') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_vita_stop_bleeding" }, @@ -165,9 +163,7 @@ { "not": { "u_know_recipe": "practice_vita_remove_poison" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "VITAKINETIC" } }, { "math": [ "u_spell_level('vita_remove_poison') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "VITAKINETIC" } }, { "math": [ "u_spell_level('vita_remove_poison') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_vita_remove_poison" }, @@ -199,9 +195,7 @@ { "not": { "u_know_recipe": "practice_vita_cure_disease" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "VITAKINETIC" } }, { "math": [ "u_spell_level('vita_cure_disease') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "VITAKINETIC" } }, { "math": [ "u_spell_level('vita_cure_disease') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_vita_cure_disease" }, @@ -226,10 +220,7 @@ "or": [ { "test_eoc": "EOC_CONDITION_ODDS_OF_RANDOM_TIER_TWO_POWER_INSIGHT" }, { - "and": [ - { "math": [ "u_spell_level('vita_health_power') >= 8" ] }, - { "math": [ "u_spell_level('vita_cure_disease') >= 4" ] } - ] + "and": [ { "math": [ "u_spell_level('vita_health_power') >= 8" ] }, { "math": [ "u_spell_level('vita_cure_disease') >= 4" ] } ] } ] }, @@ -238,9 +229,7 @@ { "not": { "u_know_recipe": "practice_vita_sleeping_trance" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "VITAKINETIC" } }, { "math": [ "u_spell_level('vita_sleeping_trance') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "VITAKINETIC" } }, { "math": [ "u_spell_level('vita_sleeping_trance') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_vita_sleeping_trance" }, @@ -272,9 +261,7 @@ { "not": { "u_know_recipe": "practice_vita_stop_infection" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "VITAKINETIC" } }, { "math": [ "u_spell_level('vita_stop_infection') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "VITAKINETIC" } }, { "math": [ "u_spell_level('vita_stop_infection') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_vita_stop_infection" }, @@ -311,9 +298,7 @@ { "not": { "u_know_recipe": "practice_vita_healing_trance" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "VITAKINETIC" } }, { "math": [ "u_spell_level('vita_healing_trance') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "VITAKINETIC" } }, { "math": [ "u_spell_level('vita_healing_trance') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_vita_healing_trance" }, @@ -345,9 +330,7 @@ { "not": { "u_know_recipe": "practice_vita_attack_touch" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "VITAKINETIC" } }, { "math": [ "u_spell_level('vita_attack_touch') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "VITAKINETIC" } }, { "math": [ "u_spell_level('vita_attack_touch') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_vita_attack_touch" }, @@ -389,9 +372,7 @@ { "not": { "u_know_recipe": "practice_vita_blood_purge" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "VITAKINETIC" } }, { "math": [ "u_spell_level('vita_blood_purge') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "VITAKINETIC" } }, { "math": [ "u_spell_level('vita_blood_purge') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_vita_blood_purge" }, @@ -433,9 +414,7 @@ { "not": { "u_know_recipe": "practice_vita_banish_illness" } } ] }, - "deactivate_condition": { - "or": [ { "not": { "u_has_trait": "VITAKINETIC" } }, { "math": [ "u_spell_level('vita_banish_illness') >= 1" ] } ] - }, + "deactivate_condition": { "or": [ { "not": { "u_has_trait": "VITAKINETIC" } }, { "math": [ "u_spell_level('vita_banish_illness') >= 1" ] } ] }, "effect": [ { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, { "u_learn_recipe": "practice_vita_banish_illness" }, diff --git a/data/mods/MindOverMatter/powers/vitakinesis_eoc.json b/data/mods/MindOverMatter/powers/vitakinesis_eoc.json index cc23541319e89..3b45f5561ab63 100644 --- a/data/mods/MindOverMatter/powers/vitakinesis_eoc.json +++ b/data/mods/MindOverMatter/powers/vitakinesis_eoc.json @@ -1076,10 +1076,7 @@ "type": "effect_on_condition", "id": "EOC_VITAKIN_SUPER_HEAL_EFFECTS", "effect": [ - { - "if": { "math": [ "u_vitamin('redcells') < 0" ] }, - "then": { "math": [ "u_vitamin('redcells')", "+=", "150" ] } - }, + { "if": { "math": [ "u_vitamin('redcells') < 0" ] }, "then": { "math": [ "u_vitamin('redcells')", "+=", "150" ] } }, { "if": { "math": [ "u_vitamin('redcells') < -1000" ] }, "then": { "math": [ "u_vitamin('redcells')", "+=", "500" ] } @@ -1088,10 +1085,7 @@ "if": { "math": [ "u_vitamin('redcells') < -10000" ] }, "then": { "math": [ "u_vitamin('redcells')", "+=", "2500" ] } }, - { - "if": { "math": [ "u_vitamin('blood') < 0" ] }, - "then": { "math": [ "u_vitamin('blood')", "+=", "150" ] } - }, + { "if": { "math": [ "u_vitamin('blood') < 0" ] }, "then": { "math": [ "u_vitamin('blood')", "+=", "150" ] } }, { "if": { "math": [ "u_vitamin('blood') < -1000" ] }, "then": { "math": [ "u_vitamin('blood')", "+=", "500" ] } diff --git a/data/mods/Sky_Island/dialog_statue.json b/data/mods/Sky_Island/dialog_statue.json index dee7fad877c2e..8171da67a7098 100644 --- a/data/mods/Sky_Island/dialog_statue.json +++ b/data/mods/Sky_Island/dialog_statue.json @@ -393,9 +393,7 @@ }, { "text": "Unlock: Slaughter Missions", - "condition": { - "and": [ { "not": { "u_has_mission": "SKYISLAND_UPGRADE_slaughter" } }, { "math": [ "slaughterunlocked == 0" ] } ] - }, + "condition": { "and": [ { "not": { "u_has_mission": "SKYISLAND_UPGRADE_slaughter" } }, { "math": [ "slaughterunlocked == 0" ] } ] }, "effect": [ { "assign_mission": "SKYISLAND_UPGRADE_slaughter" } ], "topic": "SKYISLAND_UPGRADES_FEATURES" }, @@ -419,17 +417,13 @@ }, { "text": "Unlock: Expedition Missions", - "condition": { - "and": [ { "not": { "u_has_mission": "SKYISLAND_UPGRADE_bonusmissions1" } }, { "math": [ "bonusmissions == 0" ] } ] - }, + "condition": { "and": [ { "not": { "u_has_mission": "SKYISLAND_UPGRADE_bonusmissions1" } }, { "math": [ "bonusmissions == 0" ] } ] }, "effect": [ { "assign_mission": "SKYISLAND_UPGRADE_bonusmissions1" } ], "topic": "SKYISLAND_UPGRADES_FEATURES" }, { "text": "Unlock: Two Missions per Expedition", - "condition": { - "and": [ { "not": { "u_has_mission": "SKYISLAND_UPGRADE_bonusmissions2" } }, { "math": [ "bonusmissions == 1" ] } ] - }, + "condition": { "and": [ { "not": { "u_has_mission": "SKYISLAND_UPGRADE_bonusmissions2" } }, { "math": [ "bonusmissions == 1" ] } ] }, "effect": [ { "assign_mission": "SKYISLAND_UPGRADE_bonusmissions2" } ], "topic": "SKYISLAND_UPGRADES_FEATURES" }, @@ -479,9 +473,7 @@ "responses": [ { "text": "Construct: Bunker Entrance", - "condition": { - "and": [ { "not": { "u_has_mission": "SKYISLAND_BUILD_base1" } }, { "math": [ "skyisland_build_base == 0" ] } ] - }, + "condition": { "and": [ { "not": { "u_has_mission": "SKYISLAND_BUILD_base1" } }, { "math": [ "skyisland_build_base == 0" ] } ] }, "effect": [ { "assign_mission": "SKYISLAND_BUILD_base1" } ], "topic": "SKYISLAND_UPGRADES_INFRASTRUCTURE" }, diff --git a/data/mods/Sky_Island/obelisk_selector.json b/data/mods/Sky_Island/obelisk_selector.json index 858a3958304a9..3412cc883d438 100644 --- a/data/mods/Sky_Island/obelisk_selector.json +++ b/data/mods/Sky_Island/obelisk_selector.json @@ -176,9 +176,7 @@ "type": "effect_on_condition", "id": "EOC_Lab_Loc_Warp", "//": "Picks a random underground lab and activates the actual teleport EOC.", - "condition": { - "and": [ { "math": [ "labsunlocked == 1" ] }, { "u_has_items": { "item": "warp_labs_catalyst", "count": 1 } } ] - }, + "condition": { "and": [ { "math": [ "labsunlocked == 1" ] }, { "u_has_items": { "item": "warp_labs_catalyst", "count": 1 } } ] }, "effect": [ { "u_location_variable": { "global_val": "OM_missionspot" }, diff --git a/data/mods/TEST_DATA/widgets.json b/data/mods/TEST_DATA/widgets.json index c7b29e3f4c076..803232b67cb87 100644 --- a/data/mods/TEST_DATA/widgets.json +++ b/data/mods/TEST_DATA/widgets.json @@ -6,12 +6,7 @@ "label": "Activity", "style": "text", "clauses": [ - { - "id": "none", - "text": "None", - "color": "light_gray", - "condition": { "math": [ "u_val('activity_level') == 0" ] } - }, + { "id": "none", "text": "None", "color": "light_gray", "condition": { "math": [ "u_val('activity_level') == 0" ] } }, { "id": "light", "text": "Light", @@ -118,10 +113,7 @@ "sym": "b", "color": "light_red", "condition": { - "and": [ - { "u_has_effect": "bleed", "intensity": 1 }, - { "math": [ "u_effect_intensity('bleed', 'bodypart': _widget) < 11" ] } - ] + "and": [ { "u_has_effect": "bleed", "intensity": 1 }, { "math": [ "u_effect_intensity('bleed', 'bodypart': _widget) < 11" ] } ] } }, { @@ -266,12 +258,7 @@ "color": "green", "condition": { "and": [ { "math": [ "u_val('thirst') >= -60" ] }, { "math": [ "u_val('thirst') < -20" ] } ] } }, - { - "id": "turgid", - "text": "Turgid", - "color": "green", - "condition": { "math": [ "u_val('thirst') < -60" ] } - } + { "id": "turgid", "text": "Turgid", "color": "green", "condition": { "math": [ "u_val('thirst') < -60" ] } } ] }, { @@ -456,12 +443,7 @@ "separator": ": ", "style": "clause", "clauses": [ - { - "id": "scorching", - "text": "Scorching!", - "color": "red", - "condition": { "math": [ "u_val('body_temp') > 9500" ] } - }, + { "id": "scorching", "text": "Scorching!", "color": "red", "condition": { "math": [ "u_val('body_temp') > 9500" ] } }, { "id": "very_hot", "text": "Very hot!", @@ -519,36 +501,28 @@ "text": "(Rising!)", "sym": "↑↑", "color": "light_red", - "condition": { - "and": [ { "math": [ "u_val('body_temp_delta') <= 4500" ] }, { "math": [ "u_val('body_temp_delta') > 3000" ] } ] - } + "condition": { "and": [ { "math": [ "u_val('body_temp_delta') <= 4500" ] }, { "math": [ "u_val('body_temp_delta') > 3000" ] } ] } }, { "id": "rising1", "text": "(Rising)", "sym": "↑", "color": "yellow", - "condition": { - "and": [ { "math": [ "u_val('body_temp_delta') <= 3000" ] }, { "math": [ "u_val('body_temp_delta') > 1500" ] } ] - } + "condition": { "and": [ { "math": [ "u_val('body_temp_delta') <= 3000" ] }, { "math": [ "u_val('body_temp_delta') > 1500" ] } ] } }, { "id": "falling1", "text": "(Falling)", "sym": "↓", "color": "light_blue", - "condition": { - "and": [ { "math": [ "u_val('body_temp_delta') < -1500" ] }, { "math": [ "u_val('body_temp_delta') >= -3000" ] } ] - } + "condition": { "and": [ { "math": [ "u_val('body_temp_delta') < -1500" ] }, { "math": [ "u_val('body_temp_delta') >= -3000" ] } ] } }, { "id": "falling2", "text": "(Falling!)", "sym": "↓↓", "color": "cyan", - "condition": { - "and": [ { "math": [ "u_val('body_temp_delta') < -3000" ] }, { "math": [ "u_val('body_temp_delta') >= -4500" ] } ] - } + "condition": { "and": [ { "math": [ "u_val('body_temp_delta') < -3000" ] }, { "math": [ "u_val('body_temp_delta') >= -4500" ] } ] } }, { "id": "falling3", @@ -1165,12 +1139,7 @@ "label": "Weight", "style": "text", "clauses": [ - { - "id": "skeletal", - "text": "Skeletal", - "color": "red", - "condition": { "math": [ "u_val('bmi_permil') <= 1000" ] } - }, + { "id": "skeletal", "text": "Skeletal", "color": "red", "condition": { "math": [ "u_val('bmi_permil') <= 1000" ] } }, { "id": "emaciated", "text": "Emaciated", @@ -1331,10 +1300,7 @@ "sym": "│", "color": "c_light_red_white", "condition": { - "and": [ - { "u_has_effect": "bleed", "intensity": 1 }, - { "math": [ "u_effect_intensity('bleed', 'bodypart': _widget) < 11" ] } - ] + "and": [ { "u_has_effect": "bleed", "intensity": 1 }, { "math": [ "u_effect_intensity('bleed', 'bodypart': _widget) < 11" ] } ] } }, { diff --git a/data/mods/Xedra_Evolved/effects/vampvirus.json b/data/mods/Xedra_Evolved/effects/vampvirus.json index 1dd8802d3926d..6caa9ec81b5f6 100644 --- a/data/mods/Xedra_Evolved/effects/vampvirus.json +++ b/data/mods/Xedra_Evolved/effects/vampvirus.json @@ -178,10 +178,7 @@ { "id": "EOC_VAMPVIRUS", "condition": { - "and": [ - { "u_has_effect": "vampire_virus", "intensity": 1 }, - { "math": [ "u_effect_intensity('vampire_virus') == 1" ] } - ] + "and": [ { "u_has_effect": "vampire_virus", "intensity": 1 }, { "math": [ "u_effect_intensity('vampire_virus') == 1" ] } ] }, "effect": { "run_eocs": { @@ -225,10 +222,7 @@ { "id": "EOC_VAMPVIRUS1", "condition": { - "and": [ - { "u_has_effect": "vampire_virus", "intensity": 2 }, - { "math": [ "u_effect_intensity('vampire_virus') == 2" ] } - ] + "and": [ { "u_has_effect": "vampire_virus", "intensity": 2 }, { "math": [ "u_effect_intensity('vampire_virus') == 2" ] } ] }, "effect": { "run_eocs": { @@ -269,10 +263,7 @@ { "id": "EOC_VAMPVIRUS2", "condition": { - "and": [ - { "u_has_effect": "vampire_virus", "intensity": 3 }, - { "math": [ "u_effect_intensity('vampire_virus') == 3" ] } - ] + "and": [ { "u_has_effect": "vampire_virus", "intensity": 3 }, { "math": [ "u_effect_intensity('vampire_virus') == 3" ] } ] }, "effect": { "run_eocs": { @@ -382,10 +373,7 @@ { "id": "EOC_VAMPVIRUS_HUNGER", "condition": { - "and": [ - { "u_has_effect": "vampire_virus", "intensity": 1 }, - { "math": [ "u_effect_intensity('vampire_virus') >= 1" ] } - ] + "and": [ { "u_has_effect": "vampire_virus", "intensity": 1 }, { "math": [ "u_effect_intensity('vampire_virus') >= 1" ] } ] }, "effect": { "run_eocs": { diff --git a/data/mods/Xedra_Evolved/eocs/give_a_class_eoc.json b/data/mods/Xedra_Evolved/eocs/give_a_class_eoc.json index 7edb1f99fb4da..9ddb4b9ecffd3 100644 --- a/data/mods/Xedra_Evolved/eocs/give_a_class_eoc.json +++ b/data/mods/Xedra_Evolved/eocs/give_a_class_eoc.json @@ -53,15 +53,11 @@ "type": "effect_on_condition", "id": "EOC_XE_MAGIC_BAD_DREAMS", "recurrence": [ "30 m", "2 h" ], - "deactivate_condition": { - "and": [ { "math": [ "eater_dreamer_sequence < -1" ] }, { "math": [ "inventor_dreamsmith_sequence < -1" ] } ] - }, + "deactivate_condition": { "and": [ { "math": [ "eater_dreamer_sequence < -1" ] }, { "math": [ "inventor_dreamsmith_sequence < -1" ] } ] }, "condition": { "and": [ { "u_has_effect": "sleep" }, - { - "or": [ { "math": [ "eater_dreamer_sequence > 0" ] }, { "math": [ "inventor_dreamsmith_sequence > 0" ] } ] - } + { "or": [ { "math": [ "eater_dreamer_sequence > 0" ] }, { "math": [ "inventor_dreamsmith_sequence > 0" ] } ] } ] }, "effect": [ { "u_message": "XE_BAD_DREAMS", "type": "bad", "snippet": true } ] diff --git a/data/mods/Xedra_Evolved/eocs/magic_potential_eoc.json b/data/mods/Xedra_Evolved/eocs/magic_potential_eoc.json index f84aed04e394b..e533aedb57d56 100644 --- a/data/mods/Xedra_Evolved/eocs/magic_potential_eoc.json +++ b/data/mods/Xedra_Evolved/eocs/magic_potential_eoc.json @@ -35,9 +35,7 @@ ] }, { - "if": { - "and": [ { "math": [ "u_counter_portal_storm_counter > 0" ] }, { "math": [ "magic_potential_from_ps == 0" ] } ] - }, + "if": { "and": [ { "math": [ "u_counter_portal_storm_counter > 0" ] }, { "math": [ "magic_potential_from_ps == 0" ] } ] }, "then": [ { "math": [ "magic_potential", "++" ] }, { "math": [ "magic_potential_from_ps", "=", "1" ] }, diff --git a/data/mods/Xedra_Evolved/eocs/magic_weather_control.json b/data/mods/Xedra_Evolved/eocs/magic_weather_control.json index 48c5e69f476e9..62048b5dda4cc 100644 --- a/data/mods/Xedra_Evolved/eocs/magic_weather_control.json +++ b/data/mods/Xedra_Evolved/eocs/magic_weather_control.json @@ -75,9 +75,7 @@ { "type": "effect_on_condition", "id": "EOC_WEATHER_CONTROL_LIGHT_DRIZZLE_TO_DRIZZLE", - "condition": { - "and": [ { "math": [ "magic_weather_light_drizzle == 1" ] }, { "math": [ "u_weather_change_limit >= 2" ] } ] - }, + "condition": { "and": [ { "math": [ "magic_weather_light_drizzle == 1" ] }, { "math": [ "u_weather_change_limit >= 2" ] } ] }, "effect": [ { "if": "u_is_outside", "then": { "u_message": "The rain picks up.", "type": "neutral" } }, { "math": [ "magic_weather_light_drizzle", "=", "0" ] }, @@ -323,9 +321,7 @@ { "type": "effect_on_condition", "id": "EOC_WEATHER_CONTROL_LIGHT_DRIZZLE_TO_NOTHING", - "condition": { - "and": [ { "math": [ "magic_weather_light_drizzle == 1" ] }, { "math": [ "u_weather_change_limit <= 0" ] } ] - }, + "condition": { "and": [ { "math": [ "magic_weather_light_drizzle == 1" ] }, { "math": [ "u_weather_change_limit <= 0" ] } ] }, "effect": [ { "math": [ "magic_weather_light_drizzle", "=", "0" ] }, { "run_eocs": "EOC_CALL_NEXT_WEATHER" } ] }, { diff --git a/data/mods/Xedra_Evolved/eocs/playable_changeling_advancement_eocs.json b/data/mods/Xedra_Evolved/eocs/playable_changeling_advancement_eocs.json index fa89e2fcb1046..db0d04261b0ce 100644 --- a/data/mods/Xedra_Evolved/eocs/playable_changeling_advancement_eocs.json +++ b/data/mods/Xedra_Evolved/eocs/playable_changeling_advancement_eocs.json @@ -93,10 +93,7 @@ "eoc_type": "EVENT", "required_event": "character_wakes_up", "condition": { - "and": [ - { "u_has_trait": "UNKNOWING_CHANGELING_NOBLE" }, - { "math": [ "u_changeling_advancement_dreams_counter >= 1" ] } - ] + "and": [ { "u_has_trait": "UNKNOWING_CHANGELING_NOBLE" }, { "math": [ "u_changeling_advancement_dreams_counter >= 1" ] } ] }, "effect": [ { "u_message": "XE_CHANGELING_NOBLE", "type": "neutral", "snippet": true }, diff --git a/data/mods/Xedra_Evolved/mutations/mutations.json b/data/mods/Xedra_Evolved/mutations/mutations.json index 4eb752954da6b..6d9b9babc05ce 100644 --- a/data/mods/Xedra_Evolved/mutations/mutations.json +++ b/data/mods/Xedra_Evolved/mutations/mutations.json @@ -514,10 +514,7 @@ }, { "condition": { - "and": [ - { "math": [ "u_vitamin('human_blood_vitamin') > 0" ] }, - { "math": [ "u_vitamin('human_blood_vitamin') < 1800" ] } - ] + "and": [ { "math": [ "u_vitamin('human_blood_vitamin') > 0" ] }, { "math": [ "u_vitamin('human_blood_vitamin') < 1800" ] } ] }, "values": [ { "value": "REGEN_HP", "multiply": { "math": [ "5 + (u_vitamin('human_blood_vitamin') / 300)" ] } }, diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_magic_terrain_adjustments.json b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_magic_terrain_adjustments.json index f8d91a0116839..24aa990d224c0 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_magic_terrain_adjustments.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_magic_terrain_adjustments.json @@ -382,9 +382,7 @@ "id": "EOC_UNDINE_ELEMENTAL_MAGIC_PENALTY_TOO_DRY", "eoc_type": "EVENT", "required_event": "opens_spellbook", - "condition": { - "and": [ { "math": [ "time_since(u_timer_undine_last_in_water) >= time('6 h')" ] }, { "u_has_trait": "UNDINE" } ] - }, + "condition": { "and": [ { "math": [ "time_since(u_timer_undine_last_in_water) >= time('6 h')" ] }, { "u_has_trait": "UNDINE" } ] }, "effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'UNDINE' )", "=", "3" ] } ] } ] diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/sylph_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/sylph_eocs.json index 5a7683274831c..25dd952b19327 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/sylph_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/sylph_eocs.json @@ -160,10 +160,7 @@ "type": "effect_on_condition", "id": "EOC_SYLPH_WIND_TRANSLOCATE_CHECK", "condition": { - "and": [ - "u_is_outside", - { "or": [ { "math": [ "u_val('pos_z') >= 3" ] }, { "math": [ "weather('windpower') >= 20" ] } ] } - ] + "and": [ "u_is_outside", { "or": [ { "math": [ "u_val('pos_z') >= 3" ] }, { "math": [ "weather('windpower') >= 20" ] } ] } ] }, "effect": [ { "u_cast_spell": { "id": "paraclesian_translocate" } } ], "false_effect": [ diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/sylph_spell_learning_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/sylph_spell_learning_eocs.json index 5c3fb58ad28e2..e34e54cfb685d 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/sylph_spell_learning_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/sylph_spell_learning_eocs.json @@ -128,10 +128,7 @@ "type": "effect_on_condition", "id": "EOC_LEVELER_SYLPH_OMINOUS_WIND", "condition": { - "and": [ - { "math": [ "u_spell_level('ominous_wind') >= 0" ] }, - { "math": [ "u_spell_level('ominous_wind') < 20" ] } - ] + "and": [ { "math": [ "u_spell_level('ominous_wind') >= 0" ] }, { "math": [ "u_spell_level('ominous_wind') < 20" ] } ] }, "effect": [ { @@ -254,10 +251,7 @@ "type": "effect_on_condition", "id": "EOC_LEVELER_SYLPH_SUMMON_AIR_SPRITE", "condition": { - "and": [ - { "math": [ "u_spell_level('summon_air_sprite') >= 0" ] }, - { "math": [ "u_spell_level('summon_air_sprite') < 35" ] } - ] + "and": [ { "math": [ "u_spell_level('summon_air_sprite') >= 0" ] }, { "math": [ "u_spell_level('summon_air_sprite') < 35" ] } ] }, "effect": [ { diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/undine_spell_learning_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/undine_spell_learning_eocs.json index 86bf54b5c0c85..bfbd4bb49f6f5 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/undine_spell_learning_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/undine_spell_learning_eocs.json @@ -83,10 +83,7 @@ "type": "effect_on_condition", "id": "EOC_LEVELER_UNDINE_CREATE_FOG", "condition": { - "and": [ - { "math": [ "u_spell_level('create_fog') >= 0" ] }, - { "math": [ "u_spell_level('create_fog') < dex_to_level(1)" ] } - ] + "and": [ { "math": [ "u_spell_level('create_fog') >= 0" ] }, { "math": [ "u_spell_level('create_fog') < dex_to_level(1)" ] } ] }, "effect": [ { @@ -101,10 +98,7 @@ "type": "effect_on_condition", "id": "EOC_LEVELER_UNDINE_GRANT_BUOYANCY", "condition": { - "and": [ - { "math": [ "u_spell_level('grant_buoyancy') >= 0" ] }, - { "math": [ "u_spell_level('grant_buoyancy') < 20" ] } - ] + "and": [ { "math": [ "u_spell_level('grant_buoyancy') >= 0" ] }, { "math": [ "u_spell_level('grant_buoyancy') < 20" ] } ] }, "effect": [ { @@ -154,9 +148,7 @@ { "type": "effect_on_condition", "id": "EOC_LEVELER_UNDINE_WAVE_RIDER", - "condition": { - "and": [ { "math": [ "u_spell_level('wave_rider') >= 0" ] }, { "math": [ "u_spell_level('wave_rider') < 20" ] } ] - }, + "condition": { "and": [ { "math": [ "u_spell_level('wave_rider') >= 0" ] }, { "math": [ "u_spell_level('wave_rider') < 20" ] } ] }, "effect": [ { "u_message": "Your time spent among the flowing waters has increased your facility with your fae magicks.", @@ -170,10 +162,7 @@ "type": "effect_on_condition", "id": "EOC_LEVELER_UNDINE_WATER_SEALED", "condition": { - "and": [ - { "math": [ "u_spell_level('water_pocket') >= 0" ] }, - { "math": [ "u_spell_level('water_pocket') < 20" ] } - ] + "and": [ { "math": [ "u_spell_level('water_pocket') >= 0" ] }, { "math": [ "u_spell_level('water_pocket') < 20" ] } ] }, "effect": [ { @@ -187,9 +176,7 @@ { "type": "effect_on_condition", "id": "EOC_LEVELER_UNDINE_SUMMON_FISH", - "condition": { - "and": [ { "math": [ "u_spell_level('summon_fish') >= 0" ] }, { "math": [ "u_spell_level('summon_fish') < 35" ] } ] - }, + "condition": { "and": [ { "math": [ "u_spell_level('summon_fish') >= 0" ] }, { "math": [ "u_spell_level('summon_fish') < 35" ] } ] }, "effect": [ { "u_message": "Your time spent among the flowing waters has increased your facility with your fae magicks.", @@ -202,9 +189,7 @@ { "type": "effect_on_condition", "id": "EOC_LEVELER_UNDINE_CHARM_FISH", - "condition": { - "and": [ { "math": [ "u_spell_level('charm_fish') >= 0" ] }, { "math": [ "u_spell_level('charm_fish') < 35" ] } ] - }, + "condition": { "and": [ { "math": [ "u_spell_level('charm_fish') >= 0" ] }, { "math": [ "u_spell_level('charm_fish') < 35" ] } ] }, "effect": [ { "u_message": "Your time spent among the flowing waters has increased your facility with your fae magicks.", @@ -218,10 +203,7 @@ "type": "effect_on_condition", "id": "EOC_LEVELER_UNDINE_SUMMON_KRAKEN", "condition": { - "and": [ - { "math": [ "u_spell_level('summon_kraken') >= 0" ] }, - { "math": [ "u_spell_level('summon_kraken') < 35" ] } - ] + "and": [ { "math": [ "u_spell_level('summon_kraken') >= 0" ] }, { "math": [ "u_spell_level('summon_kraken') < 35" ] } ] }, "effect": [ { diff --git a/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json b/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json index 53b831a872e87..79ea3f9d2b291 100644 --- a/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json @@ -1589,10 +1589,7 @@ "type": "effect_on_condition", "id": "EOC_SELKIE_CHANGE_WEATHER_RAINS_NOT_WINTER", "condition": { - "and": [ - { "math": [ "u_weather_change_limit <= 2" ] }, - { "not": { "u_has_effect": "effect_controlling_weather_rains" } } - ] + "and": [ { "math": [ "u_weather_change_limit <= 2" ] }, { "not": { "u_has_effect": "effect_controlling_weather_rains" } } ] }, "effect": [ { @@ -1642,10 +1639,7 @@ "type": "effect_on_condition", "id": "EOC_SELKIE_CHANGE_WEATHER_RAINSTORM_NOT_WINTER", "condition": { - "and": [ - { "math": [ "u_weather_change_limit <= 3" ] }, - { "not": { "u_has_effect": "effect_controlling_weather_rainstorm" } } - ] + "and": [ { "math": [ "u_weather_change_limit <= 3" ] }, { "not": { "u_has_effect": "effect_controlling_weather_rainstorm" } } ] }, "effect": [ { diff --git a/data/mods/Xedra_Evolved/spells/hedge_magic_eocs.json b/data/mods/Xedra_Evolved/spells/hedge_magic_eocs.json index 08ef8ce130bfe..244717c11cfd5 100644 --- a/data/mods/Xedra_Evolved/spells/hedge_magic_eocs.json +++ b/data/mods/Xedra_Evolved/spells/hedge_magic_eocs.json @@ -227,9 +227,7 @@ "type": "effect_on_condition", "id": "EOC_HEDGE_ACTIVITY_LEVEL_BREAKS_INCREASE_HEALING_RATE", "recurrence": 1, - "condition": { - "and": [ { "u_has_effect": "effect_hedge_increase_healing_rate" }, { "math": [ "u_val('activity_level') >= 3" ] } ] - }, + "condition": { "and": [ { "u_has_effect": "effect_hedge_increase_healing_rate" }, { "math": [ "u_val('activity_level') >= 3" ] } ] }, "effect": [ { "u_lose_effect": "effect_hedge_increase_healing_rate" } ] }, { @@ -316,9 +314,7 @@ "intensity": { "math": [ "u_skinchanged_penalty - 1" ] } }, { - "if": { - "and": [ { "math": [ "u_val('intelligence') >= 4" ] }, { "u_has_effect": "effect_skinchanged_animalistic_mind" } ] - }, + "if": { "and": [ { "math": [ "u_val('intelligence') >= 4" ] }, { "u_has_effect": "effect_skinchanged_animalistic_mind" } ] }, "then": [ { "u_lose_effect": "effect_skinchanged_animalistic_mind" }, { diff --git a/data/mods/Xedra_Evolved/spells/lilin_spell_eocs.json b/data/mods/Xedra_Evolved/spells/lilin_spell_eocs.json index 4cac6732ef9b0..f9eb173e9a212 100644 --- a/data/mods/Xedra_Evolved/spells/lilin_spell_eocs.json +++ b/data/mods/Xedra_Evolved/spells/lilin_spell_eocs.json @@ -139,19 +139,13 @@ { "math": [ "u_npc_fear()", "+=", "1 + (u_effect_intensity('effect_lilin_ruach_drain_side_effects') / 2)" ] }, { "if": { - "and": [ - { "math": [ "rand(1) == 1" ] }, - { "math": [ "u_effect_intensity('effect_lilin_ruach_drain_side_effects') >= 1" ] } - ] + "and": [ { "math": [ "rand(1) == 1" ] }, { "math": [ "u_effect_intensity('effect_lilin_ruach_drain_side_effects') >= 1" ] } ] }, "then": { "math": [ "u_npc_trust()", "-=", "1 + (u_effect_intensity('effect_lilin_ruach_drain_side_effects') / 2)" ] } }, { "if": { - "and": [ - { "math": [ "rand(2) == 2" ] }, - { "math": [ "u_effect_intensity('effect_lilin_ruach_drain_side_effects') >= 2" ] } - ] + "and": [ { "math": [ "rand(2) == 2" ] }, { "math": [ "u_effect_intensity('effect_lilin_ruach_drain_side_effects') >= 2" ] } ] }, "then": { "math": [ "u_npc_value()", "-=", "1 + (u_effect_intensity('effect_lilin_ruach_drain_side_effects') / 2)" ] } }, @@ -187,10 +181,7 @@ }, { "if": { - "and": [ - { "math": [ "rand(1) == 1" ] }, - { "math": [ "u_effect_intensity('effect_lilin_ruach_drain_side_effects') >= 2" ] } - ] + "and": [ { "math": [ "rand(1) == 1" ] }, { "math": [ "u_effect_intensity('effect_lilin_ruach_drain_side_effects') >= 2" ] } ] }, "then": { "math": [ "u_val('sleepiness')", "+=", "2 + (u_effect_intensity('effect_lilin_ruach_drain_side_effects') * 1.5)" ] } }, @@ -365,10 +356,7 @@ "effect": [ { "math": [ "u_vitamin('lilin_ruach_vitamin')", "-=", "300" ] }, { "math": [ "u_val('sleepiness')", "-=", "rng(200,350)" ] }, - { - "if": { "math": [ "u_val('sleepiness') < 0" ] }, - "then": { "math": [ "u_val('sleepiness')", "=", "0" ] } - }, + { "if": { "math": [ "u_val('sleepiness') < 0" ] }, "then": { "math": [ "u_val('sleepiness')", "=", "0" ] } }, { "math": [ "u_val('sleep_deprivation')", "=", "0" ] }, { "u_message": "As a cool breeze touches your skin, you feel much more awake.", "type": "good" } ],