Skip to content

Commit ac0235d

Browse files
[MoM] Update concentration message every second (#82575)
* More * Fixes * Add comment clarifying >= * Rework concentration message * Only run EOC_CONCENTRATION_LIMIT_INSTANT_UPDATER when actually maintaining any powers * Kick tests * Kick tests * Overmap tests sure are failing a lot
1 parent a9c4d36 commit ac0235d

File tree

3 files changed

+55
-2
lines changed

3 files changed

+55
-2
lines changed

data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,56 @@
566566
{ "run_eocs": "EOC_CONCENTRATION_VS_LIMIT_CALCULATIONS" }
567567
]
568568
},
569+
{
570+
"type": "effect_on_condition",
571+
"id": "EOC_CONCENTRATION_LIMIT_INSTANT_UPDATER",
572+
"//": "This allows live reporting if any conditions, such as being slimed or being dazed etc., change your concentration limit",
573+
"recurrence": 1,
574+
"condition": {
575+
"and": [
576+
{
577+
"u_has_any_trait": [
578+
"BIOKINETIC",
579+
"CLAIRSENTIENT",
580+
"ELECTROKINETIC",
581+
"PHOTOKINETIC",
582+
"PYROKINETIC",
583+
"TELEKINETIC",
584+
"TELEPATH",
585+
"TELEPORTER",
586+
"VITAKINETIC",
587+
"PSYCHIC_KNACK"
588+
]
589+
},
590+
{ "math": [ "u_vitamin('vitamin_maintained_powers') >= 1" ] }
591+
]
592+
},
593+
"deactivate_condition": {
594+
"not": {
595+
"u_has_any_trait": [
596+
"BIOKINETIC",
597+
"CLAIRSENTIENT",
598+
"ELECTROKINETIC",
599+
"PHOTOKINETIC",
600+
"PYROKINETIC",
601+
"TELEKINETIC",
602+
"TELEPATH",
603+
"TELEPORTER",
604+
"VITAKINETIC",
605+
"PSYCHIC_KNACK"
606+
]
607+
}
608+
},
609+
"effect": [
610+
{ "math": [ "_debug_maintained_powers = u_vitamin('vitamin_maintained_powers')" ] },
611+
{ "math": [ "_debug_concentration_calculations = concentration_calculations()" ] },
612+
{
613+
"u_message": "You are concentrating on <context_val:debug_maintained_powers> / <context_val:debug_concentration_calculations> powers (current/limit).",
614+
"type": "debug"
615+
},
616+
{ "run_eocs": "EOC_CONCENTRATION_VS_LIMIT_CALCULATIONS" }
617+
]
618+
},
569619
{
570620
"type": "effect_on_condition",
571621
"id": "EOC_CONCENTRATION_VS_LIMIT_CALCULATIONS",
@@ -581,7 +631,7 @@
581631
{
582632
"if": { "u_has_effect": "effect_psi_intense_concentration" },
583633
"then": [
584-
{ "u_message": "As you stop concentrating, your mind clears a bit. It's easier to think now.", "type": "good" },
634+
{ "u_message": "The pressure on your mind lightens. It's easier to concentrate now.", "type": "good" },
585635
{ "u_lose_effect": "effect_psi_intense_concentration" }
586636
]
587637
}
@@ -592,6 +642,7 @@
592642
"id": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK",
593643
"//": "x-in_y event prevents divide-by-0 but makes concentration breaking much more likely the more negative your concentration limit is",
594644
"//2": "This controls gaining metaphysics XP on concentration success or failure. Gaining metaphysics XP for general channeling of powers is in eoc_misc",
645+
"//3": "There is a small chance for your concentration breaking if you are at your exact limit. This is deliberate",
595646
"condition": {
596647
"and": [
597648
{ "math": [ "u_vitamin('vitamin_maintained_powers') >= concentration_calculations()" ] },
@@ -610,6 +661,7 @@
610661
"effect": [
611662
{ "u_message": "Your concentration breaks!", "type": "bad" },
612663
{ "run_eocs": [ "EOC_END_PSI_POWERS_MAINTAINED", "EOC_CONCENTRATION_FAILURE_REDUCE_FOCUS" ] },
664+
"u_cancel_activity",
613665
{
614666
"math": [
615667
"u_vitamin('vitamin_psionic_drain')",

data/mods/MindOverMatter/effects/effects_psionic.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,7 @@
837837
"name": [ "Heightened Senses" ],
838838
"desc": [ "You are enhancing your mundane senses." ],
839839
"apply_message": "",
840-
"remove_message": "Your enhance senses fade away.",
840+
"remove_message": "Your enhanced senses fade away.",
841841
"rating": "good",
842842
"max_duration": "7 days",
843843
"enchantments": [

data/mods/MindOverMatter/powers/clairsentience_concentration_eocs.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,7 @@
553553
"effect": [
554554
{ "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" },
555555
{ "u_lose_effect": "effect_clair_craft_bonus" },
556+
{ "u_lose_effect": "effect_clair_craft_bonus_blindness" },
556557
{ "u_lose_trait": "CLAIR_CRAFT_BONUS_01" },
557558
{ "u_lose_trait": "CLAIR_CRAFT_BONUS_02" },
558559
{ "u_lose_trait": "CLAIR_CRAFT_BONUS_03" },

0 commit comments

Comments
 (0)