diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_drain_events.json b/data/mods/MindOverMatter/effectoncondition/eoc_nether_attunement_events.json similarity index 59% rename from data/mods/MindOverMatter/effectoncondition/eoc_drain_events.json rename to data/mods/MindOverMatter/effectoncondition/eoc_nether_attunement_events.json index cc20691e28deb..00baeac527d5d 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_drain_events.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_nether_attunement_events.json @@ -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" } ] }, @@ -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" ] @@ -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 @@ -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", @@ -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 @@ -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 @@ -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 @@ -153,6 +206,32 @@ { "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", @@ -160,7 +239,14 @@ "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 + } } ] }, diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json b/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json index fe8cd669ec0c4..4888ed359ec37 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json @@ -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": [ diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json index e3c4916fb1152..be07f8835b99f 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json @@ -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", @@ -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" ] }, @@ -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" } ] diff --git a/data/mods/MindOverMatter/effects/effects_nether_attunement.json b/data/mods/MindOverMatter/effects/effects_nether_attunement.json new file mode 100644 index 0000000000000..9a373642d3d31 --- /dev/null +++ b/data/mods/MindOverMatter/effects/effects_nether_attunement.json @@ -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 ] } + } +] diff --git a/data/mods/MindOverMatter/effects/effects_penalty.json b/data/mods/MindOverMatter/effects/effects_penalty.json index f594f15034ace..86f1072357022 100644 --- a/data/mods/MindOverMatter/effects/effects_penalty.json +++ b/data/mods/MindOverMatter/effects/effects_penalty.json @@ -1,39 +1,4 @@ [ - { - "type": "effect_type", - "id": "effect_disease_psionic_drain", - "name": [ "Drained" ], - "desc": [ - "You're a little short of breath 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 tired. All that psionic channeling is starting to wear you down.", "bad" ], - [ "", "bad" ], - [ "", "bad" ], - [ "", "bad" ], - [ "", "bad" ], - [ "", "bad" ], - [ "", "bad" ], - [ "", "bad" ], - [ "", "bad" ], - [ "", "bad" ], - [ "", "bad" ], - [ "", "bad" ] - ], - "remove_message": "You take a deep breath as the last of the unnatural tiredness of psionic channeling leaves you.", - "max_intensity": 12, - "base_mods": { - "health_amount": [ -1 ], - "health_chance": [ 200 ], - "health_tick": [ 2000 ], - "hunger_min": [ 1 ], - "hunger_chance": [ 100 ], - "hunger_tick": [ 400 ], - "fatigue_min": [ 1 ], - "fatigue_chance": [ 200 ], - "fatigue_tick": [ 500 ] - } - }, { "type": "effect_type", "id": "psionic_awakened", @@ -152,6 +117,7 @@ "effect_biokin_pkill_4", "effect_biokin_pkill_5", "effect_biokin_pkill_6", + "effect_biokin_overcome_pain", "effect_biokin_flexibility", "effect_biokin_enhance_mobility", "effect_biokin_hammerhand", @@ -161,6 +127,7 @@ "effect_biokin_sealed", "effect_biokin_combat_dance", "effect_biokin_perfected_motion", + "effect_clair_night_eyes", "effect_clair_night_eyes_1", "effect_clair_night_eyes_2", "effect_clair_night_eyes_3", @@ -204,19 +171,6 @@ "max_duration": "24 hours", "flags": [ "NO_PSIONICS" ] }, - { - "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_biokin_overload", diff --git a/data/mods/MindOverMatter/effects/effects_psionic.json b/data/mods/MindOverMatter/effects/effects_psionic.json index d1ca38761fa7d..95b6f2ac27ea9 100644 --- a/data/mods/MindOverMatter/effects/effects_psionic.json +++ b/data/mods/MindOverMatter/effects/effects_psionic.json @@ -10,6 +10,15 @@ "limb_score_mods": [ { "limb_score": "breathing", "modifier": 0.95 }, { "limb_score": "reaction", "modifier": 0.97 } ], "flags": [ "EFFECT_LIMB_SCORE_MOD" ] }, + { + "type": "effect_type", + "id": "effect_nether_attunement_power_surge", + "name": [ "Power Surge" ], + "desc": [ "You are filled with power!" ], + "apply_message": "", + "remove_message": "", + "rating": "good" + }, { "type": "effect_type", "id": "effect_biokin_physical", @@ -33,19 +42,28 @@ { "value": "STRENGTH", "add": { - "math": [ "(1 + ( u_val('spell_level', 'spell: biokin_physical_enhance') / 5) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "(1 + ( u_val('spell_level', 'spell: biokin_physical_enhance') / 5) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "DEXTERITY", "add": { - "math": [ "(1 + ( u_val('spell_level', 'spell: biokin_physical_enhance') / 5) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "(1 + ( u_val('spell_level', 'spell: biokin_physical_enhance') / 5) * (scaling_factor(u_val('intelligence') ) ) )" ] } } ] } ] }, + { + "type": "effect_type", + "id": "effect_biokin_overcome_pain", + "//": "Hidden effect, used as a tracker", + "name": [ "" ], + "desc": [ "" ], + "rating": "good", + "max_duration": "7 days" + }, { "type": "effect_type", "id": "effect_biokin_pkill_1", @@ -59,8 +77,7 @@ "max_intensity": 100, "dur_add_perc": 10, "int_dur_factor": "9 s", - "base_mods": { "pkill_tick": [ 12 ], "pkill_min": [ 1 ], "pkill_max_val": [ 15 ] }, - "enchantments": [ { "values": [ { "value": "MAX_STAMINA", "add": -300 } ] } ] + "base_mods": { "pkill_tick": [ 12 ], "pkill_min": [ 1 ], "pkill_max_val": [ 15 ] } }, { "type": "effect_type", @@ -75,8 +92,7 @@ "max_intensity": 100, "dur_add_perc": 10, "int_dur_factor": "12 s", - "base_mods": { "pkill_tick": [ 10 ], "pkill_min": [ 2 ], "pkill_max_val": [ 30 ] }, - "enchantments": [ { "values": [ { "value": "MAX_STAMINA", "add": -300 } ] } ] + "base_mods": { "pkill_tick": [ 10 ], "pkill_min": [ 2 ], "pkill_max_val": [ 30 ] } }, { "type": "effect_type", @@ -91,8 +107,7 @@ "max_intensity": 100, "dur_add_perc": 10, "int_dur_factor": "15 s", - "base_mods": { "pkill_tick": [ 10 ], "pkill_min": [ 3 ], "pkill_max_val": [ 50 ] }, - "enchantments": [ { "values": [ { "value": "MAX_STAMINA", "add": -300 } ] } ] + "base_mods": { "pkill_tick": [ 10 ], "pkill_min": [ 3 ], "pkill_max_val": [ 50 ] } }, { "type": "effect_type", @@ -107,8 +122,7 @@ "max_intensity": 100, "dur_add_perc": 10, "int_dur_factor": "18 s", - "base_mods": { "pkill_tick": [ 8 ], "pkill_min": [ 4 ], "pkill_max_val": [ 75 ] }, - "enchantments": [ { "values": [ { "value": "MAX_STAMINA", "add": -300 } ] } ] + "base_mods": { "pkill_tick": [ 8 ], "pkill_min": [ 4 ], "pkill_max_val": [ 75 ] } }, { "type": "effect_type", @@ -123,8 +137,7 @@ "max_intensity": 100, "dur_add_perc": 10, "int_dur_factor": "21 s", - "base_mods": { "pkill_tick": [ 8 ], "pkill_min": [ 5 ], "pkill_max_val": [ 100 ] }, - "enchantments": [ { "values": [ { "value": "MAX_STAMINA", "add": -300 } ] } ] + "base_mods": { "pkill_tick": [ 8 ], "pkill_min": [ 5 ], "pkill_max_val": [ 100 ] } }, { "type": "effect_type", @@ -139,8 +152,7 @@ "max_intensity": 100, "dur_add_perc": 10, "int_dur_factor": "24 s", - "base_mods": { "pkill_tick": [ 6 ], "pkill_min": [ 6 ], "pkill_max_val": [ 130 ] }, - "enchantments": [ { "values": [ { "value": "MAX_STAMINA", "add": -300 } ] } ] + "base_mods": { "pkill_tick": [ 6 ], "pkill_min": [ 6 ], "pkill_max_val": [ 130 ] } }, { "type": "effect_type", @@ -164,7 +176,9 @@ { "value": "FALL_DAMAGE", "multiply": { - "math": [ "( -0.2 + ( u_val('spell_level', 'spell: biokin_flexibility') * -0.02) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ + "( -0.2 + ( u_val('spell_level', 'spell: biokin_flexibility') * -0.02) * (scaling_factor(u_val('intelligence') ) ) )" + ] } } ] @@ -192,13 +206,13 @@ { "value": "PERCEPTION", "add": { - "math": [ "( 1 + ( u_val('spell_level', 'spell: biokin_reflex_enhance') / 5) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( 1 + ( u_val('spell_level', 'spell: biokin_reflex_enhance') / 5) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "SPEED", "add": { - "math": [ "( 5 + ( u_val('spell_level', 'spell: biokin_physical_enhance') ) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( 5 + ( u_val('spell_level', 'spell: biokin_physical_enhance') ) * (scaling_factor(u_val('intelligence') ) ) )" ] } } ] @@ -225,13 +239,13 @@ "enchantments": [ { "values": [ - { "value": "ARMOR_CUT", "add": { "math": [ "( -4 * ( ( u_val('intelligence') + 10) / 20 ) )" ] } }, - { "value": "ARMOR_BASH", "add": { "math": [ "( -6 * ( ( u_val('intelligence') + 10) / 20 ) )" ] } }, - { "value": "ARMOR_STAB", "add": { "math": [ "( -3 * ( ( u_val('intelligence') + 10) / 20 ) )" ] } }, + { "value": "ARMOR_CUT", "add": { "math": [ "( -4 * (scaling_factor(u_val('intelligence') ) ) )" ] } }, + { "value": "ARMOR_BASH", "add": { "math": [ "( -6 * (scaling_factor(u_val('intelligence') ) ) )" ] } }, + { "value": "ARMOR_STAB", "add": { "math": [ "( -3 * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "PAIN", "multiply": { - "math": [ "( ( u_val('spell_level', 'spell: biokin_armor_skin') * -0.02) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( ( u_val('spell_level', 'spell: biokin_armor_skin') * -0.02) * (scaling_factor(u_val('intelligence') ) ) )" ] } } ] @@ -259,7 +273,7 @@ "value": "CLIMATE_CONTROL_HEAT", "add": { "math": [ - "( ( ( u_val('spell_level', 'spell: biokin_climate_control') * 7.5 ) + 15 ) * ( ( u_val('intelligence') + 10) / 20 ) )" + "( ( ( u_val('spell_level', 'spell: biokin_climate_control') * 7.5 ) + 15 ) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, @@ -267,11 +281,10 @@ "value": "CLIMATE_CONTROL_CHILL", "add": { "math": [ - "( ( ( u_val('spell_level', 'spell: biokin_climate_control') * 7.5 ) + 15 ) * ( ( u_val('intelligence') + 10) / 20 ) )" + "( ( ( u_val('spell_level', 'spell: biokin_climate_control') * 7.5 ) + 15 ) * (scaling_factor(u_val('intelligence') ) ) )" ] } - }, - { "value": "MAX_STAMINA", "add": -500 } + } ] } ] @@ -284,8 +297,7 @@ "apply_message": "", "remove_message": "Your gear suddenly seems to weigh you down.", "rating": "good", - "max_duration": "7 days", - "enchantments": [ { "values": [ { "value": "MAX_STAMINA", "add": -850 } ] } ] + "max_duration": "7 days" }, { "type": "effect_type", @@ -295,8 +307,7 @@ "apply_message": "", "remove_message": "", "rating": "good", - "max_duration": "7 days", - "enchantments": [ { "values": [ { "value": "MAX_STAMINA", "add": -600 } ] } ] + "max_duration": "7 days" }, { "type": "effect_type", @@ -355,7 +366,7 @@ { "value": "ATTACK_SPEED", "multiply": { - "math": [ "( ( u_val('spell_level', 'spell: biokin_combat_dance') * -0.02) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( ( u_val('spell_level', 'spell: biokin_combat_dance') * -0.02) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "MOVE_COST", "multiply": -0.1 }, @@ -363,13 +374,13 @@ { "value": "MELEE_DAMAGE", "multiply": { - "math": [ "( ( u_val('spell_level', 'spell: biokin_combat_dance') * 0.02) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( ( u_val('spell_level', 'spell: biokin_combat_dance') * 0.02) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "PAIN", "multiply": { - "math": [ "( ( u_val('spell_level', 'spell: biokin_combat_dance') * -0.03) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( ( u_val('spell_level', 'spell: biokin_combat_dance') * -0.03) * (scaling_factor(u_val('intelligence') ) ) )" ] } } ] @@ -396,7 +407,7 @@ "value": "MOVE_COST", "multiply": { "math": [ - "max(( -0.5 + ( u_val('spell_level', 'spell: biokin_perfected_motion') * -0.015) * ( ( u_val('intelligence') + 10) / 20 ) ), -0.96)" + "max(( -0.5 + ( u_val('spell_level', 'spell: biokin_perfected_motion') * -0.015) * (scaling_factor(u_val('intelligence') ) ) ), -0.96)" ] } } @@ -405,6 +416,15 @@ ], "flags": [ "HARDTOHIT", "UNCANNY_DODGE" ] }, + { + "type": "effect_type", + "id": "effect_clair_night_eyes", + "//": "Hidden effect, used as a tracker", + "name": [ "" ], + "desc": [ "" ], + "rating": "good", + "max_duration": "7 days" + }, { "type": "effect_type", "id": "effect_clair_night_eyes_1", @@ -420,8 +440,7 @@ "max_duration": "7 days", "max_intensity": 106, "limb_score_mods": [ { "limb_score": "night_vis", "modifier": 3 } ], - "flags": [ "EFFECT_LIMB_SCORE_MOD" ], - "enchantments": [ { "values": [ { "value": "MAX_STAMINA", "add": -300 } ] } ] + "flags": [ "EFFECT_LIMB_SCORE_MOD" ] }, { "type": "effect_type", @@ -438,8 +457,7 @@ "max_duration": "7 days", "max_intensity": 106, "limb_score_mods": [ { "limb_score": "night_vis", "modifier": 5 } ], - "flags": [ "EFFECT_LIMB_SCORE_MOD" ], - "enchantments": [ { "values": [ { "value": "MAX_STAMINA", "add": -300 } ] } ] + "flags": [ "EFFECT_LIMB_SCORE_MOD" ] }, { "type": "effect_type", @@ -456,8 +474,7 @@ "max_duration": "7 days", "max_intensity": 106, "limb_score_mods": [ { "limb_score": "night_vis", "modifier": 7 } ], - "flags": [ "EFFECT_LIMB_SCORE_MOD" ], - "enchantments": [ { "values": [ { "value": "MAX_STAMINA", "add": -300 } ] } ] + "flags": [ "EFFECT_LIMB_SCORE_MOD" ] }, { "type": "effect_type", @@ -474,8 +491,7 @@ "max_duration": "7 days", "max_intensity": 106, "limb_score_mods": [ { "limb_score": "night_vis", "modifier": 9 } ], - "flags": [ "EFFECT_LIMB_SCORE_MOD" ], - "enchantments": [ { "values": [ { "value": "MAX_STAMINA", "add": -300 } ] } ] + "flags": [ "EFFECT_LIMB_SCORE_MOD" ] }, { "type": "effect_type", @@ -492,8 +508,7 @@ "max_duration": "7 days", "max_intensity": 106, "limb_score_mods": [ { "limb_score": "night_vis", "modifier": 11 } ], - "flags": [ "EFFECT_LIMB_SCORE_MOD" ], - "enchantments": [ { "values": [ { "value": "MAX_STAMINA", "add": -300 } ] } ] + "flags": [ "EFFECT_LIMB_SCORE_MOD" ] }, { "type": "effect_type", @@ -510,8 +525,7 @@ "max_duration": "7 days", "max_intensity": 106, "limb_score_mods": [ { "limb_score": "night_vis", "modifier": 13 } ], - "flags": [ "EFFECT_LIMB_SCORE_MOD" ], - "enchantments": [ { "values": [ { "value": "MAX_STAMINA", "add": -300 } ] } ] + "flags": [ "EFFECT_LIMB_SCORE_MOD" ] }, { "type": "effect_type", @@ -528,8 +542,7 @@ "max_duration": "7 days", "max_intensity": 106, "limb_score_mods": [ { "limb_score": "night_vis", "modifier": 15 } ], - "flags": [ "EFFECT_LIMB_SCORE_MOD" ], - "enchantments": [ { "values": [ { "value": "MAX_STAMINA", "add": -300 } ] } ] + "flags": [ "EFFECT_LIMB_SCORE_MOD" ] }, { "type": "effect_type", @@ -546,8 +559,7 @@ "max_duration": "7 days", "max_intensity": 106, "limb_score_mods": [ { "limb_score": "night_vis", "modifier": 17 } ], - "flags": [ "EFFECT_LIMB_SCORE_MOD" ], - "enchantments": [ { "values": [ { "value": "MAX_STAMINA", "add": -300 } ] } ] + "flags": [ "EFFECT_LIMB_SCORE_MOD" ] }, { "type": "effect_type", @@ -557,8 +569,7 @@ "apply_message": "", "remove_message": "", "rating": "good", - "max_duration": "7 days", - "enchantments": [ { "values": [ { "value": "MAX_STAMINA", "add": -400 } ] } ] + "max_duration": "7 days" }, { "type": "effect_type", @@ -581,7 +592,9 @@ "values": [ { "value": "MOTION_VISION_RANGE", - "add": { "math": [ "( ( u_val('spell_level', 'spell: clair_danger_sense') * 2) * ( ( u_val('intelligence') + 10) / 20 ) )" ] } + "add": { + "math": [ "( ( u_val('spell_level', 'spell: clair_danger_sense') * 2) * (scaling_factor(u_val('intelligence') ) ) )" ] + } } ] } @@ -602,43 +615,43 @@ { "value": "ARMOR_CUT", "add": { - "math": [ "( ( u_val('spell_level', 'spell: clair_spot_weakness') * 0.5) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( ( u_val('spell_level', 'spell: clair_spot_weakness') * 0.5) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "ARMOR_BASH", "add": { - "math": [ "( ( u_val('spell_level', 'spell: clair_spot_weakness') * 0.5) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( ( u_val('spell_level', 'spell: clair_spot_weakness') * 0.5) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "ARMOR_STAB", "add": { - "math": [ "( ( u_val('spell_level', 'spell: clair_spot_weakness') * 0.5) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( ( u_val('spell_level', 'spell: clair_spot_weakness') * 0.5) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "ARMOR_BULLET", "add": { - "math": [ "( ( u_val('spell_level', 'spell: clair_spot_weakness') * 0.5) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( ( u_val('spell_level', 'spell: clair_spot_weakness') * 0.5) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "ARMOR_ELEC", "add": { - "math": [ "( ( u_val('spell_level', 'spell: clair_spot_weakness') * 0.5) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( ( u_val('spell_level', 'spell: clair_spot_weakness') * 0.5) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "ARMOR_HEAT", "add": { - "math": [ "( ( u_val('spell_level', 'spell: clair_spot_weakness') * 0.5) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( ( u_val('spell_level', 'spell: clair_spot_weakness') * 0.5) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "ARMOR_COLD", "add": { - "math": [ "( ( u_val('spell_level', 'spell: clair_spot_weakness') * 0.5) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( ( u_val('spell_level', 'spell: clair_spot_weakness') * 0.5) * (scaling_factor(u_val('intelligence') ) ) )" ] } } ] @@ -664,13 +677,13 @@ { "value": "RANGE", "add": { - "math": [ "(1 + ( u_val('spell_level', 'spell: clair_ranged_enhance') * 0.5 ) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "(1 + ( u_val('spell_level', 'spell: clair_ranged_enhance') * 0.5 ) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "WEAPON_DISPERSION", "multiply": { - "math": [ "( ( u_val('spell_level', 'spell: clair_ranged_enhance') * -0.025) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( ( u_val('spell_level', 'spell: clair_ranged_enhance') * -0.025) * (scaling_factor(u_val('intelligence') ) ) )" ] } } ] @@ -718,13 +731,13 @@ { "value": "BONUS_DODGE", "add": { - "math": [ "(1 + ( u_val('spell_level', 'spell: clair_dodge_power') / 6) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "(1 + ( u_val('spell_level', 'spell: clair_dodge_power') / 6) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "BONUS_BLOCK", "add": { - "math": [ "(1 + ( u_val('spell_level', 'spell: clair_dodge_power') / 6) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "(1 + ( u_val('spell_level', 'spell: clair_dodge_power') / 6) * (scaling_factor(u_val('intelligence') ) ) )" ] } } ] @@ -936,7 +949,7 @@ "value": "EVASION", "add": { "math": [ - "min(( 15 + (2 * ( u_val('spell_level', 'spell: photokinetic_light_dodge') / 100) ) + ( ( u_val('intelligence') + 10) / 20 ) ), 0.85)" + "min(( 15 + (2 * ( u_val('spell_level', 'spell: photokinetic_light_dodge') / 100) ) + (scaling_factor(u_val('intelligence') ) ) ), 0.85)" ] } } @@ -1041,6 +1054,15 @@ "show_in_info": true, "flags": [ "BLIND" ] }, + { + "type": "effect_type", + "id": "effect_pyrokinetic_fire_tool", + "//": "Hidden effect, used as a tracker", + "name": [ "" ], + "desc": [ "" ], + "rating": "good", + "max_duration": "7 days" + }, { "type": "effect_type", "id": "effect_pyrokinetic_cloak", @@ -1059,6 +1081,15 @@ "int_dur_factor": "46 s", "enchantments": [ "enchant_pyrokin_cloak" ] }, + { + "type": "effect_type", + "id": "effect_pyrokinetic_torch_weld", + "//": "Hidden effect, used as a tracker", + "name": [ "" ], + "desc": [ "" ], + "rating": "good", + "max_duration": "7 days" + }, { "type": "effect_type", "id": "effect_pyrokinetic_aura", @@ -1110,39 +1141,39 @@ { "value": "ARMOR_CUT", "multiply": { - "math": [ "( ( u_val('spell_level', 'spell: telekinetic_momentum') * -0.005 ) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( ( u_val('spell_level', 'spell: telekinetic_momentum') * -0.005 ) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "ARMOR_BASH", "multiply": { - "math": [ "( ( u_val('spell_level', 'spell: telekinetic_momentum') * -0.01 ) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( ( u_val('spell_level', 'spell: telekinetic_momentum') * -0.01 ) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "ARMOR_STAB", "multiply": { - "math": [ "( ( u_val('spell_level', 'spell: telekinetic_momentum') * -0.005 ) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( ( u_val('spell_level', 'spell: telekinetic_momentum') * -0.005 ) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "ARMOR_BULLET", "multiply": { - "math": [ "( ( u_val('spell_level', 'spell: telekinetic_momentum') * -0.02 ) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( ( u_val('spell_level', 'spell: telekinetic_momentum') * -0.02 ) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "MOVE_COST", "multiply": { "math": [ - "max(( ( u_val('spell_level', 'spell: telekinetic_momentum') * -0.005 ) * ( ( u_val('intelligence') + 10) / 20 ) ), -0.15)" + "max(( ( u_val('spell_level', 'spell: telekinetic_momentum') * -0.005 ) * (scaling_factor(u_val('intelligence') ) ) ), -0.15)" ] } }, { "value": "ATTACK_SPEED", "multiply": { - "math": [ "( ( u_val('spell_level', 'spell: telekinetic_momentum') * -0.01 ) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( ( u_val('spell_level', 'spell: telekinetic_momentum') * -0.01 ) * (scaling_factor(u_val('intelligence') ) ) )" ] } } ] @@ -1164,7 +1195,9 @@ { "value": "FALL_DAMAGE", "multiply": { - "math": [ "( -0.5 + ( u_val('spell_level', 'spell: telekinetic_slowfall') * -0.04) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ + "( -0.5 + ( u_val('spell_level', 'spell: telekinetic_slowfall') * -0.04) * (scaling_factor(u_val('intelligence') ) ) )" + ] } } ] @@ -1185,17 +1218,25 @@ "enchantments": [ { "values": [ - { "value": "MAX_STAMINA", "add": -650 }, { "value": "STRENGTH", "add": { - "math": [ "( 15 + ( u_val('spell_level', 'spell: telekinetic_strength') * 3 ) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( 15 + ( u_val('spell_level', 'spell: telekinetic_strength') * 3 ) * (scaling_factor(u_val('intelligence') ) ) )" ] } } ] } ] }, + { + "type": "effect_type", + "id": "effect_telekinetic_vehicle_lift", + "//": "Hidden effect, used as a tracker", + "name": [ "" ], + "desc": [ "" ], + "rating": "good", + "max_duration": "7 days" + }, { "type": "effect_type", "id": "effect_telekinetic_armor", @@ -1220,25 +1261,25 @@ { "value": "ARMOR_CUT", "add": { - "math": [ "( -3 + ( u_val('spell_level', 'spell: telekinetic_shield') * -1) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( -3 + ( u_val('spell_level', 'spell: telekinetic_shield') * -1) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "ARMOR_BASH", "add": { - "math": [ "( -2 + ( u_val('spell_level', 'spell: telekinetic_shield') * -0.5) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( -2 + ( u_val('spell_level', 'spell: telekinetic_shield') * -0.5) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "ARMOR_STAB", "add": { - "math": [ "( -5 + ( u_val('spell_level', 'spell: telekinetic_shield') * -1.5) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( -5 + ( u_val('spell_level', 'spell: telekinetic_shield') * -1.5) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "ARMOR_BULLET", "add": { - "math": [ "( -8 + ( u_val('spell_level', 'spell: telekinetic_shield') * -2.5) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( -8 + ( u_val('spell_level', 'spell: telekinetic_shield') * -2.5) * (scaling_factor(u_val('intelligence') ) ) )" ] } } ] @@ -1256,7 +1297,6 @@ "rating": "good", "max_duration": "7 days", "max_intensity": 34, - "enchantments": [ { "values": [ { "value": "MAX_STAMINA", "add": -800 } ] } ], "flags": [ "LEVITATION" ] }, { @@ -1302,11 +1342,10 @@ { "value": "LEARNING_FOCUS", "add": { - "math": [ "( ( u_val('spell_level', 'spell: telepathic_concentration') * 2.5) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( ( u_val('spell_level', 'spell: telepathic_concentration') * 2.5) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, - { "value": "MOVE_COST", "multiply": 3 }, - { "value": "MAX_STAMINA", "add": -350 } + { "value": "MOVE_COST", "multiply": 3 } ] } ], @@ -1334,7 +1373,7 @@ { "value": "SIGHT_RANGE_MINDS", "add": { - "math": [ "( ( u_val('spell_level', 'spell: telepathic_mind_sense') * 2) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( ( u_val('spell_level', 'spell: telepathic_mind_sense') * 2) * (scaling_factor(u_val('intelligence') ) ) )" ] } } ] @@ -1351,8 +1390,7 @@ "apply_message": "", "remove_message": "", "rating": "good", - "max_duration": "7 days", - "enchantments": [ { "values": [ { "value": "MAX_STAMINA", "add": -400 } ] } ] + "max_duration": "7 days" }, { "type": "effect_type", @@ -1426,32 +1464,32 @@ { "value": "BONUS_DODGE", "add": { - "math": [ "(1 + ( u_val('spell_level', 'spell: telepathic_network') / 12) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "(1 + ( u_val('spell_level', 'spell: telepathic_network') / 12) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "BONUS_BLOCK", "add": { - "math": [ "(1 + ( u_val('spell_level', 'spell: telepathic_network') / 12) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "(1 + ( u_val('spell_level', 'spell: telepathic_network') / 12) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "PERCEPTION", "add": { - "math": [ "( ( ( u_val('spell_level', 'spell: telepathic_network') * 0.2) + 1) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( ( ( u_val('spell_level', 'spell: telepathic_network') * 0.2) + 1) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "RANGE", "add": { - "math": [ "( ( ( u_val('spell_level', 'spell: telepathic_network') * 0.25) + 3) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ "( ( ( u_val('spell_level', 'spell: telepathic_network') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "EVASION", "multiply": { "math": [ - "( ( ( u_val('spell_level', 'spell: telepathic_network') * 0.005) + 0.05) * ( ( u_val('intelligence') + 10) / 20 ) )" + "( ( ( u_val('spell_level', 'spell: telepathic_network') * 0.005) + 0.05) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, @@ -1459,7 +1497,7 @@ "value": "RANGED_DAMAGE", "multiply": { "math": [ - "( ( ( u_val('spell_level', 'spell: telepathic_network') * 0.005) + 0.05) * ( ( u_val('intelligence') + 10) / 20 ) )" + "( ( ( u_val('spell_level', 'spell: telepathic_network') * 0.005) + 0.05) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, @@ -1467,14 +1505,16 @@ "value": "MELEE_DAMAGE", "multiply": { "math": [ - "( ( ( u_val('spell_level', 'spell: telepathic_network') * 0.005) + 0.05) * ( ( u_val('intelligence') + 10) / 20 ) )" + "( ( ( u_val('spell_level', 'spell: telepathic_network') * 0.005) + 0.05) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "COMBAT_CATCHUP", "multiply": { - "math": [ "( ( ( u_val('spell_level', 'spell: telepathic_network') * 0.25) + 1.5) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ + "( ( ( u_val('spell_level', 'spell: telepathic_network') * 0.25) + 1.5) * (scaling_factor(u_val('intelligence') ) ) )" + ] } } ] @@ -1514,7 +1554,9 @@ { "value": "MOVE_COST", "multiply": { - "math": [ "( ( ( u_val('spell_level', 'spell: teleport_stride') * -0.02 ) - 0.05 ) * ( ( u_val('intelligence') + 10) / 20 ) )" ] + "math": [ + "( ( ( u_val('spell_level', 'spell: teleport_stride') * -0.02 ) - 0.05 ) * (scaling_factor(u_val('intelligence') ) ) )" + ] } } ] @@ -1545,8 +1587,7 @@ "h_mod_chance": [ 10 ], "h_mod_tick": [ 600 ], "healing_rate": [ 2 ] - }, - "enchantments": [ { "values": [ { "value": "MAX_STAMINA", "add": -350 } ] } ] + } }, { "type": "effect_type", diff --git a/data/mods/MindOverMatter/items/psions_summon_items.json b/data/mods/MindOverMatter/items/psions_summon_items.json index 912fa208814a3..2f0ace3508c7e 100644 --- a/data/mods/MindOverMatter/items/psions_summon_items.json +++ b/data/mods/MindOverMatter/items/psions_summon_items.json @@ -313,9 +313,7 @@ "flags": [ "PERSONAL", "PADDED", "UNBREAKABLE", "INTEGRATED", "SEMITANGIBLE", "ZERO_WEIGHT", "LIGHT_20", "FIRE", "NO_DROP" ], "qualities": [ [ "BLOW_HOT_AIR", 1 ] ], "use_action": [ { "type": "firestarter", "moves": 30 }, { "type": "HEAT_FOOD" } ], - "relic_data": { - "passive_effects": [ { "has": "HELD", "condition": "ALWAYS", "values": [ { "value": "MAX_STAMINA", "add": -350 } ] } ] - }, + "relic_data": { "passive_effects": [ { "has": "HELD", "condition": "ALWAYS", "values": [ { "value": "MAX_MANA", "add": 0 } ] } ] }, "armor": [ { "encumbrance": 0, "coverage": 0, "covers": [ "hand_l", "hand_r" ] } ] }, { @@ -377,9 +375,7 @@ "flags": [ "PERSONAL", "PADDED", "UNBREAKABLE", "INTEGRATED", "SEMITANGIBLE", "ZERO_WEIGHT", "LIGHT_50", "FIRE", "NO_DROP" ], "qualities": [ [ "WELD", 2 ] ], "use_action": [ { "type": "firestarter", "moves": 10 }, { "type": "OXYTORCH" } ], - "relic_data": { - "passive_effects": [ { "has": "HELD", "condition": "ALWAYS", "values": [ { "value": "MAX_STAMINA", "add": -700 } ] } ] - }, + "relic_data": { "passive_effects": [ { "has": "HELD", "condition": "ALWAYS", "values": [ { "value": "MAX_MANA", "add": 0 } ] } ] }, "armor": [ { "encumbrance": 0, "coverage": 0, "covers": [ "hand_l", "hand_r" ] } ] }, { diff --git a/data/mods/MindOverMatter/jmath.json b/data/mods/MindOverMatter/jmath.json index a5b71710d2023..184703830a3ad 100644 --- a/data/mods/MindOverMatter/jmath.json +++ b/data/mods/MindOverMatter/jmath.json @@ -11,6 +11,12 @@ "num_args": 1, "return": "( ( _0 + 10) / 20 )" }, + { + "type": "jmath_function", + "id": "nether_attune_difficulty_scaler", + "num_args": 1, + "return": "_0 * _0" + }, { "type": "jmath_function", "id": "psionics_kcal_cost", diff --git a/data/mods/MindOverMatter/powers/biokinesis.json b/data/mods/MindOverMatter/powers/biokinesis.json index cc2a890159ac7..87afb0ef72b92 100644 --- a/data/mods/MindOverMatter/powers/biokinesis.json +++ b/data/mods/MindOverMatter/powers/biokinesis.json @@ -10,16 +10,12 @@ "spell_class": "BIOKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 2, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_biokin_physical", "extra_effects": [ { "id": "psionic_drained_difficulty_two", "hit_self": true } ], "shape": "blast", - "difficulty": 2, - "max_level": { "math": [ "int_to_level(1)" ] }, - "energy_source": "STAMINA", - "base_energy_cost": 3500, - "final_energy_cost": 1250, - "energy_increment": -175, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: biokin_physical_enhance') * 1500) + 9000) * (scaling_factor(u_val('intelligence') ) )" @@ -30,6 +26,10 @@ "( (u_val('spell_level', 'spell: biokin_physical_enhance') * 2000) + 45000) * (scaling_factor(u_val('intelligence') ) )" ] }, + "energy_source": "STAMINA", + "base_energy_cost": 3500, + "final_energy_cost": 1250, + "energy_increment": -175, "base_casting_time": 120, "final_casting_time": 75, "casting_time_increment": -5.5, @@ -45,16 +45,11 @@ "spell_class": "BIOKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 1, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_BIOKIN_PAIN_INITIATE", "shape": "blast", - "difficulty": 1, - "max_level": { "math": [ "int_to_level(1)" ] }, - "min_damage": 0, - "energy_source": "STAMINA", - "base_energy_cost": 1750, - "final_energy_cost": 850, - "energy_increment": -75, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: biokin_overcome_pain') * 2000) + 30000) * (scaling_factor(u_val('intelligence') ) )" @@ -65,9 +60,17 @@ "( (u_val('spell_level', 'spell: biokin_overcome_pain') * 2000) + 130000) * (scaling_factor(u_val('intelligence') ) )" ] }, - "base_casting_time": 125, - "final_casting_time": 50, - "casting_time_increment": -7, + "energy_source": "STAMINA", + "base_energy_cost": { + "math": [ + "u_effect_intensity('effect_biokin_overcome_pain') > 0 ? 0 : max((1750 - (u_val('spell_level', 'spell: biokin_overcome_pain') * 75)), 850)" + ] + }, + "base_casting_time": { + "math": [ + "u_effect_intensity('effect_biokin_overcome_pain') > 0 ? 10 : max((125 -(u_val('spell_level', 'spell: biokin_overcome_pain') * 7)), 50)" + ] + }, "learn_spells": { "biokin_armor_skin": 9, "biokin_climate_control": 12, "biokin_sealed_system": 18 } }, { @@ -81,12 +84,12 @@ "spell_class": "BIOKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 3, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_biokin_flexibility", "extra_effects": [ { "id": "psionic_drained_difficulty_three", "hit_self": true } ], "shape": "blast", - "difficulty": 3, - "max_level": { "math": [ "int_to_level(1)" ] }, "energy_source": "STAMINA", "base_energy_cost": 2500, "final_energy_cost": 1250, @@ -109,12 +112,12 @@ "spell_class": "BIOKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 4, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_biokin_armor_skin", "extra_effects": [ { "id": "psionic_drained_difficulty_four", "hit_self": true } ], "shape": "blast", - "difficulty": 4, - "max_level": { "math": [ "int_to_level(1)" ] }, "energy_source": "STAMINA", "base_energy_cost": 4000, "final_energy_cost": 1750, @@ -141,11 +144,11 @@ "spell_class": "BIOKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 4, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_BIOKIN_CLIMATE_CONTROL_INITIATE", "shape": "blast", - "difficulty": 4, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: biokin_climate_control') * 18000) + 30000 ) * (scaling_factor(u_val('intelligence') ) )" @@ -157,12 +160,16 @@ ] }, "energy_source": "STAMINA", - "base_energy_cost": 3500, - "final_energy_cost": 1250, - "energy_increment": -175, - "base_casting_time": 250, - "final_casting_time": 150, - "casting_time_increment": -8.5, + "base_energy_cost": { + "math": [ + "u_effect_intensity('effect_biokin_climate_control') > 0 ? 0 : max((3500 - (u_val('spell_level', 'spell: biokin_climate_control') * 175)), 1250)" + ] + }, + "base_casting_time": { + "math": [ + "u_effect_intensity('effect_biokin_climate_control') > 0 ? 10 : max((250 -(u_val('spell_level', 'spell: biokin_climate_control') * 8.5)), 150)" + ] + }, "learn_spells": { "biokin_sealed_system": 6 } }, { @@ -175,11 +182,11 @@ "valid_targets": [ "self" ], "spell_class": "BIOKINETIC", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "NO_EXPLOSION_SFX", "RANDOM_DURATION" ], + "difficulty": 5, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_BIOKIN_ENHANCE_MOBILITY_INITIATE", "shape": "blast", - "difficulty": 5, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_damage": 1, "min_duration": { "math": [ @@ -192,12 +199,16 @@ ] }, "energy_source": "STAMINA", - "base_energy_cost": 4500, - "final_energy_cost": 2500, - "energy_increment": -150, - "base_casting_time": 275, - "final_casting_time": 50, - "casting_time_increment": -15, + "base_energy_cost": { + "math": [ + "u_effect_intensity('effect_biokin_enhance_mobility') > 0 ? 0 : max((4500 - (u_val('spell_level', 'spell: biokin_enhance_mobility') * 150)), 2500)" + ] + }, + "base_casting_time": { + "math": [ + "u_effect_intensity('effect_biokin_enhance_mobility') > 0 ? 10 : max((275 -(u_val('spell_level', 'spell: biokin_enhance_mobility') * 15)), 50)" + ] + }, "learn_spells": { "biokin_reflex_enhance": 4, "biokin_combat_dance": 10 } }, { @@ -211,24 +222,28 @@ "spell_class": "BIOKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 5, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_BIOKIN_HAMMERHAND_INITIATE", "shape": "blast", - "difficulty": 5, - "max_level": { "math": [ "int_to_level(1)" ] }, - "energy_source": "STAMINA", - "base_energy_cost": 4500, - "final_energy_cost": 2250, - "energy_increment": -225, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: biokin_hammerhand') * 45000) + 180000) * (scaling_factor(u_val('intelligence') ) )" ] }, "max_duration": { "math": [ "( (u_val('spell_level', 'spell: biokin_hammerhand') * 75000) + 540000) * (scaling_factor(u_val('intelligence') ) )" ] }, - "base_casting_time": 350, - "final_casting_time": 150, - "casting_time_increment": -12.5 + "energy_source": "STAMINA", + "base_energy_cost": { + "math": [ + "u_effect_intensity('effect_biokin_hammerhand') > 0 ? 0 : max((4500 - (u_val('spell_level', 'spell: biokin_hammerhand') * 225)), 2250)" + ] + }, + "base_casting_time": { + "math": [ + "u_effect_intensity('effect_biokin_hammerhand') > 0 ? 10 : max((350 -(u_val('spell_level', 'spell: biokin_hammerhand') * 12.5)), 150)" + ] + } }, { "id": "biokin_reflex_enhance", @@ -241,12 +256,12 @@ "spell_class": "BIOKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 6, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_biokin_reflex", "extra_effects": [ { "id": "psionic_drained_difficulty_six", "hit_self": true } ], "shape": "blast", - "difficulty": 6, - "max_level": { "math": [ "int_to_level(1)" ] }, "energy_source": "STAMINA", "base_energy_cost": 5500, "final_energy_cost": 2250, @@ -277,6 +292,8 @@ "spell_class": "BIOKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 7, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_biokin_sealed", "extra_effects": [ @@ -284,8 +301,6 @@ { "id": "psionic_drained_difficulty_seven", "hit_self": false } ], "shape": "blast", - "difficulty": 7, - "max_level": { "math": [ "int_to_level(1)" ] }, "energy_source": "STAMINA", "base_energy_cost": 5500, "final_energy_cost": 2750, @@ -310,8 +325,8 @@ "valid_targets": [ "self" ], "spell_class": "BIOKINETIC", "flags": [ "PSIONIC", "NO_FAIL", "SILENT", "NO_HANDS", "NO_LEGS" ], - "effect": "remove_effect", - "effect_str": "biokin_climate_control", + "effect": "effect_on_condition", + "effect_str": "EOC_BIOKIN_REMOVE_CLIMATE_CONTROL", "shape": "blast", "max_level": 1 }, @@ -326,22 +341,22 @@ "spell_class": "BIOKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 8, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_biokin_combat_dance", "extra_effects": [ { "id": "psionic_drained_difficulty_eight", "hit_self": false } ], "shape": "blast", - "difficulty": 8, - "max_level": { "math": [ "int_to_level(1)" ] }, - "energy_source": "STAMINA", - "base_energy_cost": 5500, - "final_energy_cost": 2250, - "energy_increment": -125, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: biokin_combat_dance') * 600) + 4000) * (scaling_factor(u_val('intelligence') ) )" ] }, "max_duration": { "math": [ "( (u_val('spell_level', 'spell: biokin_combat_dance') * 600) + 20000) * (scaling_factor(u_val('intelligence') ) )" ] }, + "energy_source": "STAMINA", + "base_energy_cost": 5500, + "final_energy_cost": 2250, + "energy_increment": -125, "base_casting_time": 100, "final_casting_time": 40, "casting_time_increment": -4, @@ -358,16 +373,12 @@ "spell_class": "BIOKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 9, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_biokin_perfected_motion", "extra_effects": [ { "id": "psionic_drained_difficulty_nine", "hit_self": false } ], "shape": "blast", - "difficulty": 9, - "max_level": { "math": [ "int_to_level(1)" ] }, - "energy_source": "STAMINA", - "base_energy_cost": 6000, - "final_energy_cost": 3500, - "energy_increment": -175, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: biokin_perfected_motion') * 50) + 500) * (scaling_factor(u_val('intelligence') ) )" ] }, @@ -376,6 +387,10 @@ "( (u_val('spell_level', 'spell: biokin_perfected_motion') * 110) + 3000) * (scaling_factor(u_val('intelligence') ) )" ] }, + "energy_source": "STAMINA", + "base_energy_cost": 8000, + "final_energy_cost": 3500, + "energy_increment": -175, "base_casting_time": 75, "final_casting_time": 15, "casting_time_increment": -4 diff --git a/data/mods/MindOverMatter/powers/biokinesis_eocs.json b/data/mods/MindOverMatter/powers/biokinesis_eocs.json index fa996b5e715d4..9aa936fdc62da 100644 --- a/data/mods/MindOverMatter/powers/biokinesis_eocs.json +++ b/data/mods/MindOverMatter/powers/biokinesis_eocs.json @@ -2,18 +2,10 @@ { "type": "effect_on_condition", "id": "EOC_BIOKIN_PAIN_INITIATE", - "condition": { - "and": [ - { "not": { "u_has_effect": "effect_biokin_pkill_1" } }, - { "not": { "u_has_effect": "effect_biokin_pkill_2" } }, - { "not": { "u_has_effect": "effect_biokin_pkill_3" } }, - { "not": { "u_has_effect": "effect_biokin_pkill_4" } }, - { "not": { "u_has_effect": "effect_biokin_pkill_5" } }, - { "not": { "u_has_effect": "effect_biokin_pkill_6" } } - ] - }, + "condition": { "not": { "u_has_effect": "effect_biokin_overcome_pain" } }, "effect": [ { "u_message": "You breathe deeply and your pain lessens.", "type": "good" }, + { "u_add_effect": "effect_biokin_overcome_pain", "duration": "PERMANENT" }, { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_BIOKIN_OVERCOME_PAIN_SWITCHER" ] }, { "u_cast_spell": { "id": "psionic_drained_difficulty_one", "hit_self": true } }, { @@ -32,18 +24,7 @@ ] } ], - "false_effect": [ - { "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" }, - { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" }, - { - "math": [ "u_val('stamina')", "+=", "max( (1750 - (u_val('spell_level', 'spell: biokin_overcome_pain') * 75) ), 850)" ] - } - ] + "false_effect": [ { "run_eocs": "EOC_BIOKIN_REMOVE_OVERCOME_PAIN" } ] }, { "type": "effect_on_condition", @@ -60,19 +41,25 @@ ] } }, + { + "type": "effect_on_condition", + "id": "EOC_BIOKIN_REMOVE_OVERCOME_PAIN", + "condition": { "u_has_effect": "effect_biokin_overcome_pain" }, + "effect": [ + { "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_overcome_pain" }, + { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" } + ] + }, { "type": "effect_on_condition", "id": "EOC_BIOKIN_OVERCOME_PAIN_DRAIN", - "condition": { - "or": [ - { "u_has_effect": "effect_biokin_pkill_1" }, - { "u_has_effect": "effect_biokin_pkill_2" }, - { "u_has_effect": "effect_biokin_pkill_3" }, - { "u_has_effect": "effect_biokin_pkill_4" }, - { "u_has_effect": "effect_biokin_pkill_5" }, - { "u_has_effect": "effect_biokin_pkill_6" } - ] - }, + "condition": { "u_has_effect": "effect_biokin_overcome_pain" }, "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_one", "hit_self": true } }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, @@ -118,13 +105,13 @@ ] } ], - "false_effect": [ - { "u_lose_effect": "effect_biokin_climate_control" }, - { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" }, - { - "math": [ "u_val('stamina')", "+=", "max( (3500 - (u_val('spell_level', 'spell: biokin_climate_control') * 175) ), 1250)" ] - } - ] + "false_effect": [ { "run_eocs": "EOC_BIOKIN_REMOVE_CLIMATE_CONTROL" } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_BIOKIN_REMOVE_CLIMATE_CONTROL", + "condition": { "u_has_effect": "effect_biokin_climate_control" }, + "effect": [ { "u_lose_effect": "effect_biokin_climate_control" }, { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" } ] }, { "type": "effect_on_condition", @@ -174,19 +161,7 @@ ] } ], - "false_effect": [ - { "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_enhance_mobility" }, - { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" }, - { - "math": [ "u_val('stamina')", "+=", "max( (4500 - (u_val('spell_level', 'spell: biokin_enhance_mobility') * 150) ), 2500)" ] - } - ] + "false_effect": [ { "run_eocs": "EOC_BIOKIN_REMOVE_ENHANCE_MOBILITY" } ] }, { "type": "effect_on_condition", @@ -221,6 +196,21 @@ ] } }, + { + "type": "effect_on_condition", + "id": "EOC_BIOKIN_REMOVE_ENHANCE_MOBILITY", + "condition": { "u_has_effect": "effect_biokin_enhance_mobility" }, + "effect": [ + { "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_enhance_mobility" }, + { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" } + ] + }, { "type": "effect_on_condition", "id": "EOC_BIOKIN_ENHANCE_MOBILITY_DRAIN", @@ -268,12 +258,16 @@ ] } ], - "false_effect": [ + "false_effect": [ { "run_eocs": "EOC_BIOKIN_REMOVE_HAMMERHAND" } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_BIOKIN_REMOVE_HAMMERHAND", + "condition": { "u_has_effect": "effect_biokin_hammerhand" }, + "effect": [ + { "u_remove_item_with": "effect_biokin_hammerhand" }, { "u_lose_effect": "effect_biokin_hammerhand" }, - { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" }, - { - "math": [ "u_val('stamina')", "+=", "max( (4500 - (u_val('spell_level', 'spell: biokin_hammerhand') * 225) ), 2250)" ] - } + { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" } ] }, { diff --git a/data/mods/MindOverMatter/powers/clairsentience.json b/data/mods/MindOverMatter/powers/clairsentience.json index 2b57e3828310b..5db166ec32651 100644 --- a/data/mods/MindOverMatter/powers/clairsentience.json +++ b/data/mods/MindOverMatter/powers/clairsentience.json @@ -10,15 +10,11 @@ "spell_class": "CLAIRSENTIENT", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 1, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_CLAIR_NIGHT_EYES_INITIATE", "shape": "blast", - "difficulty": 1, - "max_level": { "math": [ "int_to_level(1)" ] }, - "energy_source": "STAMINA", - "base_energy_cost": 1500, - "final_energy_cost": 500, - "energy_increment": -50, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: clair_night_vision') * 20000) + 15000) * (scaling_factor(u_val('intelligence') ) )" ] }, @@ -27,10 +23,18 @@ "( (u_val('spell_level', 'spell: clair_night_vision') * 20000) + 180000) * (scaling_factor(u_val('intelligence') ) )" ] }, - "base_casting_time": 50, - "final_casting_time": 20, - "casting_time_increment": -2, - "learn_spells": { "clair_voyance": 7, "clair_danger_sense": 9, "clair_see_map": 15 } + "energy_source": "STAMINA", + "base_energy_cost": { + "math": [ + "u_effect_intensity('effect_clair_night_eyes') > -1 ? 0 : max((1500 - (u_val('spell_level', 'spell: clair_night_vision') * 50)), 500)" + ] + }, + "base_casting_time": { + "math": [ + "u_effect_intensity('effect_clair_night_eyes') > -1 ? 10 : max((50 -(u_val('spell_level', 'spell: clair_night_vision') * 2)), 20)" + ] + }, + "learn_spells": { "clair_danger_sense": 9, "clair_voyance": 12, "clair_see_map": 18 } }, { "id": "clair_speed_reading", @@ -43,15 +47,11 @@ "spell_class": "CLAIRSENTIENT", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 2, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_CLAIR_SPEED_READING_INITIATE", "shape": "blast", - "difficulty": 2, - "max_level": { "math": [ "int_to_level(1)" ] }, - "energy_source": "STAMINA", - "base_energy_cost": 2500, - "final_energy_cost": 1000, - "energy_increment": -125, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: clair_speed_reading') * 36000) + 360000) * (scaling_factor(u_val('intelligence') ) )" @@ -62,9 +62,17 @@ "( (u_val('spell_level', 'spell: clair_speed_reading') * 72000) + 1080000) * (scaling_factor(u_val('intelligence') ) )" ] }, - "base_casting_time": 500, - "final_casting_time": 250, - "casting_time_increment": -12, + "energy_source": "STAMINA", + "base_energy_cost": { + "math": [ + "u_effect_intensity('effect_clair_speed_reader') > -1 ? 0 : max((2500 - (u_val('spell_level', 'spell: clair_speed_reading') * 125)), 1000)" + ] + }, + "base_casting_time": { + "math": [ + "u_effect_intensity('effect_clair_speed_reader') > -1 ? 10 : max((500 -(u_val('spell_level', 'spell: clair_speed_reading') * 12)), 250)" + ] + }, "learn_spells": { "clair_spot_weakness": 5, "clair_ranged_enhance": 7, "clair_voyance": 9, "clair_clear_sight": 15 } }, { @@ -78,22 +86,22 @@ "spell_class": "CLAIRSENTIENT", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 2, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_clair_premonition", "extra_effects": [ { "id": "psionic_drained_difficulty_two", "hit_self": true } ], "shape": "blast", - "energy_source": "STAMINA", - "difficulty": 2, - "max_level": { "math": [ "int_to_level(1)" ] }, - "base_energy_cost": 1500, - "final_energy_cost": 850, - "energy_increment": -85, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: clair_danger_sense') * 6000) + 12000) * (scaling_factor(u_val('intelligence') ) )" ] }, "max_duration": { "math": [ "( (u_val('spell_level', 'spell: clair_danger_sense') * 6000) + 90000) * (scaling_factor(u_val('intelligence') ) )" ] }, + "energy_source": "STAMINA", + "base_energy_cost": 1500, + "final_energy_cost": 850, + "energy_increment": -85, "base_casting_time": 85, "final_casting_time": 25, "casting_time_increment": -7, @@ -110,12 +118,12 @@ "spell_class": "CLAIRSENTIENT", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "IGNORE_WALLS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 3, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_clair_weak_point", "extra_effects": [ { "id": "psionic_drained_difficulty_three", "hit_self": true } ], "shape": "blast", - "difficulty": 3, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_range": { "math": [ "min( ( (u_val('spell_level', 'spell: clair_spot_weakness') * 1.1) + 1) * (scaling_factor(u_val('intelligence') ) ), 100)" @@ -149,13 +157,13 @@ "spell_class": "CLAIRSENTIENT", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 3, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_CLAIR_RAD_SENSE", "//": "Drain is handled in the subspells below", "shape": "blast", "energy_source": "STAMINA", - "difficulty": 3, - "max_level": { "math": [ "int_to_level(1)" ] }, "base_energy_cost": 2500, "final_energy_cost": 500, "energy_increment": -125, @@ -171,11 +179,11 @@ "valid_targets": [ "self" ], "spell_class": "CLAIRSENTIENT", "flags": [ "PSIONIC", "SILENT", "NO_EXPLOSION_SFX", "RANDOM_DURATION" ], + "shape": "blast", + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_CLAIR_RAD_SENSE_SELF_REPORT", - "extra_effects": [ { "id": "psionic_drained_difficulty_two", "hit_self": true } ], - "shape": "blast", - "max_level": { "math": [ "int_to_level(1)" ] } + "extra_effects": [ { "id": "psionic_drained_difficulty_two", "hit_self": true } ] }, { "id": "clair_sense_rads_outside", @@ -185,11 +193,11 @@ "valid_targets": [ "self" ], "spell_class": "CLAIRSENTIENT", "flags": [ "PSIONIC", "SILENT", "NO_EXPLOSION_SFX", "RANDOM_DURATION" ], + "shape": "blast", + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_clair_sense_rads_self", "extra_effects": [ { "id": "psionic_drained_difficulty_four", "hit_self": true } ], - "shape": "blast", - "max_level": { "math": [ "int_to_level(1)" ] }, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: clair_sense_rads') * 23000) + 180000) * (scaling_factor(u_val('intelligence') ) )" ] }, @@ -205,10 +213,10 @@ "valid_targets": [ "self" ], "spell_class": "CLAIRSENTIENT", "flags": [ "PSIONIC", "SILENT", "NO_EXPLOSION_SFX", "RANDOM_DURATION" ], + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "spawn_item", "effect_str": "clair_sense_rad_item", "shape": "blast", - "max_level": { "math": [ "int_to_level(1)" ] }, "min_damage": 1, "max_damage": 1, "min_duration": 1100, @@ -225,16 +233,12 @@ "spell_class": "CLAIRSENTIENT", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 4, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_clair_ranged_enhance", "extra_effects": [ { "id": "psionic_drained_difficulty_four", "hit_self": true } ], "shape": "blast", - "energy_source": "STAMINA", - "difficulty": 4, - "max_level": { "math": [ "int_to_level(1)" ] }, - "base_energy_cost": 4000, - "final_energy_cost": 1500, - "energy_increment": -175, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: clair_ranged_enhance') * 800) + 10000) * (scaling_factor(u_val('intelligence') ) )" ] }, @@ -243,6 +247,10 @@ "( (u_val('spell_level', 'spell: clair_ranged_enhance') * 1500) + 60000) * (scaling_factor(u_val('intelligence') ) )" ] }, + "energy_source": "STAMINA", + "base_energy_cost": 4000, + "final_energy_cost": 1500, + "energy_increment": -175, "base_casting_time": 200, "final_casting_time": 125, "casting_time_increment": -10, @@ -259,11 +267,11 @@ "spell_class": "CLAIRSENTIENT", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "IGNORE_WALLS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 5, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "extra_effects": [ { "id": "psionic_drained_difficulty_five", "hit_self": true } ], "shape": "blast", - "difficulty": 5, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_range": { "math": [ "min( ( (u_val('spell_level', 'spell: clair_voyance') * 1.2) + 2) * (scaling_factor(u_val('intelligence') ) ), 80)" ] }, @@ -274,15 +282,15 @@ ] }, "max_aoe": 50, - "field_id": "fd_clairvoyant", - "min_field_intensity": 1, - "max_field_intensity": 1, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: clair_voyance') * 50) + 250) * (scaling_factor(u_val('intelligence') ) )" ] }, "max_duration": { "math": [ "( (u_val('spell_level', 'spell: clair_voyance') * 50) + 1500) * (scaling_factor(u_val('intelligence') ) )" ] }, + "field_id": "fd_clairvoyant", + "min_field_intensity": 1, + "max_field_intensity": 1, "energy_source": "STAMINA", "base_energy_cost": 5000, "final_energy_cost": 2500, @@ -304,12 +312,12 @@ "spell_class": "CLAIRSENTIENT", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 6, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_clair_dodge", "extra_effects": [ { "id": "psionic_drained_difficulty_six", "hit_self": true } ], "shape": "blast", - "difficulty": 6, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: clair_dodge_power') * 1200) + 3000) * (scaling_factor(u_val('intelligence') ) )" ] }, @@ -336,11 +344,11 @@ "spell_class": "CLAIRSENTIENT", "skill": "metaphysics", "flags": [ "PSIONIC", "NO_HANDS", "CONCENTRATE", "SILENT", "NO_LEGS", "RANDOM_AOE" ], + "difficulty": 7, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "map", "extra_effects": [ { "id": "psionic_drained_difficulty_seven", "hit_self": true } ], "shape": "blast", - "difficulty": 7, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_aoe": { "math": [ "( (u_val('spell_level', 'spell: clair_see_map') * 1) + 4) * (scaling_factor(u_val('intelligence') ) )" ] }, "max_aoe": { "math": [ "( (u_val('spell_level', 'spell: clair_see_map') * 1) + 11) * (scaling_factor(u_val('intelligence') ) )" ] }, "energy_source": "STAMINA", @@ -357,14 +365,14 @@ "teachable": false, "valid_targets": [ "self" ], "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 8, + "max_level": { "math": [ "int_to_level(1)" ] }, "spell_class": "CLAIRSENTIENT", "skill": "metaphysics", "effect": "attack", "effect_str": "effect_clair_clear_sight", "extra_effects": [ { "id": "psionic_drained_difficulty_eight", "hit_self": true } ], "shape": "blast", - "difficulty": 8, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: clair_clear_sight') * 1000) + 8000) * (scaling_factor(u_val('intelligence') ) )" ] }, @@ -389,14 +397,14 @@ "teachable": false, "valid_targets": [ "self" ], "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 10, + "max_level": { "math": [ "int_to_level(1)" ] }, "spell_class": "CLAIRSENTIENT", "skill": "metaphysics", "effect": "attack", "effect_str": "effect_clair_omniscence", "extra_effects": [ { "id": "psionic_drained_difficulty_ten", "hit_self": true } ], "shape": "blast", - "difficulty": 10, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: clair_omniscience') * 100) + 200) * (scaling_factor(u_val('intelligence') ) )" ] }, diff --git a/data/mods/MindOverMatter/powers/clairsentience_eoc.json b/data/mods/MindOverMatter/powers/clairsentience_eoc.json index 5066e3a6fe060..88f9eebedc369 100644 --- a/data/mods/MindOverMatter/powers/clairsentience_eoc.json +++ b/data/mods/MindOverMatter/powers/clairsentience_eoc.json @@ -2,21 +2,11 @@ { "type": "effect_on_condition", "id": "EOC_CLAIR_NIGHT_EYES_INITIATE", - "condition": { - "and": [ - { "not": { "u_has_effect": "effect_clair_night_eyes_1" } }, - { "not": { "u_has_effect": "effect_clair_night_eyes_2" } }, - { "not": { "u_has_effect": "effect_clair_night_eyes_3" } }, - { "not": { "u_has_effect": "effect_clair_night_eyes_4" } }, - { "not": { "u_has_effect": "effect_clair_night_eyes_5" } }, - { "not": { "u_has_effect": "effect_clair_night_eyes_6" } }, - { "not": { "u_has_effect": "effect_clair_night_eyes_7" } }, - { "not": { "u_has_effect": "effect_clair_night_eyes_8" } } - ] - }, + "condition": { "not": { "u_has_effect": "effect_clair_night_eyes" } }, "effect": [ { "u_message": "You open your senses to the world.", "type": "good" }, { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_CLAIR_NIGHT_EYES_SWITCHER" ] }, + { "u_add_effect": "effect_clair_night_eyes", "duration": "PERMANENT" }, { "u_cast_spell": { "id": "psionic_drained_difficulty_one", "hit_self": true } }, { "queue_eocs": "EOC_CLAIR_NIGHT_EYES_DRAIN", @@ -34,20 +24,7 @@ ] } ], - "false_effect": [ - { "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" }, - { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" }, - { - "math": [ "u_val('stamina')", "+=", "max( (1500 - (u_val('spell_level', 'spell: clair_night_vision') * 50) ), 500)" ] - } - ] + "false_effect": [ { "run_eocs": "EOC_CLAIR_REMOVE_NIGHT_EYES" } ] }, { "type": "effect_on_condition", @@ -66,6 +43,23 @@ ] } }, + { + "type": "effect_on_condition", + "id": "EOC_CLAIR_REMOVE_NIGHT_EYES", + "condition": { "u_has_effect": "effect_clair_night_eyes" }, + "effect": [ + { "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_night_eyes" }, + { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" } + ] + }, { "type": "effect_on_condition", "id": "EOC_CLAIR_NIGHT_EYES_DRAIN", @@ -124,12 +118,7 @@ ] } ], - "false_effect": [ - { "run_eocs": "EOC_CLAIR_REMOVE_SPEED_READ" }, - { - "math": [ "u_val('stamina')", "+=", "max( (2500 - (u_val('spell_level', 'spell: clair_speed_reading') * 125) ), 1000)" ] - } - ] + "false_effect": [ { "run_eocs": "EOC_CLAIR_REMOVE_SPEED_READ" } ] }, { "type": "effect_on_condition", diff --git a/data/mods/MindOverMatter/powers/drain_spells.json b/data/mods/MindOverMatter/powers/drain_spells.json index 8df4c89b45653..57d023ee2f87a 100644 --- a/data/mods/MindOverMatter/powers/drain_spells.json +++ b/data/mods/MindOverMatter/powers/drain_spells.json @@ -2,9 +2,9 @@ { "id": "psionic_drained_spell", "type": "SPELL", - "name": { "str": "Psionic Drain" }, + "name": { "str": "Nether-Attunement" }, "valid_targets": [ "self" ], - "description": "Applies Drained to you.", + "description": "Applies Nether Attunement to you.", "flags": [ "SILENT", "NO_EXPLOSION_SFX", "NO_FAIL" ], "message": "", "effect": "effect_on_condition", @@ -16,11 +16,11 @@ "id": "EOC_CAUSE_PSIONIC_DRAIN", "condition": { "u_has_effect": "effect_noetic_resilience" }, "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( 0,3 )" ] } ], "false_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( 1,5 )" ] } ] }, diff --git a/data/mods/MindOverMatter/powers/electrokinesis_eocs.json b/data/mods/MindOverMatter/powers/electrokinesis_eocs.json index 1e5d05fe25419..334c2a146f2aa 100644 --- a/data/mods/MindOverMatter/powers/electrokinesis_eocs.json +++ b/data/mods/MindOverMatter/powers/electrokinesis_eocs.json @@ -4,7 +4,7 @@ "id": "EOC_ELECTROKIN_PERSONAL_BATTERY_INITIATE", "condition": { "not": { "u_has_effect": "effect_electrokin_personal_battery" } }, "effect": [ - { "u_message": "The hair on your arms stands up on end.", "type": "good" }, + { "u_message": "The hair on your body stands up on end.", "type": "good" }, { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_ELECTROKIN_PERSONAL_BATTERY_SWITCHER" ] }, { "u_add_effect": "effect_electrokin_personal_battery", "duration": "PERMANENT" }, { "u_cast_spell": { "id": "psionic_drained_difficulty_three", "hit_self": true } }, @@ -24,7 +24,13 @@ ] } ], - "false_effect": [ + "false_effect": [ { "run_eocs": "EOC_ELECTROKIN_REMOVE_PERSONAL_BATTERY" } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_ELECTROKIN_REMOVE_PERSONAL_BATTERY", + "condition": { "u_has_effect": "effect_electrokin_personal_battery" }, + "effect": [ { "u_remove_item_with": "electrokinetic_ups_1" }, { "u_remove_item_with": "electrokinetic_ups_2" }, { "u_remove_item_with": "electrokinetic_ups_3" }, diff --git a/data/mods/MindOverMatter/powers/photokinesis.json b/data/mods/MindOverMatter/powers/photokinesis.json index 3b3accb27e8c2..aad6799576eb1 100644 --- a/data/mods/MindOverMatter/powers/photokinesis.json +++ b/data/mods/MindOverMatter/powers/photokinesis.json @@ -26,12 +26,16 @@ ] }, "energy_source": "STAMINA", - "base_energy_cost": 1500, - "final_energy_cost": 450, - "energy_increment": -80, - "base_casting_time": 125, - "final_casting_time": 50, - "casting_time_increment": -7.5, + "base_energy_cost": { + "math": [ + "u_effect_intensity('effect_photokin_light_local') > -1 ? 0 : max((1500 - (u_val('spell_level', 'spell: photokinetic_light_local') * 80)), 450)" + ] + }, + "base_casting_time": { + "math": [ + "u_effect_intensity('effect_photokin_light_local') > -1 ? 10 : max((125 -(u_val('spell_level', 'spell: photokinetic_light_local') * 7.5)), 50)" + ] + }, "learn_spells": { "photokinetic_create_light": 5, "photokinetic_light_beam": 10, "photokinetic_light_image": 15 } }, { @@ -324,7 +328,7 @@ { "id": "photokinetic_rad_immunity", "type": "SPELL", - "name": "[Ψ]Lucent Barrier", + "name": "[Ψ]Lucent Barrier (toggle)", "description": "Create a barrier of light around yourself to protect against radiation and light damage.\n\nThis power may be maintained by concentration and causes Drain at intervals.", "message": "", "teachable": false, @@ -348,12 +352,16 @@ ] }, "energy_source": "STAMINA", - "base_energy_cost": 3000, - "final_energy_cost": 700, - "energy_increment": -125, - "base_casting_time": 250, - "final_casting_time": 100, - "casting_time_increment": -4.5, + "base_energy_cost": { + "math": [ + "u_effect_intensity('effect_photokin_light_barrier') > -1 ? 0 : max((3000 - (u_val('spell_level', 'spell: photokinetic_rad_immunity') * 125)), 800)" + ] + }, + "base_casting_time": { + "math": [ + "u_effect_intensity('effect_photokin_light_barrier') > -1 ? 10 : max((250 -(u_val('spell_level', 'spell: photokinetic_rad_immunity') * 4.5)), 100)" + ] + }, "learn_spells": { "photokinetic_invisibility": 5, "photokinetic_light_flash": 7 } }, { @@ -457,12 +465,16 @@ ] }, "energy_source": "STAMINA", - "base_energy_cost": 4000, - "final_energy_cost": 1500, - "energy_increment": -100, - "base_casting_time": 250, - "final_casting_time": 75, - "casting_time_increment": -10, + "base_energy_cost": { + "math": [ + "u_effect_intensity('effect_photokinetic_radio') > -1 ? 0 : max((4000 - (u_val('spell_level', 'spell: photokinetic_radio') * 100)), 1500)" + ] + }, + "base_casting_time": { + "math": [ + "u_effect_intensity('effect_photokinetic_radio') > -1 ? 10 : max((250 -(u_val('spell_level', 'spell: biokin_hammerhand') * 10)), 75)" + ] + }, "learn_spells": { "photokinetic_blinding_glare": 8 } }, { diff --git a/data/mods/MindOverMatter/powers/photokinesis_eocs.json b/data/mods/MindOverMatter/powers/photokinesis_eocs.json index bf96162a4f2fa..26b3b6e89aa79 100644 --- a/data/mods/MindOverMatter/powers/photokinesis_eocs.json +++ b/data/mods/MindOverMatter/powers/photokinesis_eocs.json @@ -23,16 +23,11 @@ ] } ], - "false_effect": [ - { "run_eocs": "EOC_PHOTO_REMOVE_LIGHT_LOCAL" }, - { - "math": [ "u_val('stamina')", "+=", "max( (1500 - (u_val('spell_level', 'spell: photokinetic_light_local') * 80) ), 450)" ] - } - ] + "false_effect": [ { "run_eocs": "EOC_PHOTOKIN_REMOVE_LIGHT_LOCAL" } ] }, { "type": "effect_on_condition", - "id": "EOC_PHOTO_REMOVE_LIGHT_LOCAL", + "id": "EOC_PHOTOKIN_REMOVE_LIGHT_LOCAL", "condition": { "u_has_effect": "effect_photokin_light_local" }, "effect": [ { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" }, { "u_lose_effect": "effect_photokin_light_local" } ] }, @@ -100,13 +95,16 @@ ] } ], - "false_effect": [ + "false_effect": [ { "run_eocs": "EOC_PHOTOKIN_REMOVE_RAD_IMMUNITY" } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_PHOTOKIN_REMOVE_RAD_IMMUNITY", + "condition": { "u_has_effect": "effect_photokin_light_barrier" }, + "effect": [ { "u_remove_item_with": "photokinetic_rad_aura" }, { "u_lose_effect": "effect_photokin_light_barrier" }, - { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" }, - { - "math": [ "u_val('stamina')", "+=", "max( (2500 - (u_val('spell_level', 'spell: photokinetic_rad_immunity') * 150) ), 800)" ] - } + { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" } ] }, { @@ -269,17 +267,12 @@ ] } ], - "false_effect": [ - { "run_eocs": "EOC_PHOTOKIN_REMOVE_RADIO" }, - { - "math": [ "u_val('stamina')", "+=", "max( (4000 - (u_val('spell_level', 'spell: photokinetic_radio') * 100) ), 1500)" ] - } - ] + "false_effect": [ { "run_eocs": "EOC_PHOTOKIN_REMOVE_RADIO" } ] }, { "type": "effect_on_condition", "id": "EOC_PHOTOKIN_REMOVE_RADIO", - "condition": { "or": [ { "u_has_item": "photokinetic_radio" }, { "u_has_item": "photokinetic_radio_on" } ] }, + "condition": { "u_has_effect": "effect_photokinetic_radio" }, "effect": [ { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" }, { "u_remove_item_with": "item_photokinetic_radio" }, @@ -290,7 +283,7 @@ { "type": "effect_on_condition", "id": "EOC_PHOTOKIN_RADIO_DRAIN", - "condition": { "or": [ { "u_has_item": "photokinetic_radio" }, { "u_has_item": "photokinetic_radio_on" } ] }, + "condition": { "u_has_effect": "effect_photokinetic_radio" }, "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_five", "hit_self": true } }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, diff --git a/data/mods/MindOverMatter/powers/pyrokinesis.json b/data/mods/MindOverMatter/powers/pyrokinesis.json index a39bf035cffd3..8473c1d33c5f9 100644 --- a/data/mods/MindOverMatter/powers/pyrokinesis.json +++ b/data/mods/MindOverMatter/powers/pyrokinesis.json @@ -10,12 +10,12 @@ "spell_class": "PYROKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "LOUD", "NO_PROJECTILE", "IGNITE_FLAMMABLE", "RANDOM_DAMAGE", "NO_HANDS", "NO_LEGS" ], + "difficulty": 2, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "extra_effects": [ { "id": "psionic_drained_difficulty_two", "hit_self": true } ], "shape": "blast", "damage_type": "heat", - "difficulty": 2, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_damage": { "math": [ "( (u_val('spell_level', 'spell: pyrokinetic_eruption') * 2) + 6) * (scaling_factor(u_val('intelligence') ) )" ] }, @@ -62,13 +62,13 @@ "spell_class": "PYROKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "NO_HANDS", "NO_PROJECTILE", "NO_LEGS", "RANDOM_DURATION" ], + "difficulty": 1, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_pyrokinetic_flash", "extra_effects": [ { "id": "psionic_drained_difficulty_one", "hit_self": true } ], "shape": "blast", "affected_body_parts": [ "eyes" ], - "difficulty": 1, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_range": { "math": [ "min( ( (u_val('spell_level', 'spell: pyrokinetic_flash') * 1.5) + 3 ) * (scaling_factor(u_val('intelligence') ) ), 50)" @@ -107,18 +107,22 @@ "valid_targets": [ "self" ], "spell_class": "PYROKINETIC", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "NO_EXPLOSION_SFX" ], + "difficulty": 3, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_PYROKIN_CALL_FLAME_INITIATE", "shape": "blast", - "difficulty": 3, - "max_level": { "math": [ "int_to_level(1)" ] }, "energy_source": "STAMINA", - "base_energy_cost": 2500, - "final_energy_cost": 800, - "energy_increment": -150, - "base_casting_time": 250, - "final_casting_time": 75, - "casting_time_increment": -10, + "base_energy_cost": { + "math": [ + "u_effect_intensity('effect_pyrokinetic_fire_tool') > -1 ? 0 : max((2500 - (u_val('spell_level', 'spell: pyrokinetic_call_flames') * 150)), 800)" + ] + }, + "base_casting_time": { + "math": [ + "u_effect_intensity('effect_pyrokinetic_fire_tool') > -1 ? 10 : max((250 -(u_val('spell_level', 'spell: pyrokinetic_call_flames') * 10)), 75)" + ] + }, "learn_spells": { "pyrokinetic_lance": 5, "pyrokinetic_thermogenesis": 6, "pyrokinetic_blast": 8, "pyrokinetic_aura": 12 } }, { @@ -132,6 +136,8 @@ "spell_class": "PYROKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "NO_EXPLOSION_SFX" ], + "difficulty": 3, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "ter_transform", "effect_str": "ter_pyrokin_quell_fire", "extra_effects": [ @@ -139,8 +145,6 @@ { "id": "pyrokinetic_quell_flames_self", "hit_self": true } ], "shape": "blast", - "difficulty": 3, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_range": { "math": [ "min( ( (u_val('spell_level', 'spell: pyrokinetic_quell_flames') * 0.8) + 5) * (scaling_factor(u_val('intelligence') ) ), 70)" @@ -171,11 +175,11 @@ "teachable": false, "valid_targets": [ "self", "ally", "ground", "hostile" ], "flags": [ "PSIONIC", "SILENT", "NO_HANDS", "NO_LEGS", "NO_EXPLOSION_SFX" ], + "difficulty": 3, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "remove_effect", "effect_str": "onfire", "shape": "blast", - "difficulty": 3, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_range": { "math": [ "min( ( (u_val('spell_level', 'spell: pyrokinetic_quell_flames') * 0.8) + 5) * (scaling_factor(u_val('intelligence') ) ), 70)" @@ -200,11 +204,11 @@ "spell_class": "PYROKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION" ], + "difficulty": 4, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_PYROKIN_WARMTH_CLOAK_INITIATE", "shape": "blast", - "difficulty": 4, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: pyrokinetic_cloak') * 2000) + 9000) * (scaling_factor(u_val('intelligence') ) )" ] }, @@ -212,12 +216,16 @@ "math": [ "( (u_val('spell_level', 'spell: pyrokinetic_cloak') * 2000) + 180000) * (scaling_factor(u_val('intelligence') ) )" ] }, "energy_source": "STAMINA", - "base_energy_cost": 4500, - "final_energy_cost": 1550, - "energy_increment": -200, - "base_casting_time": 200, - "final_casting_time": 75, - "casting_time_increment": -11, + "base_energy_cost": { + "math": [ + "u_effect_intensity('effect_pyrokinetic_cloak') > -1 ? 0 : max((4500 - (u_val('spell_level', 'spell: pyrokinetic_cloak') * 200)), 2000)" + ] + }, + "base_casting_time": { + "math": [ + "u_effect_intensity('effect_pyrokinetic_cloak') > -1 ? 10 : max((250 -(u_val('spell_level', 'spell: pyrokinetic_cloak') * 11)), 75)" + ] + }, "learn_spells": { "pyrokinetic_thermogenesis": 8, "pyrokinetic_aura": 9, "pyrokinetic_eruption": 12, "pyrokinetic_flame_immunity": 15 } }, { @@ -231,12 +239,12 @@ "spell_class": "PYROKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "LOUD", "NO_PROJECTILE", "IGNITE_FLAMMABLE", "RANDOM_DAMAGE", "NO_HANDS", "NO_LEGS" ], + "difficulty": 5, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "extra_effects": [ { "id": "psionic_drained_difficulty_five", "hit_self": true } ], "shape": "cone", "damage_type": "heat", - "difficulty": 5, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_damage": { "math": [ "( (u_val('spell_level', 'spell: pyrokinetic_flamethrower') * 1.5) + 15) * (scaling_factor(u_val('intelligence') ) )" @@ -285,11 +293,11 @@ "valid_targets": [ "self" ], "spell_class": "PYROKINETIC", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 5, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_PYROKIN_TORCH_WELD_INITIATE", "shape": "blast", - "difficulty": 5, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: pyrokinetic_lance') * 12000) + 360000) * (scaling_factor(u_val('intelligence') ) )" ] }, @@ -297,12 +305,16 @@ "math": [ "( (u_val('spell_level', 'spell: pyrokinetic_lance') * 36000) + 720000) * (scaling_factor(u_val('intelligence') ) )" ] }, "energy_source": "STAMINA", - "base_energy_cost": 4000, - "final_energy_cost": 2000, - "energy_increment": -125, - "base_casting_time": 650, - "final_casting_time": 320, - "casting_time_increment": -12 + "base_energy_cost": { + "math": [ + "u_effect_intensity('effect_pyrokinetic_torch_weld') > -1 ? 0 : max((5000 - (u_val('spell_level', 'spell: pyrokinetic_lance') * 125)), 2000)" + ] + }, + "base_casting_time": { + "math": [ + "u_effect_intensity('effect_pyrokinetic_torch_weld') > -1 ? 10 : max((650 -(u_val('spell_level', 'spell: pyrokinetic_lance') * 12)), 320)" + ] + } }, { "id": "pyrokinetic_thermogenesis", @@ -314,12 +326,12 @@ "valid_targets": [ "self" ], "spell_class": "PYROKINETIC", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 6, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_SPELL_PYROKIN_THERMOGENESIS_SELECTOR", "//": "No drain on the spell, it's all in the selector.", "shape": "blast", - "difficulty": 6, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: pyrokinetic_thermogenesis') * 15000) + 360000) * (scaling_factor(u_val('intelligence') ) )" @@ -462,12 +474,12 @@ "spell_class": "PYROKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION" ], + "difficulty": 6, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_pyrokinetic_aura", "extra_effects": [ { "id": "psionic_drained_difficulty_six", "hit_self": true } ], "shape": "blast", - "difficulty": 6, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: pyrokinetic_aura') * 600) + 4500) * (scaling_factor(u_val('intelligence') ) )" ] }, @@ -494,12 +506,12 @@ "spell_class": "PYROKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION" ], + "difficulty": 7, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_pyrokinetic_flame_immunity", "extra_effects": [ { "id": "psionic_drained_difficulty_seven", "hit_self": true } ], "shape": "blast", - "difficulty": 7, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: pyrokinetic_flame_immunity') * 600) + 4500) * (scaling_factor(u_val('intelligence') ) )" @@ -511,7 +523,7 @@ ] }, "energy_source": "STAMINA", - "base_energy_cost": 6750, + "base_energy_cost": 7750, "final_energy_cost": 3500, "energy_increment": -255, "base_casting_time": 150, @@ -530,12 +542,12 @@ "spell_class": "PYROKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "LOUD", "NO_PROJECTILE", "IGNITE_FLAMMABLE", "RANDOM_DAMAGE", "NO_HANDS", "NO_LEGS" ], + "difficulty": 7, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "extra_effects": [ { "id": "psionic_drained_difficulty_seven", "hit_self": true } ], "shape": "blast", "damage_type": "heat", - "difficulty": 7, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_damage": { "math": [ "( (u_val('spell_level', 'spell: pyrokinetic_blast') * 3) + 37) * (scaling_factor(u_val('intelligence') ) )" ] }, @@ -581,6 +593,8 @@ "spell_class": "PYROKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "LOUD", "NO_PROJECTILE", "IGNITE_FLAMMABLE", "RANDOM_DAMAGE", "NO_HANDS", "NO_LEGS" ], + "difficulty": 9, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "extra_effects": [ { "id": "psionic_drained_difficulty_nine", "hit_self": true }, @@ -588,8 +602,6 @@ ], "shape": "blast", "damage_type": "heat", - "difficulty": 9, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_damage": { "math": [ "( (u_val('spell_level', 'spell: pyrokinetic_aoe_blast') * 5) + 40) * (scaling_factor(u_val('intelligence') ) )" ] }, diff --git a/data/mods/MindOverMatter/powers/pyrokinesis_eoc.json b/data/mods/MindOverMatter/powers/pyrokinesis_eoc.json index b53e247b95cb3..d27d88c6f2654 100644 --- a/data/mods/MindOverMatter/powers/pyrokinesis_eoc.json +++ b/data/mods/MindOverMatter/powers/pyrokinesis_eoc.json @@ -2,10 +2,11 @@ { "type": "effect_on_condition", "id": "EOC_PYROKIN_CALL_FLAME_INITIATE", - "condition": { "not": { "u_has_item": "pyrokinetic_fire_tool" } }, + "condition": { "not": { "u_has_effect": "effect_pyrokinetic_fire_tool" } }, "effect": [ { "u_message": "Flames begin dancing in the air above your hand.", "type": "good" }, { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, + { "u_add_effect": "effect_pyrokinetic_fire_tool", "duration": "PERMANENT" }, { "u_spawn_item": "pyrokinetic_fire_tool", "suppress_message": true, "force_equip": true }, { "u_cast_spell": { "id": "psionic_drained_difficulty_three", "hit_self": true } }, { @@ -24,27 +25,23 @@ ] } ], - "false_effect": [ - { "run_eocs": "EOC_PYRO_REMOVE_FIRE_TOOL" }, - { - "math": [ "u_val('stamina')", "+=", "max( (2500 - (u_val('spell_level', 'spell: pyrokinetic_call_flames') * 150) ), 800)" ] - } - ] + "false_effect": [ { "run_eocs": "EOC_PYRO_REMOVE_FIRE_TOOL" } ] }, { "type": "effect_on_condition", "id": "EOC_PYRO_REMOVE_FIRE_TOOL", - "condition": { "u_has_item": "pyrokinetic_fire_tool" }, + "condition": { "u_has_effect": "effect_pyrokinetic_fire_tool" }, "effect": [ { "u_message": "The flames over your hand gutter and die out.", "type": "bad" }, { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" }, - { "u_remove_item_with": "pyrokinetic_fire_tool" } + { "u_remove_item_with": "pyrokinetic_fire_tool" }, + { "u_lose_effect": "effect_pyrokinetic_fire_tool" } ] }, { "type": "effect_on_condition", "id": "EOC_PYROKIN_CALL_FLAME_DRAIN", - "condition": { "u_has_item": "pyrokinetic_fire_tool" }, + "condition": { "u_has_effect": "effect_pyrokinetic_fire_tool" }, "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_three", "hit_self": true } }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, @@ -87,13 +84,13 @@ ] } ], - "false_effect": [ - { "u_lose_effect": "effect_pyrokinetic_cloak" }, - { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" }, - { - "math": [ "u_val('stamina')", "+=", "max( (3500 - (u_val('spell_level', 'spell: pyrokinetic_cloak') * 175) ), 1250)" ] - } - ] + "false_effect": [ { "run_eocs": "EOC_PYRO_REMOVE_WARMTH_CLOAK" } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_PYRO_REMOVE_WARMTH_CLOAK", + "condition": { "u_has_effect": "effect_pyrokinetic_cloak" }, + "effect": [ { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" }, { "u_lose_effect": "effect_pyrokinetic_cloak" } ] }, { "type": "effect_on_condition", @@ -119,10 +116,11 @@ { "type": "effect_on_condition", "id": "EOC_PYROKIN_TORCH_WELD_INITIATE", - "condition": { "not": { "u_has_item": "pyrokinetic_torch_weld" } }, + "condition": { "not": { "u_has_effect": "effect_pyrokinetic_torch_weld" } }, "effect": [ { "u_message": "A searing line of flame springs forth from your finger.", "type": "good" }, { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, + { "u_add_effect": "effect_pyrokinetic_torch_weld", "duration": "PERMANENT" }, { "u_spawn_item": "pyrokinetic_torch_weld", "suppress_message": true, "force_equip": true }, { "u_cast_spell": { "id": "psionic_drained_difficulty_five", "hit_self": true } }, { @@ -137,21 +135,17 @@ ] } ], - "false_effect": [ - { "run_eocs": "EOC_PYRO_REMOVE_TORCH_WELD" }, - { - "math": [ "u_val('stamina')", "+=", "max( (4000 - (u_val('spell_level', 'spell: pyrokinetic_lance') * 125) ), 2000)" ] - } - ] + "false_effect": [ { "run_eocs": "EOC_PYRO_REMOVE_TORCH_WELD" } ] }, { "type": "effect_on_condition", "id": "EOC_PYRO_REMOVE_TORCH_WELD", - "condition": { "u_has_item": "pyrokinetic_torch_weld" }, + "condition": { "u_has_effect": "effect_pyrokinetic_torch_weld" }, "effect": [ { "u_message": "The line of fire vanishes in an instant.", "type": "bad" }, { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" }, - { "u_remove_item_with": "pyrokinetic_torch_weld" } + { "u_remove_item_with": "pyrokinetic_torch_weld" }, + { "u_lose_effect": "effect_pyrokinetic_torch_weld" } ] }, { diff --git a/data/mods/MindOverMatter/powers/telekinesis.json b/data/mods/MindOverMatter/powers/telekinesis.json index da3ae1844410b..f3926f9d72b26 100644 --- a/data/mods/MindOverMatter/powers/telekinesis.json +++ b/data/mods/MindOverMatter/powers/telekinesis.json @@ -238,11 +238,11 @@ "RANDOM_DURATION", "EXTRA_EFFECTS_FIRST" ], + "difficulty": 5, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_TELEKIN_STRENGTH_INITIATE", "shape": "blast", - "difficulty": 5, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_damage": 1, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: telekinetic_strength') * 1500) + 3000) * (scaling_factor(u_val('intelligence') ) )" ] @@ -253,12 +253,16 @@ ] }, "energy_source": "STAMINA", - "base_energy_cost": 4000, - "final_energy_cost": 2000, - "energy_increment": -150, - "base_casting_time": 1500, - "final_casting_time": 200, - "casting_time_increment": -86, + "base_energy_cost": { + "math": [ + "u_effect_intensity('effect_telekinetic_strength') > -1 ? 0 : max((4000 - (u_val('spell_level', 'spell: telekinetic_strength') * 150)), 2000)" + ] + }, + "base_casting_time": { + "math": [ + "u_effect_intensity('effect_telekinetic_strength') > -1 ? 10 : max((1500 -(u_val('spell_level', 'spell: telekinetic_strength') * 86)), 200)" + ] + }, "learn_spells": { "telekinetic_vehicle_lift": 4, "telekinetic_shield": 8 } }, { @@ -357,12 +361,16 @@ ] }, "energy_source": "STAMINA", - "base_energy_cost": 6000, - "final_energy_cost": 2750, - "energy_increment": -250, - "base_casting_time": 250, - "final_casting_time": 125, - "casting_time_increment": -8, + "base_energy_cost": { + "math": [ + "u_effect_intensity('effect_telekinetic_vehicle_lift') > -1 ? 0 : max((6500 - (u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 200)), 2750)" + ] + }, + "base_casting_time": { + "math": [ + "u_effect_intensity('effect_telekinetic_vehicle_lift') > -1 ? 10 : max((250 -(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 8)), 125)" + ] + }, "learn_spells": { "telekinetic_wave": 4, "telekinetic_explosion": 6 } }, { @@ -510,12 +518,16 @@ "math": [ "( (u_val('spell_level', 'spell: telekinetic_levitation') * 200) + 500) * (scaling_factor(u_val('intelligence') ) )" ] }, "energy_source": "STAMINA", - "base_energy_cost": 5500, - "final_energy_cost": 3000, - "energy_increment": -250, - "base_casting_time": 75, - "final_casting_time": 15, - "casting_time_increment": -7.5 + "base_energy_cost": { + "math": [ + "u_effect_intensity('effect_telekinetic_levitation') > -1 ? 0 : max((7500 - (u_val('spell_level', 'spell: telekinetic_levitation') * 250)), 3500)" + ] + }, + "base_casting_time": { + "math": [ + "u_effect_intensity('effect_telekinetic_levitation') > -1 ? 10 : max((75 -(u_val('spell_level', 'spell: telekinetic_levitation') * 7.5)), 15)" + ] + } }, { "id": "telekinetic_aegis", diff --git a/data/mods/MindOverMatter/powers/telekinesis_eoc.json b/data/mods/MindOverMatter/powers/telekinesis_eoc.json index 624e756846798..f7e06570923bf 100644 --- a/data/mods/MindOverMatter/powers/telekinesis_eoc.json +++ b/data/mods/MindOverMatter/powers/telekinesis_eoc.json @@ -20,17 +20,12 @@ ] } ], - "false_effect": [ - { "run_eocs": "EOC_TELEKIN_REMOVE_TELEKINETIC_STRENGTH" }, - { - "math": [ "u_val('stamina')", "+=", "max( (4000 - (u_val('spell_level', 'spell: telekinetic_strength') * 150) ), 2000)" ] - } - ] + "false_effect": [ { "run_eocs": "EOC_TELEKIN_REMOVE_TELEKINETIC_STRENGTH" } ] }, { "type": "effect_on_condition", "id": "EOC_TELEKIN_REMOVE_TELEKINETIC_STRENGTH", - "condition": { "or": [ { "u_has_effect": "effect_telekinetic_strength" } ] }, + "condition": { "u_has_effect": "effect_telekinetic_strength" }, "effect": [ { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" }, { "u_lose_effect": "effect_telekinetic_strength" } ] }, { @@ -57,33 +52,11 @@ { "type": "effect_on_condition", "id": "EOC_TELEKIN_SUMMON_JACKING_TOOL_INITIATE", - "condition": { - "and": [ - { "not": { "u_has_item": "telekin_lifting_jack_1" } }, - { "not": { "u_has_item": "telekin_lifting_jack_2" } }, - { "not": { "u_has_item": "telekin_lifting_jack_3" } }, - { "not": { "u_has_item": "telekin_lifting_jack_4" } }, - { "not": { "u_has_item": "telekin_lifting_jack_5" } }, - { "not": { "u_has_item": "telekin_lifting_jack_6" } }, - { "not": { "u_has_item": "telekin_lifting_jack_7" } }, - { "not": { "u_has_item": "telekin_lifting_jack_8" } }, - { "not": { "u_has_item": "telekin_lifting_jack_9" } }, - { "not": { "u_has_item": "telekin_lifting_jack_10" } }, - { "not": { "u_has_item": "telekin_lifting_jack_11" } }, - { "not": { "u_has_item": "telekin_lifting_jack_12" } }, - { "not": { "u_has_item": "telekin_lifting_jack_13" } }, - { "not": { "u_has_item": "telekin_lifting_jack_14" } }, - { "not": { "u_has_item": "telekin_lifting_jack_15" } }, - { "not": { "u_has_item": "telekin_lifting_jack_16" } }, - { "not": { "u_has_item": "telekin_lifting_jack_17" } }, - { "not": { "u_has_item": "telekin_lifting_jack_18" } }, - { "not": { "u_has_item": "telekin_lifting_jack_19" } }, - { "not": { "u_has_item": "telekin_lifting_jack_20" } } - ] - }, + "condition": { "not": { "u_has_effect": "effect_telekinetic_vehicle_lift" } }, "effect": [ { "u_message": "You ready yourself to lift a car just enough to work on it.", "type": "good" }, { "u_cast_spell": { "id": "psionic_drained_difficulty_six", "hit_self": true } }, + { "u_add_effect": "effect_telekinetic_vehicle_lift", "duration": "PERMANENT" }, { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_TELEKIN_SUMMON_JACKING_TOOL_SWITCHER" ] }, { "queue_eocs": "EOC_TELEKIN_SUMMON_JACKING_TOOL_DRAIN", @@ -101,40 +74,12 @@ ] } ], - "false_effect": [ - { "run_eocs": "EOC_TELEKIN_REMOVE_JACKING_TOOL" }, - { - "math": [ "u_val('stamina')", "+=", "max( (6000 - (u_val('spell_level', 'spell: biokin_enhance_mobility') * 250) ), 2750)" ] - } - ] + "false_effect": [ { "run_eocs": "EOC_TELEKIN_REMOVE_JACKING_TOOL" } ] }, { "type": "effect_on_condition", "id": "EOC_TELEKIN_REMOVE_JACKING_TOOL", - "condition": { - "or": [ - { "u_has_item": "telekin_lifting_jack_1" }, - { "u_has_item": "telekin_lifting_jack_2" }, - { "u_has_item": "telekin_lifting_jack_3" }, - { "u_has_item": "telekin_lifting_jack_4" }, - { "u_has_item": "telekin_lifting_jack_5" }, - { "u_has_item": "telekin_lifting_jack_6" }, - { "u_has_item": "telekin_lifting_jack_7" }, - { "u_has_item": "telekin_lifting_jack_8" }, - { "u_has_item": "telekin_lifting_jack_9" }, - { "u_has_item": "telekin_lifting_jack_10" }, - { "u_has_item": "telekin_lifting_jack_11" }, - { "u_has_item": "telekin_lifting_jack_12" }, - { "u_has_item": "telekin_lifting_jack_13" }, - { "u_has_item": "telekin_lifting_jack_14" }, - { "u_has_item": "telekin_lifting_jack_15" }, - { "u_has_item": "telekin_lifting_jack_16" }, - { "u_has_item": "telekin_lifting_jack_17" }, - { "u_has_item": "telekin_lifting_jack_18" }, - { "u_has_item": "telekin_lifting_jack_19" }, - { "u_has_item": "telekin_lifting_jack_20" } - ] - }, + "condition": { "u_has_effect": "effect_telekinetic_vehicle_lift" }, "effect": [ { "u_message": "You let the vehicle settle gently to the ground.", "type": "bad" }, { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" }, @@ -157,7 +102,8 @@ { "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_remove_item_with": "telekin_lifting_jack_20" }, + { "u_lose_effect": "effect_telekinetic_vehicle_lift" } ] }, { @@ -192,30 +138,7 @@ { "type": "effect_on_condition", "id": "EOC_TELEKIN_SUMMON_JACKING_TOOL_DRAIN", - "condition": { - "or": [ - { "u_has_item": "telekin_lifting_jack_1" }, - { "u_has_item": "telekin_lifting_jack_2" }, - { "u_has_item": "telekin_lifting_jack_3" }, - { "u_has_item": "telekin_lifting_jack_4" }, - { "u_has_item": "telekin_lifting_jack_5" }, - { "u_has_item": "telekin_lifting_jack_6" }, - { "u_has_item": "telekin_lifting_jack_7" }, - { "u_has_item": "telekin_lifting_jack_8" }, - { "u_has_item": "telekin_lifting_jack_9" }, - { "u_has_item": "telekin_lifting_jack_10" }, - { "u_has_item": "telekin_lifting_jack_11" }, - { "u_has_item": "telekin_lifting_jack_12" }, - { "u_has_item": "telekin_lifting_jack_13" }, - { "u_has_item": "telekin_lifting_jack_14" }, - { "u_has_item": "telekin_lifting_jack_15" }, - { "u_has_item": "telekin_lifting_jack_16" }, - { "u_has_item": "telekin_lifting_jack_17" }, - { "u_has_item": "telekin_lifting_jack_18" }, - { "u_has_item": "telekin_lifting_jack_19" }, - { "u_has_item": "telekin_lifting_jack_20" } - ] - }, + "condition": { "u_has_effect": "effect_telekinetic_vehicle_lift" }, "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_six", "hit_self": true } }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, @@ -258,12 +181,7 @@ ] } ], - "false_effect": [ - { "run_eocs": "EOC_TELEKIN_REMOVE_LEVITATION" }, - { - "math": [ "u_val('stamina')", "+=", "max( (5500 - (u_val('spell_level', 'spell: telekinetic_levitation') * 250) ), 3000)" ] - } - ] + "false_effect": [ { "run_eocs": "EOC_TELEKIN_REMOVE_LEVITATION" } ] }, { "type": "effect_on_condition", diff --git a/data/mods/MindOverMatter/powers/telepathy.json b/data/mods/MindOverMatter/powers/telepathy.json index 7b8ec2d57bf76..d16f89a4407e8 100644 --- a/data/mods/MindOverMatter/powers/telepathy.json +++ b/data/mods/MindOverMatter/powers/telepathy.json @@ -10,11 +10,11 @@ "spell_class": "TELEPATH", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION" ], + "difficulty": 1, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_TELEPATH_CONCENTRATION_INITIATE", "shape": "blast", - "difficulty": 1, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: telepathic_concentration') * 15000) + 180000) * (scaling_factor(u_val('intelligence') ) )" @@ -26,12 +26,16 @@ ] }, "energy_source": "STAMINA", - "base_energy_cost": 4000, - "final_energy_cost": 1000, - "energy_increment": -200, - "base_casting_time": 300, - "final_casting_time": 150, - "casting_time_increment": -15, + "base_energy_cost": { + "math": [ + "u_effect_intensity('effect_telepathic_learning_bonus') > -1 ? 0 : max((4000 - (u_val('spell_level', 'spell: telepathic_concentration') * 200)), 1500)" + ] + }, + "base_casting_time": { + "math": [ + "u_effect_intensity('effect_telepathic_learning_bonus') > -1 ? 10 : max((300 -(u_val('spell_level', 'spell: telepathic_concentration') * 12)), 150)" + ] + }, "learn_spells": { "telepathic_mind_sense": 5, "telepathic_blast": 7, "telepathic_confusion": 15 } }, { @@ -45,12 +49,12 @@ "spell_class": "TELEPATH", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION" ], + "difficulty": 2, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_telepathic_psi_armor", "extra_effects": [ { "id": "psionic_drained_difficulty_two", "hit_self": true } ], "shape": "blast", - "difficulty": 2, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: telepathic_shield') * 1500) + 6000) * (scaling_factor(u_val('intelligence') ) )" ] }, @@ -77,11 +81,11 @@ "spell_class": "TELEPATH", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION" ], + "difficulty": 3, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_TELEKIN_MORALE_INITIATE", "shape": "blast", - "difficulty": 3, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: telepathic_morale') * 15000) + 180000) * (scaling_factor(u_val('intelligence') ) )" ] }, @@ -89,12 +93,16 @@ "math": [ "( (u_val('spell_level', 'spell: telepathic_morale') * 15000) + 720000) * (scaling_factor(u_val('intelligence') ) )" ] }, "energy_source": "STAMINA", - "base_energy_cost": 4000, - "final_energy_cost": 1000, - "energy_increment": -125, - "base_casting_time": 300, - "final_casting_time": 150, - "casting_time_increment": -9.5, + "base_energy_cost": { + "math": [ + "u_effect_intensity('effect_telepathic_morale') > -1 ? 0 : max((5000 - (u_val('spell_level', 'spell: telepathic_morale') * 125)), 2000)" + ] + }, + "base_casting_time": { + "math": [ + "u_effect_intensity('effect_telepathic_morale') > -1 ? 10 : max((300 -(u_val('spell_level', 'spell: telepathic_morale') * 9.5)), 150)" + ] + }, "learn_spells": { "telepathic_confusion": 7, "telepathic_invisibility": 10, "telepathic_mind_control": 15 } }, { @@ -108,12 +116,12 @@ "spell_class": "TELEPATH", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION" ], + "difficulty": 3, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_telepath_sense_minds", "extra_effects": [ { "id": "psionic_drained_difficulty_three", "hit_self": true } ], "shape": "blast", - "difficulty": 3, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: telepathic_mind_sense') * 4000) + 9000) * (scaling_factor(u_val('intelligence') ) )" @@ -258,11 +266,11 @@ "spell_class": "TELEPATH", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DAMAGE", "NO_PROJECTILE", "IGNORE_WALLS" ], + "difficulty": 6, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "mod_moves", "extra_effects": [ { "id": "psionic_drained_difficulty_six", "hit_self": true }, { "id": "telepathic_fear_extra", "hit_self": false } ], "shape": "blast", - "difficulty": 6, - "max_level": { "math": [ "int_to_level(1)" ] }, "//": "Complicated formula here is to produce diminishing returns, since mod_moves for too long might as well just kill the target. Level 1 minimum is 46.5 moves lost, level 20 maximum is 625, all before Intelligence scaling", "min_damage": { "math": [ @@ -301,8 +309,8 @@ "description": "Applies a longer debuff when using Primal Terror. It's a bug if you have it directly.", "message": "", "teachable": false, - "max_level": { "math": [ "int_to_level(1)" ] }, "flags": [ "PSIONIC", "SILENT", "RANDOM_DURATION", "NO_PROJECTILE", "IGNORE_WALLS" ], + "max_level": { "math": [ "int_to_level(1)" ] }, "valid_targets": [ "hostile", "ground" ], "effect": "attack", "effect_str": "effect_telepathic_primal_terror", @@ -337,12 +345,12 @@ "spell_class": "TELEPATH", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION" ], + "difficulty": 6, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_telepath_invisibility", "extra_effects": [ { "id": "psionic_drained_difficulty_six", "hit_self": true } ], "shape": "blast", - "difficulty": 6, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: telepathic_invisibility') * 200) + 800) * (scaling_factor(u_val('intelligence') ) )" @@ -490,12 +498,12 @@ "spell_class": "TELEPATH", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION" ], + "difficulty": 9, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_TELEPATH_NETWORK_ALLY_CHECK", "extra_effects": [ { "id": "psionic_drained_difficulty_nine", "hit_self": true } ], "shape": "blast", - "difficulty": 9, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: telepathic_network') * 1500) + 30000) * (scaling_factor(u_val('intelligence') ) )" ] }, @@ -521,10 +529,10 @@ "spell_class": "TELEPATH", "skill": "metaphysics", "flags": [ "PSIONIC", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION" ], + "difficulty": 9, "effect": "attack", "effect_str": "effect_telepath_network_effect", "shape": "blast", - "difficulty": 9, "min_aoe": 60, "max_aoe": 60, "//": "Ideally range would scale with power level, but there would need to be a way to detect nearby allies first instead of just any ally in the bubble.", diff --git a/data/mods/MindOverMatter/powers/telepathy_eoc.json b/data/mods/MindOverMatter/powers/telepathy_eoc.json index 8b5eb202157b9..b1e4cf6cdea8c 100644 --- a/data/mods/MindOverMatter/powers/telepathy_eoc.json +++ b/data/mods/MindOverMatter/powers/telepathy_eoc.json @@ -24,12 +24,7 @@ ] } ], - "false_effect": [ - { "run_eocs": "EOC_TELEPATH_REMOVE_TELEPATHIC_CONCENTRATION" }, - { - "math": [ "u_val('stamina')", "+=", "max( (4000 - (u_val('spell_level', 'spell: telepathic_concentration') * 200) ), 1000)" ] - } - ] + "false_effect": [ { "run_eocs": "EOC_TELEPATH_REMOVE_TELEPATHIC_CONCENTRATION" } ] }, { "type": "effect_on_condition", @@ -90,13 +85,13 @@ ] } ], - "false_effect": [ - { "u_lose_effect": "effect_telepathic_morale" }, - { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" }, - { - "math": [ "u_val('stamina')", "+=", "max( (4000 - (u_val('spell_level', 'spell: telepathic_morale') * 125) ), 1000)" ] - } - ] + "false_effect": [ { "run_eocs": "EOC_TELEPATH_REMOVE_TELEPATHIC_MORALE" } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_TELEPATH_REMOVE_TELEPATHIC_MORALE", + "condition": { "u_has_effect": "effect_telepathic_morale" }, + "effect": [ { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" }, { "u_lose_effect": "effect_telepathic_morale" } ] }, { "type": "effect_on_condition", diff --git a/data/mods/MindOverMatter/powers/teleportation.json b/data/mods/MindOverMatter/powers/teleportation.json index c53f71542d943..91475d974409b 100644 --- a/data/mods/MindOverMatter/powers/teleportation.json +++ b/data/mods/MindOverMatter/powers/teleportation.json @@ -10,11 +10,11 @@ "spell_class": "TELEPORTER", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_AOE" ], + "difficulty": 1, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "short_range_teleport", "extra_effects": [ { "id": "psionic_drained_difficulty_one", "hit_self": true } ], "shape": "blast", - "difficulty": 1, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_aoe": 1, "max_aoe": 5, "aoe_increment": 0.25, @@ -41,12 +41,12 @@ "spell_class": "TELEPORTER", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "RANDOM_DURATION", "NO_LEGS", "NO_EXPLOSION_SFX" ], + "difficulty": 2, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_teleport_slow", "extra_effects": [ { "id": "psionic_drained_difficulty_two", "hit_self": true } ], "shape": "blast", - "difficulty": 2, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_aoe": 0, "max_aoe": 20, "aoe_increment": 0.2, @@ -81,11 +81,11 @@ "spell_class": "TELEPORTER", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "TARGET_TELEPORT", "IGNORE_WALLS" ], + "difficulty": 2, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "short_range_teleport", "extra_effects": [ { "id": "psionic_drained_difficulty_two", "hit_self": true } ], "shape": "blast", - "difficulty": 2, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_range": { "math": [ "min( ( (u_val('spell_level', 'spell: teleport_phase') * 0.1) + 2) * (scaling_factor(u_val('intelligence') ) ), 4)" ] }, @@ -110,22 +110,22 @@ "spell_class": "TELEPORTER", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 3, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_teleport_stride", "extra_effects": [ { "id": "psionic_drained_difficulty_three", "hit_self": true } ], "shape": "blast", - "energy_source": "STAMINA", - "difficulty": 3, - "max_level": { "math": [ "int_to_level(1)" ] }, - "base_energy_cost": 2500, - "final_energy_cost": 750, - "energy_increment": -125, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: teleport_stride') * 300) + 3000) * (scaling_factor(u_val('intelligence') ) )" ] }, "max_duration": { "math": [ "( (u_val('spell_level', 'spell: teleport_stride') * 350) + 30000) * (scaling_factor(u_val('intelligence') ) )" ] }, + "energy_source": "STAMINA", + "base_energy_cost": 2500, + "final_energy_cost": 750, + "energy_increment": -125, "base_casting_time": 85, "final_casting_time": 25, "casting_time_increment": -7, @@ -142,11 +142,11 @@ "spell_class": "TELEPORTER", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "SWAP_POS", "IGNORE_WALLS" ], + "difficulty": 4, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "extra_effects": [ { "id": "psionic_drained_difficulty_four", "hit_self": true } ], "shape": "blast", - "difficulty": 4, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_range": { "math": [ "min( ( (u_val('spell_level', 'spell: teleport_transpose') * 1.5) + 1) * (scaling_factor(u_val('intelligence') ) ), 80)" @@ -174,19 +174,19 @@ "spell_class": "TELEPORTER", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "NO_EXPLOSION_SFX" ], + "difficulty": 5, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "extra_effects": [ { "id": "psionic_drained_difficulty_five", "hit_self": true } ], "shape": "blast", "damage_type": "psi_teleporter_teleporting_damage", - "difficulty": 5, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_damage": 1, "max_damage": 1, + "min_range": 1, "energy_source": "STAMINA", "base_energy_cost": 2500, "final_energy_cost": 1250, "energy_increment": -65, - "min_range": 1, "base_casting_time": 75, "final_casting_time": 25, "casting_time_increment": -3, @@ -204,11 +204,11 @@ "spell_class": "TELEPORTER", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DAMAGE", "IGNORE_WALLS", "NO_EXPLOSION_SFX" ], + "difficulty": 5, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "area_pull", "extra_effects": [ { "id": "psionic_drained_difficulty_five", "hit_self": true } ], "shape": "blast", - "difficulty": 5, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_damage": { "math": [ "( (u_val('spell_level', 'spell: teleport_collapse') * -0.15) - 1) * (scaling_factor(u_val('intelligence') ) )" ] }, @@ -245,11 +245,11 @@ "spell_class": "TELEPORTER", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "TARGET_TELEPORT", "IGNORE_WALLS" ], + "difficulty": 6, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "short_range_teleport", "extra_effects": [ { "id": "psionic_drained_difficulty_six", "hit_self": true } ], "shape": "blast", - "difficulty": 6, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_aoe": 4, "max_aoe": 1, "aoe_increment": -0.25, @@ -279,11 +279,11 @@ "spell_class": "TELEPORTER", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "RANDOM_DAMAGE", "NO_HANDS", "NO_LEGS", "NO_EXPLOSION_SFX" ], + "difficulty": 7, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "banishment", "extra_effects": [ { "id": "psionic_drained_difficulty_seven", "hit_self": true } ], "shape": "blast", - "difficulty": 7, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_damage": { "math": [ "( (u_val('spell_level', 'spell: teleport_banish') * 15) + 15) * (scaling_factor(u_val('intelligence') ) )" ] }, @@ -317,11 +317,11 @@ "spell_class": "TELEPORTER", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS" ], + "difficulty": 8, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "translocate", "extra_effects": [ { "id": "psionic_drained_difficulty_eight", "hit_self": true } ], "shape": "blast", - "difficulty": 8, - "max_level": { "math": [ "int_to_level(1)" ] }, "energy_source": "STAMINA", "base_energy_cost": 10000, "final_energy_cost": 6000, @@ -342,12 +342,12 @@ "spell_class": "TELEPORTER", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS" ], + "difficulty": 9, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_TELEPORT_SUMMON", "extra_effects": [ { "id": "psionic_drained_difficulty_nine", "hit_self": true } ], "shape": "blast", - "difficulty": 9, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_damage": 1, "min_range": { "math": [ diff --git a/data/mods/MindOverMatter/powers/vitakinesis.json b/data/mods/MindOverMatter/powers/vitakinesis.json index 87f854426f59b..392a2a6a01098 100644 --- a/data/mods/MindOverMatter/powers/vitakinesis.json +++ b/data/mods/MindOverMatter/powers/vitakinesis.json @@ -91,24 +91,28 @@ "spell_class": "VITAKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 1, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_VITAKIN_HEALTH_POWER_INITIATE", "shape": "blast", - "difficulty": 1, - "max_level": { "math": [ "int_to_level(1)" ] }, - "energy_source": "STAMINA", - "base_energy_cost": 3500, - "final_energy_cost": 2000, - "energy_increment": -75, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: vita_health_power') * 2100) + 18000) * (scaling_factor(u_val('intelligence') ) )" ] }, "max_duration": { "math": [ "( (u_val('spell_level', 'spell: vita_health_power') * 2700) + 145000) * (scaling_factor(u_val('intelligence') ) )" ] }, - "base_casting_time": 100, - "final_casting_time": 25, - "casting_time_increment": -7.5, + "energy_source": "STAMINA", + "base_energy_cost": { + "math": [ + "u_effect_intensity('effect_vita_health') > -1 ? 0 : max((3500 - (u_val('spell_level', 'spell: vita_health_power') * 75)), 2000)" + ] + }, + "base_casting_time": { + "math": [ + "u_effect_intensity('effect_vita_health') > -1 ? 10 : max((100 -(u_val('spell_level', 'spell: vita_health_power') * 7.5)), 25)" + ] + }, "learn_spells": { "vita_health_power_ally": 5, "vita_sleeping_trance": 7, "vita_healing_trance": 15, "vita_banish_illness": 18 } }, { @@ -122,26 +126,26 @@ "spell_class": "VITAKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 3, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_vitakin_hurt", "extra_effects": [ { "id": "psionic_drained_difficulty_three", "hit_self": true } ], "shape": "blast", "damage_type": "biological", - "difficulty": 3, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_dot": 1, "max_dot": 1, - "energy_source": "STAMINA", - "base_energy_cost": 1500, - "final_energy_cost": 750, - "energy_increment": -65, + "min_range": 1, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: vita_hurt_touch') * 100) + 400) * (scaling_factor(u_val('intelligence') ) )" ] }, "max_duration": { "math": [ "( (u_val('spell_level', 'spell: vita_hurt_touch') * 100) + 3000) * (scaling_factor(u_val('intelligence') ) )" ] }, - "min_range": 1, + "energy_source": "STAMINA", + "base_energy_cost": 1500, + "final_energy_cost": 750, + "energy_increment": -65, "base_casting_time": 85, "final_casting_time": 55, "casting_time_increment": -3, @@ -159,17 +163,13 @@ "spell_class": "VITAKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 3, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_vita_health", "extra_effects": [ { "id": "psionic_drained_difficulty_three", "hit_self": true } ], "shape": "blast", - "difficulty": 3, - "max_level": { "math": [ "int_to_level(1)" ] }, - "energy_source": "STAMINA", "min_range": 1, - "base_energy_cost": 3500, - "final_energy_cost": 2000, - "energy_increment": -75, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: vita_health_power_ally') * 2100) + 18000) * (scaling_factor(u_val('intelligence') ) )" @@ -180,6 +180,10 @@ "( (u_val('spell_level', 'spell: vita_health_power_ally') * 2700) + 145000) * (scaling_factor(u_val('intelligence') ) )" ] }, + "energy_source": "STAMINA", + "base_energy_cost": 3500, + "final_energy_cost": 2000, + "energy_increment": -75, "base_casting_time": 100, "final_casting_time": 25, "casting_time_increment": -7.5, @@ -197,11 +201,11 @@ "spell_class": "VITAKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "NO_EXPLOSION_SFX" ], + "difficulty": 5, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "pain_split", "extra_effects": [ { "id": "psionic_drained_difficulty_five", "hit_self": true } ], "shape": "blast", - "difficulty": 5, - "max_level": { "math": [ "int_to_level(1)" ] }, "energy_source": "STAMINA", "base_energy_cost": 4500, "final_energy_cost": 1750, @@ -222,12 +226,12 @@ "spell_class": "VITAKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DAMAGE" ], + "difficulty": 4, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_VITAKIN_SLEEP", "extra_effects": [ { "id": "psionic_drained_difficulty_four", "hit_self": true } ], "shape": "blast", - "difficulty": 4, - "max_level": { "math": [ "int_to_level(1)" ] }, "energy_source": "STAMINA", "base_energy_cost": 1000, "base_casting_time": 100, @@ -244,12 +248,12 @@ "spell_class": "VITAKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "NO_EXPLOSION_SFX" ], + "difficulty": 5, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_VITAKIN_STOP_INFECTION_SWITCH", "extra_effects": [ { "id": "psionic_drained_difficulty_five", "hit_self": true } ], "shape": "blast", - "difficulty": 5, - "max_level": { "math": [ "int_to_level(1)" ] }, "energy_source": "STAMINA", "base_energy_cost": 5000, "final_energy_cost": 2250, @@ -321,11 +325,11 @@ "spell_class": "VITAKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DAMAGE" ], + "difficulty": 6, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "extra_effects": [ { "id": "psionic_drained_difficulty_six", "hit_self": true } ], "shape": "blast", - "difficulty": 6, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_damage": { "math": [ "( (u_val('spell_level', 'spell: vita_healing_trance') * -1.5) - 6) * (scaling_factor(u_val('intelligence') ) )" ] }, @@ -348,13 +352,13 @@ "spell_class": "VITAKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ], + "difficulty": 6, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_VITAKIN_RAD_PURGE", "//": "Drain is handled in the EoC", "shape": "blast", "energy_source": "STAMINA", - "difficulty": 6, - "max_level": { "math": [ "int_to_level(1)" ] }, "base_energy_cost": 5000, "final_energy_cost": 3500, "energy_increment": -125, @@ -371,6 +375,8 @@ "spell_class": "VITAKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "NO_EXPLOSION_SFX" ], + "difficulty": 7, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "cureall", "extra_effects": [ @@ -378,8 +384,6 @@ { "id": "psionic_drained_difficulty_seven", "hit_self": true } ], "shape": "blast", - "difficulty": 7, - "max_level": { "math": [ "int_to_level(1)" ] }, "energy_source": "STAMINA", "base_energy_cost": 7000, "final_energy_cost": 4500, @@ -411,12 +415,12 @@ "spell_class": "VITAKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "NO_EXPLOSION_SFX" ], + "difficulty": 8, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_VITAKIN_BANISH_ILLNESS_SELECTOR", "extra_effects": [ { "id": "psionic_drained_difficulty_eight", "hit_self": true } ], "shape": "blast", - "difficulty": 8, - "max_level": { "math": [ "int_to_level(1)" ] }, "energy_source": "STAMINA", "base_energy_cost": 10000, "base_casting_time": 500, @@ -433,12 +437,12 @@ "spell_class": "VITAKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "NO_EXPLOSION_SFX" ], + "difficulty": 9, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "attack", "effect_str": "effect_vita_super_heal", "extra_effects": [ { "id": "psionic_drained_difficulty_nine", "hit_self": true } ], "shape": "blast", - "difficulty": 9, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: vita_super_heal') * 3000) + 15000) * (scaling_factor(u_val('intelligence') ) )" ] }, @@ -486,12 +490,12 @@ "spell_class": "VITAKINETIC", "skill": "metaphysics", "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "NO_EXPLOSION_SFX" ], + "difficulty": 10, + "max_level": { "math": [ "int_to_level(1)" ] }, "effect": "effect_on_condition", "effect_str": "EOC_VITAKIN_RESTORE_LIMB_SELECTOR", "extra_effects": [ { "id": "psionic_drained_difficulty_ten", "hit_self": true } ], "shape": "blast", - "difficulty": 10, - "max_level": { "math": [ "int_to_level(1)" ] }, "min_duration": { "math": [ "( (u_val('spell_level', 'spell: vita_limb_restore') * 3000) + 20000) * (scaling_factor(u_val('intelligence') ) )" ] }, diff --git a/data/mods/MindOverMatter/powers/vitakinesis_eoc.json b/data/mods/MindOverMatter/powers/vitakinesis_eoc.json index ff9ffefb27305..c33d7107f0452 100644 --- a/data/mods/MindOverMatter/powers/vitakinesis_eoc.json +++ b/data/mods/MindOverMatter/powers/vitakinesis_eoc.json @@ -20,13 +20,13 @@ ] } ], - "false_effect": [ - { "u_lose_effect": "effect_vita_health" }, - { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" }, - { - "math": [ "u_val('stamina')", "+=", "max( (3500 - (u_val('spell_level', 'spell: vita_health_power') * 75) ), 2000)" ] - } - ] + "false_effect": [ { "run_eocs": "EOC_VITAKIN_REMOVE_HEALTH_POWER" } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_VITAKIN_REMOVE_HEALTH_POWER", + "condition": { "u_has_effect": "effect_vita_health" }, + "effect": [ { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" }, { "u_lose_effect": "effect_vita_health" } ] }, { "type": "effect_on_condition", diff --git a/data/mods/MindOverMatter/professions.json b/data/mods/MindOverMatter/professions.json index e29ba2e2dd8b1..137c34a09e611 100644 --- a/data/mods/MindOverMatter/professions.json +++ b/data/mods/MindOverMatter/professions.json @@ -20,7 +20,12 @@ "name": "Star Athlete", "description": "You were always good at athletics. People praised your effort and hard work, but the truth was you barely needed to practice. It all just came naturally to you, as naturally as breathing. That kept you safe during the Cataclysm--you outran the dead and worse things that chased you and made it out of the cities, and they're certainly the thing that will keep you going, especially since now, you're stronger and faster than you've ever been.", "points": 4, - "skills": [ { "level": 2, "name": "throw" }, { "level": 3, "name": "swimming" }, { "level": 1, "name": "unarmed" } ], + "skills": [ + { "level": 3, "name": "throw" }, + { "level": 7, "name": "swimming" }, + { "level": 2, "name": "unarmed" }, + { "level": 4, "name": "dodge" } + ], "traits": [ "BIOKINETIC", "BIOKIN_NEEDS" ], "spells": [ { "id": "biokin_physical_enhance", "level": 4 }, @@ -43,7 +48,7 @@ "name": "Doomseer", "description": "You knew the world was going to end, but they never listened. They never listened! They couldn't see the things that walked among them! They didn't know what you had seen, what you knew was coming, and where are they now? In a zombie's stomach or walking with those corpses themselves, but you're still alive.", "points": 0, - "skills": [ { "level": 2, "name": "speech" }, { "level": 1, "name": "metaphysics" } ], + "skills": [ { "level": 3, "name": "speech" }, { "level": 3, "name": "metaphysics" }, { "level": 3, "name": "survival" } ], "traits": [ "CLAIRSENTIENT", "CLAIR_SENSES", "SCHIZOPHRENIC" ], "spells": [ { "id": "clair_night_vision", "level": 4 }, @@ -70,7 +75,7 @@ { "level": 2, "name": "cooking" }, { "level": 1, "name": "driving" }, { "level": 2, "name": "metaphysics" }, - { "level": 2, "name": "speech" } + { "level": 4, "name": "speech" } ], "traits": [ "FAST_REFLEXES", "PHOTOKINETIC", "PHOTO_EYES" ], "spells": [ @@ -128,11 +133,11 @@ "description": "Before the Cataclysm, you were 'volunteered' for a top-secret military project. They never told you what all the injections and EEGs and hours of staring at a quarter on the table were supposed to accomplish, but now that you can move things with your mind you have a pretty good idea what they were aiming at.", "points": 5, "skills": [ - { "level": 2, "name": "gun" }, - { "level": 2, "name": "pistol" }, - { "level": 1, "name": "dodge" }, - { "level": 1, "name": "driving" }, - { "level": 1, "name": "metaphysics" } + { "level": 5, "name": "gun" }, + { "level": 4, "name": "pistol" }, + { "level": 2, "name": "dodge" }, + { "level": 3, "name": "driving" }, + { "level": 2, "name": "metaphysics" } ], "traits": [ "TELEKINETIC", "TELEKINETIC_LIFTER_1" ], "spells": [ @@ -156,7 +161,7 @@ "name": "Government Interrogater (DECEASED)", "description": "You did not die in the Cataclysm because on paper, you are already dead. You assumed a new identity as part of an experimental program designed to produce psychic interrogators. They told you that you were serving your country, that your gifts would be the key to winning the new Cold War that was surely developing, but they didn't consider the ramifications of having a telepath on the base. You knew right away that things were much worse than the brass was telling you, and your gifts let you \"persuade\" the guards to let you out even in the face of the lockdown. You had thought to go somewhere else, to get away from New England, but the end came much faster than even you thought it would.", "points": 3, - "skills": [ { "level": 3, "name": "speech" }, { "level": 3, "name": "metaphysics" } ], + "skills": [ { "level": 6, "name": "speech" }, { "level": 3, "name": "metaphysics" } ], "traits": [ "TELEPATH", "TELEPATHIC_SUGGESTION" ], "spells": [ { "id": "telepathic_concentration", "level": 4 }, @@ -184,16 +189,17 @@ "description": "You don't understand what happened. You were readying for a routine jump at the Far Hebrides transfer point when there was a power cascade in the drive and now you're here, on some other version of Tlalticpactli. You need to find your way back home, but first you need to find a way to survive.", "points": 6, "skills": [ - { "level": 2, "name": "computer" }, + { "level": 3, "name": "computer" }, { "level": 2, "name": "gun" }, { "level": 2, "name": "pistol" }, - { "level": 3, "name": "metaphysics" } + { "level": 5, "name": "metaphysics" } ], "traits": [ "TELEPORTER", "TELEPORTER_PROTECT" ], "spells": [ - { "id": "teleport_blink", "level": 5 }, + { "id": "teleport_blink", "level": 8 }, { "id": "teleport_slow", "level": 1 }, { "id": "teleport_transpose", "level": 4 }, + { "id": "teleport_phase", "level": 5 }, { "id": "teleport_farstep", "level": 3 } ], "items": { @@ -214,7 +220,7 @@ "name": "Faith Healer", "description": "People came to you for diseases that modern medicine told them were incurable, and you made them well. At least, they felt well, and that was what mattered. Now the dead walk and do not respond to your exhortations, but your healing works better on yourself than it ever has on anyone else.", "points": 4, - "skills": [ { "level": 2, "name": "speech" }, { "level": 1, "name": "driving" }, { "level": 1, "name": "metaphysics" } ], + "skills": [ { "level": 6, "name": "speech" }, { "level": 1, "name": "driving" }, { "level": 3, "name": "metaphysics" } ], "traits": [ "VITAKINETIC", "VITAKINETIC_HEALTH", "SPIRITUAL" ], "spells": [ { "id": "vita_stop_bleeding", "level": 2 }, diff --git a/data/mods/MindOverMatter/recipes/drain.json b/data/mods/MindOverMatter/recipes/drain.json index 79a2832a8f1b1..4e0a09d091a6a 100644 --- a/data/mods/MindOverMatter/recipes/drain.json +++ b/data/mods/MindOverMatter/recipes/drain.json @@ -19,7 +19,7 @@ "effect": [ { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "-=", "1" ] } ], "false_effect": [ { - "u_message": "After your meditations, your mind is free and clear. The toll of psionic channeling has entirely left you.", + "u_message": "After your meditations, your mind is free and clear. The odd feelings caused by excessive psionic channeling have entirely left you.", "type": "good" } ] diff --git a/data/mods/MindOverMatter/vitamins.json b/data/mods/MindOverMatter/vitamins.json index c69a564acf989..19a7ef2680f2e 100644 --- a/data/mods/MindOverMatter/vitamins.json +++ b/data/mods/MindOverMatter/vitamins.json @@ -3,7 +3,7 @@ "id": "vitamin_psionic_drain", "type": "vitamin", "vit_type": "counter", - "name": { "str": "Psionic Drain" }, + "name": { "str": "Nether-Attunement Counter" }, "excess": "effect_disease_psionic_drain", "min": 0, "max": 250,