diff --git a/data/mods/MindOverMatter/effects/effects_psionic.json b/data/mods/MindOverMatter/effects/effects_psionic.json index cd0f8724c31fc..b437c57faad50 100644 --- a/data/mods/MindOverMatter/effects/effects_psionic.json +++ b/data/mods/MindOverMatter/effects/effects_psionic.json @@ -670,31 +670,31 @@ "values": [ { "value": "ARMOR_CUT", - "add": { "math": [ "( ( ( u_spell_level('clair_spot_weakness') * 1) + 4) * (scaling_factor(u_val('intelligence') ) ) )" ] } + "add": { "math": [ "( ( u_discern_weakness_clear_power_level * 1.5) + 2) * u_discern_weakness_clear_intelligence" ] } }, { "value": "ARMOR_BASH", - "add": { "math": [ "( ( ( u_spell_level('clair_spot_weakness') * 1) + 4) * (scaling_factor(u_val('intelligence') ) ) )" ] } + "add": { "math": [ "( ( u_discern_weakness_clear_power_level * 1.5) + 2) * u_discern_weakness_clear_intelligence" ] } }, { "value": "ARMOR_STAB", - "add": { "math": [ "( ( ( u_spell_level('clair_spot_weakness') * 1) + 4) * (scaling_factor(u_val('intelligence') ) ) )" ] } + "add": { "math": [ "( ( u_discern_weakness_clear_power_level * 1.5) + 2) * u_discern_weakness_clear_intelligence" ] } }, { "value": "ARMOR_BULLET", - "add": { "math": [ "( ( ( u_spell_level('clair_spot_weakness') * 1) + 4) * (scaling_factor(u_val('intelligence') ) ) )" ] } + "add": { "math": [ "( ( u_discern_weakness_clear_power_level * 1.5) + 2) * u_discern_weakness_clear_intelligence" ] } }, { "value": "ARMOR_ELEC", - "add": { "math": [ "( ( ( u_spell_level('clair_spot_weakness') * 1) + 4) * (scaling_factor(u_val('intelligence') ) ) )" ] } + "add": { "math": [ "( ( u_discern_weakness_clear_power_level * 1.5) + 2) * u_discern_weakness_clear_intelligence" ] } }, { "value": "ARMOR_HEAT", - "add": { "math": [ "( ( ( u_spell_level('clair_spot_weakness') * 1) + 4) * (scaling_factor(u_val('intelligence') ) ) )" ] } + "add": { "math": [ "( ( u_discern_weakness_clear_power_level * 1.5) + 2) * u_discern_weakness_clear_intelligence" ] } }, { "value": "ARMOR_COLD", - "add": { "math": [ "( ( ( u_spell_level('clair_spot_weakness') * 1) + 4) * (scaling_factor(u_val('intelligence') ) ) )" ] } + "add": { "math": [ "( ( u_discern_weakness_clear_power_level * 1.5) + 2) * u_discern_weakness_clear_intelligence" ] } } ] } diff --git a/data/mods/MindOverMatter/powers/clairsentience.json b/data/mods/MindOverMatter/powers/clairsentience.json index 012b3c11fec13..1ec04b0840f49 100644 --- a/data/mods/MindOverMatter/powers/clairsentience.json +++ b/data/mods/MindOverMatter/powers/clairsentience.json @@ -124,8 +124,8 @@ "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "IGNORE_WALLS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], "difficulty": 3, "max_level": { "math": [ "int_to_level(1)" ] }, - "effect": "attack", - "effect_str": "effect_clair_weak_point", + "effect": "effect_on_condition", + "effect_str": "EOC_CLAIR_DISCERN_WEAKNESS", "shape": "blast", "min_range": { "math": [ diff --git a/data/mods/MindOverMatter/powers/clairsentience_eoc.json b/data/mods/MindOverMatter/powers/clairsentience_eoc.json index 25352ad4ca950..a7e48d0ecc534 100644 --- a/data/mods/MindOverMatter/powers/clairsentience_eoc.json +++ b/data/mods/MindOverMatter/powers/clairsentience_eoc.json @@ -1,4 +1,21 @@ [ + { + "type": "effect_on_condition", + "id": "EOC_CLAIR_DISCERN_WEAKNESS", + "effect": [ + { "math": [ "u_discern_weakness_clear_intelligence", "=", "( ( n_val('intelligence') + 10) / 20 )" ] }, + { "math": [ "u_discern_weakness_clear_power_level", "=", "n_spell_level('clair_spot_weakness')" ] }, + { "math": [ "u_nether_attunement_discern_weakness_scaling", "=", "n_nether_attunement_power_scaling" ] }, + { + "u_add_effect": "effect_clair_weak_point", + "duration": { + "math": [ + "rng( ( ( (u_discern_weakness_clear_power_level * 1.5) + 13.5) * u_discern_weakness_clear_intelligence * u_nether_attunement_discern_weakness_scaling),( ( (u_discern_weakness_clear_power_level * 2.5) + 30) * u_discern_weakness_clear_intelligence * u_nether_attunement_discern_weakness_scaling) )" + ] + } + } + ] + }, { "type": "effect_on_condition", "id": "EOC_CLAIR_RAD_SENSE",