Skip to content

Commit 0fa5bea

Browse files
[MoM] Reduce portal storm awakening odds (#83720)
1 parent 9d97d6a commit 0fa5bea

File tree

2 files changed

+38
-38
lines changed

2 files changed

+38
-38
lines changed

data/mods/MindOverMatter/effectoncondition/eoc_awakening.json

Lines changed: 32 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -720,19 +720,13 @@
720720
"deactivate_condition": { "not": { "is_weather": "distant_portal_storm" } },
721721
"effect": [
722722
{ "math": [ "u_awakening_reducer = (portal_storm_awakening_odds(u_awakening_countup))" ] },
723+
{ "math": [ "_roll_chance = portal_storm_awakening_chance()" ] },
723724
{
724-
"weighted_list_eocs": [
725-
[ "EOC_PORTAL_NULL_AWAKENING", { "math": [ "147 * e^(-0.24 * ps_str) + 5" ] } ],
726-
[ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ],
727-
[ "EOC_PORTAL_CLAIR_AWAKENING", 1 ],
728-
[ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ],
729-
[ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ],
730-
[ "EOC_PORTAL_PYRO_AWAKENING", 1 ],
731-
[ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ],
732-
[ "EOC_PORTAL_TEEP_AWAKENING", 1 ],
733-
[ "EOC_PORTAL_PORTER_AWAKENING", 1 ],
734-
[ "EOC_PORTAL_VITA_AWAKENING", 1 ]
735-
]
725+
"u_message": { "str": "Odds of awakening are 1 in <context_val:roll_chance>.", "//~": "NO_I18N" },
726+
"type": "debug"
727+
},
728+
{
729+
"weighted_list_eocs": [ [ "EOC_NONE", { "math": [ "_roll_chance" ] } ], [ "EOC_PORTAL_SUCCESSFUL_AWAKENING", 1 ] ]
736730
}
737731
]
738732
},
@@ -754,19 +748,13 @@
754748
"deactivate_condition": { "not": { "is_weather": "portal_storm" } },
755749
"effect": [
756750
{ "math": [ "u_awakening_reducer = (portal_storm_awakening_odds(u_awakening_countup))" ] },
751+
{ "math": [ "_roll_chance = portal_storm_awakening_chance()" ] },
757752
{
758-
"weighted_list_eocs": [
759-
[ "EOC_PORTAL_NULL_AWAKENING", { "math": [ "147 * e^(-0.24 * ps_str) + 5" ] } ],
760-
[ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ],
761-
[ "EOC_PORTAL_CLAIR_AWAKENING", 1 ],
762-
[ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ],
763-
[ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ],
764-
[ "EOC_PORTAL_PYRO_AWAKENING", 1 ],
765-
[ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ],
766-
[ "EOC_PORTAL_TEEP_AWAKENING", 1 ],
767-
[ "EOC_PORTAL_PORTER_AWAKENING", 1 ],
768-
[ "EOC_PORTAL_VITA_AWAKENING", 1 ]
769-
]
753+
"u_message": { "str": "Odds of awakening are 1 in <context_val:roll_chance>.", "//~": "NO_I18N" },
754+
"type": "debug"
755+
},
756+
{
757+
"weighted_list_eocs": [ [ "EOC_NONE", { "math": [ "_roll_chance" ] } ], [ "EOC_PORTAL_SUCCESSFUL_AWAKENING", 1 ] ]
770758
}
771759
]
772760
},
@@ -788,26 +776,32 @@
788776
"deactivate_condition": { "not": { "is_weather": "close_portal_storm" } },
789777
"effect": [
790778
{ "math": [ "u_awakening_reducer = (portal_storm_awakening_odds(u_awakening_countup))" ] },
779+
{ "math": [ "_roll_chance = portal_storm_awakening_chance()" ] },
791780
{
792-
"weighted_list_eocs": [
793-
[ "EOC_PORTAL_NULL_AWAKENING", { "math": [ "147 * e^(-0.24 * ps_str) + 5" ] } ],
794-
[ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ],
795-
[ "EOC_PORTAL_CLAIR_AWAKENING", 1 ],
796-
[ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ],
797-
[ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ],
798-
[ "EOC_PORTAL_PYRO_AWAKENING", 1 ],
799-
[ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ],
800-
[ "EOC_PORTAL_TEEP_AWAKENING", 1 ],
801-
[ "EOC_PORTAL_PORTER_AWAKENING", 1 ],
802-
[ "EOC_PORTAL_VITA_AWAKENING", 1 ]
803-
]
781+
"u_message": { "str": "Odds of awakening are 1 in <context_val:roll_chance>.", "//~": "NO_I18N" },
782+
"type": "debug"
783+
},
784+
{
785+
"weighted_list_eocs": [ [ "EOC_NONE", { "math": [ "_roll_chance" ] } ], [ "EOC_PORTAL_SUCCESSFUL_AWAKENING", 1 ] ]
804786
}
805787
]
806788
},
807789
{
808790
"type": "effect_on_condition",
809-
"id": "EOC_PORTAL_NULL_AWAKENING",
810-
"effect": [ { "u_message": "" } ]
791+
"id": "EOC_PORTAL_SUCCESSFUL_AWAKENING",
792+
"effect": {
793+
"weighted_list_eocs": [
794+
[ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ],
795+
[ "EOC_PORTAL_CLAIR_AWAKENING", 1 ],
796+
[ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ],
797+
[ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ],
798+
[ "EOC_PORTAL_PYRO_AWAKENING", 1 ],
799+
[ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ],
800+
[ "EOC_PORTAL_TEEP_AWAKENING", 1 ],
801+
[ "EOC_PORTAL_PORTER_AWAKENING", 1 ],
802+
[ "EOC_PORTAL_VITA_AWAKENING", 1 ]
803+
]
804+
}
811805
},
812806
{
813807
"type": "effect_on_condition",

data/mods/MindOverMatter/jmath.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,12 @@
135135
"num_args": 1,
136136
"return": "100 * (e ^ ( ( _0 - max( (u_has_trait('MORE_PSI_ALPHA') * 0.75), 0) ) / -3) )"
137137
},
138+
{
139+
"type": "jmath_function",
140+
"id": "portal_storm_awakening_chance",
141+
"num_args": 0,
142+
"return": "((450 * e^(-0.24 * ps_str) ) + 20) * (u_effect_intensity('psi_nether_attention') > 0 ? 0.5 : 1)"
143+
},
138144
{
139145
"type": "jmath_function",
140146
"id": "concentration_trait_bonuses",

0 commit comments

Comments
 (0)