Skip to content

Commit

Permalink
[MoM] Add new u_cancel_activity to unlocking new power/wakeful rest (…
Browse files Browse the repository at this point in the history 
…#78292)

* Initial commit

* Updates
  • Loading branch information
@Standing-Storm
Standing-Storm authored Dec 2, 2024
1 parent a56ffed commit 2a0db1d
Show file tree
Hide file tree
Showing 10 changed files with 492 additions and 250 deletions.
8 changes: 2 additions & 6 deletions data/mods/MindOverMatter/powers/vitakinesis_eoc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,12 +262,8 @@
"condition": { "math": [ "u_val('sleepiness') + u_val('sleep_deprivation') >= 0" ] },
"effect": [ { "run_eocs": [ "EOC_VITAKIN_SLEEP_SLEEPINESS", "EOC_VITAKIN_SLEEP_DEPRIVATION" ] } ],
"false_effect": [
{
"u_message": "You are fully refreshed, and can end your meditations now.",
"popup": true,
"popup_w_interrupt_query": true,
"interrupt_type": "eoc"
},
{ "u_message": "You are fully refreshed, and end your meditations.", "type": "good" },
"u_cancel_activity",
{ "u_lose_effect": "effect_vitakin_wakeful_resting" }
]
},
Expand Down
86 changes: 58 additions & 28 deletions data/mods/MindOverMatter/recipes/practice/biokinetic_practice.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,16 @@
},
{ "math": [ "u_spell_level('biokin_breathe_skin') = 1" ] },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 10,20 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity",
"u_cancel_activity"
],
"false_effect": [
{ "u_message": "You just couldn't manage to grasp the technique. You'll have to try again.", "popup": true },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 10,20 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity",
"u_cancel_activity"
]
}
]
Expand Down Expand Up @@ -255,12 +259,14 @@
},
{ "math": [ "u_spell_level('biokin_flexibility') = 1" ] },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 15,30 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
],
"false_effect": [
{ "u_message": "You just couldn't manage to grasp the technique. You'll have to try again.", "popup": true },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 15,30 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
]
}
]
Expand Down Expand Up @@ -339,12 +345,14 @@
},
{ "math": [ "u_spell_level('biokin_dash') = 1" ] },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 15,30 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
],
"false_effect": [
{ "u_message": "You just couldn't manage to grasp the technique. You'll have to try again.", "popup": true },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 15,30 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
]
}
]
Expand Down Expand Up @@ -424,12 +432,14 @@
},
{ "math": [ "u_spell_level('biokin_armor_skin') = 1" ] },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 20,40 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
],
"false_effect": [
{ "u_message": "You just couldn't manage to grasp the technique. You'll have to try again.", "popup": true },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 20,40 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
]
}
]
Expand Down Expand Up @@ -509,12 +519,14 @@
},
{ "math": [ "u_spell_level('biokin_climate_control') = 1" ] },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 20,40 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
],
"false_effect": [
{ "u_message": "You just couldn't manage to grasp the technique. You'll have to try again.", "popup": true },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 20,40 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
]
}
]
Expand Down Expand Up @@ -594,12 +606,14 @@
},
{ "math": [ "u_spell_level('biokin_adrenaline') = 1" ] },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 20,40 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
],
"false_effect": [
{ "u_message": "You just couldn't manage to grasp the technique. You'll have to try again.", "popup": true },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 20,40 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
]
}
]
Expand Down Expand Up @@ -679,12 +693,14 @@
},
{ "math": [ "u_spell_level('biokin_enhance_mobility') = 1" ] },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 25,50 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
],
"false_effect": [
{ "u_message": "You just couldn't manage to grasp the technique. You'll have to try again.", "popup": true },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 25,50 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
]
}
]
Expand Down Expand Up @@ -764,12 +780,14 @@
},
{ "math": [ "u_spell_level('biokin_hammerhand') = 1" ] },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 25,50 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
],
"false_effect": [
{ "u_message": "You just couldn't manage to grasp the technique. You'll have to try again.", "popup": true },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 25,50 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
]
}
]
Expand Down Expand Up @@ -849,12 +867,14 @@
},
{ "math": [ "u_spell_level('biokin_reflex_enhance') = 1" ] },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 30,60 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
],
"false_effect": [
{ "u_message": "You just couldn't manage to grasp the technique. You'll have to try again.", "popup": true },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 30,60 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
]
}
]
Expand Down Expand Up @@ -934,12 +954,14 @@
},
{ "math": [ "u_spell_level('biokin_sealed_system') = 1" ] },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 35,70 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
],
"false_effect": [
{ "u_message": "You just couldn't manage to grasp the technique. You'll have to try again.", "popup": true },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 35,70 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
]
}
]
Expand Down Expand Up @@ -1019,12 +1041,14 @@
},
{ "math": [ "u_spell_level('biokin_metabolism_enhance') = 1" ] },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 35,70 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
],
"false_effect": [
{ "u_message": "You just couldn't manage to grasp the technique. You'll have to try again.", "popup": true },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 35,70 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
]
}
]
Expand Down Expand Up @@ -1104,12 +1128,14 @@
},
{ "math": [ "u_spell_level('biokin_combat_dance') = 1" ] },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 40,80 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
],
"false_effect": [
{ "u_message": "You just couldn't manage to grasp the technique. You'll have to try again.", "popup": true },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 40,80 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
]
}
]
Expand Down Expand Up @@ -1189,12 +1215,14 @@
},
{ "math": [ "u_spell_level('biokin_perfected_motion') = 1" ] },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 45,90 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
],
"false_effect": [
{ "u_message": "You just couldn't manage to grasp the technique. You'll have to try again.", "popup": true },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 45,90 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
]
}
]
Expand Down Expand Up @@ -1274,12 +1302,14 @@
},
{ "math": [ "u_spell_level('biokin_hurricane_blows') = 1" ] },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 45,90 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
],
"false_effect": [
{ "u_message": "You just couldn't manage to grasp the technique. You'll have to try again.", "popup": true },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 45,90 )" ] },
{ "u_lose_effect": "effect_psi_learning_new_power" }
{ "u_lose_effect": "effect_psi_learning_new_power" },
"u_cancel_activity"
]
}
]
Expand Down
Loading

0 comments on commit 2a0db1d

Please sign in to comment.