diff --git a/data/mods/MindOverMatter/PowerDescriptionSpoilers.md b/data/mods/MindOverMatter/PowerDescriptionSpoilers.md index a6de45aae5b1a..43026798e365f 100644 --- a/data/mods/MindOverMatter/PowerDescriptionSpoilers.md +++ b/data/mods/MindOverMatter/PowerDescriptionSpoilers.md @@ -584,7 +584,7 @@ Powers causing photokinetic damage have a 40% chance to blind the target for 3 s *Effects*: Unleash a high-powered laser blast, doing 20 to 54 photokinetic damage plus 2.5 to 6 photokinetic damage per level to everything within the targeted line.
*Prerequisites*: Photon Beam 8, Lucent Barrier 6 *or* Refracted Arms 6
-## Blinding Radiance +## Blinding Radiance (C) *Difficulty*: 7
*Target*: Self
*Duration*: 59 seconds to 2 minutes and 58 seconds, plus 11 seconds to 47 seconds per power level
diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json index fdd87d6757cf0..ad9a267b506e9 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json @@ -269,6 +269,7 @@ "EOC_PHOTOKIN_REMOVE_HIDE_UGLY", "EOC_PHOTOKIN_REMOVE_RADIO", "EOC_PHOTOKIN_REMOVE_INVISIBILITY", + "EOC_PHOTOKIN_REMOVE_BLINDING_GLARE", "EOC_PYRO_REMOVE_FIRE_TOOL", "EOC_PYRO_REMOVE_WARMTH_CLOAK", "EOC_PYROKIN_REMOVE_BLAZING_AURA", @@ -348,6 +349,7 @@ "EOC_PHOTOKIN_REMOVE_HIDE_UGLY", "EOC_PHOTOKIN_REMOVE_RADIO", "EOC_PHOTOKIN_REMOVE_INVISIBILITY", + "EOC_PHOTOKIN_REMOVE_BLINDING_GLARE", "EOC_PYRO_REMOVE_FIRE_TOOL", "EOC_PYRO_REMOVE_WARMTH_CLOAK", "EOC_PYROKIN_REMOVE_BLAZING_AURA", diff --git a/data/mods/MindOverMatter/effects/effects_psionic.json b/data/mods/MindOverMatter/effects/effects_psionic.json index 1cd13196d7ec3..dae7237b460a2 100644 --- a/data/mods/MindOverMatter/effects/effects_psionic.json +++ b/data/mods/MindOverMatter/effects/effects_psionic.json @@ -1250,12 +1250,9 @@ "desc": [ "You are glowing like the sun." ], "apply_message": "", "remove_message": "The last light finally dies.", - "decay_messages": [ [ "The light you are emitting is dimming rapidly.", "bad" ], [ "The intense glow has started to flicker.", "bad" ] ], "rating": "good", - "max_duration": "15 minutes", + "max_duration": "7 days", "max_intensity": 46, - "dur_add_perc": 10, - "int_dur_factor": "20 s", "base_mods": { "dodge_mod": [ 4 ] }, "enchantments": [ "enchant_photokin_blinding_glare" ] }, @@ -1298,15 +1295,9 @@ "desc": [ "The air around you has its temperature controlled." ], "apply_message": "", "remove_message": "A cool breeze hits your skin.", - "decay_messages": [ - [ "The warm air you've surrounded yourself with is nearly spent.", "bad" ], - [ "The air around you is slowing beginning to cool.", "bad" ] - ], "rating": "good", - "max_duration": "60 minutes", + "max_duration": "7 days", "max_intensity": 77, - "dur_add_perc": 10, - "int_dur_factor": "46 s", "enchantments": [ "enchant_pyrokin_cloak" ], "flags": [ "BARKY" ] }, diff --git a/data/mods/MindOverMatter/powers/photokinesis.json b/data/mods/MindOverMatter/powers/photokinesis.json index 7589345ffe202..6df216a056163 100644 --- a/data/mods/MindOverMatter/powers/photokinesis.json +++ b/data/mods/MindOverMatter/powers/photokinesis.json @@ -645,9 +645,9 @@ { "id": "photokinetic_blinding_glare", "type": "SPELL", - "name": "[Ψ]Blinding Radiance", - "description": "You can emit so much light that anyone trying to attack you risks being blinded.", - "message": "You begin glowing as brightly as the sun!", + "name": "[Ψ]Blinding Radiance (C)", + "description": "You can emit so much light that anyone trying to attack you risks being blinded.\n\nThis power is maintained by concentration and may fail if concentration is interrupted.", + "message": "", "teachable": false, "valid_targets": [ "self" ], "spell_class": "PHOTOKINETIC", @@ -655,8 +655,8 @@ "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "NO_EXPLOSION_SFX", "RANDOM_DURATION" ], "difficulty": 7, "max_level": { "math": [ "int_to_level(1)" ] }, - "effect": "attack", - "effect_str": "effect_photokin_blinding_glare", + "effect": "effect_on_condition", + "effect_str": "EOC_PHOTOKIN_BLINDING_GLARE_INITIATE", "shape": "blast", "min_duration": { "math": [ @@ -669,12 +669,16 @@ ] }, "energy_source": "STAMINA", - "base_energy_cost": 6500, - "final_energy_cost": 3250, - "energy_increment": -95, - "base_casting_time": 125, - "final_casting_time": 25, - "casting_time_increment": -7.5 + "base_energy_cost": { + "math": [ + "u_effect_intensity('effect_photokin_blinding_glare') > -1 ? 0 : max((6500 - (u_spell_level('photokinetic_blinding_glare') * 95)), 3250)" + ] + }, + "base_casting_time": { + "math": [ + "u_effect_intensity('effect_photokin_blinding_glare') > -1 ? 10 : max((125 -(u_spell_level('photokinetic_blinding_glare') * 7.5)), 25)" + ] + } }, { "id": "photokinetic_light_disintegrate", diff --git a/data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json b/data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json index 72c36a8fbfb64..4c40a6da8a15c 100644 --- a/data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json +++ b/data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json @@ -444,7 +444,7 @@ { "math": [ "u_latest_channeled_power_difficulty", "=", "6" ] }, { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, { "math": [ "u_calories()", "-=", "psionics_kcal_cost(6)" ] }, - { "math": [ "u_spell_exp('photokinetic_light_dodge')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, + { "math": [ "u_spell_exp('photokinetic_invisibility')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_PHOTOKIN_INVISIBILITY_DRAIN", @@ -463,5 +463,65 @@ } ], "false_effect": [ ] + }, + { + "type": "effect_on_condition", + "id": "EOC_PHOTOKIN_BLINDING_GLARE_INITIATE", + "condition": { "not": { "u_has_effect": "effect_photokin_blinding_glare" } }, + "effect": [ + { "u_message": "You begin glowing as brightly as the sun!", "type": "good" }, + { "u_add_effect": "effect_photokin_blinding_glare", "duration": "PERMANENT" }, + { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, + { + "queue_eocs": "EOC_PHOTOKIN_BLINDING_GLARE_DRAIN", + "time_in_future": [ + { + "math": [ + "( (u_spell_level('photokinetic_blinding_glare') * 11) + 59) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + ] + }, + { + "math": [ + "( (u_spell_level('photokinetic_blinding_glare') * 47) + 178) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + ] + } + ] + } + ], + "false_effect": [ { "run_eocs": "EOC_PHOTOKIN_REMOVE_BLINDING_GLARE" } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_PHOTOKIN_REMOVE_BLINDING_GLARE", + "condition": { "u_has_effect": "effect_photokin_blinding_glare" }, + "effect": [ { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" }, { "u_lose_effect": "effect_photokin_blinding_glare" } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_PHOTOKIN_BLINDING_GLARE_DRAIN", + "condition": { "u_has_effect": "effect_photokin_blinding_glare" }, + "effect": [ + { "math": [ "u_latest_channeled_power_difficulty", "=", "7" ] }, + { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, + { "math": [ "u_calories()", "-=", "psionics_kcal_cost(7)" ] }, + { "math": [ "u_spell_exp('photokinetic_blinding_glare')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, + { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, + { + "queue_eocs": "EOC_PHOTOKIN_BLINDING_GLARE_DRAIN", + "time_in_future": [ + { + "math": [ + "( (u_spell_level('photokinetic_blinding_glare') * 11) + 59) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + ] + }, + { + "math": [ + "( (u_spell_level('photokinetic_blinding_glare') * 47) + 178) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + ] + } + ] + } + ], + "false_effect": [ ] } ]