Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MoM] Various maintenance tasks #69753

Merged
merged 15 commits into from
Nov 28, 2023
Merged

[MoM] Various maintenance tasks #69753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
49afe40
Initial commit
Standing-Storm Nov 26, 2023
17fb8d2
Update data/mods/MindOverMatter/powers/clairsentience_eoc.json
Standing-Storm Nov 26, 2023
fd3f2ce
Update data/mods/MindOverMatter/powers/clairsentience_eoc.json
Standing-Storm Nov 26, 2023
74f8dd4
Update data/mods/MindOverMatter/powers/clairsentience_eoc.json
Standing-Storm Nov 26, 2023
bf1577d
link remaining effects that scale into jmath
Standing-Storm Nov 26, 2023
1f520fa
Merge branch 'mom-maintenance' of https://github.com/Standing-Storm/C…
Standing-Storm Nov 26, 2023
859487f
Manual linting
Standing-Storm Nov 26, 2023
8f6f338
Merge branch 'CleverRaven:master' into mom-maintenance
Standing-Storm Nov 26, 2023
a87b2e6
Nether-attunement and integrate electrokinesis
Standing-Storm Nov 26, 2023
bb192b0
Fixes
Standing-Storm Nov 26, 2023
a77ee16
Further Nether-Attuned wording changes
Standing-Storm Nov 26, 2023
cf9c169
Fix Health effect
Standing-Storm Nov 27, 2023
334c874
Kick tests
Standing-Storm Nov 27, 2023
32262c0
Merge branch 'master' of https://github.com/Standing-Storm/Cataclysm-…
Standing-Storm Nov 27, 2023
828f99b
Merge branch 'mom-maintenance' of https://github.com/Standing-Storm/C…
Standing-Storm Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 98 additions & 12 deletions ...r/effectoncondition/eoc_drain_events.json → ...ndition/eoc_nether_attunement_events.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,23 @@
"condition": {
"and": [
{
"u_has_any_trait": [ "BIOKINETIC", "CLAIRSENTIENT", "PHOTOKINETIC", "PYROKINETIC", "TELEKINETIC", "TELEPATH", "TELEPORTER", "VITAKINETIC" ]
"u_has_any_trait": [
"BIOKINETIC",
"CLAIRSENTIENT",
"ELECTROKINETIC",
"PHOTOKINETIC",
"PYROKINETIC",
"TELEKINETIC",
"TELEPATH",
"TELEPORTER",
"VITAKINETIC"
]
},
{
"or": [
{ "compare_string": [ "BIOKINETIC", { "context_val": "school" } ] },
{ "compare_string": [ "CLAIRSENTIENT", { "context_val": "school" } ] },
{ "compare_string": [ "ELECTROKINETIC", { "context_val": "school" } ] },
{ "compare_string": [ "PHOTOKINETIC", { "context_val": "school" } ] },
{ "compare_string": [ "PYROKINETIC", { "context_val": "school" } ] },
{ "compare_string": [ "TELEKINETIC", { "context_val": "school" } ] },
Expand All @@ -25,12 +36,15 @@
]
},
"effect": [
{ "math": [ "u_latest_channeled_power_difficulty", "=", "_difficulty" ] },
{
"run_eocs": [
"EOC_DRAIN_EFFECT_CHECK_HEADACHE",
"EOC_DRAIN_EFFECT_CHECK_EXTRA_DRAIN",
"EOC_DRAIN_EFFECT_CHECK_EXTRA_ATTUNEMENT",
"EOC_DRAIN_EFFECT_CHECK_HEALTH_CHANGE",
"EOC_DRAIN_EFFECT_CHECK_NOSEBLEED",
"EOC_DRAIN_EFFECT_CHECK_STAMINA_LOSS",
"EOC_DRAIN_EFFECT_CHECK_POWER_SURGE",
"EOC_DRAIN_EFFECT_CHECK_FATIGUE",
"EOC_DRAIN_EFFECT_CHECK_WEAKNESS"
]
Expand All @@ -47,7 +61,7 @@
"x_in_y_chance": {
"x": {
"math": [
"( clamp( (u_val('vitamin', 'name:vitamin_psionic_drain') - 60), 0, 160) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 160) * 1.5 ), 0, 375) + 5)"
"( clamp( (u_val('vitamin', 'name:vitamin_psionic_drain') - 60), 0, 160) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 160) * 1.5 ), 0, 375) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 5)"
]
},
"y": 1000
Expand All @@ -69,20 +83,59 @@
},
{
"type": "effect_on_condition",
"id": "EOC_DRAIN_EFFECT_CHECK_EXTRA_DRAIN",
"id": "EOC_DRAIN_EFFECT_CHECK_EXTRA_ATTUNEMENT",
"condition": {
"and": [
{ "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "15" ] },
{
"x_in_y_chance": { "x": { "math": [ "clamp( ( ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2) - 75), 0, 80) + 20" ] }, "y": 1000 }
"x_in_y_chance": {
"x": {
"math": [
"clamp( ( ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2) - 75), 0, 80) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 20"
]
},
"y": 1000
}
}
]
},
"effect": [
{ "u_message": "You feel a sudden fatigue as your powers are unleashed.", "type": "bad" },
{ "u_message": "You feel a strange tingling sensation as your powers are unleashed.", "type": "mixed" },
{ "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 2,6 )" ] }
]
},
{
"type": "effect_on_condition",
"id": "EOC_DRAIN_EFFECT_CHECK_HEALTH_CHANGE",
"condition": {
"and": [
{ "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "25" ] },
{
"x_in_y_chance": {
"x": {
"math": [
"( clamp( ( ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2) - 70), 0, 50) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 150) * 1.5 ), 0, 310) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 15)"
]
},
"y": 1000
}
}
]
},
"effect": [
{ "u_message": "As you unleash your powers, an electric feeling passes through your whole body!", "type": "mixed" },
{
"run_eocs": [
{
"id": "EOC_DRAIN_EFFECT_CHECK_HEALTH_CHANGE_2",
"condition": { "math": [ "rand(1)", ">=", "1" ] },
"effect": [ { "u_add_effect": "effect_nether_attunement_health_bonus", "duration": "30 seconds" } ],
"false_effect": [ { "u_add_effect": "effect_nether_attunement_health_penalty", "duration": "30 seconds" } ]
}
]
}
]
},
{
"type": "effect_on_condition",
"id": "EOC_DRAIN_EFFECT_CHECK_NOSEBLEED",
Expand All @@ -93,7 +146,7 @@
"x_in_y_chance": {
"x": {
"math": [
"( clamp( ( ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2) - 60), 0, 50) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 160) * 1.5 ), 0, 300) + 10)"
"( clamp( ( ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2) - 60), 0, 50) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 160) * 1.5 ), 0, 300) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 10)"
]
},
"y": 1000
Expand All @@ -112,12 +165,12 @@
"id": "EOC_DRAIN_EFFECT_CHECK_STAMINA_LOSS",
"condition": {
"and": [
{ "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "60" ] },
{ "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "50" ] },
{
"x_in_y_chance": {
"x": {
"math": [
"( clamp( (u_val('vitamin', 'name:vitamin_psionic_drain') - 100), 0, 100) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 160) * 1.8 ), 0, 250) + 20)"
"( clamp( (u_val('vitamin', 'name:vitamin_psionic_drain') - 100), 0, 100) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 160) * 1.8 ), 0, 250) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 20)"
]
},
"y": 1000
Expand All @@ -135,12 +188,12 @@
"id": "EOC_DRAIN_EFFECT_CHECK_FATIGUE",
"condition": {
"and": [
{ "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "75" ] },
{ "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "70" ] },
{
"x_in_y_chance": {
"x": {
"math": [
"( clamp( (u_val('vitamin', 'name:vitamin_psionic_drain') - 125), 0, 100) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 175) * 2 ), 0, 150) + 20)"
"( clamp( (u_val('vitamin', 'name:vitamin_psionic_drain') - 125), 0, 100) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 175) * 2 ), 0, 150) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 20)"
]
},
"y": 1000
Expand All @@ -153,14 +206,47 @@
{ "math": [ "u_val('fatigue')", "+=", "rng(30,90)" ] }
]
},
{
"type": "effect_on_condition",
"id": "EOC_DRAIN_EFFECT_CHECK_POWER_SURGE",
"condition": {
"and": [
{ "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "85" ] },
{
"x_in_y_chance": {
"x": {
"math": [
"( clamp( (u_val('vitamin', 'name:vitamin_psionic_drain') - 120), 0, 100) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 180) * 3 ), 0, 250) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 15)"
]
},
"y": 1000
}
}
]
},
"effect": [
{ "u_message": "As you unleash your powers, you feel a surge of energy!", "type": "good" },
{
"u_add_effect": "effect_nether_attunement_power_surge",
"duration": { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain') * rng(1,10)" ] }
}
]
},
{
"type": "effect_on_condition",
"id": "EOC_DRAIN_EFFECT_CHECK_WEAKNESS",
"condition": {
"and": [
{ "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "100" ] },
{
"x_in_y_chance": { "x": { "math": [ "clamp( (u_val('vitamin', 'name:vitamin_psionic_drain') - 200), 0, 50) + 10" ] }, "y": 1000 }
"x_in_y_chance": {
"x": {
"math": [
"clamp( (u_val('vitamin', 'name:vitamin_psionic_drain') - 200), 0, 50) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 10"
]
},
"y": 1000
}
}
]
},
Expand Down
4 changes: 2 additions & 2 deletions data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,8 +741,8 @@
"condition": {
"math": [
"u_val('vitamin', 'name:vitamin_maintained_powers')",
">",
"( u_val('intelligence') / 4) + (u_bonus_concentration_powers)"
"==",
"( u_val('intelligence') / 4) + (u_bonus_concentration_powers) + 1"
]
},
"effect": [
Expand Down
89 changes: 32 additions & 57 deletions data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,24 @@
"condition": { "and": [ { "u_has_trait": "VITAKINETIC" }, { "u_has_wielded_with_flag": "MATRIX_CRYSTAL_VITAKINESIS" } ] },
"effect": [ { "math": [ "u_val('spell_level_adjustment', 'school: VITAKINETIC')", "=", "4" ] } ]
},
{
"type": "effect_on_condition",
"id": "EOC_NETHER_ATTUNEMENT_BOOST",
"eoc_type": "EVENT",
"required_event": "opens_spellbook",
"condition": { "u_has_effect": "effect_nether_attunement_power_surge" },
"effect": [
{ "math": [ "u_val('spell_level_adjustment', 'school: BIOKINETIC')", "=", "3" ] },
{ "math": [ "u_val('spell_level_adjustment', 'school: CLAIRSENTIENT')", "=", "3" ] },
{ "math": [ "u_val('spell_level_adjustment', 'school: ELECTROKINETIC')", "=", "3" ] },
{ "math": [ "u_val('spell_level_adjustment', 'school: PHOTOKINETIC')", "=", "3" ] },
{ "math": [ "u_val('spell_level_adjustment', 'school: PYROKINETIC')", "=", "3" ] },
{ "math": [ "u_val('spell_level_adjustment', 'school: TELEKINETIC')", "=", "3" ] },
{ "math": [ "u_val('spell_level_adjustment', 'school: TELEPATH')", "=", "3" ] },
{ "math": [ "u_val('spell_level_adjustment', 'school: TELEPORTER')", "=", "3" ] },
{ "math": [ "u_val('spell_level_adjustment', 'school: VITAKINETIC')", "=", "3" ] }
]
},
{
"type": "effect_on_condition",
"id": "EOC_DRAIN_RESIST_POTION_COMEDOWN_PENALTY",
Expand All @@ -80,6 +98,8 @@
"effect": [
{ "math": [ "u_val('spell_level_adjustment', 'school: BIOKINETIC')", "=", "-3" ] },
{ "math": [ "u_val('spell_level_adjustment', 'school: CLAIRSENTIENT')", "=", "-3" ] },
{ "math": [ "u_val('spell_level_adjustment', 'school: ELECTROKINETIC')", "=", "-3" ] },
{ "math": [ "u_val('spell_level_adjustment', 'school: PHOTOKINETIC')", "=", "-3" ] },
{ "math": [ "u_val('spell_level_adjustment', 'school: PYROKINETIC')", "=", "-3" ] },
{ "math": [ "u_val('spell_level_adjustment', 'school: TELEKINETIC')", "=", "-3" ] },
{ "math": [ "u_val('spell_level_adjustment', 'school: TELEPATH')", "=", "-3" ] },
Expand Down Expand Up @@ -189,72 +209,27 @@
"effect": [
{
"run_eocs": [
"EOC_BIOKIN_REMOVE_OVERCOME_PAIN",
"EOC_BIOKIN_REMOVE_CLIMATE_CONTROL",
"EOC_BIOKIN_REMOVE_ENHANCE_MOBILITY",
"EOC_BIOKIN_REMOVE_HAMMERHAND",
"EOC_CLAIR_REMOVE_NIGHT_EYES",
"EOC_CLAIR_REMOVE_SPEED_READ",
"EOC_PHOTO_REMOVE_LIGHT_LOCAL",
"EOC_ELECTROKIN_REMOVE_PERSONAL_BATTERY",
"EOC_PHOTOKIN_REMOVE_LIGHT_LOCAL",
"EOC_PHOTOKIN_REMOVE_RAD_IMMUNITY",
"EOC_PHOTOKIN_REMOVE_RADIO",
"EOC_PYRO_REMOVE_FIRE_TOOL",
"EOC_PYRO_REMOVE_WARMTH_CLOAK",
"EOC_PYRO_REMOVE_TORCH_WELD",
"EOC_TELEKIN_REMOVE_TELEKINETIC_STRENGTH",
"EOC_TELEKIN_REMOVE_JACKING_TOOL",
"EOC_TELEKIN_REMOVE_LEVITATION",
"EOC_TELEPATH_REMOVE_TELEPATHIC_CONCENTRATION"
"EOC_TELEPATH_REMOVE_TELEPATHIC_CONCENTRATION",
"EOC_TELEPATH_REMOVE_TELEPATHIC_MORALE",
"EOC_VITAKIN_REMOVE_HEALTH_POWER"
]
},
{ "u_lose_effect": "effect_biokin_pkill_1" },
{ "u_lose_effect": "effect_biokin_pkill_2" },
{ "u_lose_effect": "effect_biokin_pkill_3" },
{ "u_lose_effect": "effect_biokin_pkill_4" },
{ "u_lose_effect": "effect_biokin_pkill_5" },
{ "u_lose_effect": "effect_biokin_pkill_6" },
{ "u_lose_effect": "effect_biokin_hammerhand" },
{ "u_remove_item_with": "biokin_hammerhand_item" },
{ "u_lose_effect": "effect_biokin_enhance_mobility" },
{ "u_remove_item_with": "biokin_enhance_mobility_item_1" },
{ "u_remove_item_with": "biokin_enhance_mobility_item_2" },
{ "u_remove_item_with": "biokin_enhance_mobility_item_3" },
{ "u_remove_item_with": "biokin_enhance_mobility_item_4" },
{ "u_remove_item_with": "biokin_enhance_mobility_item_5" },
{ "u_remove_item_with": "biokin_enhance_mobility_item_6" },
{ "u_lose_effect": "effect_biokin_climate_control" },
{ "u_lose_effect": "effect_clair_night_eyes_1" },
{ "u_lose_effect": "effect_clair_night_eyes_2" },
{ "u_lose_effect": "effect_clair_night_eyes_3" },
{ "u_lose_effect": "effect_clair_night_eyes_4" },
{ "u_lose_effect": "effect_clair_night_eyes_5" },
{ "u_lose_effect": "effect_clair_night_eyes_6" },
{ "u_lose_effect": "effect_clair_night_eyes_7" },
{ "u_lose_effect": "effect_clair_night_eyes_8" },
{ "u_lose_effect": "effect_clair_premonition" },
{ "u_remove_item_with": "photokinetic_rad_aura" },
{ "u_lose_effect": "effect_pyrokinetic_cloak" },
{ "u_remove_item_with": "pyrokinetic_fire_tool" },
{ "u_remove_item_with": "pyrokinetic_torch_weld" },
{ "u_lose_effect": "effect_pyrokinetic_aura" },
{ "u_lose_effect": "effect_telekinetic_strength" },
{ "u_remove_item_with": "telekin_lifting_jack_1" },
{ "u_remove_item_with": "telekin_lifting_jack_2" },
{ "u_remove_item_with": "telekin_lifting_jack_3" },
{ "u_remove_item_with": "telekin_lifting_jack_4" },
{ "u_remove_item_with": "telekin_lifting_jack_5" },
{ "u_remove_item_with": "telekin_lifting_jack_6" },
{ "u_remove_item_with": "telekin_lifting_jack_7" },
{ "u_remove_item_with": "telekin_lifting_jack_8" },
{ "u_remove_item_with": "telekin_lifting_jack_9" },
{ "u_remove_item_with": "telekin_lifting_jack_10" },
{ "u_remove_item_with": "telekin_lifting_jack_11" },
{ "u_remove_item_with": "telekin_lifting_jack_12" },
{ "u_remove_item_with": "telekin_lifting_jack_13" },
{ "u_remove_item_with": "telekin_lifting_jack_14" },
{ "u_remove_item_with": "telekin_lifting_jack_15" },
{ "u_remove_item_with": "telekin_lifting_jack_16" },
{ "u_remove_item_with": "telekin_lifting_jack_17" },
{ "u_remove_item_with": "telekin_lifting_jack_18" },
{ "u_remove_item_with": "telekin_lifting_jack_19" },
{ "u_remove_item_with": "telekin_lifting_jack_20" },
{ "u_lose_effect": "effect_telekinetic_levitation" },
{ "u_lose_effect": "effect_telepathic_learning_bonus" },
{ "u_lose_effect": "effect_telepathic_morale" },
{ "u_lose_effect": "effect_vita_health" },
{ "math": [ "u_val('vitamin', 'name:vitamin_maintained_powers')", "=", "0" ] },
{ "u_lose_effect": "effect_psi_intense_concentration" }
]
Expand Down
61 changes: 61 additions & 0 deletions data/mods/MindOverMatter/effects/effects_nether_attunement.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
[
{
"type": "effect_type",
"id": "effect_disease_psionic_drain",
"name": [ "Nether-Attunement" ],
"desc": [
"You feel a little odd and your control over your powers isn't as sure as it was. There might be unexpected results of you channeling psionics now."
],
"apply_message": [
[
"You feel a little odd, like you've just awoken from a dream. All that psionic channeling might have unexpected effects.",
"mixed"
],
[ "", "mixed" ],
[ "", "mixed" ],
[ "", "mixed" ],
[ "", "mixed" ],
[ "", "mixed" ],
[ "", "mixed" ],
[ "", "mixed" ],
[ "", "mixed" ],
[ "", "mixed" ],
[ "", "mixed" ],
[ "", "mixed" ]
],
"remove_message": "You take a deep breath as the strange feelings fade. You are in full control of your powers once again.",
"max_intensity": 12
},
{
"type": "effect_type",
"id": "psi_nether_attention",
"name": [ "Observed" ],
"desc": [ "You have the strong impression that someone, or something, is watching you." ],
"remove_message": "The endless feeling of being watched finally fades away.",
"rating": "bad",
"show_intensity": false,
"max_intensity": 10,
"max_duration": "21 days",
"dur_add_perc": 25,
"int_dur_factor": "3 days"
},
{
"type": "effect_type",
"id": "effect_nether_attunement_health_bonus",
"//": "Hidden effect, used as a tracker",
"name": [ "" ],
"desc": [ "" ],
"rating": "good",
"max_duration": "30 seconds",
"base_mods": { "health_min": [ 1 ], "health_chance": [ 2 ] }
},
{
"type": "effect_type",
"id": "effect_nether_attunement_health_penalty",
"name": [ "" ],
"desc": [ "" ],
"rating": "bad",
"max_duration": "30 seconds",
"base_mods": { "health_min": [ -1 ], "health_chance": [ 2 ] }
}
]
Loading
Loading