diff --git a/data/json/effects_on_condition/melee_eocs.json b/data/json/effects_on_condition/melee_eocs.json index d9c33f172d383..33293186f9b54 100644 --- a/data/json/effects_on_condition/melee_eocs.json +++ b/data/json/effects_on_condition/melee_eocs.json @@ -64,30 +64,30 @@ "condition": { "u_has_wielded_with_weapon_category": "AUTOMATIC_RIFLES" }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_auto_rifles_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_auto_rifles_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_auto_rifles_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_auto_rifles_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_auto_rifles_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_auto_rifles_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_auto_rifles_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_auto_rifles_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_auto_rifles_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_auto_rifles_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_auto_rifles_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_auto_rifles_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -101,30 +101,30 @@ "condition": { "u_has_wielded_with_weapon_category": "AUTOMATIC_PISTOLS" }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_auto_pistols_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_auto_pistols_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_auto_pistols_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_auto_pistols_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_auto_pistols_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_auto_pistols_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_auto_pistols_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_auto_pistols_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_auto_pistols_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_auto_pistols_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_auto_pistols_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_auto_pistols_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -138,30 +138,30 @@ "condition": { "u_has_wielded_with_weapon_category": "KNIVES" }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_knives_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_knives_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_knives_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_knives_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_knives_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_knives_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_knives_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_knives_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_knives_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_knives_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_knives_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_knives_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -175,30 +175,30 @@ "condition": { "u_has_wielded_with_weapon_category": "BATONS" }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_batons_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_batons_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_batons_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_batons_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_batons_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_batons_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_batons_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_batons_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_batons_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_batons_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_batons_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_batons_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -212,30 +212,30 @@ "condition": { "u_has_wielded_with_weapon_category": "FLAILS" }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_flails_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_flails_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_flails_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_flails_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_flails_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_flails_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_flails_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_flails_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_flails_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_flails_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_flails_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_flails_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -249,30 +249,30 @@ "condition": { "u_has_wielded_with_weapon_category": "MACES" }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_maces_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_maces_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_maces_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_maces_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_maces_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_maces_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_maces_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_maces_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_maces_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_maces_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_maces_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_maces_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -286,30 +286,30 @@ "condition": { "u_has_wielded_with_weapon_category": "MEDIUM_SWORDS" }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_medium_swords_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_medium_swords_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_medium_swords_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_medium_swords_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_medium_swords_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_medium_swords_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_medium_swords_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_medium_swords_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_medium_swords_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_medium_swords_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_medium_swords_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_medium_swords_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -323,30 +323,30 @@ "condition": { "u_has_wielded_with_weapon_category": "SHORT_SWORDS" }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_short_swords_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_short_swords_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_short_swords_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_short_swords_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_short_swords_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_short_swords_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_short_swords_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_short_swords_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_short_swords_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_short_swords_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_short_swords_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_short_swords_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -360,30 +360,30 @@ "condition": { "u_has_wielded_with_weapon_category": "LONG_SWORDS" }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_long_swords_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_long_swords_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_long_swords_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_long_swords_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_long_swords_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_long_swords_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_long_swords_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_long_swords_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_long_swords_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_long_swords_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_long_swords_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_long_swords_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -397,30 +397,30 @@ "condition": { "u_has_wielded_with_weapon_category": "QUARTERSTAVES" }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_quarterstaves_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_quarterstaves_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_quarterstaves_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_quarterstaves_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_quarterstaves_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_quarterstaves_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_quarterstaves_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_quarterstaves_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_quarterstaves_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_quarterstaves_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_quarterstaves_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_quarterstaves_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -434,30 +434,30 @@ "condition": { "u_has_wielded_with_weapon_category": "CLAWS" }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_claws_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_claws_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_claws_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_claws_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_claws_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_claws_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_claws_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_claws_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_claws_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_claws_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_claws_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_claws_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -471,30 +471,30 @@ "condition": { "u_has_wielded_with_weapon_category": "SHIVS" }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_shivs_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_shivs_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_shivs_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_shivs_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_shivs_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_shivs_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_shivs_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_shivs_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_shivs_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_shivs_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_shivs_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_shivs_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -508,30 +508,30 @@ "condition": { "u_has_wielded_with_weapon_category": "HOOKING_WEAPONRY" }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_hooking_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_hooking_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_hooking_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_hooking_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_hooking_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_hooking_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_hooking_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_hooking_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_hooking_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_hooking_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_hooking_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_hooking_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -545,30 +545,30 @@ "condition": { "u_has_wielded_with_weapon_category": "SPEARS" }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_spears_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_spears_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_spears_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_spears_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_spears_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_spears_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_spears_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_spears_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_spears_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_spears_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_spears_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_spears_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -582,30 +582,30 @@ "condition": { "u_has_wielded_with_weapon_category": "POLEARMS" }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_polearms_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_polearms_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_polearms_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_polearms_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_polearms_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_polearms_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_polearms_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_polearms_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_polearms_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_polearms_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_polearms_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_polearms_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -619,30 +619,30 @@ "condition": { "u_has_wielded_with_weapon_category": "FENCING_WEAPONRY" }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_fencing_weapons_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_fencing_weapons_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_fencing_weapons_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_fencing_weapons_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_fencing_weapons_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_fencing_weapons_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_fencing_weapons_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_fencing_weapons_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_fencing_weapons_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_fencing_weapons_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_fencing_weapons_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_fencing_weapons_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -656,32 +656,30 @@ "condition": { "u_has_wielded_with_weapon_category": "LONG_THRUSTING_SWORD" }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_thrusting_swords_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_thrusting_swords_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_thrusting_swords_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_thrusting_swords_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_thrusting_swords_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_thrusting_swords_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_thrusting_swords_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_thrusting_swords_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_thrusting_swords_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_thrusting_swords_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { - "math": [ "u_val('proficiency', 'proficiency_id: prof_thrusting_swords_familiar', 'format: 1600')", "+=", "rand(4)" ] - }, + { "math": [ "u_proficiency('prof_thrusting_swords_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -695,30 +693,30 @@ "condition": { "or": [ { "u_has_wielded_with_weapon_category": "BIONIC_WEAPONRY" }, { "u_using_martial_art": "style_biojutsu" } ] }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_bionics_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_bionics_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_bionics_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_bionics_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_bionics_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_bionics_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_bionics_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_bionics_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_bionics_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_bionics_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_bionics_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_bionics_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -732,30 +730,30 @@ "condition": { "u_has_wielded_with_weapon_category": "BIONIC_SWORDS" }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_bionic_swords_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_bionic_swords_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_bionic_swords_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_bionic_swords_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_bionic_swords_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_bionic_swords_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_bionic_swords_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_bionic_swords_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_bionic_swords_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_bionic_swords_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_bionic_swords_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_bionic_swords_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -769,30 +767,30 @@ "condition": { "u_has_wielded_with_weapon_category": "GREAT_SWORDS" }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_great_swords_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_great_swords_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_great_swords_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_great_swords_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_great_swords_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_great_swords_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_great_swords_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_great_swords_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_great_swords_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_great_swords_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_great_swords_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_great_swords_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -806,30 +804,30 @@ "condition": { "u_has_wielded_with_weapon_category": "GREAT_HAMMERS" }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_great_hammers_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_great_hammers_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_great_hammers_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_great_hammers_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_great_hammers_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_great_hammers_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_great_hammers_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_great_hammers_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_great_hammers_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_great_hammers_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_great_hammers_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_great_hammers_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -843,30 +841,30 @@ "condition": { "u_has_wielded_with_weapon_category": "GREAT_AXES" }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_great_axes_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_great_axes_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_great_axes_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_great_axes_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_great_axes_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_great_axes_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_great_axes_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_great_axes_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_great_axes_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_great_axes_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_great_axes_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_great_axes_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -880,30 +878,30 @@ "condition": { "u_has_wielded_with_weapon_category": "HAND_AXES" }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_hand_axes_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_hand_axes_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_hand_axes_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_hand_axes_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_hand_axes_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_hand_axes_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_hand_axes_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_hand_axes_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_hand_axes_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_hand_axes_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_hand_axes_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_hand_axes_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] @@ -922,30 +920,30 @@ }, "effect": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_unarmed_familiar', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_unarmed_familiar', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_unarmed_pro', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_unarmed_pro', 'format': 'percent')", ">=", "100" ] }, "then": [ { - "if": { "math": [ "u_val('proficiency', 'proficiency_id: prof_unarmed_master', 'format: percent')", ">=", "100" ] }, + "if": { "math": [ "u_proficiency('prof_unarmed_master', 'format': 'percent')", ">=", "100" ] }, "then": [ { "math": [ "u_prof_level", "=", "3" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_unarmed_master', 'format: 6400')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_unarmed_master', 'format': 'percent')", "+=", "rand(4) / 64" ] }, { "math": [ "u_prof_level", "=", "2" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_unarmed_pro', 'format: 3200')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_unarmed_pro', 'format': 'percent')", "+=", "rand(4) / 32" ] }, { "math": [ "u_prof_level", "=", "1" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] } ], "else": [ - { "math": [ "u_val('proficiency', 'proficiency_id: prof_unarmed_familiar', 'format: 1600')", "+=", "rand(4)" ] }, + { "math": [ "u_proficiency('prof_unarmed_familiar', 'format': 'percent')", "+=", "rand(4) / 16" ] }, { "math": [ "u_prof_level", "=", "0" ] }, { "math": [ "u_prof_lowest", "=", "min(u_prof_level, u_prof_lowest)" ] } ] diff --git a/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_chatting_veterans.json b/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_chatting_veterans.json index afa9fdcbb73fe..49941ac350991 100644 --- a/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_chatting_veterans.json +++ b/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_chatting_veterans.json @@ -88,7 +88,7 @@ }, { "text": "Try to gross each other out with tales of mutant butchery.", - "condition": { "math": [ "u_val('proficiency', 'proficiency_id: prof_wp_basic_bug', 'format: percent')", ">=", "50" ] }, + "condition": { "math": [ "u_proficiency('prof_wp_basic_bug', 'format': 'percent')", ">=", "50" ] }, "topic": "BEM_CHATTING_VETERANS_TELL_STORY_BUTCHERY" }, { diff --git a/data/mods/Magiclysm/Spells/biomancer.json b/data/mods/Magiclysm/Spells/biomancer.json index 04b1c9640900c..188022bcf94d3 100644 --- a/data/mods/Magiclysm/Spells/biomancer.json +++ b/data/mods/Magiclysm/Spells/biomancer.json @@ -470,7 +470,7 @@ { "math": [ "u_val('stored_kcal')", "+=", "100000" ] }, { "queue_eocs": "EOC_GIANT_GROWTH_MUTATION_REMOVE", - "time_in_future": { "math": [ "(( u_val('spell_level', 'spell: biomancer_giant_growth') * 40 ) + 300 )" ] } + "time_in_future": { "math": [ "(( u_spell_level('biomancer_giant_growth') * 40 ) + 300 )" ] } } ], "false_effect": [ { "u_message": "You are already enormous--the spell cannot make you any larger!" } ] @@ -554,7 +554,7 @@ { "u_add_trait": "BIO_LASHING_TENTACLES" }, { "queue_eocs": "EOC_LASHING_TENTACLES_MUTATION_REMOVE", - "time_in_future": { "math": [ "(( u_val('spell_level', 'spell: biomancer_lashing_tentacles') * 15 ) + 70 )" ] } + "time_in_future": { "math": [ "(( u_spell_level('biomancer_lashing_tentacles') * 15 ) + 70 )" ] } } ], "false_effect": [ { "u_message": "You are already enormous--the spell cannot make you any larger!" } ] diff --git a/data/mods/Magiclysm/Spells/druid.json b/data/mods/Magiclysm/Spells/druid.json index 8e25624cd964e..b841f1b7d7edb 100644 --- a/data/mods/Magiclysm/Spells/druid.json +++ b/data/mods/Magiclysm/Spells/druid.json @@ -133,8 +133,8 @@ "effect": "spawn_item", "effect_str": "druid_quiver", "shape": "blast", - "min_duration": { "math": [ "( (u_val('spell_level', 'spell: druid_naturebow1') * 24000) + 24000)" ] }, - "max_duration": { "math": [ "( (u_val('spell_level', 'spell: druid_naturebow1') * 24000) + 24000)" ] } + "min_duration": { "math": [ "( (u_spell_level('druid_naturebow1') * 24000) + 24000)" ] }, + "max_duration": { "math": [ "( (u_spell_level('druid_naturebow1') * 24000) + 24000)" ] } }, { "id": "druid_naturearrows1", @@ -143,13 +143,13 @@ "description": "This spell conjures magical arrows as part of the nature's bow spell. It's a bug if you have it directly.", "valid_targets": [ "none" ], "flags": [ "SILENT" ], - "min_damage": { "math": [ "( (u_val('spell_level', 'spell: druid_naturebow1') * 3) + 15)" ] }, - "max_damage": { "math": [ "( (u_val('spell_level', 'spell: druid_naturebow1') * 3) + 15)" ] }, + "min_damage": { "math": [ "( (u_spell_level('druid_naturebow1') * 3) + 15)" ] }, + "max_damage": { "math": [ "( (u_spell_level('druid_naturebow1') * 3) + 15)" ] }, "effect": "spawn_item", "effect_str": "druid_naturearrows1", "shape": "blast", - "min_duration": { "math": [ "( (u_val('spell_level', 'spell: druid_naturebow1') * 24000) + 24000)" ] }, - "max_duration": { "math": [ "( (u_val('spell_level', 'spell: druid_naturebow1') * 24000) + 24000)" ] } + "min_duration": { "math": [ "( (u_spell_level('druid_naturebow1') * 24000) + 24000)" ] }, + "max_duration": { "math": [ "( (u_spell_level('druid_naturebow1') * 24000) + 24000)" ] } }, { "id": "druid_naturebow1_plus", @@ -190,8 +190,8 @@ "effect": "spawn_item", "effect_str": "druid_quiver_plus", "shape": "blast", - "min_duration": { "math": [ "( (u_val('spell_level', 'spell: druid_naturebow1_plus') * 72000) + 360000)" ] }, - "max_duration": { "math": [ "( (u_val('spell_level', 'spell: druid_naturebow1_plus') * 72000) + 360000)" ] } + "min_duration": { "math": [ "( (u_spell_level('druid_naturebow1_plus') * 72000) + 360000)" ] }, + "max_duration": { "math": [ "( (u_spell_level('druid_naturebow1_plus') * 72000) + 360000)" ] } }, { "id": "druid_naturearrows1_plus", @@ -200,13 +200,13 @@ "description": "This spell conjures magical arrows as part of the nature's bow spell. It's a bug if you have it directly.", "valid_targets": [ "none" ], "flags": [ "SILENT" ], - "min_damage": { "math": [ "( (u_val('spell_level', 'spell: druid_naturebow1_plus') * 4) + 30)" ] }, - "max_damage": { "math": [ "( (u_val('spell_level', 'spell: druid_naturebow1_plus') * 4) + 30)" ] }, + "min_damage": { "math": [ "( (u_spell_level('druid_naturebow1_plus') * 4) + 30)" ] }, + "max_damage": { "math": [ "( (u_spell_level('druid_naturebow1_plus') * 4) + 30)" ] }, "effect": "spawn_item", "effect_str": "druid_naturearrows1", "shape": "blast", - "min_duration": { "math": [ "( (u_val('spell_level', 'spell: druid_naturebow1_plus') * 72000) + 360000)" ] }, - "max_duration": { "math": [ "( (u_val('spell_level', 'spell: druid_naturebow1_plus') * 72000) + 360000)" ] } + "min_duration": { "math": [ "( (u_spell_level('druid_naturebow1_plus') * 72000) + 360000)" ] }, + "max_duration": { "math": [ "( (u_spell_level('druid_naturebow1_plus') * 72000) + 360000)" ] } }, { "id": "recover_fatigue", @@ -560,14 +560,14 @@ "effect": [ { "u_add_effect": "natures_commune", - "duration": { "math": [ "( 300 + (u_val('spell_level', 'spell: druid_natures_commune') * 165)) " ] } + "duration": { "math": [ "( 300 + (u_spell_level('druid_natures_commune') * 165)) " ] } }, { "u_add_morale": "morale_forest_unity", "bonus": 10, "max_bonus": 15, - "duration": { "math": [ "( 300 + (u_val('spell_level', 'spell: druid_natures_commune') * 165) )" ] }, - "decay_start": { "math": [ "(( 300 + (u_val('spell_level', 'spell: druid_natures_commune') * 165) ) / 2)" ] } + "duration": { "math": [ "( 300 + (u_spell_level('druid_natures_commune') * 165) )" ] }, + "decay_start": { "math": [ "(( 300 + (u_spell_level('druid_natures_commune') * 165) ) / 2)" ] } } ], "false_effect": [ { "u_message": "You must be surrounded by nature to commune with nature", "type": "bad" } ] @@ -921,10 +921,10 @@ "spell_class": "DRUID", "energy_source": "MANA", "max_level": 15, - "min_range": { "math": [ "( (u_val('spell_level', 'spell: druid_summon_brambles') * 0.6) + 1)" ] }, - "max_range": { "math": [ "( (u_val('spell_level', 'spell: druid_summon_brambles') * 0.6) + 1)" ] }, - "min_aoe": { "math": [ "( (u_val('spell_level', 'spell: druid_summon_brambles') * 1.9) + 30)" ] }, - "max_aoe": { "math": [ "( (u_val('spell_level', 'spell: druid_summon_brambles') * 1.9) + 30)" ] } + "min_range": { "math": [ "( (u_spell_level('druid_summon_brambles') * 0.6) + 1)" ] }, + "max_range": { "math": [ "( (u_spell_level('druid_summon_brambles') * 0.6) + 1)" ] }, + "min_aoe": { "math": [ "( (u_spell_level('druid_summon_brambles') * 1.9) + 30)" ] }, + "max_aoe": { "math": [ "( (u_spell_level('druid_summon_brambles') * 1.9) + 30)" ] } }, { "id": "druid_summon_brambles_line", @@ -939,8 +939,8 @@ "spell_class": "DRUID", "energy_source": "MANA", "max_level": 15, - "min_range": { "math": [ "( (u_val('spell_level', 'spell: druid_summon_brambles') * 1) + 1)" ] }, - "max_range": { "math": [ "( (u_val('spell_level', 'spell: druid_summon_brambles') * 1) + 1)" ] } + "min_range": { "math": [ "( (u_spell_level('druid_summon_brambles') * 1) + 1)" ] }, + "max_range": { "math": [ "( (u_spell_level('druid_summon_brambles') * 1) + 1)" ] } }, { "id": "druid_thorn_skin", diff --git a/data/mods/Magiclysm/Spells/earthshaper.json b/data/mods/Magiclysm/Spells/earthshaper.json index 0916809271a57..d1fc8e5f9faec 100644 --- a/data/mods/Magiclysm/Spells/earthshaper.json +++ b/data/mods/Magiclysm/Spells/earthshaper.json @@ -564,8 +564,8 @@ "effect": "spawn_item", "effect_str": "eshaper_hammer", "shape": "blast", - "min_duration": { "math": [ "( (u_val('spell_level', 'spell: eshaper_spawn_tools') * 576000) + 576000)" ] }, - "max_duration": { "math": [ "( (u_val('spell_level', 'spell: eshaper_spawn_tools') * 576000) + 576000)" ] } + "min_duration": { "math": [ "( (u_spell_level('eshaper_spawn_tools') * 576000) + 576000)" ] }, + "max_duration": { "math": [ "( (u_spell_level('eshaper_spawn_tools') * 576000) + 576000)" ] } }, { "id": "eshaper_spawn_pickaxe", @@ -579,8 +579,8 @@ "effect": "spawn_item", "effect_str": "eshaper_pickaxe", "shape": "blast", - "min_duration": { "math": [ "( (u_val('spell_level', 'spell: eshaper_spawn_tools') * 576000) + 576000)" ] }, - "max_duration": { "math": [ "( (u_val('spell_level', 'spell: eshaper_spawn_tools') * 576000) + 576000)" ] } + "min_duration": { "math": [ "( (u_spell_level('eshaper_spawn_tools') * 576000) + 576000)" ] }, + "max_duration": { "math": [ "( (u_spell_level('eshaper_spawn_tools') * 576000) + 576000)" ] } }, { "id": "eshaper_spawn_axe", @@ -594,8 +594,8 @@ "effect": "spawn_item", "effect_str": "eshaper_ax", "shape": "blast", - "min_duration": { "math": [ "( (u_val('spell_level', 'spell: eshaper_spawn_tools') * 576000) + 576000)" ] }, - "max_duration": { "math": [ "( (u_val('spell_level', 'spell: eshaper_spawn_tools') * 576000) + 576000)" ] } + "min_duration": { "math": [ "( (u_spell_level('eshaper_spawn_tools') * 576000) + 576000)" ] }, + "max_duration": { "math": [ "( (u_spell_level('eshaper_spawn_tools') * 576000) + 576000)" ] } }, { "id": "eshaper_spawn_knife", @@ -609,8 +609,8 @@ "effect": "spawn_item", "effect_str": "eshaper_knife", "shape": "blast", - "min_duration": { "math": [ "( (u_val('spell_level', 'spell: eshaper_spawn_tools') * 576000) + 576000)" ] }, - "max_duration": { "math": [ "( (u_val('spell_level', 'spell: eshaper_spawn_tools') * 576000) + 576000)" ] } + "min_duration": { "math": [ "( (u_spell_level('eshaper_spawn_tools') * 576000) + 576000)" ] }, + "max_duration": { "math": [ "( (u_spell_level('eshaper_spawn_tools') * 576000) + 576000)" ] } }, { "id": "eshaper_spawn_shovel", @@ -624,8 +624,8 @@ "effect": "spawn_item", "effect_str": "eshaper_shovel", "shape": "blast", - "min_duration": { "math": [ "( (u_val('spell_level', 'spell: eshaper_spawn_tools') * 576000) + 576000)" ] }, - "max_duration": { "math": [ "( (u_val('spell_level', 'spell: eshaper_spawn_tools') * 576000) + 576000)" ] } + "min_duration": { "math": [ "( (u_spell_level('eshaper_spawn_tools') * 576000) + 576000)" ] }, + "max_duration": { "math": [ "( (u_spell_level('eshaper_spawn_tools') * 576000) + 576000)" ] } }, { "id": "eshaper_melee_damage", @@ -795,7 +795,7 @@ "effect": "map", "shape": "blast", "max_level": 1, - "min_aoe": { "math": [ "( 7 + (u_val('spell_level', 'spell: earthshaper_reveal_world_map') * 2.2) )" ] } + "min_aoe": { "math": [ "( 7 + (u_spell_level('earthshaper_reveal_world_map') * 2.2) )" ] } }, { "id": "earthshaper_danger_sense", @@ -824,7 +824,7 @@ "effect": [ { "u_add_effect": "effect_tremorsense", - "duration": { "math": [ "(u_val('spell_level', 'spell: earthshaper_danger_sense') * 30000)" ] } + "duration": { "math": [ "(u_spell_level('earthshaper_danger_sense') * 30000)" ] } } ], "false_effect": [ { "u_message": "Without a direct connection to the living earth, the spell fails.", "type": "bad" } ] diff --git a/data/mods/Magiclysm/Spells/stormshaper.json b/data/mods/Magiclysm/Spells/stormshaper.json index 3a2d33357aeba..63827b5764858 100644 --- a/data/mods/Magiclysm/Spells/stormshaper.json +++ b/data/mods/Magiclysm/Spells/stormshaper.json @@ -481,25 +481,6 @@ "max_duration": 2160000, "duration_increment": 72000 }, - { - "id": "stormshaper_stormglove_zap", - "type": "SPELL", - "name": "Stormglove Zap", - "description": "This casts when you hit people with the stormglove.", - "valid_targets": [ "hostile" ], - "effect": "attack", - "shape": "blast", - "damage_type": "electric", - "min_damage": 1, - "max_damage": { - "math": [ "(5 + (1 * u_val('spell_level', 'spell: stormfist')) + (1 * u_val('spell_level', 'spell: stormfist_plus')))" ] - }, - "flags": [ "RANDOM_DAMAGE", "NO_PROJECTILE" ], - "sound_type": "combat", - "sound_description": "arcing electricity!", - "min_range": 1, - "max_range": 1 - }, { "id": "create_electric_lighter", "type": "SPELL", @@ -1007,8 +988,8 @@ "effect": "attack", "extra_effects": [ { "id": "stormshaper_cloak_fog_random", "max_level": 20 } ], "shape": "blast", - "min_damage": { "math": [ "( (u_val('spell_level', 'spell: stormshaper_cloak_of_fog') * 0.5) + 2)" ] }, - "max_damage": { "math": [ "( (u_val('spell_level', 'spell: stormshaper_cloak_of_fog') * 0.5) + 2)" ] } + "min_damage": { "math": [ "( (u_spell_level('stormshaper_cloak_of_fog') * 0.5) + 2)" ] }, + "max_damage": { "math": [ "( (u_spell_level('stormshaper_cloak_of_fog') * 0.5) + 2)" ] } }, { "id": "stormshaper_cloak_fog_random", @@ -1064,7 +1045,7 @@ "effect": "directed_push", "shape": "blast", "min_damage": 1, - "max_damage": { "math": [ "( (u_val('spell_level', 'spell: stormshaper_heart_of_hurricane') / 2) + 1)" ] }, + "max_damage": { "math": [ "( (u_spell_level('stormshaper_heart_of_hurricane') / 2) + 1)" ] }, "min_range": 1 }, { @@ -1113,8 +1094,8 @@ { "queue_eocs": "EOC_LOSE_CLOAK_OF_FROG_MUTATIONS", "time_in_future": [ - { "math": [ "( (u_val('spell_level', 'spell: stormshaper_cloak_of_frog') * 3750) + 15000)" ] }, - { "math": [ "( (u_val('spell_level', 'spell: stormshaper_cloak_of_frog') * 3750) + 15000)" ] } + { "math": [ "( (u_spell_level('stormshaper_cloak_of_frog') * 3750) + 15000)" ] }, + { "math": [ "( (u_spell_level('stormshaper_cloak_of_frog') * 3750) + 15000)" ] } ] } ], @@ -1140,8 +1121,8 @@ "effect": "attack", "extra_effects": [ { "id": "stormshaper_cloak_frog_summon", "max_level": 20 } ], "shape": "blast", - "min_damage": { "math": [ "( (u_val('spell_level', 'spell: stormshaper_cloak_of_frog') * 1) + 1)" ] }, - "max_damage": { "math": [ "( (u_val('spell_level', 'spell: stormshaper_cloak_of_frog') * 1) + 1)" ] } + "min_damage": { "math": [ "( (u_spell_level('stormshaper_cloak_of_frog') * 1) + 1)" ] }, + "max_damage": { "math": [ "( (u_spell_level('stormshaper_cloak_of_frog') * 1) + 1)" ] } }, { "id": "stormshaper_cloak_frog_summon", @@ -1162,6 +1143,6 @@ "min_aoe": 4, "max_aoe": 20, "aoe_increment": 0.65, - "min_duration": { "math": [ "( (u_val('spell_level', 'spell: stormshaper_cloak_of_frog') * 3750) + 15000)" ] } + "min_duration": { "math": [ "( (u_spell_level('stormshaper_cloak_of_frog') * 3750) + 15000)" ] } } ] diff --git a/data/mods/Magiclysm/Spells/technomancer.json b/data/mods/Magiclysm/Spells/technomancer.json index 2074309e3a9fa..fabf1832c28a8 100644 --- a/data/mods/Magiclysm/Spells/technomancer.json +++ b/data/mods/Magiclysm/Spells/technomancer.json @@ -649,8 +649,8 @@ "min_range": 5, "max_range": 20, "range_increment": 1, - "min_damage": { "math": [ "( (u_val('spell_level', 'spell: technomancer_robot_shutdown') * -15) - 200)" ] }, - "max_damage": { "math": [ "( (u_val('spell_level', 'spell: technomancer_robot_shutdown') * -25) - 400)" ] }, + "min_damage": { "math": [ "( (u_spell_level('technomancer_robot_shutdown') * -15) - 200)" ] }, + "max_damage": { "math": [ "( (u_spell_level('technomancer_robot_shutdown') * -25) - 400)" ] }, "energy_source": "MANA", "base_casting_time": 150, "base_energy_cost": 350, diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json index 22d74d868420f..ebb3d21520192 100644 --- a/data/mods/Magiclysm/effects/effects.json +++ b/data/mods/Magiclysm/effects/effects.json @@ -154,11 +154,7 @@ "desc": [ "Light is distorting around you and making it easier for you to avoid attacks." ], "apply_message": "The edges of your vision ripple slightly.", "remove_message": "The aura of light distortion around you vanishes.", - "enchantments": [ - { - "values": [ { "value": "BONUS_DODGE", "add": { "math": [ "((u_val('spell_level', 'spell: obfuscated_body') / 7) + 1)" ] } } ] - } - ] + "enchantments": [ { "values": [ { "value": "BONUS_DODGE", "add": { "math": [ "((u_spell_level('obfuscated_body') / 7) + 1)" ] } } ] } ] }, { "type": "effect_type", @@ -179,12 +175,7 @@ "remove_message": "The tingling fades.", "enchantments": [ { - "values": [ - { - "value": "ARMOR_ACID", - "multiply": { "math": [ "((u_val('spell_level', 'spell: acid_resistance') * -0.02) - 0.2)" ] } - } - ] + "values": [ { "value": "ARMOR_ACID", "multiply": { "math": [ "((u_spell_level('acid_resistance') * -0.02) - 0.2)" ] } } ] } ] }, @@ -745,17 +736,14 @@ "enchantments": [ { "values": [ - { - "value": "HUNGER", - "multiply": { "math": [ "(-0.2 - (0.04 * u_val('spell_level', 'spell: earthshaper_fortitude_of_stone')))" ] } - }, + { "value": "HUNGER", "multiply": { "math": [ "(-0.2 - (0.04 * u_spell_level('earthshaper_fortitude_of_stone')))" ] } }, { "value": "THIRST", - "multiply": { "math": [ "(-0.2 - (0.04 * u_val('spell_level', 'spell: earthshaper_fortitude_of_stone')))" ] } + "multiply": { "math": [ "(-0.2 - (0.04 * u_spell_level('earthshaper_fortitude_of_stone')))" ] } }, { "value": "METABOLISM", - "multiply": { "math": [ "(-0.2 - (0.04 * u_val('spell_level', 'spell: earthshaper_fortitude_of_stone')))" ] } + "multiply": { "math": [ "(-0.2 - (0.04 * u_spell_level('earthshaper_fortitude_of_stone')))" ] } }, { "value": "REGEN_HP", "multiply": -1.0 } ] @@ -773,12 +761,7 @@ "max_duration": "30 minutes", "enchantments": [ { - "values": [ - { - "value": "MOTION_VISION_RANGE", - "add": { "math": [ "( u_val('spell_level', 'spell: earthshaper_danger_sense') * 3)" ] } - } - ] + "values": [ { "value": "MOTION_VISION_RANGE", "add": { "math": [ "( u_spell_level('earthshaper_danger_sense') * 3)" ] } } ] } ] }, @@ -792,12 +775,7 @@ "rating": "good", "enchantments": [ { - "values": [ - { - "value": "SIGHT_RANGE_NETHER", - "add": { "math": [ "(( u_val('spell_level', 'spell: animist_sense_outsiders') * 2.5) + 3)" ] } - } - ] + "values": [ { "value": "SIGHT_RANGE_NETHER", "add": { "math": [ "(( u_spell_level('animist_sense_outsiders') * 2.5) + 3)" ] } } ] } ] }, @@ -815,10 +793,7 @@ "emitter": "emit_kelvinist_anti_cold", "values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 50 }, - { - "value": "ARMOR_COLD", - "add": { "math": [ "( u_val('spell_level', 'spell: kelvinist_anti_cold') * -1)" ] } - } + { "value": "ARMOR_COLD", "add": { "math": [ "( u_spell_level('kelvinist_anti_cold') * -1)" ] } } ] } ] @@ -837,10 +812,7 @@ "emitter": "emit_kelvinist_anti_heat", "values": [ { "value": "CLIMATE_CONTROL_CHILL", "add": 50 }, - { - "value": "ARMOR_HEAT", - "add": { "math": [ "( u_val('spell_level', 'spell: kelvinist_anti_heat') * -1)" ] } - } + { "value": "ARMOR_HEAT", "add": { "math": [ "( u_spell_level('kelvinist_anti_heat') * -1)" ] } } ] } ] @@ -854,12 +826,7 @@ "remove_message": "You can feel gravity take hold of you again.", "enchantments": [ { - "values": [ - { - "value": "FALL_DAMAGE", - "multiply": { "math": [ "(( u_val('spell_level', 'spell: magus_slowfall') * -0.01) - 0.9 )" ] } - } - ] + "values": [ { "value": "FALL_DAMAGE", "multiply": { "math": [ "(( u_spell_level('magus_slowfall') * -0.01) - 0.9 )" ] } } ] } ] }, diff --git a/data/mods/Magiclysm/enchantments/Spells.json b/data/mods/Magiclysm/enchantments/Spells.json index 58044a7be7c64..b63bbde237c6d 100644 --- a/data/mods/Magiclysm/enchantments/Spells.json +++ b/data/mods/Magiclysm/enchantments/Spells.json @@ -24,11 +24,11 @@ { "value": "FOOTSTEP_NOISE", "multiply": 1 }, { "value": "KNOCKBACK_RESIST", - "add": { "math": [ "(( u_val('spell_level', 'spell: stormshaper_heart_of_hurricane') * 0.02) + 0.3 )" ] } + "add": { "math": [ "(( u_spell_level('stormshaper_heart_of_hurricane') * 0.02) + 0.3 )" ] } }, { "value": "KNOCKDOWN_RESIST", - "add": { "math": [ "(( u_val('spell_level', 'spell: stormshaper_heart_of_hurricane') * 0.02) + 0.3 )" ] } + "add": { "math": [ "(( u_spell_level('stormshaper_heart_of_hurricane') * 0.02) + 0.3 )" ] } } ] }, diff --git a/data/mods/Magiclysm/items/item_enchants.json b/data/mods/Magiclysm/items/item_enchants.json index 34c3e55ebfda8..fd433566c878a 100644 --- a/data/mods/Magiclysm/items/item_enchants.json +++ b/data/mods/Magiclysm/items/item_enchants.json @@ -9,19 +9,11 @@ "values": [ { "value": "ITEM_DAMAGE_CUT", - "add": { - "math": [ - "(u_val('intelligence') * 2) + (u_val('spell_level', 'spell: holy_blade') + u_val('spell_level', 'spell: holy_blade_plus'))" - ] - } + "add": { "math": [ "(u_val('intelligence') * 2) + (u_spell_level('holy_blade') + u_spell_level('holy_blade_plus'))" ] } }, { "value": "LUMINATION", - "add": { - "math": [ - "((u_val('intelligence') * 2) + (u_val('spell_level', 'spell: holy_blade') + u_val('spell_level', 'spell: holy_blade_plus'))) * 3" - ] - } + "add": { "math": [ "((u_val('intelligence') * 2) + (u_spell_level('holy_blade') + u_spell_level('holy_blade_plus'))) * 3" ] } } ] }, @@ -36,41 +28,31 @@ { "value": "ARMOR_BASH", "add": { - "math": [ - "((u_val('intelligence') * 1.5) + (u_val('spell_level', 'spell: spirit_armor') + u_val('spell_level', 'spell: spirit_armor_plus')) * 0.5) * -1" - ] + "math": [ "((u_val('intelligence') * 1.5) + (u_spell_level('spirit_armor') + u_spell_level('spirit_armor_plus')) * 0.5) * -1" ] } }, { "value": "ARMOR_CUT", "add": { - "math": [ - "((u_val('intelligence') * 1.5) + (u_val('spell_level', 'spell: spirit_armor') + u_val('spell_level', 'spell: spirit_armor_plus')) * 0.5) * -1" - ] + "math": [ "((u_val('intelligence') * 1.5) + (u_spell_level('spirit_armor') + u_spell_level('spirit_armor_plus')) * 0.5) * -1" ] } }, { "value": "ARMOR_STAB", "add": { - "math": [ - "((u_val('intelligence') * 1.5) + (u_val('spell_level', 'spell: spirit_armor') + u_val('spell_level', 'spell: spirit_armor_plus')) * 0.5) * -1" - ] + "math": [ "((u_val('intelligence') * 1.5) + (u_spell_level('spirit_armor') + u_spell_level('spirit_armor_plus')) * 0.5) * -1" ] } }, { "value": "ARMOR_BULLET", "add": { - "math": [ - "((u_val('intelligence') * 1.5) + (u_val('spell_level', 'spell: spirit_armor') + u_val('spell_level', 'spell: spirit_armor_plus')) * 0.5) * -1" - ] + "math": [ "((u_val('intelligence') * 1.5) + (u_spell_level('spirit_armor') + u_spell_level('spirit_armor_plus')) * 0.5) * -1" ] } }, { "value": "LUMINATION", "add": { - "math": [ - "((u_val('intelligence') * 1.5) + (u_val('spell_level', 'spell: spirit_armor') + u_val('spell_level', 'spell: spirit_armor_plus')) * 0.5) * 3" - ] + "math": [ "((u_val('intelligence') * 1.5) + (u_spell_level('spirit_armor') + u_spell_level('spirit_armor_plus')) * 0.5) * 3" ] } } ] @@ -85,9 +67,7 @@ "values": [ { "value": "ITEM_DAMAGE_ELEC", - "add": { - "math": [ "(5 + (1 * u_val('spell_level', 'spell: storm_hammer')) + (1 * u_val('spell_level', 'spell: storm_hammer_plus')))" ] - } + "add": { "math": [ "(5 + (1 * u_spell_level('storm_hammer')) + (1 * u_spell_level('storm_hammer_plus')))" ] } } ] }, @@ -98,7 +78,12 @@ "condition": { "not": "u_has_weapon" }, "name": { "str": "Stormglove" }, "description": "A coating of lighting on your hand and lower arm.", - "hit_you_effect": [ { "id": "stormshaper_stormglove_zap" } ] + "values": [ + { + "value": "ITEM_DAMAGE_ELEC", + "add": { "math": [ "rand(5 + (1 * u_spell_level('stormfist')) + (1 * u_spell_level('stormfist_plus')))" ] } + } + ] }, { "type": "enchantment", @@ -112,17 +97,13 @@ { "value": "ARMOR_ACID", "add": { - "math": [ - "(-2 - (0.5 * u_val('spell_level', 'spell: biomancer_caustic_aura')) - (0.5 * u_val('spell_level', 'spell: biomancer_caustic_aura_plus')))" - ] + "math": [ "(-2 - (0.5 * u_spell_level('biomancer_caustic_aura')) - (0.5 * u_spell_level('biomancer_caustic_aura_plus')))" ] } }, { "value": "ITEM_DAMAGE_ACID", "add": { - "math": [ - "(1 + (0.25 * u_val('spell_level', 'spell: biomancer_caustic_aura')) + (0.25 * u_val('spell_level', 'spell: biomancer_caustic_aura_plus')))" - ] + "math": [ "(1 + (0.25 * u_spell_level('biomancer_caustic_aura')) + (0.25 * u_spell_level('biomancer_caustic_aura_plus')))" ] } } ] @@ -134,12 +115,7 @@ "condition": "ALWAYS", "name": { "str": "Subzero Talons" }, "description": "Icy talons to freeze your enemies.", - "values": [ - { - "value": "ITEM_DAMAGE_COLD", - "add": { "math": [ "(3 + (0.5 * u_val('spell_level', 'spell: summon_subzero_talons')))" ] } - } - ] + "values": [ { "value": "ITEM_DAMAGE_COLD", "add": { "math": [ "(3 + (0.5 * u_spell_level('summon_subzero_talons')))" ] } } ] }, { "type": "enchantment", @@ -149,13 +125,10 @@ "has": "HELD", "condition": "ALWAYS", "values": [ - { "value": "STRENGTH", "add": { "math": [ "(1 + (u_val('spell_level', 'spell: druid_feralform') / 5 ))" ] } }, - { "value": "DEXTERITY", "add": { "math": [ "(1 + (u_val('spell_level', 'spell: druid_feralform') / 5 ))" ] } }, - { - "value": "INTELLIGENCE", - "add": { "math": [ "(-3 + (u_val('spell_level', 'spell: druid_feralform') / 7 ))" ] } - }, - { "value": "PERCEPTION", "add": { "math": [ "(-3 + (u_val('spell_level', 'spell: druid_feralform') / 7 ))" ] } } + { "value": "STRENGTH", "add": { "math": [ "(1 + (u_spell_level('druid_feralform') / 5 ))" ] } }, + { "value": "DEXTERITY", "add": { "math": [ "(1 + (u_spell_level('druid_feralform') / 5 ))" ] } }, + { "value": "INTELLIGENCE", "add": { "math": [ "(-3 + (u_spell_level('druid_feralform') / 7 ))" ] } }, + { "value": "PERCEPTION", "add": { "math": [ "(-3 + (u_spell_level('druid_feralform') / 7 ))" ] } } ], "mutations": [ "LIGHTFUR", "CLAWS", "ADRENALINE", "CANINE_EARS", "PERSISTENCE_HUNTER", "SNARL", "CARNIVORE", "SMELLY2", "DEFORMED2" ] }, @@ -167,12 +140,9 @@ "has": "HELD", "condition": "ALWAYS", "values": [ - { "value": "STRENGTH", "add": { "math": [ "(3 + (u_val('spell_level', 'spell: druid_feralform_plus') / 5 ))" ] } }, - { - "value": "DEXTERITY", - "add": { "math": [ "(3 + (u_val('spell_level', 'spell: druid_feralform_plus') / 5 ))" ] } - }, - { "value": "PERCEPTION", "add": { "math": [ "(0 + (u_val('spell_level', 'spell: druid_feralform') / 7 ))" ] } } + { "value": "STRENGTH", "add": { "math": [ "(3 + (u_spell_level('druid_feralform_plus') / 5 ))" ] } }, + { "value": "DEXTERITY", "add": { "math": [ "(3 + (u_spell_level('druid_feralform_plus') / 5 ))" ] } }, + { "value": "PERCEPTION", "add": { "math": [ "(0 + (u_spell_level('druid_feralform') / 7 ))" ] } } ], "mutations": [ "FUR", diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_nether_attunement_events.json b/data/mods/MindOverMatter/effectoncondition/eoc_nether_attunement_events.json index 9833ac8d0f066..9a57ea0b60e90 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_nether_attunement_events.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_nether_attunement_events.json @@ -57,7 +57,7 @@ { "compare_string": [ "VITAKINETIC", { "context_val": "school" } ] } ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "15" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "15" ] } ] }, "//": "Switch statement below is to ensure there is always a chance of something happening.", @@ -218,12 +218,12 @@ "//": "Base is 0.5% chance from 15 attunement to 60 attunement, then scaling up 0.1% per attunement up to 10.5% chance at 160 attunement, then scaling up 0.25% chance per attunement up to 33% chance at max, plus the Difficulty squared.", "condition": { "and": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "15" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "15" ] }, { "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) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 5)" + "( clamp( (u_vitamin('vitamin_psionic_drain') - 60), 0, 160) + clamp( ( (u_vitamin('vitamin_psionic_drain') - 160) * 1.5 ), 0, 375) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 5)" ] }, "y": 1000 @@ -237,7 +237,7 @@ "u_add_effect": "psionic_overload", "duration": { "math": [ - "u_val('time: 30 s') * rng( ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ), ( u_val('vitamin', 'name:vitamin_psionic_drain') * 2 ) )" + "u_val('time: 30 s') * rng( ( u_vitamin('vitamin_psionic_drain') / 2 ), ( u_vitamin('vitamin_psionic_drain') * 2 ) )" ] } } @@ -249,12 +249,12 @@ "//": "Base is 3% chance from 15 attunement to 50 attunement, then scaling up 0.1% per attunement up to 11% chance at 130 attunement, then scaling up 0.25% chance per attunement up to 41% chance at max, plus the Difficulty squared.", "condition": { "and": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "15" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "15" ] }, { "x_in_y_chance": { "x": { "math": [ - "( clamp( (u_val('vitamin', 'name:vitamin_psionic_drain') - 50), 0, 200) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 130) * 1.5 ), 0, 375) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 30)" + "( clamp( (u_vitamin('vitamin_psionic_drain') - 50), 0, 200) + clamp( ( (u_vitamin('vitamin_psionic_drain') - 130) * 1.5 ), 0, 375) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 30)" ] }, "y": 1000 @@ -273,12 +273,12 @@ "//": "Base is 2% chance from 15 attunement to 150 attunement, then scaling up 0.05% per attunement up 10.5% chance at 160 attunement, then scaling up 0.25% chance per attunement up to 33% chance at max, plus the Difficulty squared.", "condition": { "and": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "15" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "15" ] }, { "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" + "clamp( ( ( u_vitamin('vitamin_psionic_drain') / 2) - 75), 0, 80) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 20" ] }, "y": 1000 @@ -288,7 +288,7 @@ }, "effect": [ { "u_message": "As you unleash your powers, you feel a strange tingling sensation.", "type": "mixed" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 2,6 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 2,6 )" ] } ] }, { @@ -297,12 +297,12 @@ "//": "Base is 1.5% chance from 25 attunement to 70 attunement, then scaling up 0.1% per attunement up to 6.5% chance at 120 attunement, then scaling up 0.2% chance per attunement up to 32.5% chance at max, plus the Difficulty squared.", "condition": { "and": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "25" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "25" ] }, { "x_in_y_chance": { "x": { "math": [ - "( clamp( ( u_val('vitamin', 'name:vitamin_psionic_drain') - 70), 0, 50) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 120) * 2 ), 0, 310) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 15)" + "( clamp( ( u_vitamin('vitamin_psionic_drain') - 70), 0, 50) + clamp( ( (u_vitamin('vitamin_psionic_drain') - 120) * 2 ), 0, 310) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 15)" ] }, "y": 1000 @@ -335,12 +335,12 @@ "//": "Base is 1% chance from 25 attunement to 60 attunement, then scaling up 0.1% per attunement up to 12% chance at 150 attunement, then scaling up 0.25% chance per attunement up to 37% chance at max, plus the Difficulty squared.", "condition": { "and": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "25" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "25" ] }, { "x_in_y_chance": { "x": { "math": [ - "( clamp( ( u_val('vitamin', 'name:vitamin_psionic_drain') - 60), 0, 90) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 160) * 2.5 ), 0, 300) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 10)" + "( clamp( ( u_vitamin('vitamin_psionic_drain') - 60), 0, 90) + clamp( ( (u_vitamin('vitamin_psionic_drain') - 160) * 2.5 ), 0, 300) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 10)" ] }, "y": 1000 @@ -360,12 +360,12 @@ "//": "Base is 2% chance from 50 attunement to 100 attunement, then scaling up 0.1% per attunement up to 8% chance at 160 attunement, then scaling up 0.28% chance per attunement up to 17.2% chance at 200 attunement, then scaling up 0.18% to 26.2% chance at max, plus the Difficulty squared.", "condition": { "and": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "50" ] }, + { "math": [ "u_vitamin('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) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 20)" + "( clamp( (u_vitamin('vitamin_psionic_drain') - 100), 0, 100) + clamp( ( (u_vitamin('vitamin_psionic_drain') - 160) * 1.8 ), 0, 250) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 20)" ] }, "y": 1000 @@ -384,12 +384,12 @@ "//": "Base is 2% chance from 70 attunement to 125 attunement, then scaling up 0.15% per attunement up to 9.5% chance at 175 attunement, then scaling up 0.45% chance per attunement up to 32% chance at 225 attunement, then scaling up 0.3% to 39.5% chance at max, plus the Difficulty squared.", "condition": { "and": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "70" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "70" ] }, { "x_in_y_chance": { "x": { "math": [ - "( clamp( (( u_val('vitamin', 'name:vitamin_psionic_drain') * 1.5 ) - 125), 0, 100) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 175) * 3 ), 0, 150) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 20)" + "( clamp( (( u_vitamin('vitamin_psionic_drain') * 1.5 ) - 125), 0, 100) + clamp( ( (u_vitamin('vitamin_psionic_drain') - 175) * 3 ), 0, 150) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 20)" ] }, "y": 1000 @@ -408,12 +408,12 @@ "//": "Base is 1.5% chance from 80 attunement to 120 attunement, then scaling up 0.1% per attunement up to 7.5% chance at 180 attunement, then scaling up 0.45% chance per attunement up to 32% chance at 225 attunement, then scaling up 0.3% to 39.5% chance at max, plus the Difficulty squared.", "condition": { "and": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "85" ] }, + { "math": [ "u_vitamin('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)" + "( clamp( (u_vitamin('vitamin_psionic_drain') - 120), 0, 100) + clamp( ( (u_vitamin('vitamin_psionic_drain') - 180) * 3 ), 0, 250) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 15)" ] }, "y": 1000 @@ -425,7 +425,7 @@ { "u_message": "As you unleash your powers, you feel a surge of strength!", "type": "good" }, { "u_add_effect": "effect_nether_attunement_power_surge", - "duration": { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain') * rng(1,10)" ] } + "duration": { "math": [ "u_vitamin('vitamin_psionic_drain') * rng(1,10)" ] } } ] }, @@ -435,12 +435,12 @@ "//": "Base is 1% chance from 85 attunement to 120 attunement, then scaling up 0.1% per attunement up to 8% chance at 190 attunement, then scaling up 0.35% chance per attunement up to 29% chance at max, plus the Difficulty squared.", "condition": { "and": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "85" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "85" ] }, { "x_in_y_chance": { "x": { "math": [ - "( clamp( (u_val('vitamin', 'name:vitamin_psionic_drain') - 120), 0, 130) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 190) * 2.5 ), 0, 375) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 10)" + "( clamp( (u_vitamin('vitamin_psionic_drain') - 120), 0, 130) + clamp( ( (u_vitamin('vitamin_psionic_drain') - 190) * 2.5 ), 0, 375) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 10)" ] }, "y": 1000 @@ -454,7 +454,7 @@ "u_add_effect": "effect_psi_teleport_lock", "duration": { "math": [ - "u_val('time: 30 s') * rng( ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ), ( u_val('vitamin', 'name:vitamin_psionic_drain') * 2 ) )" + "u_val('time: 30 s') * rng( ( u_vitamin('vitamin_psionic_drain') / 2 ), ( u_vitamin('vitamin_psionic_drain') * 2 ) )" ] } } @@ -466,12 +466,12 @@ "//": "Base is 2% chance from 100 attunement to 150 attunement, then scaling up 0.1% per attunement up to 9% chance at 220 attunement, then scaling up 0.5% chance per attunement up to 24% chance at max, plus the Difficulty squared.", "condition": { "and": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "100" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "100" ] }, { "x_in_y_chance": { "x": { "math": [ - "( clamp( ( u_val('vitamin', 'name:vitamin_psionic_drain') - 150), 0, 100) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 220) * 4 ), 0, 150) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 20)" + "( clamp( ( u_vitamin('vitamin_psionic_drain') - 150), 0, 100) + clamp( ( (u_vitamin('vitamin_psionic_drain') - 220) * 4 ), 0, 150) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 20)" ] }, "y": 1000 @@ -485,7 +485,7 @@ "u_add_effect": "effect_biokin_overload", "duration": { "math": [ - "u_val('time: 30 s') * rng( ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ), ( u_val('vitamin', 'name:vitamin_psionic_drain') * 2 ) )" + "u_val('time: 30 s') * rng( ( u_vitamin('vitamin_psionic_drain') / 2 ), ( u_vitamin('vitamin_psionic_drain') * 2 ) )" ] } } @@ -497,12 +497,12 @@ "//": "Base is 2% chance from 100 attunement to 150 attunement, then scaling up 0.1% per attunement up to 9% chance at 220 attunement, then scaling up 0.5% chance per attunement up to 24% chance at max, plus the Difficulty squared.", "condition": { "and": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "100" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "100" ] }, { "x_in_y_chance": { "x": { "math": [ - "( clamp( ( u_val('vitamin', 'name:vitamin_psionic_drain') - 150), 0, 100) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 220) * 4 ), 0, 150) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 20)" + "( clamp( ( u_vitamin('vitamin_psionic_drain') - 150), 0, 100) + clamp( ( (u_vitamin('vitamin_psionic_drain') - 220) * 4 ), 0, 150) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 20)" ] }, "y": 1000 @@ -516,7 +516,7 @@ "u_add_effect": "effect_psi_reduced_breathing", "duration": { "math": [ - "u_val('time: 30 s') * rng( ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ), ( u_val('vitamin', 'name:vitamin_psionic_drain') * 2 ) )" + "u_val('time: 30 s') * rng( ( u_vitamin('vitamin_psionic_drain') / 2 ), ( u_vitamin('vitamin_psionic_drain') * 2 ) )" ] } } @@ -528,12 +528,12 @@ "//": "Base is 3% chance from 125 attunement to 160 attunement, then scaling up 0.15% per attunement up to 9.75% chance at 205 attunement, then scaling up 0.45% chance per attunement up to 29.75% chance at max, plus the Difficulty squared.", "condition": { "and": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "125" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "125" ] }, { "x_in_y_chance": { "x": { "math": [ - "( clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') * 1.5) - 160), 0, 100) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 205) * 3 ), 0, 150) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 30)" + "( clamp( ( (u_vitamin('vitamin_psionic_drain') * 1.5) - 160), 0, 100) + clamp( ( (u_vitamin('vitamin_psionic_drain') - 205) * 3 ), 0, 150) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 30)" ] }, "y": 1000 @@ -552,12 +552,12 @@ "//": "Base is 2% chance from 150 attunement to 200 attunement, then scaling up 0.15% per attunement up to 5.75% chance at 225 attunement, then scaling up 0.5% chance per attunement up to 18.25% chance at max, plus the Difficulty squared.", "condition": { "and": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "150" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "150" ] }, { "x_in_y_chance": { "x": { "math": [ - "( clamp( (( u_val('vitamin', 'name:vitamin_psionic_drain') * 1.5) - 200), 0, 100) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 225) * 3.5 ), 0, 150) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 20)" + "( clamp( (( u_vitamin('vitamin_psionic_drain') * 1.5) - 200), 0, 100) + clamp( ( (u_vitamin('vitamin_psionic_drain') - 225) * 3.5 ), 0, 150) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 20)" ] }, "y": 1000 @@ -574,7 +574,7 @@ "u_add_effect": "effect_psi_null_unbound", "duration": { "math": [ - "u_val('time: 30 s') * rng( ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ), ( u_val('vitamin', 'name:vitamin_psionic_drain') * 2 ) )" + "u_val('time: 30 s') * rng( ( u_vitamin('vitamin_psionic_drain') / 2 ), ( u_vitamin('vitamin_psionic_drain') * 2 ) )" ] } } @@ -587,12 +587,12 @@ "condition": { "and": [ { "u_has_effect": "psi_nether_attention" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "200" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "200" ] }, { "x_in_y_chance": { "x": { "math": [ - "(clamp( (u_val('vitamin', 'name:vitamin_psionic_drain') - 200), 0, 50) / 2 ) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 30" + "(clamp( (u_vitamin('vitamin_psionic_drain') - 200), 0, 50) / 2 ) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 30" ] }, "y": 1000 @@ -617,7 +617,7 @@ "effect": [ { "u_message": "psi_nether_attention_nightmares", "snippet": true, "type": "bad" }, { "u_add_morale": "morale_nightmare", "bonus": [ -15, -30 ], "max_bonus": -30 }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 3,9 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 3,9 )" ] } ] }, { @@ -728,7 +728,7 @@ ] }, "effect": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rand( 1 )" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rand( 1 )" ] }, { "run_eocs": [ { 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 7fffdbf723650..4eaf6e17571db 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json @@ -289,7 +289,7 @@ ] }, { - "x_in_y_chance": { "x": { "math": [ "max( (20 - u_val('spell_level', 'spell: photokinetic_invisibility')),4)" ] }, "y": 1000 } + "x_in_y_chance": { "x": { "math": [ "max( (20 - u_spell_level('photokinetic_invisibility')),4)" ] }, "y": 1000 } } ] }, @@ -309,7 +309,7 @@ { "u_has_effect": "effect_photokin_invisibility" }, { "compare_string": [ "run", { "context_val": "movement_mode" } ] }, { - "x_in_y_chance": { "x": { "math": [ "max( (80 - ( u_val('spell_level', 'spell: photokinetic_invisibility') * 3)),30)" ] }, "y": 1000 } + "x_in_y_chance": { "x": { "math": [ "max( (80 - ( u_spell_level('photokinetic_invisibility') * 3)),30)" ] }, "y": 1000 } } ] }, @@ -338,7 +338,7 @@ { "compare_string": [ "BIOKINETIC", { "context_val": "school" } ] }, { "or": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "200" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "200" ] }, { "math": [ "_success", "==", "false" ] }, { "is_weather": "distant_portal_storm" }, { "is_weather": "portal_storm" }, @@ -348,9 +348,7 @@ { "x_in_y_chance": { "x": { - "math": [ - "(10 * (min(0,( _difficulty - 1 - ( u_skill('metaphysics') / 2 ) ) * 15) ) + u_val('vitamin', 'name:vitamin_psionic_drain'))" - ] + "math": [ "(10 * (min(0,( _difficulty - 1 - ( u_skill('metaphysics') / 2 ) ) * 15) ) + u_vitamin('vitamin_psionic_drain'))" ] }, "y": 1000 } @@ -362,15 +360,11 @@ { "run_eocs": [ "EOC_END_PSI_POWERS" ] }, { "u_add_effect": "psionic_overload", - "duration": { - "math": [ "u_val('time: 30 s') * (1 + ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] - } + "duration": { "math": [ "u_val('time: 30 s') * (1 + ( u_vitamin('vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] } }, { "u_add_effect": "effect_biokin_overload", - "duration": { - "math": [ "u_val('time: 30 s') * (1 + ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] - } + "duration": { "math": [ "u_val('time: 30 s') * (1 + ( u_vitamin('vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] } } ] }, @@ -385,7 +379,7 @@ { "compare_string": [ "CLAIRSENTIENT", { "context_val": "school" } ] }, { "or": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "200" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "200" ] }, { "math": [ "_success", "==", "false" ] }, { "is_weather": "distant_portal_storm" }, { "is_weather": "portal_storm" }, @@ -395,9 +389,7 @@ { "x_in_y_chance": { "x": { - "math": [ - "(10 * (min(0,( _difficulty - 1 - ( u_skill('metaphysics') / 2 ) ) * 15) ) + u_val('vitamin', 'name:vitamin_psionic_drain'))" - ] + "math": [ "(10 * (min(0,( _difficulty - 1 - ( u_skill('metaphysics') / 2 ) ) * 15) ) + u_vitamin('vitamin_psionic_drain'))" ] }, "y": 1000 } @@ -409,21 +401,15 @@ { "run_eocs": [ "EOC_END_PSI_POWERS" ] }, { "u_add_effect": "psionic_overload", - "duration": { - "math": [ "u_val('time: 30 s') * (1 + ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] - } + "duration": { "math": [ "u_val('time: 30 s') * (1 + ( u_vitamin('vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] } }, { "u_add_effect": "blind_clair_overload", - "duration": { - "math": [ "u_val('time: 15 s') * (1 + ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] - } + "duration": { "math": [ "u_val('time: 15 s') * (1 + ( u_vitamin('vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] } }, { "u_add_effect": "deaf_clair_overload", - "duration": { - "math": [ "u_val('time: 15 s') * (1 + ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] - } + "duration": { "math": [ "u_val('time: 15 s') * (1 + ( u_vitamin('vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] } } ] }, @@ -438,7 +424,7 @@ { "compare_string": [ "ELECTROKINETIC", { "context_val": "school" } ] }, { "or": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "200" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "200" ] }, { "math": [ "_success", "==", "false" ] }, { "is_weather": "distant_portal_storm" }, { "is_weather": "portal_storm" }, @@ -448,9 +434,7 @@ { "x_in_y_chance": { "x": { - "math": [ - "(10 * (min(0,( _difficulty - 1 - ( u_skill('metaphysics') / 2 ) ) * 15) ) + u_val('vitamin', 'name:vitamin_psionic_drain'))" - ] + "math": [ "(10 * (min(0,( _difficulty - 1 - ( u_skill('metaphysics') / 2 ) ) * 15) ) + u_vitamin('vitamin_psionic_drain'))" ] }, "y": 1000 } @@ -462,15 +446,11 @@ { "run_eocs": [ "EOC_END_PSI_POWERS" ] }, { "u_add_effect": "psionic_overload", - "duration": { - "math": [ "u_val('time: 30 s') * (1 + ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] - } + "duration": { "math": [ "u_val('time: 30 s') * (1 + ( u_vitamin('vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] } }, { "u_add_effect": "effect_electrokin_overload", - "duration": { - "math": [ "u_val('time: 5 s') * (1 + ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] - } + "duration": { "math": [ "u_val('time: 5 s') * (1 + ( u_vitamin('vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] } }, { "run_eocs": "EOC_ELECTRO_OVERLOAD_ZAP" } ] @@ -486,7 +466,7 @@ { "compare_string": [ "PHOTOKINETIC", { "context_val": "school" } ] }, { "or": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "200" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "200" ] }, { "math": [ "_success", "==", "false" ] }, { "is_weather": "distant_portal_storm" }, { "is_weather": "portal_storm" }, @@ -496,9 +476,7 @@ { "x_in_y_chance": { "x": { - "math": [ - "(10 * (min(0,( _difficulty - 1 - ( u_skill('metaphysics') / 2 ) ) * 15) ) + u_val('vitamin', 'name:vitamin_psionic_drain'))" - ] + "math": [ "(10 * (min(0,( _difficulty - 1 - ( u_skill('metaphysics') / 2 ) ) * 15) ) + u_vitamin('vitamin_psionic_drain'))" ] }, "y": 1000 } @@ -510,21 +488,15 @@ { "run_eocs": [ "EOC_END_PSI_POWERS" ] }, { "u_add_effect": "psionic_overload", - "duration": { - "math": [ "u_val('time: 30 s') * (1 + ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] - } + "duration": { "math": [ "u_val('time: 30 s') * (1 + ( u_vitamin('vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] } }, { "u_add_effect": "effect_photokin_myopia_overload", - "duration": { - "math": [ "u_val('time: 15 s') * (1 + ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] - } + "duration": { "math": [ "u_val('time: 15 s') * (1 + ( u_vitamin('vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] } }, { "u_add_effect": "effect_photokin_lumination_overload", - "duration": { - "math": [ "u_val('time: 15 s') * (1 + ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] - } + "duration": { "math": [ "u_val('time: 15 s') * (1 + ( u_vitamin('vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] } } ] }, @@ -539,7 +511,7 @@ { "compare_string": [ "PYROKINETIC", { "context_val": "school" } ] }, { "or": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "200" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "200" ] }, { "math": [ "_success", "==", "false" ] }, { "is_weather": "distant_portal_storm" }, { "is_weather": "portal_storm" }, @@ -549,9 +521,7 @@ { "x_in_y_chance": { "x": { - "math": [ - "(10 * (min(0,( _difficulty - 1 - ( u_skill('metaphysics') / 2 ) ) * 15) ) + u_val('vitamin', 'name:vitamin_psionic_drain'))" - ] + "math": [ "(10 * (min(0,( _difficulty - 1 - ( u_skill('metaphysics') / 2 ) ) * 15) ) + u_vitamin('vitamin_psionic_drain'))" ] }, "y": 1000 } @@ -563,15 +533,11 @@ { "run_eocs": [ "EOC_END_PSI_POWERS" ] }, { "u_add_effect": "psionic_overload", - "duration": { - "math": [ "u_val('time: 30 s') * (1 + ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] - } + "duration": { "math": [ "u_val('time: 30 s') * (1 + ( u_vitamin('vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] } }, { "u_add_effect": "effect_pyrokin_overload", - "duration": { - "math": [ "u_val('time: 5 s') * (1 + ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] - } + "duration": { "math": [ "u_val('time: 5 s') * (1 + ( u_vitamin('vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] } } ] }, @@ -586,7 +552,7 @@ { "compare_string": [ "TELEKINETIC", { "context_val": "school" } ] }, { "or": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "200" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "200" ] }, { "math": [ "_success", "==", "false" ] }, { "is_weather": "distant_portal_storm" }, { "is_weather": "portal_storm" }, @@ -596,9 +562,7 @@ { "x_in_y_chance": { "x": { - "math": [ - "(10 * (min(0,( _difficulty - 1 - ( u_skill('metaphysics') / 2 ) ) * 15) ) + u_val('vitamin', 'name:vitamin_psionic_drain'))" - ] + "math": [ "(10 * (min(0,( _difficulty - 1 - ( u_skill('metaphysics') / 2 ) ) * 15) ) + u_vitamin('vitamin_psionic_drain'))" ] }, "y": 1000 } @@ -610,15 +574,11 @@ { "run_eocs": [ "EOC_END_PSI_POWERS" ] }, { "u_add_effect": "psionic_overload", - "duration": { - "math": [ "u_val('time: 30 s') * (1 + ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] - } + "duration": { "math": [ "u_val('time: 30 s') * (1 + ( u_vitamin('vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] } }, { "u_add_effect": "effect_telekin_overload", - "duration": { - "math": [ "u_val('time: 15 s') * (1 + ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] - } + "duration": { "math": [ "u_val('time: 15 s') * (1 + ( u_vitamin('vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] } } ] }, @@ -633,7 +593,7 @@ { "compare_string": [ "TELEPATH", { "context_val": "school" } ] }, { "or": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "200" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "200" ] }, { "math": [ "_success", "==", "false" ] }, { "is_weather": "distant_portal_storm" }, { "is_weather": "portal_storm" }, @@ -643,9 +603,7 @@ { "x_in_y_chance": { "x": { - "math": [ - "(10 * (min(0,( _difficulty - 1 - ( u_skill('metaphysics') / 2 ) ) * 15) ) + u_val('vitamin', 'name:vitamin_psionic_drain'))" - ] + "math": [ "(10 * (min(0,( _difficulty - 1 - ( u_skill('metaphysics') / 2 ) ) * 15) ) + u_vitamin('vitamin_psionic_drain'))" ] }, "y": 1000 } @@ -657,21 +615,15 @@ { "run_eocs": [ "EOC_END_PSI_POWERS" ] }, { "u_add_effect": "psionic_overload", - "duration": { - "math": [ "u_val('time: 30 s') * (1 + ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] - } + "duration": { "math": [ "u_val('time: 30 s') * (1 + ( u_vitamin('vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] } }, { "u_add_effect": "nightmares", - "duration": { - "math": [ "u_val('time: 30 m') * (1 + ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] - } + "duration": { "math": [ "u_val('time: 30 m') * (1 + ( u_vitamin('vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] } }, { "u_add_effect": "disrupted_sleep", - "duration": { - "math": [ "u_val('time: 30 m') * (1 + ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] - } + "duration": { "math": [ "u_val('time: 30 m') * (1 + ( u_vitamin('vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] } } ] }, @@ -686,7 +638,7 @@ { "compare_string": [ "TELEPORTER", { "context_val": "school" } ] }, { "or": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "200" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "200" ] }, { "math": [ "_success", "==", "false" ] }, { "is_weather": "distant_portal_storm" }, { "is_weather": "portal_storm" }, @@ -696,9 +648,7 @@ { "x_in_y_chance": { "x": { - "math": [ - "(10 * (min(0,( _difficulty - 1 - ( u_skill('metaphysics') / 2 ) ) * 15) ) + u_val('vitamin', 'name:vitamin_psionic_drain'))" - ] + "math": [ "(10 * (min(0,( _difficulty - 1 - ( u_skill('metaphysics') / 2 ) ) * 15) ) + u_vitamin('vitamin_psionic_drain'))" ] }, "y": 1000 } @@ -710,15 +660,11 @@ { "run_eocs": [ "EOC_END_PSI_POWERS" ] }, { "u_add_effect": "psionic_overload", - "duration": { - "math": [ "u_val('time: 30 s') * (1 + ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] - } + "duration": { "math": [ "u_val('time: 30 s') * (1 + ( u_vitamin('vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] } }, { "u_add_effect": "effect_portal_storm_teleport", - "duration": { - "math": [ "u_val('time: 15 s') * (1 + ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] - } + "duration": { "math": [ "u_val('time: 15 s') * (1 + ( u_vitamin('vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] } } ] }, @@ -732,17 +678,12 @@ { "u_has_trait": "VITAKINETIC" }, { "compare_string": [ "VITAKINETIC", { "context_val": "school" } ] }, { - "or": [ - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "200" ] }, - { "math": [ "_success", "==", "false" ] } - ] + "or": [ { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "200" ] }, { "math": [ "_success", "==", "false" ] } ] }, { "x_in_y_chance": { "x": { - "math": [ - "(10 * (min(0,( _difficulty - 1 - ( u_skill('metaphysics') / 2 ) ) * 15) ) + u_val('vitamin', 'name:vitamin_psionic_drain'))" - ] + "math": [ "(10 * (min(0,( _difficulty - 1 - ( u_skill('metaphysics') / 2 ) ) * 15) ) + u_vitamin('vitamin_psionic_drain'))" ] }, "y": 1000 } @@ -754,15 +695,11 @@ { "run_eocs": [ "EOC_END_PSI_POWERS" ] }, { "u_add_effect": "psionic_overload", - "duration": { - "math": [ "u_val('time: 30 s') * (1 + ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] - } + "duration": { "math": [ "u_val('time: 30 s') * (1 + ( u_vitamin('vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] } }, { "u_add_effect": "effect_vitakin_overload", - "duration": { - "math": [ "u_val('time: 30 s') * (1 + ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] - } + "duration": { "math": [ "u_val('time: 30 s') * (1 + ( u_vitamin('vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ] } } ] }, @@ -820,7 +757,7 @@ "id": "EOC_POWER_MAINTENANCE_PLUS_ONE", "condition": { "math": [ - "u_val('vitamin', 'name:vitamin_maintained_powers')", + "u_vitamin('vitamin_maintained_powers')", ">=", "( u_val('intelligence') / 4) + (u_bonus_concentration_powers) + (concentration_trait_bonuses())" ] @@ -831,16 +768,16 @@ "type": "bad" }, { "u_add_effect": "effect_psi_intense_concentration", "duration": "PERMANENT" }, - { "math": [ "u_val('vitamin', 'name:vitamin_maintained_powers')", "+=", "1" ] } + { "math": [ "u_vitamin('vitamin_maintained_powers')", "+=", "1" ] } ], - "false_effect": [ { "math": [ "u_val('vitamin', 'name:vitamin_maintained_powers')", "+=", "1" ] } ] + "false_effect": [ { "math": [ "u_vitamin('vitamin_maintained_powers')", "+=", "1" ] } ] }, { "type": "effect_on_condition", "id": "EOC_POWER_MAINTENANCE_MINUS_ONE", "condition": { "math": [ - "u_val('vitamin', 'name:vitamin_maintained_powers')", + "u_vitamin('vitamin_maintained_powers')", "==", "( u_val('intelligence') / 4) + (u_bonus_concentration_powers) + (concentration_trait_bonuses()) + 1" ] @@ -848,9 +785,9 @@ "effect": [ { "u_message": "As you stop concentrating, your mind clears a bit. It's easier to think now.", "type": "good" }, { "u_lose_effect": "effect_psi_intense_concentration" }, - { "math": [ "u_val('vitamin', 'name:vitamin_maintained_powers')", "-=", "1" ] } + { "math": [ "u_vitamin('vitamin_maintained_powers')", "-=", "1" ] } ], - "false_effect": [ { "math": [ "u_val('vitamin', 'name:vitamin_maintained_powers')", "-=", "1" ] } ] + "false_effect": [ { "math": [ "u_vitamin('vitamin_maintained_powers')", "-=", "1" ] } ] }, { "type": "effect_on_condition", @@ -859,7 +796,7 @@ "and": [ { "math": [ - "u_val('vitamin', 'name:vitamin_maintained_powers')", + "u_vitamin('vitamin_maintained_powers')", ">", "( u_val('intelligence') / 4) + (u_bonus_concentration_powers) + (concentration_trait_bonuses())" ] @@ -868,7 +805,7 @@ "x_in_y_chance": { "x": { "math": [ - "((u_val('vitamin', 'name:vitamin_maintained_powers')) / (( u_val('intelligence') / 4) + (u_bonus_concentration_powers) + (concentration_trait_bonuses()))) * 5" + "((u_vitamin('vitamin_maintained_powers')) / (( u_val('intelligence') / 4) + (u_bonus_concentration_powers) + (concentration_trait_bonuses()))) * 5" ] }, "y": 100 @@ -881,9 +818,9 @@ { "run_eocs": "EOC_END_PSI_POWERS_MAINTAINED" }, { "math": [ - "u_val('vitamin', 'name:vitamin_psionic_drain')", + "u_vitamin('vitamin_psionic_drain')", "+=", - "rng( 3,8 ) * (u_val('vitamin', 'name:vitamin_maintained_powers')) / (( u_val('intelligence') / 4) + (u_bonus_concentration_powers) + (concentration_trait_bonuses()))" + "rng( 3,8 ) * (u_vitamin('vitamin_maintained_powers')) / (( u_val('intelligence') / 4) + (u_bonus_concentration_powers) + (concentration_trait_bonuses()))" ] } ], @@ -893,23 +830,20 @@ "type": "effect_on_condition", "id": "EOC_CONCENTRATION_SUCCESS_PROFICIENCY", "condition": { "not": { "u_has_proficiency": "prof_concentration_basic" } }, - "effect": [ { "math": [ "u_val('proficiency', 'proficiency_id: prof_concentration_basic', 'format: 2400')", "+=", "rand(4)" ] } ], + "effect": [ { "math": [ "u_proficiency('prof_concentration_basic', 'format': 'percent')", "+=", "rand(4) / 24" ] } ], + "//": "adds 0% - 1.6% experience per run", "false_effect": { "run_eocs": [ { "id": "EOC_CONCENTRATION_SUCCESS_PROFICIENCY_INT", "condition": { "not": { "u_has_proficiency": "prof_concentration_intermediate" } }, - "effect": [ - { - "math": [ "u_val('proficiency', 'proficiency_id: prof_concentration_intermediate', 'format: 4800')", "+=", "rand(4)" ] - } - ], + "effect": [ { "math": [ "u_proficiency('prof_concentration_intermediate', 'format': 'percent')", "+=", "rand(4) / 48" ] } ], "false_effect": { "run_eocs": [ { "id": "EOC_CONCENTRATION_SUCCESS_PROFICIENCY_MASTER", "condition": { "not": { "u_has_proficiency": "prof_concentration_master" } }, - "effect": [ { "math": [ "u_val('proficiency', 'proficiency_id: prof_concentration_master', 'format: 9600')", "+=", "rand(4)" ] } ] + "effect": [ { "math": [ "u_proficiency('prof_concentration_intermediate', 'format': 'percent')", "+=", "rand(4) / 96" ] } ] } ] } @@ -951,11 +885,7 @@ ] }, { - "math": [ - "u_val('vitamin', 'name:vitamin_maintained_powers')", - ">=", - "( u_val('intelligence') / 4) + (u_bonus_concentration_powers)" - ] + "math": [ "u_vitamin('vitamin_maintained_powers')", ">=", "( u_val('intelligence') / 4) + (u_bonus_concentration_powers)" ] } ] }, diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json index 785f2566ce903..fc84167609c29 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json @@ -5,7 +5,7 @@ "eoc_type": "EVENT", "required_event": "opens_spellbook", "condition": { "and": [ { "u_has_trait": "BIOKINETIC" }, { "u_has_wielded_with_flag": "MATRIX_CRYSTAL_BIOKINESIS" } ] }, - "effect": [ { "math": [ "u_val('spell_level_adjustment', 'school: BIOKINETIC')", "=", "4" ] } ] + "effect": [ { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'BIOKINETIC')", "=", "4" ] } ] }, { "type": "effect_on_condition", @@ -13,7 +13,7 @@ "eoc_type": "EVENT", "required_event": "opens_spellbook", "condition": { "and": [ { "u_has_trait": "CLAIRSENTIENT" }, { "u_has_wielded_with_flag": "MATRIX_CRYSTAL_CLAIRSENTIENCE" } ] }, - "effect": [ { "math": [ "u_val('spell_level_adjustment', 'school: CLAIRSENTIENT')", "=", "4" ] } ] + "effect": [ { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'CLAIRSENTIENT')", "=", "4" ] } ] }, { "type": "effect_on_condition", @@ -21,7 +21,7 @@ "eoc_type": "EVENT", "required_event": "opens_spellbook", "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, { "u_has_wielded_with_flag": "MATRIX_CRYSTAL_ELECTROKINESIS" } ] }, - "effect": [ { "math": [ "u_val('spell_level_adjustment', 'school: ELECTROKINETIC')", "=", "4" ] } ] + "effect": [ { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'ELECTROKINETIC')", "=", "4" ] } ] }, { "type": "effect_on_condition", @@ -29,7 +29,7 @@ "eoc_type": "EVENT", "required_event": "opens_spellbook", "condition": { "and": [ { "u_has_trait": "PHOTOKINETIC" }, { "u_has_wielded_with_flag": "MATRIX_CRYSTAL_PHOTOKINESIS" } ] }, - "effect": [ { "math": [ "u_val('spell_level_adjustment', 'school: PHOTOKINETIC')", "=", "4" ] } ] + "effect": [ { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'PHOTOKINETIC')", "=", "4" ] } ] }, { "type": "effect_on_condition", @@ -37,7 +37,7 @@ "eoc_type": "EVENT", "required_event": "opens_spellbook", "condition": { "and": [ { "u_has_trait": "PYROKINETIC" }, { "u_has_wielded_with_flag": "MATRIX_CRYSTAL_PYROKINESIS" } ] }, - "effect": [ { "math": [ "u_val('spell_level_adjustment', 'school: PYROKINETIC')", "=", "4" ] } ] + "effect": [ { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'PYROKINETIC')", "=", "4" ] } ] }, { "type": "effect_on_condition", @@ -45,7 +45,7 @@ "eoc_type": "EVENT", "required_event": "opens_spellbook", "condition": { "and": [ { "u_has_trait": "TELEKINETIC" }, { "u_has_wielded_with_flag": "MATRIX_CRYSTAL_TELEKINESIS" } ] }, - "effect": [ { "math": [ "u_val('spell_level_adjustment', 'school: TELEKINETIC')", "=", "4" ] } ] + "effect": [ { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'TELEKINETIC')", "=", "4" ] } ] }, { "type": "effect_on_condition", @@ -53,7 +53,7 @@ "eoc_type": "EVENT", "required_event": "opens_spellbook", "condition": { "and": [ { "u_has_trait": "TELEPATH" }, { "u_has_wielded_with_flag": "MATRIX_CRYSTAL_TELEPATHY" } ] }, - "effect": [ { "math": [ "u_val('spell_level_adjustment', 'school: TELEPATH')", "=", "4" ] } ] + "effect": [ { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'TELEPATH')", "=", "4" ] } ] }, { "type": "effect_on_condition", @@ -61,7 +61,7 @@ "eoc_type": "EVENT", "required_event": "opens_spellbook", "condition": { "and": [ { "u_has_trait": "TELEPORTER" }, { "u_has_wielded_with_flag": "MATRIX_CRYSTAL_TELEPORTATION" } ] }, - "effect": [ { "math": [ "u_val('spell_level_adjustment', 'school: TELEPORTER')", "=", "4" ] } ] + "effect": [ { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'TELEPORTER')", "=", "4" ] } ] }, { "type": "effect_on_condition", @@ -69,7 +69,7 @@ "eoc_type": "EVENT", "required_event": "opens_spellbook", "condition": { "and": [ { "u_has_trait": "VITAKINETIC" }, { "u_has_wielded_with_flag": "MATRIX_CRYSTAL_VITAKINESIS" } ] }, - "effect": [ { "math": [ "u_val('spell_level_adjustment', 'school: VITAKINETIC')", "=", "4" ] } ] + "effect": [ { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'VITAKINETIC')", "=", "4" ] } ] }, { "type": "effect_on_condition", @@ -135,15 +135,15 @@ "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" ] } + { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'BIOKINETIC')", "=", "3" ] }, + { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'CLAIRSENTIENT')", "=", "3" ] }, + { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'ELECTROKINETIC')", "=", "3" ] }, + { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'PHOTOKINETIC')", "=", "3" ] }, + { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'PYROKINETIC')", "=", "3" ] }, + { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'TELEKINETIC')", "=", "3" ] }, + { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'TELEPATH')", "=", "3" ] }, + { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'TELEPORTER')", "=", "3" ] }, + { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'VITAKINETIC')", "=", "3" ] } ] }, { @@ -153,15 +153,15 @@ "required_event": "opens_spellbook", "condition": { "u_has_effect": "effect_noetic_resilience_comedown" }, "effect": [ - { "math": [ "u_val('spell_level_adjustment', 'school: BIOKINETIC')", "=", "-4" ] }, - { "math": [ "u_val('spell_level_adjustment', 'school: CLAIRSENTIENT')", "=", "-4" ] }, - { "math": [ "u_val('spell_level_adjustment', 'school: ELECTROKINETIC')", "=", "-4" ] }, - { "math": [ "u_val('spell_level_adjustment', 'school: PHOTOKINETIC')", "=", "-4" ] }, - { "math": [ "u_val('spell_level_adjustment', 'school: PYROKINETIC')", "=", "-4" ] }, - { "math": [ "u_val('spell_level_adjustment', 'school: TELEKINETIC')", "=", "-4" ] }, - { "math": [ "u_val('spell_level_adjustment', 'school: TELEPATH')", "=", "-3" ] }, - { "math": [ "u_val('spell_level_adjustment', 'school: TELEPORTER')", "=", "-4" ] }, - { "math": [ "u_val('spell_level_adjustment', 'school: VITAKINETIC')", "=", "-4" ] } + { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'BIOKINETIC')", "=", "-4" ] }, + { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'CLAIRSENTIENT')", "=", "-4" ] }, + { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'ELECTROKINETIC')", "=", "-4" ] }, + { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'PHOTOKINETIC')", "=", "-4" ] }, + { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'PYROKINETIC')", "=", "-4" ] }, + { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'TELEKINETIC')", "=", "-4" ] }, + { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'TELEPATH')", "=", "-3" ] }, + { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'TELEPORTER')", "=", "-4" ] }, + { "math": [ "u_spellcasting_adjustment('caster_level', 'school': 'VITAKINETIC')", "=", "-4" ] } ] }, { @@ -237,7 +237,7 @@ { "u_lose_effect": "effect_telepath_invisibility" }, { "u_lose_effect": "effect_telepath_network_effect" }, { "u_lose_effect": "effect_vitakin_purge_rads" }, - { "math": [ "u_val('vitamin', 'name:vitamin_maintained_powers')", "=", "0" ] }, + { "math": [ "u_vitamin('vitamin_maintained_powers')", "=", "0" ] }, { "u_lose_effect": "effect_psi_intense_concentration" } ] }, @@ -293,7 +293,7 @@ "EOC_VITAKIN_REMOVE_RETURN_FROM_DEATH" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_maintained_powers')", "=", "0" ] }, + { "math": [ "u_vitamin('vitamin_maintained_powers')", "=", "0" ] }, { "u_lose_effect": "effect_psi_intense_concentration" } ] } diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json index 2a8b2243333ae..58c95cfb23f17 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json @@ -35,9 +35,7 @@ "condition": { "and": [ { "u_has_effect": "pre_common_cold" }, - { - "x_in_y_chance": { "x": { "math": [ "10 + u_val('spell_level', 'spell: vita_health_power')" ] }, "y": 100 } - } + { "x_in_y_chance": { "x": { "math": [ "10 + u_spell_level('vita_health_power')" ] }, "y": 100 } } ] }, "effect": [ { "u_add_effect": "effect_vita_health_common_cold_protection", "duration": "10 days" } ] @@ -48,9 +46,7 @@ "condition": { "and": [ { "u_has_effect": "pre_flu" }, - { - "x_in_y_chance": { "x": { "math": [ "10 + u_val('spell_level', 'spell: vita_health_power')" ] }, "y": 100 } - } + { "x_in_y_chance": { "x": { "math": [ "10 + u_spell_level('vita_health_power')" ] }, "y": 100 } } ] }, "effect": [ { "u_add_effect": "effect_vita_health_flu_protection", "duration": "10 days" } ] @@ -61,9 +57,7 @@ "condition": { "and": [ { "u_has_effect": "pre_conjunctivitis_viral" }, - { - "x_in_y_chance": { "x": { "math": [ "10 + u_val('spell_level', 'spell: vita_health_power')" ] }, "y": 100 } - } + { "x_in_y_chance": { "x": { "math": [ "10 + u_spell_level('vita_health_power')" ] }, "y": 100 } } ] }, "effect": [ { "u_add_effect": "effect_vita_health_conjunctivitis_viral_protection", "duration": "10 days" } ] @@ -74,9 +68,7 @@ "condition": { "and": [ { "u_has_effect": "pre_conjunctivitis_bacterial" }, - { - "x_in_y_chance": { "x": { "math": [ "10 + u_val('spell_level', 'spell: vita_health_power')" ] }, "y": 100 } - } + { "x_in_y_chance": { "x": { "math": [ "10 + u_spell_level('vita_health_power')" ] }, "y": 100 } } ] }, "effect": [ { "u_add_effect": "effect_vita_health_conjunctivitis_bacterial_protection", "duration": "10 days" } ] diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_premonition_instances.json b/data/mods/MindOverMatter/effectoncondition/eoc_premonition_instances.json index ec92edbf7fd81..4e13bbb845ad7 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_premonition_instances.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_premonition_instances.json @@ -21,7 +21,7 @@ "run_eocs": [ { "id": "EOC_LIEUTENANT_SPAWN_SHADOW_PREMONITION", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_danger_sense')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_danger_sense')", ">=", "1" ] }, "effect": [ { "u_message": "The darkness takes on a palpable sense of menace. Something terrible is coming.", @@ -30,7 +30,7 @@ }, { "queue_eocs": "EOC_LIEUTENANT_SPAWN_SHADOW_ACTUAL", - "time_in_future": { "math": [ "(u_val('spell_level', 'spell: clair_danger_sense') * 5) + 10" ] } + "time_in_future": { "math": [ "(u_spell_level('clair_danger_sense') * 5) + 10" ] } } ], "false_effect": [ { "run_eocs": [ "EOC_LIEUTENANT_SPAWN_SHADOW_ACTUAL" ] } ] @@ -68,7 +68,7 @@ "run_eocs": [ { "id": "EOC_CAUSE_EARLY_PORTAL_STORM_PREMONITION", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_danger_sense')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_danger_sense')", ">=", "1" ] }, "effect": [ { "u_message": "The air hums like a wire stretched taut and on the verge of breaking. Any moment, something is going to snap.", @@ -77,7 +77,7 @@ }, { "queue_eocs": "EOC_CAUSE_EARLY_PORTAL_STORM_ACTUAL", - "time_in_future": { "math": [ "(u_val('spell_level', 'spell: clair_danger_sense') * 15) + 15" ] } + "time_in_future": { "math": [ "(u_spell_level('clair_danger_sense') * 15) + 15" ] } } ], "false_effect": [ { "run_eocs": [ "EOC_CAUSE_EARLY_PORTAL_STORM_ACTUAL" ] } ] @@ -126,7 +126,7 @@ "run_eocs": [ { "id": "EOC_BANDIT_ASSASSIN_1_PREMONITION", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_danger_sense')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_danger_sense')", ">=", "1" ] }, "effect": [ { "u_message": "You feel hostile eyes watching you and rapidly getting closer. Someone has it in for you.", @@ -135,7 +135,7 @@ }, { "queue_eocs": "EOC_BANDIT_ASSASSIN_1_ACTUAL_FAR", - "time_in_future": { "math": [ "(u_val('spell_level', 'spell: clair_danger_sense') * 4) + 5" ] } + "time_in_future": { "math": [ "(u_spell_level('clair_danger_sense') * 4) + 5" ] } } ], "false_effect": [ { "run_eocs": [ "EOC_BANDIT_ASSASSIN_1_ACTUAL_NEAR" ] } ] @@ -198,7 +198,7 @@ "run_eocs": [ { "id": "EOC_BANDIT_ASSASSIN_2_PREMONITION", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_danger_sense')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_danger_sense')", ">=", "1" ] }, "effect": [ { "u_message": "You feel hostile eyes watching you and rapidly getting closer. Someone has it in for you.", @@ -207,7 +207,7 @@ }, { "queue_eocs": "EOC_BANDIT_ASSASSIN_2_ACTUAL_NEAR", - "time_in_future": { "math": [ "(u_val('spell_level', 'spell: clair_danger_sense') * 4) + 5" ] } + "time_in_future": { "math": [ "(u_spell_level('clair_danger_sense') * 4) + 5" ] } } ], "false_effect": [ { "run_eocs": [ "EOC_BANDIT_ASSASSIN_2_ACTUAL_FAR" ] } ] @@ -271,7 +271,7 @@ "run_eocs": [ { "id": "EOC_BANDIT_ASSASSIN_3_PREMONITION", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_danger_sense')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_danger_sense')", ">=", "1" ] }, "effect": [ { "u_message": "You feel several sets of hostile eyes watching you and rapidly getting closer. Someone has it in for you.", @@ -280,7 +280,7 @@ }, { "queue_eocs": "EOC_BANDIT_ASSASSIN_3_ACTUAL_NEAR", - "time_in_future": { "math": [ "(u_val('spell_level', 'spell: clair_danger_sense') * 4) + 5" ] } + "time_in_future": { "math": [ "(u_spell_level('clair_danger_sense') * 4) + 5" ] } } ], "false_effect": [ { "run_eocs": [ "EOC_BANDIT_ASSASSIN_3_ACTUAL_FAR" ] } ] @@ -344,7 +344,7 @@ "run_eocs": [ { "id": "EOC_OLD_GUARD_ASSASSIN_PREMONITION", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_danger_sense')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_danger_sense')", ">=", "1" ] }, "effect": [ { "u_message": "You feel several sets of hostile eyes watching you and rapidly getting closer. Someone has it in for you.", @@ -353,7 +353,7 @@ }, { "queue_eocs": "EOC_OLD_GUARD_ASSASSIN_ACTUAL_NEAR", - "time_in_future": { "math": [ "(u_val('spell_level', 'spell: clair_danger_sense') * 4) + 5" ] } + "time_in_future": { "math": [ "(u_spell_level('clair_danger_sense') * 4) + 5" ] } } ], "false_effect": [ { "run_eocs": [ "EOC_OLD_GUARD_ASSASSIN_ACTUAL_FAR" ] } ] diff --git a/data/mods/MindOverMatter/effects/effects_penalty.json b/data/mods/MindOverMatter/effects/effects_penalty.json index a58569f23513c..4ff2cf1cb2791 100644 --- a/data/mods/MindOverMatter/effects/effects_penalty.json +++ b/data/mods/MindOverMatter/effects/effects_penalty.json @@ -294,11 +294,7 @@ "apply_message": "", "remove_message": "The glow from your skin fades.", "rating": "bad", - "enchantments": [ - { - "values": [ { "value": "LUMINATION", "add": { "math": [ "50 + ( u_val('vitamin', 'name:vitamin_psionic_drain'))" ] } } ] - } - ] + "enchantments": [ { "values": [ { "value": "LUMINATION", "add": { "math": [ "50 + ( u_vitamin('vitamin_psionic_drain'))" ] } } ] } ] }, { "type": "effect_type", diff --git a/data/mods/MindOverMatter/effects/effects_psionic.json b/data/mods/MindOverMatter/effects/effects_psionic.json index 721b03b3daf35..9eea8e60dbf5d 100644 --- a/data/mods/MindOverMatter/effects/effects_psionic.json +++ b/data/mods/MindOverMatter/effects/effects_psionic.json @@ -37,7 +37,7 @@ "value": "STRENGTH", "add": { "math": [ - "(1 + ( u_val('spell_level', 'spell: biokin_physical_enhance') / 5) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "(1 + ( u_spell_level('biokin_physical_enhance') / 5) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } }, @@ -45,7 +45,7 @@ "value": "DEXTERITY", "add": { "math": [ - "(1 + ( u_val('spell_level', 'spell: biokin_physical_enhance') / 5) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "(1 + ( u_spell_level('biokin_physical_enhance') / 5) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } } @@ -184,7 +184,7 @@ "value": "FALL_DAMAGE", "multiply": { "math": [ - "( -0.2 + ( u_val('spell_level', 'spell: biokin_flexibility') * -0.02) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( -0.2 + ( u_spell_level('biokin_flexibility') * -0.02) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } } @@ -211,7 +211,7 @@ "value": "PERCEPTION", "add": { "math": [ - "( 1 + ( u_val('spell_level', 'spell: biokin_reflex_enhance') / 5) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( 1 + ( u_spell_level('biokin_reflex_enhance') / 5) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } }, @@ -219,7 +219,7 @@ "value": "SPEED", "add": { "math": [ - "max((( 5 + ( u_val('spell_level', 'spell: biokin_physical_enhance') ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 30)" + "max((( 5 + ( u_spell_level('biokin_physical_enhance') ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 30)" ] } } @@ -263,7 +263,7 @@ "value": "PAIN", "multiply": { "math": [ - "( ( u_val('spell_level', 'spell: biokin_armor_skin') * -0.02) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( u_spell_level('biokin_armor_skin') * -0.02) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } } @@ -292,7 +292,7 @@ "value": "CLIMATE_CONTROL_HEAT", "add": { "math": [ - "( ( ( u_val('spell_level', 'spell: biokin_climate_control') * 7.5 ) + 15 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( ( u_spell_level('biokin_climate_control') * 7.5 ) + 15 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } }, @@ -300,7 +300,7 @@ "value": "CLIMATE_CONTROL_CHILL", "add": { "math": [ - "( ( ( u_val('spell_level', 'spell: biokin_climate_control') * 7.5 ) + 15 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( ( u_spell_level('biokin_climate_control') * 7.5 ) + 15 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } } @@ -378,7 +378,7 @@ "value": "HUNGER", "multiply": { "math": [ - "max((( -0.25 + ( u_val('spell_level', 'spell: biokin_metabolism_enhance') * -0.02 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), -0.7)" + "max((( -0.25 + ( u_spell_level('biokin_metabolism_enhance') * -0.02 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), -0.7)" ] } }, @@ -386,7 +386,7 @@ "value": "THIRST", "multiply": { "math": [ - "max((( -0.25 + ( u_val('spell_level', 'spell: biokin_metabolism_enhance') * -0.02 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), -0.7)" + "max((( -0.25 + ( u_spell_level('biokin_metabolism_enhance') * -0.02 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), -0.7)" ] } }, @@ -394,7 +394,7 @@ "value": "METABOLISM", "multiply": { "math": [ - "max((( -0.25 + ( u_val('spell_level', 'spell: biokin_metabolism_enhance') * -0.02 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), -0.7)" + "max((( -0.25 + ( u_spell_level('biokin_metabolism_enhance') * -0.02 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), -0.7)" ] } }, @@ -402,7 +402,7 @@ "value": "FATIGUE", "multiply": { "math": [ - "max((( -0.25 + ( u_val('spell_level', 'spell: biokin_metabolism_enhance') * -0.02 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), -0.7)" + "max((( -0.25 + ( u_spell_level('biokin_metabolism_enhance') * -0.02 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), -0.7)" ] } } @@ -434,7 +434,7 @@ "value": "ATTACK_SPEED", "multiply": { "math": [ - "( ( u_val('spell_level', 'spell: biokin_combat_dance') * -0.02) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( u_spell_level('biokin_combat_dance') * -0.02) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } }, @@ -444,7 +444,7 @@ "value": "MELEE_DAMAGE", "multiply": { "math": [ - "( ( u_val('spell_level', 'spell: biokin_combat_dance') * 0.02) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( u_spell_level('biokin_combat_dance') * 0.02) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } }, @@ -452,7 +452,7 @@ "value": "PAIN", "multiply": { "math": [ - "( ( u_val('spell_level', 'spell: biokin_combat_dance') * -0.03) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( u_spell_level('biokin_combat_dance') * -0.03) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } } @@ -481,7 +481,7 @@ "value": "MOVE_COST", "multiply": { "math": [ - "max((( -0.5 + ( u_val('spell_level', 'spell: biokin_perfected_motion') * -0.015) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), -0.96)" + "max((( -0.5 + ( u_spell_level('biokin_perfected_motion') * -0.015) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), -0.96)" ] } } @@ -662,7 +662,7 @@ "value": "MOTION_VISION_RANGE", "add": { "math": [ - "( ( u_val('spell_level', 'spell: clair_danger_sense') * 2) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( u_spell_level('clair_danger_sense') * 2) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } } @@ -686,7 +686,7 @@ "value": "SOCIAL_LIE", "add": { "math": [ - "min((( 5 + ( u_val('spell_level', 'spell: clair_see_auras') ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 20)" + "min((( 5 + ( u_spell_level('clair_see_auras') ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 20)" ] } }, @@ -694,7 +694,7 @@ "value": "SOCIAL_PERSUADE", "add": { "math": [ - "min((( 5 + ( u_val('spell_level', 'spell: clair_see_auras') ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 20)" + "min((( 5 + ( u_spell_level('clair_see_auras') ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 20)" ] } } @@ -716,45 +716,31 @@ "values": [ { "value": "ARMOR_CUT", - "add": { - "math": [ "( ( u_val('spell_level', 'spell: clair_spot_weakness') * 0.5) * (scaling_factor(u_val('intelligence') ) ) )" ] - } + "add": { "math": [ "( ( u_spell_level('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) * (scaling_factor(u_val('intelligence') ) ) )" ] - } + "add": { "math": [ "( ( u_spell_level('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) * (scaling_factor(u_val('intelligence') ) ) )" ] - } + "add": { "math": [ "( ( u_spell_level('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) * (scaling_factor(u_val('intelligence') ) ) )" ] - } + "add": { "math": [ "( ( u_spell_level('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) * (scaling_factor(u_val('intelligence') ) ) )" ] - } + "add": { "math": [ "( ( u_spell_level('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) * (scaling_factor(u_val('intelligence') ) ) )" ] - } + "add": { "math": [ "( ( u_spell_level('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) * (scaling_factor(u_val('intelligence') ) ) )" ] - } + "add": { "math": [ "( ( u_spell_level('clair_spot_weakness') * 0.5) * (scaling_factor(u_val('intelligence') ) ) )" ] } } ] } @@ -777,7 +763,7 @@ "value": "RANGE", "add": { "math": [ - "(1 + ( u_val('spell_level', 'spell: clair_ranged_enhance') * 0.5 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "(1 + ( u_spell_level('clair_ranged_enhance') * 0.5 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } }, @@ -785,7 +771,7 @@ "value": "WEAPON_DISPERSION", "multiply": { "math": [ - "( ( u_val('spell_level', 'spell: clair_ranged_enhance') * -0.025) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( u_spell_level('clair_ranged_enhance') * -0.025) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } } @@ -829,7 +815,7 @@ "value": "BONUS_DODGE", "add": { "math": [ - "(1 + ( u_val('spell_level', 'spell: clair_dodge_power') / 6) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "(1 + ( u_spell_level('clair_dodge_power') / 6) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } }, @@ -837,7 +823,7 @@ "value": "BONUS_BLOCK", "add": { "math": [ - "(1 + ( u_val('spell_level', 'spell: clair_dodge_power') / 6) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "(1 + ( u_spell_level('clair_dodge_power') / 6) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } } @@ -914,15 +900,11 @@ "values": [ { "value": "BONUS_DODGE", - "add": { - "math": [ "(1 + ( u_val('spell_level', 'spell: clair_group_tactics') / 8) * (scaling_factor(u_val('intelligence') ) ) )" ] - } + "add": { "math": [ "(1 + ( u_spell_level('clair_group_tactics') / 8) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "BONUS_BLOCK", - "add": { - "math": [ "(1 + ( u_val('spell_level', 'spell: clair_group_tactics') / 8) * (scaling_factor(u_val('intelligence') ) ) )" ] - } + "add": { "math": [ "(1 + ( u_spell_level('clair_group_tactics') / 8) * (scaling_factor(u_val('intelligence') ) ) )" ] } } ] } @@ -967,7 +949,7 @@ "value": "SIGHT_RANGE_ELECTRIC", "add": { "math": [ - "( ( u_val('spell_level', 'spell: electrokinesis_see_electric') * 1.5) + 6 ) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( ( u_spell_level('electrokinesis_see_electric') * 1.5) + 6 ) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } } @@ -1032,7 +1014,7 @@ "value": "PAIN", "multiply": { "math": [ - "max((( -0.15 + ( u_val('spell_level', 'spell: electrokinetic_reduce_pain') * -0.02 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), -0.5)" + "max((( -0.15 + ( u_spell_level('electrokinetic_reduce_pain') * -0.02 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), -0.5)" ] } }, @@ -1040,7 +1022,7 @@ "value": "PAIN_REMOVE", "multiply": { "math": [ - "min((( 0.1 + ( u_val('spell_level', 'spell: electrokinetic_reduce_pain') * 0.02 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 0.5)" + "min((( 0.1 + ( u_spell_level('electrokinetic_reduce_pain') * 0.02 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 0.5)" ] } } @@ -1088,7 +1070,7 @@ "value": "LEARNING_FOCUS", "add": { "math": [ - "min( (( 5 + u_val('spell_level', 'spell: electrokinetic_speed_boost') ) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 35 )" + "min( (( 5 + u_spell_level('electrokinetic_speed_boost') ) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 35 )" ] } }, @@ -1096,7 +1078,7 @@ "value": "SPEED", "add": { "math": [ - "min( (( 10 + ( ( u_val('spell_level', 'spell: electrokinetic_speed_boost') ) * 1.5) ) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 60 )" + "min( (( 10 + ( ( u_spell_level('electrokinetic_speed_boost') ) * 1.5) ) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 60 )" ] } } @@ -1155,7 +1137,7 @@ "value": "EVASION", "add": { "math": [ - "min((( 15 + (2 * ( u_val('spell_level', 'spell: photokinetic_light_dodge') / 100) ) + (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 0.85)" + "min((( 15 + (2 * ( u_spell_level('photokinetic_light_dodge') / 100) ) + (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 0.85)" ] } } @@ -1376,7 +1358,7 @@ "value": "ARMOR_CUT", "multiply": { "math": [ - "( ( u_val('spell_level', 'spell: telekinetic_momentum') * -0.005 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( u_spell_level('telekinetic_momentum') * -0.005 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } }, @@ -1384,7 +1366,7 @@ "value": "ARMOR_BASH", "multiply": { "math": [ - "( ( u_val('spell_level', 'spell: telekinetic_momentum') * -0.01 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( u_spell_level('telekinetic_momentum') * -0.01 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } }, @@ -1392,7 +1374,7 @@ "value": "ARMOR_STAB", "multiply": { "math": [ - "( ( u_val('spell_level', 'spell: telekinetic_momentum') * -0.005 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( u_spell_level('telekinetic_momentum') * -0.005 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } }, @@ -1400,7 +1382,7 @@ "value": "ARMOR_BULLET", "multiply": { "math": [ - "( ( u_val('spell_level', 'spell: telekinetic_momentum') * -0.02 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( u_spell_level('telekinetic_momentum') * -0.02 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } }, @@ -1408,7 +1390,7 @@ "value": "MOVE_COST", "multiply": { "math": [ - "max((( ( u_val('spell_level', 'spell: telekinetic_momentum') * -0.005 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), -0.15)" + "max((( ( u_spell_level('telekinetic_momentum') * -0.005 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), -0.15)" ] } }, @@ -1416,7 +1398,7 @@ "value": "ATTACK_SPEED", "multiply": { "math": [ - "( ( u_val('spell_level', 'spell: telekinetic_momentum') * -0.01 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( u_spell_level('telekinetic_momentum') * -0.01 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } } @@ -1440,7 +1422,7 @@ "value": "FALL_DAMAGE", "multiply": { "math": [ - "max( (( -0.5 + ( u_val('spell_level', 'spell: telekinetic_slowfall') * -0.04) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), -0.95)" + "max( (( -0.5 + ( u_spell_level('telekinetic_slowfall') * -0.04) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), -0.95)" ] } } @@ -1466,7 +1448,7 @@ "value": "STRENGTH", "add": { "math": [ - "( 15 + ( u_val('spell_level', 'spell: telekinetic_strength') * 3 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( 15 + ( u_spell_level('telekinetic_strength') * 3 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } } @@ -1502,7 +1484,7 @@ "value": "ARMOR_CUT", "add": { "math": [ - "( -3 + ( u_val('spell_level', 'spell: telekinetic_shield') * -1) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( -3 + ( u_spell_level('telekinetic_shield') * -1) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } }, @@ -1510,7 +1492,7 @@ "value": "ARMOR_BASH", "add": { "math": [ - "( -2 + ( u_val('spell_level', 'spell: telekinetic_shield') * -0.5) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( -2 + ( u_spell_level('telekinetic_shield') * -0.5) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } }, @@ -1518,7 +1500,7 @@ "value": "ARMOR_STAB", "add": { "math": [ - "( -5 + ( u_val('spell_level', 'spell: telekinetic_shield') * -1.5) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( -5 + ( u_spell_level('telekinetic_shield') * -1.5) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } }, @@ -1526,7 +1508,7 @@ "value": "ARMOR_BULLET", "add": { "math": [ - "( -12 + ( u_val('spell_level', 'spell: telekinetic_shield') * -2.5) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( -12 + ( u_spell_level('telekinetic_shield') * -2.5) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } } @@ -1591,7 +1573,7 @@ "value": "LEARNING_FOCUS", "add": { "math": [ - "( ( u_val('spell_level', 'spell: telepathic_concentration') * 2.5) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( u_spell_level('telepathic_concentration') * 2.5) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } }, @@ -1618,7 +1600,7 @@ "value": "SIGHT_RANGE_MINDS", "add": { "math": [ - "( ( u_val('spell_level', 'spell: telepathic_mind_sense') * 2) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( u_spell_level('telepathic_mind_sense') * 2) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } } @@ -1703,59 +1685,41 @@ "values": [ { "value": "BONUS_DODGE", - "add": { - "math": [ "(1 + ( u_val('spell_level', 'spell: telepathic_network') / 12) * (scaling_factor(u_val('intelligence') ) ) )" ] - } + "add": { "math": [ "(1 + ( u_spell_level('telepathic_network') / 12) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "BONUS_BLOCK", - "add": { - "math": [ "(1 + ( u_val('spell_level', 'spell: telepathic_network') / 12) * (scaling_factor(u_val('intelligence') ) ) )" ] - } + "add": { "math": [ "(1 + ( u_spell_level('telepathic_network') / 12) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "PERCEPTION", - "add": { - "math": [ "( ( ( u_val('spell_level', 'spell: telepathic_network') * 0.2) + 1) * (scaling_factor(u_val('intelligence') ) ) )" ] - } + "add": { "math": [ "( ( ( u_spell_level('telepathic_network') * 0.2) + 1) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "RANGE", - "add": { - "math": [ "( ( ( u_val('spell_level', 'spell: telepathic_network') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) )" ] - } + "add": { "math": [ "( ( ( u_spell_level('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) * (scaling_factor(u_val('intelligence') ) ) )" - ] + "math": [ "( ( ( u_spell_level('telepathic_network') * 0.005) + 0.05) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "RANGED_DAMAGE", "multiply": { - "math": [ - "( ( ( u_val('spell_level', 'spell: telepathic_network') * 0.005) + 0.05) * (scaling_factor(u_val('intelligence') ) ) )" - ] + "math": [ "( ( ( u_spell_level('telepathic_network') * 0.005) + 0.05) * (scaling_factor(u_val('intelligence') ) ) )" ] } }, { "value": "MELEE_DAMAGE", "multiply": { - "math": [ - "( ( ( u_val('spell_level', 'spell: telepathic_network') * 0.005) + 0.05) * (scaling_factor(u_val('intelligence') ) ) )" - ] + "math": [ "( ( ( u_spell_level('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) * (scaling_factor(u_val('intelligence') ) ) )" - ] - } + "multiply": { "math": [ "( ( ( u_spell_level('telepathic_network') * 0.25) + 1.5) * (scaling_factor(u_val('intelligence') ) ) )" ] } } ] } @@ -1791,7 +1755,7 @@ "value": "MOVE_COST", "multiply": { "math": [ - "max( (( ( ( u_val('spell_level', 'spell: teleport_stride') * -0.02 ) - 0.05 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), -0.6)" + "max( (( ( ( u_spell_level('teleport_stride') * -0.02 ) - 0.05 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), -0.6)" ] } } diff --git a/data/mods/MindOverMatter/enchantments/enchantment_item.json b/data/mods/MindOverMatter/enchantments/enchantment_item.json index 7f56397572d22..f637fdbbe62ab 100644 --- a/data/mods/MindOverMatter/enchantments/enchantment_item.json +++ b/data/mods/MindOverMatter/enchantments/enchantment_item.json @@ -9,7 +9,7 @@ "value": "STRENGTH", "add": { "math": [ - "((((u_val('spell_level', 'spell: telekinetic_pull')) + u_val('spell_level', 'spell: telekinetic_push')) + u_val('spell_level', 'spell: telekinetic_wave')) + u_val('spell_level', 'spell: telekinetic_momentum'))" + "((((u_spell_level('telekinetic_pull')) + u_spell_level('telekinetic_push')) + u_spell_level('telekinetic_wave')) + u_spell_level('telekinetic_momentum'))" ] } }, diff --git a/data/mods/MindOverMatter/enchantments/enchantments_player.json b/data/mods/MindOverMatter/enchantments/enchantments_player.json index aed78bb96a906..f94ec1dad47a1 100644 --- a/data/mods/MindOverMatter/enchantments/enchantments_player.json +++ b/data/mods/MindOverMatter/enchantments/enchantments_player.json @@ -36,7 +36,7 @@ "value": "READING_EXP", "add": { "math": [ - "( ( u_val('spell_level', 'spell: clair_speed_reading') * 0.15) * (scaling_factor(u_val('intelligence') ))) * u_nether_attunement_power_scaling" + "( ( u_spell_level('clair_speed_reading') * 0.15) * (scaling_factor(u_val('intelligence') ))) * u_nether_attunement_power_scaling" ] } } @@ -87,12 +87,12 @@ "damage_type": "electric", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: electrokinesis_zap_enemies') / 4 ) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinesis_zap_enemies') / 4 ) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: electrokinesis_zap_enemies') / 2 ) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinesis_zap_enemies') / 2 ) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": 1, @@ -104,7 +104,7 @@ "condition": "ALWAYS", "has": "HELD", "hit_you_effect": [ { "id": "electrokin_zap_attack", "hit_self": false, "once_in": 2 } ], - "values": [ { "value": "ARMOR_ELEC", "add": { "math": [ "u_val('spell_level', 'spell: electrokinetic_melee_attacks') * -1" ] } } ] + "values": [ { "value": "ARMOR_ELEC", "add": { "math": [ "u_spell_level('electrokinetic_melee_attacks') * -1" ] } } ] }, { "id": "electrokin_zap_attack", @@ -118,12 +118,12 @@ "damage_type": "electric", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_melee_attacks') / 3 ) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_melee_attacks') / 3 ) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_melee_attacks') / 1.5 ) + 10) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_melee_attacks') / 1.5 ) + 10) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": 1, @@ -142,9 +142,7 @@ "condition": "ALWAYS", "has": "HELD", "intermittent_activation": { "effects": [ { "frequency": "5 seconds", "spell_effects": [ { "id": "electrokinetic_lightning_aura_attack" } ] } ] }, - "values": [ - { "value": "ARMOR_ELEC", "add": { "math": [ "u_val('spell_level', 'spell: electrokinetic_lightning_aura') * -1" ] } } - ] + "values": [ { "value": "ARMOR_ELEC", "add": { "math": [ "u_spell_level('electrokinetic_lightning_aura') * -1" ] } } ] }, { "id": "electrokinetic_lightning_aura_attack", @@ -180,18 +178,14 @@ "damage_type": "electric", "max_level": { "math": [ "int_to_level(1)" ] }, "min_damage": { - "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_lightning_aura') * 1) + 5) * (scaling_factor(u_val('intelligence') ) )" - ] + "math": [ "( (u_spell_level('electrokinetic_lightning_aura') * 1) + 5) * (scaling_factor(u_val('intelligence') ) )" ] }, "max_damage": { - "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_lightning_bolt') * 1.5) + 20) * (scaling_factor(u_val('intelligence') ) )" - ] + "math": [ "( (u_spell_level('electrokinetic_lightning_bolt') * 1.5) + 20) * (scaling_factor(u_val('intelligence') ) )" ] }, "min_range": { "math": [ - "min( ( (u_val('spell_level', 'spell: electrokinetic_lightning_aura') * 0.33) + 2) * (scaling_factor(u_val('intelligence') ) ), 10)" + "min( ( (u_spell_level('electrokinetic_lightning_aura') * 0.33) + 2) * (scaling_factor(u_val('intelligence') ) ), 10)" ] }, "max_range": 10, @@ -211,7 +205,7 @@ "value": "CLIMATE_CONTROL_CHILL", "add": { "math": [ - "(60 + ( u_val('spell_level', 'spell: pyrokinetic_cloak') * 4) * ( ( u_val('intelligence') + 10) / 20 ) ) * u_nether_attunement_power_scaling" + "(60 + ( u_spell_level('pyrokinetic_cloak') * 4) * ( ( u_val('intelligence') + 10) / 20 ) ) * u_nether_attunement_power_scaling" ] } }, @@ -219,7 +213,7 @@ "value": "CLIMATE_CONTROL_HEAT", "add": { "math": [ - "( ( u_val('spell_level', 'spell: pyrokinetic_cloak') * 10) * ( ( u_val('intelligence') + 10) / 20 ) ) * u_nether_attunement_power_scaling" + "( ( u_spell_level('pyrokinetic_cloak') * 10) * ( ( u_val('intelligence') + 10) / 20 ) ) * u_nether_attunement_power_scaling" ] } }, @@ -227,7 +221,7 @@ "value": "ARMOR_HEAT", "add": { "math": [ - "( ( u_val('spell_level', 'spell: pyrokinetic_cloak') * -10) * ( ( u_val('intelligence') + 10) / 20 ) ) * u_nether_attunement_power_scaling" + "( ( u_spell_level('pyrokinetic_cloak') * -10) * ( ( u_val('intelligence') + 10) / 20 ) ) * u_nether_attunement_power_scaling" ] } }, @@ -235,7 +229,7 @@ "value": "ARMOR_COLD", "add": { "math": [ - "( ( u_val('spell_level', 'spell: pyrokinetic_cloak') * -3) * ( ( u_val('intelligence') + 10) / 20 ) ) * u_nether_attunement_power_scaling" + "( ( u_spell_level('pyrokinetic_cloak') * -3) * ( ( u_val('intelligence') + 10) / 20 ) ) * u_nether_attunement_power_scaling" ] } } @@ -270,13 +264,13 @@ "effect_str": "blind", "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: photokinetic_blinding_glare') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" + "min( (( (u_spell_level('photokinetic_blinding_glare') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" ] }, "max_aoe": 40, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: photokinetic_blinding_glare') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" + "min( (( (u_spell_level('photokinetic_blinding_glare') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" ] }, "min_duration": 500, diff --git a/data/mods/MindOverMatter/modinteractions/Defense_Mode/premonition_instances.json b/data/mods/MindOverMatter/modinteractions/Defense_Mode/premonition_instances.json index a86b00d68661d..8c8a71ff37fa4 100644 --- a/data/mods/MindOverMatter/modinteractions/Defense_Mode/premonition_instances.json +++ b/data/mods/MindOverMatter/modinteractions/Defense_Mode/premonition_instances.json @@ -12,7 +12,7 @@ { "id": "DEFENSE_MODE_WAVE_CONTROL_PREMENITION", "global": true, - "condition": { "math": [ "u_val('spell_level', 'spell: clair_danger_sense')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_danger_sense')", ">=", "1" ] }, "effect": [ { "u_message": "You feel a multitude of foes coming for you, bleary-eyed and full of bloodlust. Steel yourself, for the horde is coming.", @@ -21,7 +21,7 @@ }, { "queue_eocs": "DEFENSE_MODE_WAVE_CONTROL_ACTUAL", - "time_in_future": { "math": [ "(u_val('spell_level', 'spell: clair_danger_sense') * 4) + 5" ] } + "time_in_future": { "math": [ "(u_spell_level('clair_danger_sense') * 4) + 5" ] } } ], "false_effect": { "run_eocs": [ "DEFENSE_MODE_WAVE_CONTROL_ACTUAL" ] } @@ -45,7 +45,7 @@ "type": "effect_on_condition", "id": "EOC_DEFENSE_MODE_RANDOM_NPC_ROBBER", "//": "Copied EOC. Original is in mods/Defense_Mode/eocs.json", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_danger_sense')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_danger_sense')", ">=", "1" ] }, "effect": [ { "u_message": "You feel greedy, insidious eyes watching you and rapidly getting closer. Someone has it out for your stuff.", @@ -54,7 +54,7 @@ }, { "queue_eocs": "EOC_DEFENSE_MODE_RANDOM_NPC_ROBBER_ACTUAL", - "time_in_future": { "math": [ "(u_val('spell_level', 'spell: clair_danger_sense') * 4) + 5" ] } + "time_in_future": { "math": [ "(u_spell_level('clair_danger_sense') * 4) + 5" ] } } ] }, @@ -75,7 +75,7 @@ "type": "effect_on_condition", "id": "EOC_DEFENSE_MODE_BANDIT_ATTACK", "//": "Copied EOC. Original is in mods/Defense_Mode/eocs.json", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_danger_sense')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_danger_sense')", ">=", "1" ] }, "effect": [ { "u_message": "You feel a multitude of hostile eyes watching you and rapidly getting closer. The masses have it in for you.", @@ -84,7 +84,7 @@ }, { "queue_eocs": "EOC_DEFENSE_MODE_BANDIT_ATTACK_ACTUAL", - "time_in_future": { "math": [ "(u_val('spell_level', 'spell: clair_danger_sense') * 4) + 5" ] } + "time_in_future": { "math": [ "(u_spell_level('clair_danger_sense') * 4) + 5" ] } } ] }, diff --git a/data/mods/MindOverMatter/npcs/dialogue/Rubik.json b/data/mods/MindOverMatter/npcs/dialogue/Rubik.json index 7a206b1c96132..90580be73d23f 100644 --- a/data/mods/MindOverMatter/npcs/dialogue/Rubik.json +++ b/data/mods/MindOverMatter/npcs/dialogue/Rubik.json @@ -6,7 +6,7 @@ { "text": "[Premonition] *Determine if is a threat*", "topic": "TALK_EXODII_MERCHANT_danger_sense", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_danger_sense')", ">=", "2" ] } + "condition": { "math": [ "u_spell_level('clair_danger_sense')", ">=", "2" ] } } ] }, diff --git a/data/mods/MindOverMatter/npcs/dialogue/generic_dialogue.json b/data/mods/MindOverMatter/npcs/dialogue/generic_dialogue.json index 0623f5e602b69..ae1574144fe41 100644 --- a/data/mods/MindOverMatter/npcs/dialogue/generic_dialogue.json +++ b/data/mods/MindOverMatter/npcs/dialogue/generic_dialogue.json @@ -87,14 +87,14 @@ "text": "[Brilliant Flash Check] *blind *", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: pyrokinetic_flash')", ">=", "1" ] }, + { "math": [ "u_spell_level('pyrokinetic_flash')", ">=", "1" ] }, { "not": { "npc_has_worn_with_flag": "FLASH_PROTECTION" } } ] }, "trial": { "type": "CONDITION", "condition": { - "roll_contested": { "math": [ "u_val('spell_level', 'spell: pyrokinetic_flash')" ] }, + "roll_contested": { "math": [ "u_spell_level('pyrokinetic_flash')" ] }, "difficulty": { "math": [ "n_val('perception')" ] }, "die_size": 10 } @@ -112,14 +112,14 @@ "text": "[Mood Stablization Check] You don't want to hurt me.", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telepathic_morale')", ">=", "1" ] }, + { "math": [ "u_spell_level('telepathic_morale')", ">=", "1" ] }, { "not": { "npc_has_trait": "NPC_TELEPATHY_IMMUNE" } } ] }, "trial": { "type": "CONDITION", "condition": { - "roll_contested": { "math": [ "u_val('spell_level', 'spell: telepathic_morale')" ] }, + "roll_contested": { "math": [ "u_spell_level('telepathic_morale')" ] }, "difficulty": { "math": [ "n_val('intelligence')" ] }, "die_size": 10 } @@ -129,11 +129,11 @@ }, { "text": "[Sensory Deprivation Check] *Shut off 's senses*.", - "condition": { "math": [ "u_val('spell_level', 'spell: telepathic_confusion')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telepathic_confusion')", ">=", "1" ] }, "trial": { "type": "CONDITION", "condition": { - "roll_contested": { "math": [ "u_val('spell_level', 'spell: telepathic_confusion')" ] }, + "roll_contested": { "math": [ "u_spell_level('telepathic_confusion')" ] }, "difficulty": { "math": [ "n_val('perception')" ] }, "die_size": 10 } @@ -153,11 +153,11 @@ }, { "text": "[Synaptic Overload Check] *Attack 's mind*.", - "condition": { "math": [ "u_val('spell_level', 'spell: telepathic_blast')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telepathic_blast')", ">=", "1" ] }, "trial": { "type": "CONDITION", "condition": { - "roll_contested": { "math": [ "u_val('spell_level', 'spell: telepathic_blast')" ] }, + "roll_contested": { "math": [ "u_spell_level('telepathic_blast')" ] }, "difficulty": { "math": [ "n_val('intelligence')" ] }, "die_size": 10 } @@ -167,7 +167,7 @@ "effect": [ "hostile", { - "npc_set_hp": { "math": [ "(80 - (6 * (u_val('spell_level', 'spell: telepathic_blast'))))" ] }, + "npc_set_hp": { "math": [ "(80 - (6 * (u_spell_level('telepathic_blast'))))" ] }, "target_part": "head" }, { "npc_add_effect": "stunned", "duration": "2 s" } @@ -188,14 +188,14 @@ "text": "[Mood Stablization Check] I'm not going to hurt you.", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telepathic_morale')", ">=", "1" ] }, + { "math": [ "u_spell_level('telepathic_morale')", ">=", "1" ] }, { "not": { "npc_has_trait": "NPC_TELEPATHY_IMMUNE" } } ] }, "trial": { "type": "CONDITION", "condition": { - "roll_contested": { "math": [ "u_val('spell_level', 'spell: telepathic_morale')" ] }, + "roll_contested": { "math": [ "u_spell_level('telepathic_morale')" ] }, "difficulty": { "math": [ "n_val('intelligence')" ] }, "die_size": 10 } @@ -213,14 +213,14 @@ "text": "[Mood Stablization Check] I'm not going to hurt you.", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telepathic_morale')", ">=", "1" ] }, + { "math": [ "u_spell_level('telepathic_morale')", ">=", "1" ] }, { "not": { "npc_has_trait": "NPC_TELEPATHY_IMMUNE" } } ] }, "trial": { "type": "CONDITION", "condition": { - "roll_contested": { "math": [ "u_val('spell_level', 'spell: telepathic_morale')" ] }, + "roll_contested": { "math": [ "u_spell_level('telepathic_morale')" ] }, "difficulty": { "math": [ "n_val('intelligence')" ] }, "die_size": 10 } diff --git a/data/mods/MindOverMatter/npcs/dialogue/portal_future_you.json b/data/mods/MindOverMatter/npcs/dialogue/portal_future_you.json index 9ba6de3ce13be..1790005e2e40c 100644 --- a/data/mods/MindOverMatter/npcs/dialogue/portal_future_you.json +++ b/data/mods/MindOverMatter/npcs/dialogue/portal_future_you.json @@ -6,12 +6,12 @@ { "text": "[Premonition] *Determine if the voice is a threat*", "topic": "TALK_PORTAL_STORM_DANGER_SENSE_FAIL", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_danger_sense')", "<=", "7" ] } + "condition": { "math": [ "u_spell_level('clair_danger_sense')", "<=", "7" ] } }, { "text": "[Premonition 8+] *Determine if the voice is a threat*", "topic": "TALK_PORTAL_STORM_DANGER_SENSE_SUCCEED", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_danger_sense')", ">", "7" ] } + "condition": { "math": [ "u_spell_level('clair_danger_sense')", ">", "7" ] } } ] }, @@ -57,7 +57,7 @@ { "text": "[Clarity 3+] *Is the voice lying?*", "topic": "TALK_PORTAL_STORM_CLARITY", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_clear_sight')", ">=", "3" ] } + "condition": { "math": [ "u_spell_level('clair_clear_sight')", ">=", "3" ] } } ] }, @@ -77,7 +77,7 @@ { "text": "[Gateway 8+] Thanks, but here I can leave without your help. Be seeing you. (End your story)", "topic": "TALK_PORTAL_STORM_TELEPORT_OUT", - "condition": { "math": [ "u_val('spell_level', 'spell: teleport_gateway')", ">=", "8" ] }, + "condition": { "math": [ "u_spell_level('teleport_gateway')", ">=", "8" ] }, "effect": { "give_achievement": "teleported_offworld" } } ] diff --git a/data/mods/MindOverMatter/npcs/dialogue/refugee_guards_generic.json b/data/mods/MindOverMatter/npcs/dialogue/refugee_guards_generic.json index 9c06ec08a27d0..61aa6e4c791d9 100644 --- a/data/mods/MindOverMatter/npcs/dialogue/refugee_guards_generic.json +++ b/data/mods/MindOverMatter/npcs/dialogue/refugee_guards_generic.json @@ -6,7 +6,7 @@ { "text": "[Premonition] *Determine if is a threat*", "topic": "TALK_GUARD_GENERIC_REFUGEE_danger_sense", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_danger_sense')", ">=", "2" ] } + "condition": { "math": [ "u_spell_level('clair_danger_sense')", ">=", "2" ] } }, { "text": "[Telepathy] *Read 's mind*", @@ -34,7 +34,7 @@ { "text": "[Premonition] *Determine if is a threat*", "topic": "TALK_EVAC_GUARD1_danger_sense", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_danger_sense')", ">=", "2" ] } + "condition": { "math": [ "u_spell_level('clair_danger_sense')", ">=", "2" ] } }, { "text": "[Telepathy] *Read 's mind*", @@ -81,7 +81,7 @@ { "text": "[Premonition] *Determine if is a threat*", "topic": "TALK_EVAC_GUARD2_danger_sense", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_danger_sense')", ">=", "2" ] } + "condition": { "math": [ "u_spell_level('clair_danger_sense')", ">=", "2" ] } }, { "text": "[Telepathy] *Read 's mind*", diff --git a/data/mods/MindOverMatter/npcs/dialogue/refugee_guards_traitor.json b/data/mods/MindOverMatter/npcs/dialogue/refugee_guards_traitor.json index b0e3b268f0aea..e5a1fbd92859a 100644 --- a/data/mods/MindOverMatter/npcs/dialogue/refugee_guards_traitor.json +++ b/data/mods/MindOverMatter/npcs/dialogue/refugee_guards_traitor.json @@ -6,7 +6,7 @@ { "text": "[Premonition] *Determine if is a threat*", "topic": "TALK_EVAC_GUARD3_danger_sense", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_danger_sense')", ">=", "2" ] } + "condition": { "math": [ "u_spell_level('clair_danger_sense')", ">=", "2" ] } }, { "text": "[Telepathy] *Read 's mind*", @@ -115,7 +115,7 @@ "text": "[Brilliant Flash Check] *blind *", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: pyrokinetic_flash')", ">=", "1" ] }, + { "math": [ "u_spell_level('pyrokinetic_flash')", ">=", "1" ] }, { "not": { "npc_has_worn_with_flag": "FLASH_PROTECTION" } } ] }, @@ -123,7 +123,7 @@ "trial": { "type": "CONDITION", "condition": { - "roll_contested": { "math": [ "u_val('spell_level', 'spell: pyrokinetic_flash')" ] }, + "roll_contested": { "math": [ "u_spell_level('pyrokinetic_flash')" ] }, "difficulty": { "math": [ "n_val('perception')" ] }, "die_size": 10 } @@ -136,14 +136,14 @@ }, { "text": "[Sensory Deprivation Check] *Shut off 's senses*.", - "condition": { "math": [ "u_val('spell_level', 'spell: telepathic_confusion')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telepathic_confusion')", ">=", "1" ] }, "switch": false, "trial": { "type": "CONDITION", "condition": { "and": [ { - "roll_contested": { "math": [ "u_val('spell_level', 'spell: telepathic_confusion')" ] }, + "roll_contested": { "math": [ "u_spell_level('telepathic_confusion')" ] }, "difficulty": { "math": [ "n_val('perception')" ] }, "die_size": 10 }, @@ -162,14 +162,14 @@ }, { "text": "[Synaptic Overload Check] *Attack 's mind*.", - "condition": { "and": [ { "math": [ "u_val('spell_level', 'spell: telepathic_blast')", ">=", "1" ] } ] }, + "condition": { "and": [ { "math": [ "u_spell_level('telepathic_blast')", ">=", "1" ] } ] }, "switch": false, "trial": { "type": "CONDITION", "condition": { "and": [ { - "roll_contested": { "math": [ "u_val('spell_level', 'spell: telepathic_blast')" ] }, + "roll_contested": { "math": [ "u_spell_level('telepathic_blast')" ] }, "difficulty": { "math": [ "n_val('intelligence')" ] }, "die_size": 10 }, @@ -182,7 +182,7 @@ "effect": [ "hostile", { - "npc_set_hp": { "math": [ "(80 - (6 * (u_val('spell_level', 'spell: telepathic_blast'))))" ] }, + "npc_set_hp": { "math": [ "(80 - (6 * (u_spell_level('telepathic_blast'))))" ] }, "target_part": "head" }, { "npc_add_effect": "stunned", "duration": "2 s" } @@ -195,15 +195,11 @@ }, { "text": "[Transposition Check] *Teleport away 's weapon*.", - "condition": { "math": [ "u_val('spell_level', 'spell: teleport_transpose')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('teleport_transpose')", ">=", "1" ] }, "switch": false, "trial": { "type": "CONDITION", - "condition": { - "roll_contested": { "math": [ "u_val('spell_level', 'spell: teleport_transpose')" ] }, - "difficulty": 10, - "die_size": 10 - } + "condition": { "roll_contested": { "math": [ "u_spell_level('teleport_transpose')" ] }, "difficulty": 10, "die_size": 10 } }, "success": { "topic": "TALK_EVAC_GUARD3_WEAPON_TELEPORT_DISAMED", @@ -228,11 +224,11 @@ }, { "text": "[Oubliette Check] *Banish to another dimension*.", - "condition": { "math": [ "u_val('spell_level', 'spell: teleport_banish')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('teleport_banish')", ">=", "1" ] }, "switch": false, "trial": { "type": "CONDITION", - "condition": { "roll_contested": { "math": [ "u_val('spell_level', 'spell: teleport_banish')" ] }, "difficulty": 15, "die_size": 10 } + "condition": { "roll_contested": { "math": [ "u_spell_level('teleport_banish')" ] }, "difficulty": 15, "die_size": 10 } }, "success": { "topic": "TALK_DONE", diff --git a/data/mods/MindOverMatter/obsolete/biokinesis.json b/data/mods/MindOverMatter/obsolete/biokinesis.json index 5e4cd63c270bb..a19bebb8c1d0c 100644 --- a/data/mods/MindOverMatter/obsolete/biokinesis.json +++ b/data/mods/MindOverMatter/obsolete/biokinesis.json @@ -26,16 +26,8 @@ "shape": "blast", "max_level": 20, "min_damage": 0, - "min_duration": { - "math": [ - "( (u_val('spell_level', 'spell: biokin_overcome_pain') * 2000) + 30000) * (scaling_factor(u_val('intelligence') ) )" - ] - }, - "max_duration": { - "math": [ - "( (u_val('spell_level', 'spell: biokin_overcome_pain') * 2000) + 130000) * (scaling_factor(u_val('intelligence') ) )" - ] - } + "min_duration": { "math": [ "( (u_spell_level('biokin_overcome_pain') * 2000) + 30000) * (scaling_factor(u_val('intelligence') ) )" ] }, + "max_duration": { "math": [ "( (u_spell_level('biokin_overcome_pain') * 2000) + 130000) * (scaling_factor(u_val('intelligence') ) )" ] } }, { "id": "biokin_overcome_pain_2", @@ -50,16 +42,8 @@ "shape": "blast", "max_level": 20, "min_damage": 0, - "min_duration": { - "math": [ - "( (u_val('spell_level', 'spell: biokin_overcome_pain') * 2000) + 60000) * (scaling_factor(u_val('intelligence') ) )" - ] - }, - "max_duration": { - "math": [ - "( (u_val('spell_level', 'spell: biokin_overcome_pain') * 2000) + 150000) * (scaling_factor(u_val('intelligence') ) )" - ] - } + "min_duration": { "math": [ "( (u_spell_level('biokin_overcome_pain') * 2000) + 60000) * (scaling_factor(u_val('intelligence') ) )" ] }, + "max_duration": { "math": [ "( (u_spell_level('biokin_overcome_pain') * 2000) + 150000) * (scaling_factor(u_val('intelligence') ) )" ] } }, { "id": "biokin_overcome_pain_3", @@ -74,16 +58,8 @@ "shape": "blast", "max_level": 20, "min_damage": 0, - "min_duration": { - "math": [ - "( (u_val('spell_level', 'spell: biokin_overcome_pain') * 2000) + 90000) * (scaling_factor(u_val('intelligence') ) )" - ] - }, - "max_duration": { - "math": [ - "( (u_val('spell_level', 'spell: biokin_overcome_pain') * 2000) + 180000) * (scaling_factor(u_val('intelligence') ) )" - ] - } + "min_duration": { "math": [ "( (u_spell_level('biokin_overcome_pain') * 2000) + 90000) * (scaling_factor(u_val('intelligence') ) )" ] }, + "max_duration": { "math": [ "( (u_spell_level('biokin_overcome_pain') * 2000) + 180000) * (scaling_factor(u_val('intelligence') ) )" ] } }, { "id": "biokin_overcome_pain_4", @@ -98,16 +74,8 @@ "shape": "blast", "max_level": 20, "min_damage": 0, - "min_duration": { - "math": [ - "( (u_val('spell_level', 'spell: biokin_overcome_pain') * 2000) + 120000) * (scaling_factor(u_val('intelligence') ) )" - ] - }, - "max_duration": { - "math": [ - "( (u_val('spell_level', 'spell: biokin_overcome_pain') * 2000) + 210000) * (scaling_factor(u_val('intelligence') ) )" - ] - } + "min_duration": { "math": [ "( (u_spell_level('biokin_overcome_pain') * 2000) + 120000) * (scaling_factor(u_val('intelligence') ) )" ] }, + "max_duration": { "math": [ "( (u_spell_level('biokin_overcome_pain') * 2000) + 210000) * (scaling_factor(u_val('intelligence') ) )" ] } }, { "id": "biokin_overcome_pain_5", @@ -122,16 +90,8 @@ "shape": "blast", "max_level": 20, "min_damage": 0, - "min_duration": { - "math": [ - "( (u_val('spell_level', 'spell: biokin_overcome_pain') * 2000) + 150000) * (scaling_factor(u_val('intelligence') ) )" - ] - }, - "max_duration": { - "math": [ - "( (u_val('spell_level', 'spell: biokin_overcome_pain') * 2000) + 240000) * (scaling_factor(u_val('intelligence') ) )" - ] - } + "min_duration": { "math": [ "( (u_spell_level('biokin_overcome_pain') * 2000) + 150000) * (scaling_factor(u_val('intelligence') ) )" ] }, + "max_duration": { "math": [ "( (u_spell_level('biokin_overcome_pain') * 2000) + 240000) * (scaling_factor(u_val('intelligence') ) )" ] } }, { "id": "biokin_overcome_pain_6", @@ -146,16 +106,8 @@ "shape": "blast", "max_level": 20, "min_damage": 0, - "min_duration": { - "math": [ - "( (u_val('spell_level', 'spell: biokin_overcome_pain') * 2000) + 180000) * (scaling_factor(u_val('intelligence') ) )" - ] - }, - "max_duration": { - "math": [ - "( (u_val('spell_level', 'spell: biokin_overcome_pain') * 2000) + 270000) * (scaling_factor(u_val('intelligence') ) )" - ] - } + "min_duration": { "math": [ "( (u_spell_level('biokin_overcome_pain') * 2000) + 180000) * (scaling_factor(u_val('intelligence') ) )" ] }, + "max_duration": { "math": [ "( (u_spell_level('biokin_overcome_pain') * 2000) + 270000) * (scaling_factor(u_val('intelligence') ) )" ] } }, { "id": "biokin_enhance_mobility_1", diff --git a/data/mods/MindOverMatter/obsolete/clairsentience.json b/data/mods/MindOverMatter/obsolete/clairsentience.json index 094bc32042f4e..ba1cf54761d1c 100644 --- a/data/mods/MindOverMatter/obsolete/clairsentience.json +++ b/data/mods/MindOverMatter/obsolete/clairsentience.json @@ -12,14 +12,8 @@ "shape": "blast", "max_level": { "math": [ "int_to_level(1)" ] }, "min_damage": 0, - "min_duration": { - "math": [ "( (u_val('spell_level', 'spell: clair_night_vision') * 20000) + 15000) * (scaling_factor(u_val('intelligence') ) )" ] - }, - "max_duration": { - "math": [ - "( (u_val('spell_level', 'spell: clair_night_vision') * 20000) + 180000) * (scaling_factor(u_val('intelligence') ) )" - ] - } + "min_duration": { "math": [ "( (u_spell_level('clair_night_vision') * 20000) + 15000) * (scaling_factor(u_val('intelligence') ) )" ] }, + "max_duration": { "math": [ "( (u_spell_level('clair_night_vision') * 20000) + 180000) * (scaling_factor(u_val('intelligence') ) )" ] } }, { "id": "clair_night_vision_2", @@ -34,14 +28,8 @@ "shape": "blast", "max_level": { "math": [ "int_to_level(1)" ] }, "min_damage": 0, - "min_duration": { - "math": [ "( (u_val('spell_level', 'spell: clair_night_vision') * 20000) + 15000) * (scaling_factor(u_val('intelligence') ) )" ] - }, - "max_duration": { - "math": [ - "( (u_val('spell_level', 'spell: clair_night_vision') * 20000) + 180000) * (scaling_factor(u_val('intelligence') ) )" - ] - } + "min_duration": { "math": [ "( (u_spell_level('clair_night_vision') * 20000) + 15000) * (scaling_factor(u_val('intelligence') ) )" ] }, + "max_duration": { "math": [ "( (u_spell_level('clair_night_vision') * 20000) + 180000) * (scaling_factor(u_val('intelligence') ) )" ] } }, { "id": "clair_night_vision_3", @@ -56,14 +44,8 @@ "shape": "blast", "max_level": { "math": [ "int_to_level(1)" ] }, "min_damage": 0, - "min_duration": { - "math": [ "( (u_val('spell_level', 'spell: clair_night_vision') * 20000) + 15000) * (scaling_factor(u_val('intelligence') ) )" ] - }, - "max_duration": { - "math": [ - "( (u_val('spell_level', 'spell: clair_night_vision') * 20000) + 180000) * (scaling_factor(u_val('intelligence') ) )" - ] - } + "min_duration": { "math": [ "( (u_spell_level('clair_night_vision') * 20000) + 15000) * (scaling_factor(u_val('intelligence') ) )" ] }, + "max_duration": { "math": [ "( (u_spell_level('clair_night_vision') * 20000) + 180000) * (scaling_factor(u_val('intelligence') ) )" ] } }, { "id": "clair_night_vision_4", @@ -78,14 +60,8 @@ "shape": "blast", "max_level": { "math": [ "int_to_level(1)" ] }, "min_damage": 0, - "min_duration": { - "math": [ "( (u_val('spell_level', 'spell: clair_night_vision') * 20000) + 15000) * (scaling_factor(u_val('intelligence') ) )" ] - }, - "max_duration": { - "math": [ - "( (u_val('spell_level', 'spell: clair_night_vision') * 20000) + 180000) * (scaling_factor(u_val('intelligence') ) )" - ] - } + "min_duration": { "math": [ "( (u_spell_level('clair_night_vision') * 20000) + 15000) * (scaling_factor(u_val('intelligence') ) )" ] }, + "max_duration": { "math": [ "( (u_spell_level('clair_night_vision') * 20000) + 180000) * (scaling_factor(u_val('intelligence') ) )" ] } }, { "id": "clair_night_vision_5", @@ -100,14 +76,8 @@ "shape": "blast", "max_level": { "math": [ "int_to_level(1)" ] }, "min_damage": 0, - "min_duration": { - "math": [ "( (u_val('spell_level', 'spell: clair_night_vision') * 20000) + 15000) * (scaling_factor(u_val('intelligence') ) )" ] - }, - "max_duration": { - "math": [ - "( (u_val('spell_level', 'spell: clair_night_vision') * 20000) + 180000) * (scaling_factor(u_val('intelligence') ) )" - ] - } + "min_duration": { "math": [ "( (u_spell_level('clair_night_vision') * 20000) + 15000) * (scaling_factor(u_val('intelligence') ) )" ] }, + "max_duration": { "math": [ "( (u_spell_level('clair_night_vision') * 20000) + 180000) * (scaling_factor(u_val('intelligence') ) )" ] } }, { "id": "clair_night_vision_6", @@ -122,14 +92,8 @@ "shape": "blast", "max_level": { "math": [ "int_to_level(1)" ] }, "min_damage": 0, - "min_duration": { - "math": [ "( (u_val('spell_level', 'spell: clair_night_vision') * 20000) + 15000) * (scaling_factor(u_val('intelligence') ) )" ] - }, - "max_duration": { - "math": [ - "( (u_val('spell_level', 'spell: clair_night_vision') * 20000) + 180000) * (scaling_factor(u_val('intelligence') ) )" - ] - } + "min_duration": { "math": [ "( (u_spell_level('clair_night_vision') * 20000) + 15000) * (scaling_factor(u_val('intelligence') ) )" ] }, + "max_duration": { "math": [ "( (u_spell_level('clair_night_vision') * 20000) + 180000) * (scaling_factor(u_val('intelligence') ) )" ] } }, { "id": "clair_night_vision_7", @@ -144,14 +108,8 @@ "shape": "blast", "max_level": { "math": [ "int_to_level(1)" ] }, "min_damage": 0, - "min_duration": { - "math": [ "( (u_val('spell_level', 'spell: clair_night_vision') * 20000) + 15000) * (scaling_factor(u_val('intelligence') ) )" ] - }, - "max_duration": { - "math": [ - "( (u_val('spell_level', 'spell: clair_night_vision') * 20000) + 180000) * (scaling_factor(u_val('intelligence') ) )" - ] - } + "min_duration": { "math": [ "( (u_spell_level('clair_night_vision') * 20000) + 15000) * (scaling_factor(u_val('intelligence') ) )" ] }, + "max_duration": { "math": [ "( (u_spell_level('clair_night_vision') * 20000) + 180000) * (scaling_factor(u_val('intelligence') ) )" ] } }, { "id": "clair_night_vision_8", @@ -166,14 +124,8 @@ "shape": "blast", "max_level": { "math": [ "int_to_level(1)" ] }, "min_damage": 0, - "min_duration": { - "math": [ "( (u_val('spell_level', 'spell: clair_night_vision') * 20000) + 15000) * (scaling_factor(u_val('intelligence') ) )" ] - }, - "max_duration": { - "math": [ - "( (u_val('spell_level', 'spell: clair_night_vision') * 20000) + 180000) * (scaling_factor(u_val('intelligence') ) )" - ] - } + "min_duration": { "math": [ "( (u_spell_level('clair_night_vision') * 20000) + 15000) * (scaling_factor(u_val('intelligence') ) )" ] }, + "max_duration": { "math": [ "( (u_spell_level('clair_night_vision') * 20000) + 180000) * (scaling_factor(u_val('intelligence') ) )" ] } }, { "type": "effect_on_condition", diff --git a/data/mods/MindOverMatter/obsolete/pyrokinesis.json b/data/mods/MindOverMatter/obsolete/pyrokinesis.json index cc0ae76cc11df..75c4b4491047b 100644 --- a/data/mods/MindOverMatter/obsolete/pyrokinesis.json +++ b/data/mods/MindOverMatter/obsolete/pyrokinesis.json @@ -9,15 +9,9 @@ "flags": [ "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "IGNORE_WALLS", "NO_EXPLOSION_SFX" ], "effect": "attack", "shape": "blast", - "min_range": { - "math": [ "( (u_val('spell_level', 'spell: pyrokinetic_quell_flames') * 0.8) + 5) * (scaling_factor(u_val('intelligence') ) )" ] - }, + "min_range": { "math": [ "( (u_spell_level('pyrokinetic_quell_flames') * 0.8) + 5) * (scaling_factor(u_val('intelligence') ) )" ] }, "max_range": 70, - "min_aoe": { - "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_quell_flames') * 0.25) + 0) * (scaling_factor(u_val('intelligence') ) )" - ] - }, + "min_aoe": { "math": [ "( (u_spell_level('pyrokinetic_quell_flames') * 0.25) + 0) * (scaling_factor(u_val('intelligence') ) )" ] }, "max_aoe": 50, "field_id": "fd_extinguisher", "min_field_intensity": 2, @@ -67,8 +61,8 @@ "shape": "blast", "min_damage": 1, "max_damage": 1, - "min_duration": { "math": [ "((u_val('spell_level', 'spell: pyrokinetic_call_flames') * 1500) + 30000)" ] }, - "max_duration": { "math": [ "((u_val('spell_level', 'spell: pyrokinetic_call_flames') * 3000) + 60000)" ] } + "min_duration": { "math": [ "((u_spell_level('pyrokinetic_call_flames') * 1500) + 30000)" ] }, + "max_duration": { "math": [ "((u_spell_level('pyrokinetic_call_flames') * 3000) + 60000)" ] } }, { "id": "pyrokin_call_flame_long_term", @@ -85,8 +79,8 @@ "shape": "blast", "min_damage": 1, "max_damage": 1, - "min_duration": { "math": [ "((u_val('spell_level', 'spell: pyrokinetic_call_flames') * 6000) + 360000)" ] }, - "max_duration": { "math": [ "((u_val('spell_level', 'spell: pyrokinetic_call_flames') * 6000) + 540000)" ] } + "min_duration": { "math": [ "((u_spell_level('pyrokinetic_call_flames') * 6000) + 360000)" ] }, + "max_duration": { "math": [ "((u_spell_level('pyrokinetic_call_flames') * 6000) + 540000)" ] } }, { "type": "effect_on_condition", @@ -95,7 +89,7 @@ { "u_remove_item_with": "pyrokinetic_fire_tool" }, { "u_cast_spell": { "id": "pyrokin_call_flame_short_term" } }, { "u_message": "Flames begin dancing in the air above your hand", "type": "neutral" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,1 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,1 )" ] } ] }, { @@ -105,7 +99,7 @@ { "u_remove_item_with": "pyrokinetic_fire_tool" }, { "u_cast_spell": { "id": "pyrokin_call_flame_long_term" } }, { "u_message": "Flames begin dancing in the air above your hand", "type": "neutral" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 2,5 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 2,5 )" ] } ] } ] diff --git a/data/mods/MindOverMatter/obsolete/telekinesis.json b/data/mods/MindOverMatter/obsolete/telekinesis.json index b2d835f965abb..aca8e21ae6fa8 100644 --- a/data/mods/MindOverMatter/obsolete/telekinesis.json +++ b/data/mods/MindOverMatter/obsolete/telekinesis.json @@ -14,8 +14,8 @@ "shape": "blast", "min_damage": 1, "max_damage": 1, - "min_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 12000)" ] }, - "max_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 120000)" ] } + "min_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 12000)" ] }, + "max_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 120000)" ] } }, { "id": "telekin_ritual_summon_lifting_jack_2", @@ -32,8 +32,8 @@ "shape": "blast", "min_damage": 1, "max_damage": 1, - "min_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 12000)" ] }, - "max_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 120000)" ] } + "min_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 12000)" ] }, + "max_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 120000)" ] } }, { "id": "telekin_ritual_summon_lifting_jack_3", @@ -50,8 +50,8 @@ "shape": "blast", "min_damage": 1, "max_damage": 1, - "min_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 12000)" ] }, - "max_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 120000)" ] } + "min_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 12000)" ] }, + "max_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 120000)" ] } }, { "id": "telekin_ritual_summon_lifting_jack_4", @@ -68,8 +68,8 @@ "shape": "blast", "min_damage": 1, "max_damage": 1, - "min_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 12000)" ] }, - "max_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 120000)" ] } + "min_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 12000)" ] }, + "max_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 120000)" ] } }, { "id": "telekin_ritual_summon_lifting_jack_5", @@ -86,8 +86,8 @@ "shape": "blast", "min_damage": 1, "max_damage": 1, - "min_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 12000)" ] }, - "max_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 120000)" ] } + "min_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 12000)" ] }, + "max_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 120000)" ] } }, { "id": "telekin_ritual_summon_lifting_jack_6", @@ -104,8 +104,8 @@ "shape": "blast", "min_damage": 1, "max_damage": 1, - "min_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 12000)" ] }, - "max_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 120000)" ] } + "min_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 12000)" ] }, + "max_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 120000)" ] } }, { "id": "telekin_ritual_summon_lifting_jack_7", @@ -122,8 +122,8 @@ "shape": "blast", "min_damage": 1, "max_damage": 1, - "min_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 12000)" ] }, - "max_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 120000)" ] } + "min_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 12000)" ] }, + "max_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 120000)" ] } }, { "id": "telekin_ritual_summon_lifting_jack_8", @@ -140,8 +140,8 @@ "shape": "blast", "min_damage": 1, "max_damage": 1, - "min_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 12000)" ] }, - "max_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 120000)" ] } + "min_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 12000)" ] }, + "max_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 120000)" ] } }, { "id": "telekin_ritual_summon_lifting_jack_9", @@ -158,8 +158,8 @@ "shape": "blast", "min_damage": 1, "max_damage": 1, - "min_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 12000)" ] }, - "max_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 120000)" ] } + "min_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 12000)" ] }, + "max_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 120000)" ] } }, { "id": "telekin_ritual_summon_lifting_jack_10", @@ -176,8 +176,8 @@ "shape": "blast", "min_damage": 1, "max_damage": 1, - "min_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 12000)" ] }, - "max_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 120000)" ] } + "min_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 12000)" ] }, + "max_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 120000)" ] } }, { "id": "telekin_ritual_summon_lifting_jack_11", @@ -194,8 +194,8 @@ "shape": "blast", "min_damage": 1, "max_damage": 1, - "min_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 12000)" ] }, - "max_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 120000)" ] } + "min_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 12000)" ] }, + "max_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 120000)" ] } }, { "id": "telekin_ritual_summon_lifting_jack_12", @@ -212,8 +212,8 @@ "shape": "blast", "min_damage": 1, "max_damage": 1, - "min_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 12000)" ] }, - "max_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 120000)" ] } + "min_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 12000)" ] }, + "max_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 120000)" ] } }, { "id": "telekin_ritual_summon_lifting_jack_13", @@ -230,8 +230,8 @@ "shape": "blast", "min_damage": 1, "max_damage": 1, - "min_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 12000)" ] }, - "max_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 120000)" ] } + "min_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 12000)" ] }, + "max_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 120000)" ] } }, { "id": "telekin_ritual_summon_lifting_jack_14", @@ -248,8 +248,8 @@ "shape": "blast", "min_damage": 1, "max_damage": 1, - "min_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 12000)" ] }, - "max_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 120000)" ] } + "min_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 12000)" ] }, + "max_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 120000)" ] } }, { "id": "telekin_ritual_summon_lifting_jack_15", @@ -266,8 +266,8 @@ "shape": "blast", "min_damage": 1, "max_damage": 1, - "min_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 12000)" ] }, - "max_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 120000)" ] } + "min_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 12000)" ] }, + "max_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 120000)" ] } }, { "id": "telekin_ritual_summon_lifting_jack_16", @@ -284,8 +284,8 @@ "shape": "blast", "min_damage": 1, "max_damage": 1, - "min_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 12000)" ] }, - "max_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 120000)" ] } + "min_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 12000)" ] }, + "max_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 120000)" ] } }, { "id": "telekin_ritual_summon_lifting_jack_17", @@ -302,8 +302,8 @@ "shape": "blast", "min_damage": 1, "max_damage": 1, - "min_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 12000)" ] }, - "max_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 120000)" ] } + "min_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 12000)" ] }, + "max_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 120000)" ] } }, { "id": "telekin_ritual_summon_lifting_jack_18", @@ -320,8 +320,8 @@ "shape": "blast", "min_damage": 1, "max_damage": 1, - "min_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 12000)" ] }, - "max_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 120000)" ] } + "min_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 12000)" ] }, + "max_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 120000)" ] } }, { "id": "telekin_ritual_summon_lifting_jack_19", @@ -338,8 +338,8 @@ "shape": "blast", "min_damage": 1, "max_damage": 1, - "min_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 12000)" ] }, - "max_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 120000)" ] } + "min_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 12000)" ] }, + "max_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 120000)" ] } }, { "id": "telekin_ritual_summon_lifting_jack_20", @@ -356,8 +356,8 @@ "shape": "blast", "min_damage": 1, "max_damage": 1, - "min_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 12000)" ] }, - "max_duration": { "math": [ "(u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 120000)" ] } + "min_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 12000)" ] }, + "max_duration": { "math": [ "(u_spell_level('telekinetic_vehicle_lift') * 120000)" ] } }, { "type": "effect_on_condition", @@ -376,11 +376,9 @@ { "queue_eocs": "EOC_TELEKIN_MORALE_DRAIN", "time_in_future": [ + { "math": [ "( (u_spell_level('telepathic_morale') * 150) + 1800) * (scaling_factor(u_val('intelligence') ) )" ] }, { - "math": [ "( (u_val('spell_level', 'spell: telepathic_morale') * 150) + 1800) * (scaling_factor(u_val('intelligence') ) )" ] - }, - { - "math": [ "( (u_val('spell_level', 'spell: telepathic_morale') * 150) + 7200) * (scaling_factor(u_val('intelligence') ) )" ] + "math": [ "( (u_spell_level('telepathic_morale') * 150) + 7200) * (scaling_factor(u_val('intelligence') ) )" ] } ] } diff --git a/data/mods/MindOverMatter/powers/biokinesis.json b/data/mods/MindOverMatter/powers/biokinesis.json index 91dd0bf7231c1..01f1e9275a47a 100644 --- a/data/mods/MindOverMatter/powers/biokinesis.json +++ b/data/mods/MindOverMatter/powers/biokinesis.json @@ -17,23 +17,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: biokin_physical_enhance') * 1500) + 9000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_physical_enhance') * 1500) + 9000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: biokin_physical_enhance') * 3000) + 45000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_physical_enhance') * 3000) + 45000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_biokin_physical') > -1 ? 0 : max((3500 - (u_val('spell_level', 'spell: biokin_physical_enhance') * 175)), 1250)" + "u_effect_intensity('effect_biokin_physical') > -1 ? 0 : max((3500 - (u_spell_level('biokin_physical_enhance') * 175)), 1250)" ] }, "base_casting_time": { "math": [ - "u_effect_intensity('effect_biokin_physical') > -1 ? 10 : max((120 -(u_val('spell_level', 'spell: biokin_physical_enhance') * 5.5)), 75)" + "u_effect_intensity('effect_biokin_physical') > -1 ? 10 : max((120 -(u_spell_level('biokin_physical_enhance') * 5.5)), 75)" ] }, "learn_spells": { @@ -62,23 +62,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: biokin_overcome_pain') * 2000) + 30000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_overcome_pain') * 2000) + 30000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: biokin_overcome_pain') * 2000) + 130000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_overcome_pain') * 2000) + 130000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "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)" + "u_effect_intensity('effect_biokin_overcome_pain') > 0 ? 0 : max((1750 - (u_spell_level('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)" + "u_effect_intensity('effect_biokin_overcome_pain') > 0 ? 10 : max((125 -(u_spell_level('biokin_overcome_pain') * 7)), 50)" ] }, "learn_spells": { "biokin_armor_skin": 9, "biokin_climate_control": 12, "biokin_sealed_system": 18 } @@ -100,23 +100,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: biokin_breathe_skin') * 3600) + 18000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_breathe_skin') * 3600) + 18000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: biokin_breathe_skin') * 7200) + 54000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_breathe_skin') * 7200) + 54000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_biokin_breathe_skin') > 0 ? 0 : max((2500 - (u_val('spell_level', 'spell: biokin_breathe_skin') * 85)), 1200)" + "u_effect_intensity('effect_biokin_breathe_skin') > 0 ? 0 : max((2500 - (u_spell_level('biokin_breathe_skin') * 85)), 1200)" ] }, "base_casting_time": { "math": [ - "u_effect_intensity('effect_biokin_breathe_skin') > 0 ? 10 : max((700 -(u_val('spell_level', 'spell: biokin_breathe_skin') * 6)), 25)" + "u_effect_intensity('effect_biokin_breathe_skin') > 0 ? 10 : max((700 -(u_spell_level('biokin_breathe_skin') * 6)), 25)" ] }, "learn_spells": { "biokin_armor_skin": 6, "biokin_enhance_mobility": 9, "biokin_sealed_system": 15 } @@ -194,12 +194,12 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: biokin_armor_skin') * 800) + 4500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_armor_skin') * 800) + 4500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: biokin_armor_skin') * 1500) + 9000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_armor_skin') * 1500) + 9000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -229,23 +229,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: biokin_climate_control') * 18000) + 30000 ) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_climate_control') * 18000) + 30000 ) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: biokin_climate_control') * 36000) + 60000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_climate_control') * 36000) + 60000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "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)" + "u_effect_intensity('effect_biokin_climate_control') > 0 ? 0 : max((3500 - (u_spell_level('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)" + "u_effect_intensity('effect_biokin_climate_control') > 0 ? 10 : max((250 -(u_spell_level('biokin_climate_control') * 8.5)), 150)" ] }, "learn_spells": { "biokin_sealed_system": 6, "biokin_metabolism_enhance": 9 } @@ -268,23 +268,23 @@ "min_damage": 1, "min_duration": { "math": [ - "( ( (u_val('spell_level', 'spell: biokin_enhance_mobility') * 4500 ) + 30000) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( (u_spell_level('biokin_enhance_mobility') * 4500 ) + 30000) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( ( (u_val('spell_level', 'spell: biokin_enhance_mobility') * 9000 ) + 90000) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( (u_spell_level('biokin_enhance_mobility') * 9000 ) + 90000) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "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)" + "u_effect_intensity('effect_biokin_enhance_mobility') > 0 ? 0 : max((4500 - (u_spell_level('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)" + "u_effect_intensity('effect_biokin_enhance_mobility') > 0 ? 10 : max((275 -(u_spell_level('biokin_enhance_mobility') * 15)), 50)" ] }, "learn_spells": { "biokin_reflex_enhance": 4, "biokin_combat_dance": 10 } @@ -307,23 +307,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: biokin_hammerhand') * 45000) + 180000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_hammerhand') * 45000) + 180000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: biokin_hammerhand') * 75000) + 540000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_hammerhand') * 75000) + 540000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "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)" + "u_effect_intensity('effect_biokin_hammerhand') > 0 ? 0 : max((4500 - (u_spell_level('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)" + "u_effect_intensity('effect_biokin_hammerhand') > 0 ? 10 : max((350 -(u_spell_level('biokin_hammerhand') * 12.5)), 150)" ] } }, @@ -345,23 +345,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: biokin_reflex_enhance') * 1500) + 9000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_reflex_enhance') * 1500) + 9000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: biokin_reflex_enhance') * 2000) + 45000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_reflex_enhance') * 2000) + 45000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_biokin_reflex') > -1 ? 0 : max((5500 - (u_val('spell_level', 'spell: biokin_reflex_enhance') * 205)), 2250)" + "u_effect_intensity('effect_biokin_reflex') > -1 ? 0 : max((5500 - (u_spell_level('biokin_reflex_enhance') * 205)), 2250)" ] }, "base_casting_time": { "math": [ - "u_effect_intensity('effect_biokin_reflex') > -1 ? 10 : max((175 -(u_val('spell_level', 'spell: biokin_reflex_enhance') * 5.5)), 100)" + "u_effect_intensity('effect_biokin_reflex') > -1 ? 10 : max((175 -(u_spell_level('biokin_reflex_enhance') * 5.5)), 100)" ] }, "learn_spells": { "biokin_combat_dance": 8, "biokin_hammerhand": 12, "biokin_perfected_motion": 15 } @@ -389,12 +389,12 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: biokin_sealed_system') * 800) + 6000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_sealed_system') * 800) + 6000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: biokin_sealed_system') * 800) + 30000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_sealed_system') * 800) + 30000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -452,23 +452,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: biokin_metabolism_enhance') * 25000) + 270000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_metabolism_enhance') * 25000) + 270000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: biokin_metabolism_enhance') * 50000) + 675000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_metabolism_enhance') * 50000) + 675000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_biokin_metabolism_enhance') > -1 ? 0 : max((8000 - (u_val('spell_level', 'spell: biokin_metabolism_enhance') * 250)), 4000)" + "u_effect_intensity('effect_biokin_metabolism_enhance') > -1 ? 0 : max((8000 - (u_spell_level('biokin_metabolism_enhance') * 250)), 4000)" ] }, "base_casting_time": { "math": [ - "u_effect_intensity('effect_biokin_metabolism_enhance') > -1 ? 10 : max((250 -(u_val('spell_level', 'spell: biokin_metabolism_enhance') * 13)), 50)" + "u_effect_intensity('effect_biokin_metabolism_enhance') > -1 ? 10 : max((250 -(u_spell_level('biokin_metabolism_enhance') * 13)), 50)" ] }, "learn_spells": { "biokin_perfected_motion": 8 } @@ -492,12 +492,12 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: biokin_combat_dance') * 600) + 4000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_combat_dance') * 600) + 4000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: biokin_combat_dance') * 600) + 20000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_combat_dance') * 600) + 20000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -528,12 +528,12 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: biokin_perfected_motion') * 50) + 500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_perfected_motion') * 50) + 500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: biokin_perfected_motion') * 110) + 3000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_perfected_motion') * 110) + 3000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", diff --git a/data/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json b/data/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json index cd1cd1b542d08..2b18d02f67e0f 100644 --- a/data/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json +++ b/data/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json @@ -13,12 +13,12 @@ "time_in_future": [ { "math": [ - "( ( (u_val('spell_level', 'spell: biokin_overcome_pain') * 20 ) + 600) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( (u_spell_level('biokin_overcome_pain') * 20 ) + 600) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( ( (u_val('spell_level', 'spell: biokin_overcome_pain') * 20 ) + 2100) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( (u_spell_level('biokin_overcome_pain') * 20 ) + 2100) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } ] @@ -63,21 +63,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_one", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(1)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: biokin_overcome_pain')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('biokin_overcome_pain')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_BIOKIN_OVERCOME_PAIN_DRAIN", "time_in_future": [ { "math": [ - "( ( (u_val('spell_level', 'spell: biokin_overcome_pain') * 20 ) + 600) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( (u_spell_level('biokin_overcome_pain') * 20 ) + 600) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( ( (u_val('spell_level', 'spell: biokin_overcome_pain') * 20 ) + 2100) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( (u_spell_level('biokin_overcome_pain') * 20 ) + 2100) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } ] @@ -99,12 +97,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: biokin_physical_enhance') * 15) + 90) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_physical_enhance') * 15) + 90) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: biokin_physical_enhance') * 30) + 450) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_physical_enhance') * 30) + 450) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -125,21 +123,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_two", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(2)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: biokin_physical_enhance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('biokin_physical_enhance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_BIOKIN_PHYSICAL_ENHANCE_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: biokin_physical_enhance') * 15) + 90) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_physical_enhance') * 15) + 90) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: biokin_physical_enhance') * 30) + 450) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_physical_enhance') * 30) + 450) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -163,12 +159,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: biokin_breathe_skin') * 36) + 180) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_breathe_skin') * 36) + 180) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: biokin_breathe_skin') * 72) + 540) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_breathe_skin') * 72) + 540) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -193,21 +189,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_two", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(2)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: biokin_breathe_skin')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('biokin_breathe_skin')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_BIOKIN_BREATH_SKIN_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: biokin_breathe_skin') * 36) + 180) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_breathe_skin') * 36) + 180) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: biokin_breathe_skin') * 72) + 540) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_breathe_skin') * 72) + 540) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -230,12 +224,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: biokin_climate_control') * 180) + 300 ) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_climate_control') * 180) + 300 ) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: biokin_climate_control') * 360) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_climate_control') * 360) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -256,21 +250,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_four", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(4)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: biokin_climate_control')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('biokin_climate_control')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_BIOKIN_CLIMATE_CONTROL_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: biokin_climate_control') * 180) + 300 ) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_climate_control') * 180) + 300 ) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: biokin_climate_control') * 360) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_climate_control') * 360) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -292,12 +284,12 @@ "time_in_future": [ { "math": [ - "( ( (u_val('spell_level', 'spell: biokin_enhance_mobility') * 45 ) + 300) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( (u_spell_level('biokin_enhance_mobility') * 45 ) + 300) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( ( (u_val('spell_level', 'spell: biokin_enhance_mobility') * 90 ) + 900) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( (u_spell_level('biokin_enhance_mobility') * 90 ) + 900) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } ] @@ -309,7 +301,7 @@ "type": "effect_on_condition", "id": "EOC_BIOKIN_ENHANCE_MOBILITY_SWITCHER", "effect": { - "switch": { "math": [ "u_val('spell_level', 'spell: biokin_enhance_mobility')" ] }, + "switch": { "math": [ "u_spell_level('biokin_enhance_mobility')" ] }, "cases": [ { "case": 0, @@ -360,21 +352,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_five", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(5)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: biokin_enhance_mobility')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('biokin_enhance_mobility')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_BIOKIN_ENHANCE_MOBILITY_DRAIN", "time_in_future": [ { "math": [ - "( ( (u_val('spell_level', 'spell: biokin_enhance_mobility') * 45 ) + 300) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( (u_spell_level('biokin_enhance_mobility') * 45 ) + 300) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( ( (u_val('spell_level', 'spell: biokin_enhance_mobility') * 90 ) + 900) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( (u_spell_level('biokin_enhance_mobility') * 90 ) + 900) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } ] @@ -397,12 +387,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: biokin_hammerhand') * 450) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_hammerhand') * 450) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: biokin_hammerhand') * 750) + 5400) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_hammerhand') * 750) + 5400) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -428,21 +418,19 @@ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_five", "hit_self": true } }, { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_five", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(5)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: biokin_hammerhand')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('biokin_hammerhand')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_BIOKIN_HAMMERHAND_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: biokin_hammerhand') * 450) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_hammerhand') * 450) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: biokin_hammerhand') * 750) + 5400) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_hammerhand') * 750) + 5400) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -464,12 +452,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: biokin_reflex_enhance') * 15) + 90) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_reflex_enhance') * 15) + 90) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: biokin_reflex_enhance') * 30) + 450) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_reflex_enhance') * 30) + 450) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -490,21 +478,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_six", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(6)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: biokin_reflex_enhance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('biokin_reflex_enhance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_BIOKIN_REFLEX_ENHANCE_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: biokin_reflex_enhance') * 15) + 90) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_reflex_enhance') * 15) + 90) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: biokin_reflex_enhance') * 30) + 450) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_reflex_enhance') * 30) + 450) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -526,12 +512,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: biokin_metabolism_enhance') * 250) + 2700) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_metabolism_enhance') * 250) + 2700) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: biokin_metabolism_enhance') * 500) + 6750) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_metabolism_enhance') * 500) + 6750) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -552,9 +538,7 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_seven", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(7)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: biokin_metabolism_enhance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('biokin_metabolism_enhance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "math": [ "u_val('sleep_deprivation')", "-=", "10" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -562,12 +546,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: biokin_metabolism_enhance') * 250) + 2700) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_metabolism_enhance') * 250) + 2700) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: biokin_metabolism_enhance') * 500) + 6750) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('biokin_metabolism_enhance') * 500) + 6750) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] diff --git a/data/mods/MindOverMatter/powers/clairsentience.json b/data/mods/MindOverMatter/powers/clairsentience.json index 38d00d9171d81..03d8abbfe1e66 100644 --- a/data/mods/MindOverMatter/powers/clairsentience.json +++ b/data/mods/MindOverMatter/powers/clairsentience.json @@ -17,24 +17,22 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_night_vision') * 20000) + 15000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_night_vision') * 20000) + 15000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_night_vision') * 20000) + 180000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_night_vision') * 20000) + 180000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "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)" + "u_effect_intensity('effect_clair_night_eyes') > -1 ? 0 : max((1500 - (u_spell_level('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)" - ] + "math": [ "u_effect_intensity('effect_clair_night_eyes') > -1 ? 10 : max((50 -(u_spell_level('clair_night_vision') * 2)), 20)" ] }, "learn_spells": { "clair_see_auras": 7, "clair_danger_sense": 9, "clair_voyance": 12, "clair_see_map": 18 } }, @@ -56,23 +54,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_speed_reading') * 36000) + 360000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_speed_reading') * 36000) + 360000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_speed_reading') * 72000) + 1080000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_speed_reading') * 72000) + 1080000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "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)" + "u_effect_intensity('effect_clair_speed_reader') > -1 ? 0 : max((2500 - (u_spell_level('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)" + "u_effect_intensity('effect_clair_speed_reader') > -1 ? 10 : max((500 -(u_spell_level('clair_speed_reading') * 12)), 250)" ] }, "learn_spells": { @@ -101,23 +99,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_danger_sense') * 4500) + 12000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_danger_sense') * 4500) + 12000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_danger_sense') * 7500) + 90000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_danger_sense') * 7500) + 90000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_clair_premonition') > -1 ? 0 : max((1500 - (u_val('spell_level', 'spell: clair_danger_sense') * 85)), 850)" + "u_effect_intensity('effect_clair_premonition') > -1 ? 0 : max((1500 - (u_spell_level('clair_danger_sense') * 85)), 850)" ] }, "base_casting_time": { "math": [ - "u_effect_intensity('effect_clair_premonition') > -1 ? 10 : max((85 -(u_val('spell_level', 'spell: clair_danger_sense') * 7)), 25)" + "u_effect_intensity('effect_clair_premonition') > -1 ? 10 : max((85 -(u_spell_level('clair_danger_sense') * 7)), 25)" ] }, "learn_spells": { "clair_spot_weakness": 6, "clair_dodge_power": 12, "clair_clear_sight": 15 } @@ -141,18 +139,18 @@ "shape": "blast", "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: clair_spot_weakness') * 1.1) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 100)" + "min( (( (u_spell_level('clair_spot_weakness') * 1.1) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 100)" ] }, "max_range": 100, "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_spot_weakness') * 150) + 1350) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_spot_weakness') * 150) + 1350) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_spot_weakness') * 150) + 3000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_spot_weakness') * 150) + 3000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -184,24 +182,22 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_see_auras') * 9000) + 65000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_see_auras') * 9000) + 65000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_see_auras') * 19000) + 120000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_see_auras') * 19000) + 120000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_clair_see_auras') > -1 ? 0 : max((4000 - (u_val('spell_level', 'spell: clair_see_auras') * 125)), 1750)" + "u_effect_intensity('effect_clair_see_auras') > -1 ? 0 : max((4000 - (u_spell_level('clair_see_auras') * 125)), 1750)" ] }, "base_casting_time": { - "math": [ - "u_effect_intensity('effect_clair_see_auras') > -1 ? 10 : max((300 -(u_val('spell_level', 'spell: clair_see_auras') * 8.5)), 100)" - ] + "math": [ "u_effect_intensity('effect_clair_see_auras') > -1 ? 10 : max((300 -(u_spell_level('clair_see_auras') * 8.5)), 100)" ] }, "learn_spells": { "clair_dodge_power": 9, "clair_craft_bonus": 12, "clair_clear_sight": 15 } }, @@ -258,12 +254,12 @@ "extra_effects": [ { "id": "psionic_drained_difficulty_four", "hit_self": true } ], "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_sense_rads') * 23000) + 180000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_sense_rads') * 23000) + 180000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_sense_rads') * 48000) + 450000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_sense_rads') * 48000) + 450000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } }, @@ -302,23 +298,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_ranged_enhance') * 800) + 20000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_ranged_enhance') * 800) + 20000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_ranged_enhance') * 2500) + 60000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_ranged_enhance') * 2500) + 60000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_clair_ranged_enhance') > -1 ? 0 : max((4000 - (u_val('spell_level', 'spell: clair_ranged_enhance') * 175)), 1500)" + "u_effect_intensity('effect_clair_ranged_enhance') > -1 ? 0 : max((4000 - (u_spell_level('clair_ranged_enhance') * 175)), 1500)" ] }, "base_casting_time": { "math": [ - "u_effect_intensity('effect_clair_ranged_enhance') > -1 ? 10 : max((200 -(u_val('spell_level', 'spell: clair_ranged_enhance') * 6)), 125)" + "u_effect_intensity('effect_clair_ranged_enhance') > -1 ? 10 : max((200 -(u_spell_level('clair_ranged_enhance') * 6)), 125)" ] }, "learn_spells": { @@ -347,24 +343,24 @@ "shape": "blast", "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: clair_voyance') * 1.2) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" + "min( (( (u_spell_level('clair_voyance') * 1.2) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" ] }, "max_range": 80, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: clair_voyance') * 1.2) + 1.5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" + "min( (( (u_spell_level('clair_voyance') * 1.2) + 1.5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" ] }, "max_aoe": 50, "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_voyance') * 50) + 250) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_voyance') * 50) + 250) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_voyance') * 50) + 1500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_voyance') * 50) + 1500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "field_id": "fd_clairvoyant", @@ -398,24 +394,20 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_dodge_power') * 1000) + 12000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_dodge_power') * 1000) + 12000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_dodge_power') * 2000) + 45000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_dodge_power') * 2000) + 45000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { - "math": [ - "u_effect_intensity('effect_clair_dodge') > -1 ? 0 : max((5500 - (u_val('spell_level', 'spell: clair_dodge_power') * 145)), 2250)" - ] + "math": [ "u_effect_intensity('effect_clair_dodge') > -1 ? 0 : max((5500 - (u_spell_level('clair_dodge_power') * 145)), 2250)" ] }, "base_casting_time": { - "math": [ - "u_effect_intensity('effect_clair_dodge') > -1 ? 10 : max((150 -(u_val('spell_level', 'spell: clair_dodge_power') * 9)), 70)" - ] + "math": [ "u_effect_intensity('effect_clair_dodge') > -1 ? 10 : max((150 -(u_spell_level('clair_dodge_power') * 9)), 70)" ] }, "learn_spells": { "clair_spot_weakness": 3, "clair_ranged_enhance": 6, "clair_clear_sight": 10, "clair_perfect_shot": 12 } }, @@ -437,23 +429,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_craft_bonus') * 25000) + 121500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_craft_bonus') * 25000) + 121500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_craft_bonus') * 60000) + 270000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_craft_bonus') * 60000) + 270000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_clair_craft_bonus') > -1 ? 0 : max((5500 - (u_val('spell_level', 'spell: clair_craft_bonus') * 145)), 2250)" + "u_effect_intensity('effect_clair_craft_bonus') > -1 ? 0 : max((5500 - (u_spell_level('clair_craft_bonus') * 145)), 2250)" ] }, "base_casting_time": { "math": [ - "u_effect_intensity('effect_clair_craft_bonus') > -1 ? 10 : max((150 -(u_val('spell_level', 'spell: clair_craft_bonus') * 9)), 70)" + "u_effect_intensity('effect_clair_craft_bonus') > -1 ? 10 : max((150 -(u_spell_level('clair_craft_bonus') * 9)), 70)" ] }, "learn_spells": { "clair_clear_sight": 8, "clair_omniscience": 12 } @@ -503,12 +495,12 @@ "shape": "blast", "min_aoe": { "math": [ - "( (u_val('spell_level', 'spell: clair_see_map') * 1) + 4) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_see_map') * 1) + 4) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_aoe": { "math": [ - "( (u_val('spell_level', 'spell: clair_see_map') * 1) + 11) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_see_map') * 1) + 11) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -534,23 +526,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_clear_sight') * 1200) + 15000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_clear_sight') * 1200) + 15000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_clear_sight') * 2500) + 45000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_clear_sight') * 2500) + 45000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_clair_clear_sight') > -1 ? 0 : max((5000 - (u_val('spell_level', 'spell: clair_clear_sight') * 150)), 2000)" + "u_effect_intensity('effect_clair_clear_sight') > -1 ? 0 : max((5000 - (u_spell_level('clair_clear_sight') * 150)), 2000)" ] }, "base_casting_time": { "math": [ - "u_effect_intensity('effect_clair_clear_sight') > -1 ? 10 : max((75 -(u_val('spell_level', 'spell: clair_clear_sight') * 3.5)), 25)" + "u_effect_intensity('effect_clair_clear_sight') > -1 ? 10 : max((75 -(u_spell_level('clair_clear_sight') * 3.5)), 25)" ] }, "learn_spells": { "clair_omniscience": 7 } @@ -573,23 +565,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_group_tactics') * 1200) + 6000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_group_tactics') * 1200) + 6000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_group_tactics') * 2500) + 18000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_group_tactics') * 2500) + 18000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_clair_group_tactics_self') > -1 ? 0 : max((6500 - (u_val('spell_level', 'spell: clair_group_tactics') * 150)), 2500)" + "u_effect_intensity('effect_clair_group_tactics_self') > -1 ? 0 : max((6500 - (u_spell_level('clair_group_tactics') * 150)), 2500)" ] }, "base_casting_time": { "math": [ - "u_effect_intensity('effect_clair_group_tactics_self') > -1 ? 10 : max((200 -(u_val('spell_level', 'spell: clair_group_tactics') * 7.5)), 60)" + "u_effect_intensity('effect_clair_group_tactics_self') > -1 ? 10 : max((200 -(u_spell_level('clair_group_tactics') * 7.5)), 60)" ] } }, @@ -612,12 +604,12 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_omniscience') * 100) + 200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_omniscience') * 100) + 200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: clair_omniscience') * 100) + 1000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_omniscience') * 100) + 1000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", diff --git a/data/mods/MindOverMatter/powers/clairsentience_concentration_eocs.json b/data/mods/MindOverMatter/powers/clairsentience_concentration_eocs.json index 89aef10a55aab..cea62060a79ab 100644 --- a/data/mods/MindOverMatter/powers/clairsentience_concentration_eocs.json +++ b/data/mods/MindOverMatter/powers/clairsentience_concentration_eocs.json @@ -13,12 +13,12 @@ "time_in_future": [ { "math": [ - "( ( (u_val('spell_level', 'spell: clair_night_vision') * 200 ) + 150) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( (u_spell_level('clair_night_vision') * 200 ) + 150) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( ( (u_val('spell_level', 'spell: clair_night_vision') * 200 ) + 1800) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( (u_spell_level('clair_night_vision') * 200 ) + 1800) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } ] @@ -67,21 +67,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_one", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(1)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: clair_night_vision')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('clair_night_vision')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_CLAIR_NIGHT_EYES_DRAIN", "time_in_future": [ { "math": [ - "( ( (u_val('spell_level', 'spell: clair_night_vision') * 200 ) + 150) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( (u_spell_level('clair_night_vision') * 200 ) + 150) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( ( (u_val('spell_level', 'spell: clair_night_vision') * 200 ) + 1800) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" + "( ( (u_spell_level('clair_night_vision') * 200 ) + 1800) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling" ] } ] @@ -104,12 +102,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: clair_speed_reading') * 360) + 3600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_speed_reading') * 360) + 3600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: clair_speed_reading') * 720) + 10800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_speed_reading') * 720) + 10800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -135,21 +133,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_two", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(2)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: clair_speed_reading')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('clair_speed_reading')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_CLAIR_SPEED_READING_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: clair_speed_reading') * 360) + 3600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_speed_reading') * 360) + 3600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: clair_speed_reading') * 720) + 10800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_speed_reading') * 720) + 10800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -171,12 +167,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: clair_see_auras') * 90) + 650) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_see_auras') * 90) + 650) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: clair_see_auras') * 190) + 1200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_see_auras') * 190) + 1200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -197,19 +193,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_three", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(3)" ] }, - { "math": [ "u_val('spell_exp', 'spell: clair_see_auras')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, + { "math": [ "u_spell_exp('clair_see_auras')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_CLAIR_SEE_AURAS_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: clair_see_auras') * 90) + 650) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_see_auras') * 90) + 650) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: clair_see_auras') * 190) + 1200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_see_auras') * 190) + 1200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -231,12 +227,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: clair_danger_sense') * 45) + 120) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_danger_sense') * 45) + 120) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: clair_danger_sense') * 75) + 900) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_danger_sense') * 75) + 900) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -257,21 +253,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_two", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(2)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: clair_danger_sense')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('clair_danger_sense')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_CLAIR_DANGER_SENSE_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: clair_danger_sense') * 45) + 120) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_danger_sense') * 45) + 120) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: clair_danger_sense') * 75) + 900) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_danger_sense') * 75) + 900) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -293,12 +287,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: clair_ranged_enhance') * 8) + 200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_ranged_enhance') * 8) + 200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: clair_ranged_enhance') * 25) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_ranged_enhance') * 25) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -319,21 +313,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_four", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(4)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: clair_ranged_enhance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('clair_ranged_enhance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_CLAIR_RANGED_ENHANCE_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: clair_ranged_enhance') * 8) + 200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_ranged_enhance') * 8) + 200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: clair_ranged_enhance') * 25) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_ranged_enhance') * 25) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -355,12 +347,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: clair_dodge_power') * 10) + 120) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_dodge_power') * 10) + 120) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: clair_dodge_power') * 20) + 450) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_dodge_power') * 20) + 450) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -381,21 +373,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_six", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(6)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: clair_dodge_power')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('clair_dodge_power')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_CLAIR_DODGE_POWER_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: clair_dodge_power') * 10) + 120) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_dodge_power') * 10) + 120) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: clair_dodge_power') * 20) + 450) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_dodge_power') * 20) + 450) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -417,12 +407,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: clair_craft_bonus') * 250) + 1215) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_craft_bonus') * 250) + 1215) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: clair_craft_bonus') * 600) + 2700) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_craft_bonus') * 600) + 2700) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -467,21 +457,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_six", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(6)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: clair_craft_bonus')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('clair_craft_bonus')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_CLAIR_CRAFT_BONUS_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: clair_craft_bonus') * 250) + 1215) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_craft_bonus') * 250) + 1215) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: clair_craft_bonus') * 600) + 2700) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_craft_bonus') * 600) + 2700) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -503,12 +491,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: clair_clear_sight') * 12) + 150) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_clear_sight') * 12) + 150) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: clair_clear_sight') * 25) + 450) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_clear_sight') * 25) + 450) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -529,21 +517,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_eight", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(8)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: clair_clear_sight')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('clair_clear_sight')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_CLAIR_CLEAR_SIGHT_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: clair_clear_sight') * 12) + 150) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_clear_sight') * 12) + 150) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: clair_clear_sight') * 25) + 450) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_clear_sight') * 25) + 450) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -568,12 +554,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: clair_group_tactics') * 12) + 60) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_group_tactics') * 12) + 60) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: clair_group_tactics') * 25) + 180) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_group_tactics') * 25) + 180) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -597,21 +583,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_nine", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(9)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: clair_group_tactics')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('clair_group_tactics')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_CLAIR_GROUP_TACTICS_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: clair_group_tactics') * 12) + 60) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_group_tactics') * 12) + 60) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: clair_group_tactics') * 25) + 180) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('clair_group_tactics') * 25) + 180) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] diff --git a/data/mods/MindOverMatter/powers/electrokinesis.json b/data/mods/MindOverMatter/powers/electrokinesis.json index 6fe6d54f0cfc5..a52c23f7313b5 100644 --- a/data/mods/MindOverMatter/powers/electrokinesis.json +++ b/data/mods/MindOverMatter/powers/electrokinesis.json @@ -17,23 +17,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_see_electric') * 15000) + 90000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_see_electric') * 15000) + 90000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_see_electric') * 30000) + 180000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_see_electric') * 30000) + 180000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_electrokin_see_electricity') > -1 ? 0 : max((2000 - (u_val('spell_level', 'spell: electrokinetic_see_electric') * 75)), 750)" + "u_effect_intensity('effect_electrokin_see_electricity') > -1 ? 0 : max((2000 - (u_spell_level('electrokinetic_see_electric') * 75)), 750)" ] }, "base_casting_time": { "math": [ - "u_effect_intensity('effect_electrokin_see_electricity') > -1 ? 10 : max((150 -(u_val('spell_level', 'spell: electrokinetic_see_electric') * 6)), 80)" + "u_effect_intensity('effect_electrokin_see_electricity') > -1 ? 10 : max((150 -(u_spell_level('electrokinetic_see_electric') * 6)), 80)" ] }, "learn_spells": { @@ -63,12 +63,12 @@ "damage_type": "electric", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_shock_touch') * 1) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_shock_touch') * 1) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_shock_touch') * 1.5) + 7) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_shock_touch') * 1.5) + 7) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": 1, @@ -113,12 +113,12 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_zap_enemies') * 8000) + 60000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_zap_enemies') * 8000) + 60000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_zap_enemies') * 24000) + 145000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_zap_enemies') * 24000) + 145000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -154,12 +154,12 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_melee_attacks') * 6500) + 30000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_melee_attacks') * 6500) + 30000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_melee_attacks') * 21000) + 90000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_melee_attacks') * 21000) + 90000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -189,12 +189,12 @@ "min_damage": 1, "min_duration": { "math": [ - "min( (( ( (u_val('spell_level', 'spell: electrokinetic_personal_battery') * 4500 ) + 60000) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 14400)" + "min( (( ( (u_spell_level('electrokinetic_personal_battery') * 4500 ) + 60000) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 14400)" ] }, "max_duration": { "math": [ - "min( (( ( (u_val('spell_level', 'spell: electrokinetic_personal_battery') * 9000 ) + 180000) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 14400)" + "min( (( ( (u_spell_level('electrokinetic_personal_battery') * 9000 ) + 180000) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 14400)" ] }, "energy_source": "STAMINA", @@ -226,17 +226,17 @@ "//": "Complicated formula here is to produce diminishing returns, since stunning 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_duration": { "math": [ - "( ( ( (u_val('spell_level', 'spell: electrokinetic_paralysis') * 0.25 ) * 6 ) / ( (u_val('spell_level', 'spell: electrokinetic_paralysis') * 0.25 ) + 3) ) * 10000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( ( ( (u_spell_level('electrokinetic_paralysis') * 0.25 ) * 6 ) / ( (u_spell_level('electrokinetic_paralysis') * 0.25 ) + 3) ) * 10000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( ( ( (u_val('spell_level', 'spell: electrokinetic_paralysis') * 0.25 ) * 10 ) / ( (u_val('spell_level', 'spell: electrokinetic_paralysis') * 0.25 ) + 3) ) * 10000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( ( ( (u_spell_level('electrokinetic_paralysis') * 0.25 ) * 10 ) / ( (u_spell_level('electrokinetic_paralysis') * 0.25 ) + 3) ) * 10000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: electrokinetic_paralysis') * 0.6) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" + "min( (( (u_spell_level('electrokinetic_paralysis') * 0.6) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" ] }, "max_range": 40, @@ -273,23 +273,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_reduce_pain') * 12000) + 60000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_reduce_pain') * 12000) + 60000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_reduce_pain') * 28000) + 150000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_reduce_pain') * 28000) + 150000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_electrokin_reduce_pain') > -1 ? 0 : max((4000 - (u_val('spell_level', 'spell: electrokinetic_reduce_pain') * 105)), 1250)" + "u_effect_intensity('effect_electrokin_reduce_pain') > -1 ? 0 : max((4000 - (u_spell_level('electrokinetic_reduce_pain') * 105)), 1250)" ] }, "base_casting_time": { "math": [ - "u_effect_intensity('effect_electrokin_reduce_pain') > -1 ? 10 : max((125 -(u_val('spell_level', 'spell: electrokinetic_reduce_pain') * 4)), 75)" + "u_effect_intensity('effect_electrokin_reduce_pain') > -1 ? 10 : max((125 -(u_spell_level('electrokinetic_reduce_pain') * 4)), 75)" ] }, "learn_spells": { @@ -318,17 +318,17 @@ "damage_type": "electric", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_lightning_bolt') * 2) + 20) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_lightning_bolt') * 2) + 20) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_lightning_bolt') * 4) + 45) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_lightning_bolt') * 4) + 45) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: electrokinetic_lightning_bolt') * 0.7) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" + "min( (( (u_spell_level('electrokinetic_lightning_bolt') * 0.7) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" ] }, "max_range": 50, @@ -400,12 +400,12 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_pain_immune') * 800) + 6000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_pain_immune') * 800) + 6000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_pain_immune') * 1300) + 15000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_pain_immune') * 1300) + 15000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -436,12 +436,12 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_speed_boost') * 1500) + 9000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_speed_boost') * 1500) + 9000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_speed_boost') * 2000) + 45000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_speed_boost') * 2000) + 45000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": 1, @@ -478,7 +478,7 @@ "max_damage": 150, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: electrokinetic_kill_robot') * 0.7) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" + "min( (( (u_spell_level('electrokinetic_kill_robot') * 0.7) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" ] }, "max_range": 40, @@ -512,7 +512,7 @@ "damage_type": "electric", "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: electrokinetic_kill_robot') * 0.4) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" + "min( (( (u_spell_level('electrokinetic_kill_robot') * 0.4) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" ] }, "max_range": 50, @@ -540,12 +540,12 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_lightning_aura') * 1500) + 6000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_lightning_aura') * 1500) + 6000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_lightning_aura') * 2500) + 25000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_lightning_aura') * 2500) + 25000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -579,23 +579,23 @@ "damage_type": "electric", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_lightning_blast') * 2) + 25) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_lightning_blast') * 2) + 25) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_lightning_blast') * 4.5) + 90) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_lightning_blast') * 4.5) + 90) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: electrokinetic_lightning_blast') * 0.7) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" + "min( (( (u_spell_level('electrokinetic_lightning_blast') * 0.7) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" ] }, "max_range": 50, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: electrokinetic_lightning_blast') * 0.25) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" + "min( (( (u_spell_level('electrokinetic_lightning_blast') * 0.25) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" ] }, "field_id": "fd_electricity", @@ -629,23 +629,23 @@ "damage_type": "electric", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_lightning_blast') * 0.5) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_lightning_blast') * 0.5) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_lightning_blast') * 1.5) + 25) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_lightning_blast') * 1.5) + 25) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: electrokinetic_lightning_blast') * 0.3) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" + "min( (( (u_spell_level('electrokinetic_lightning_blast') * 0.3) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" ] }, "max_range": 50, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: electrokinetic_lightning_blast') * 0.06) + 0) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 1)" + "min( (( (u_spell_level('electrokinetic_lightning_blast') * 0.06) + 0) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 1)" ] }, "field_id": "fd_electricity", @@ -677,7 +677,7 @@ "shape": "blast", "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: electrokinetic_revive') * 0.25) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" + "min( (( (u_spell_level('electrokinetic_revive') * 0.25) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" ] }, "max_range": 50, @@ -707,7 +707,7 @@ "max_damage": 1500, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: electrokinetic_revive') * 0.25) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" + "min( (( (u_spell_level('electrokinetic_revive') * 0.25) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" ] }, "min_duration": 360000, @@ -732,7 +732,7 @@ "max_damage": -80, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: electrokinetic_revive') * 0.25) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" + "min( (( (u_spell_level('electrokinetic_revive') * 0.25) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" ] }, "targeted_monster_species": [ "ZOMBIE" ] @@ -755,7 +755,7 @@ "max_duration": 360000, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: electrokinetic_revive') * 0.25) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" + "min( (( (u_spell_level('electrokinetic_revive') * 0.25) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" ] }, "targeted_monster_species": [ "ZOMBIE" ] diff --git a/data/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json b/data/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json index 28b9a603a3ca9..6b5c4e6b6fa05 100644 --- a/data/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json +++ b/data/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json @@ -13,12 +13,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_see_electric') * 150) + 900) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_see_electric') * 150) + 900) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_see_electric') * 300) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_see_electric') * 300) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -39,21 +39,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_one", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(1)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_see_electric')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('electrokinetic_see_electric')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_ELECTROKIN_SEE_ELECTRICITY_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_see_electric') * 150) + 900) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_see_electric') * 150) + 900) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_see_electric') * 300) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_see_electric') * 300) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -75,12 +73,12 @@ "time_in_future": [ { "math": [ - "min( (( ( (u_val('spell_level', 'spell: electrokinetic_personal_battery') * 45 ) + 600) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 14400)" + "min( (( ( (u_spell_level('electrokinetic_personal_battery') * 45 ) + 600) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 14400)" ] }, { "math": [ - "min( (( ( (u_val('spell_level', 'spell: electrokinetic_personal_battery') * 90 ) + 1800) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 14400)" + "min( (( ( (u_spell_level('electrokinetic_personal_battery') * 90 ) + 1800) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 14400)" ] } ] @@ -107,7 +105,7 @@ "type": "effect_on_condition", "id": "EOC_ELECTROKIN_PERSONAL_BATTERY_SWITCHER", "effect": { - "switch": { "math": [ "u_val('spell_level', 'spell: electrokinetic_personal_battery')" ] }, + "switch": { "math": [ "u_spell_level('electrokinetic_personal_battery')" ] }, "cases": [ { "case": 0, "effect": [ { "u_spawn_item": "electrokinetic_ups_1", "suppress_message": true, "force_equip": true } ] }, { @@ -141,7 +139,7 @@ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_three", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(3)" ] }, { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_personal_battery')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] + "math": [ "u_spell_exp('electrokinetic_personal_battery')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -149,12 +147,12 @@ "time_in_future": [ { "math": [ - "min( (( ( (u_val('spell_level', 'spell: electrokinetic_personal_battery') * 45 ) + 600) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 14400)" + "min( (( ( (u_spell_level('electrokinetic_personal_battery') * 45 ) + 600) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 14400)" ] }, { "math": [ - "min( (( ( (u_val('spell_level', 'spell: electrokinetic_personal_battery') * 90 ) + 1800) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 14400)" + "min( (( ( (u_spell_level('electrokinetic_personal_battery') * 90 ) + 1800) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 14400)" ] } ] @@ -176,12 +174,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_reduce_pain') * 120) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_reduce_pain') * 120) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_reduce_pain') * 280) + 1500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_reduce_pain') * 280) + 1500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -202,21 +200,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_four", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(4)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_reduce_pain')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('electrokinetic_reduce_pain')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_ELECTROKIN_REDUCE_PAIN_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_reduce_pain') * 120) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_reduce_pain') * 120) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_reduce_pain') * 280) + 1500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_reduce_pain') * 280) + 1500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] diff --git a/data/mods/MindOverMatter/powers/electrokinesis_eoc.json b/data/mods/MindOverMatter/powers/electrokinesis_eoc.json index 0ebe90e3b4766..1efc609edf1e2 100644 --- a/data/mods/MindOverMatter/powers/electrokinesis_eoc.json +++ b/data/mods/MindOverMatter/powers/electrokinesis_eoc.json @@ -12,12 +12,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_pain_immune') * 8) + 60) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_pain_immune') * 8) + 60) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: electrokinetic_pain_immune') * 13) + 150) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('electrokinetic_pain_immune') * 13) + 150) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] diff --git a/data/mods/MindOverMatter/powers/nether_attunement_spells.json b/data/mods/MindOverMatter/powers/nether_attunement_spells.json index 628e13f762336..04be52af52767 100644 --- a/data/mods/MindOverMatter/powers/nether_attunement_spells.json +++ b/data/mods/MindOverMatter/powers/nether_attunement_spells.json @@ -14,7 +14,7 @@ { "type": "effect_on_condition", "id": "EOC_RAISE_NETHER_ATTUNEMENT", - "condition": { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "<", "15" ] }, + "condition": { "math": [ "u_vitamin('vitamin_psionic_drain')", "<", "15" ] }, "effect": [ { "run_eocs": "EOC_RAISE_ATTUNEMENT_BELOW_THRESHOLD" } ], "false_effect": [ { "run_eocs": "EOC_RAISE_ATTUNEMENT_ABOVE_THRESHOLD" } ] }, @@ -24,11 +24,11 @@ "condition": { "u_has_effect": "effect_noetic_resilience" }, "effect": [ { "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,1 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,1 )" ] } ], "false_effect": [ { "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 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,3 )" ] } ] }, { @@ -37,15 +37,11 @@ "condition": { "u_has_effect": "effect_noetic_resilience" }, "effect": [ { "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 ) * u_nether_attunement_power_scaling" ] - } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,3 ) * u_nether_attunement_power_scaling" ] } ], "false_effect": [ { "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 ) * u_nether_attunement_power_scaling" ] - } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 2,6 ) * u_nether_attunement_power_scaling" ] } ] }, { @@ -286,7 +282,7 @@ { "type": "effect_on_condition", "id": "EOC_RAISE_NETHER_ATTUNEMENT_MAINTENANCE", - "condition": { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "<", "15" ] }, + "condition": { "math": [ "u_vitamin('vitamin_psionic_drain')", "<", "15" ] }, "effect": [ { "run_eocs": "EOC_RAISE_NETHER_ATTUNEMENT_MAINTENANCE_BELOW_THRESHOLD" } ], "false_effect": [ { "run_eocs": "EOC_RAISE_NETHER_ATTUNEMENT_MAINTENANCE_ABOVE_THRESHOLD" } ] }, @@ -296,11 +292,11 @@ "condition": { "u_has_effect": "effect_noetic_resilience" }, "effect": [ { "u_message": "You feel a strange tingling sensation as you concentrate.", "type": "mixed" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,1 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,1 )" ] } ], "false_effect": [ { "u_message": "You feel a strange tingling sensation as you concentrate.", "type": "mixed" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,3 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,3 )" ] } ] }, { @@ -309,15 +305,11 @@ "condition": { "u_has_effect": "effect_noetic_resilience" }, "effect": [ { "u_message": "You feel a strange tingling sensation as you concentrate.", "type": "mixed" }, - { - "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,3 ) * u_nether_attunement_power_scaling" ] - } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,3 ) * u_nether_attunement_power_scaling" ] } ], "false_effect": [ { "u_message": "You feel a strange tingling sensation as you concentrate.", "type": "mixed" }, - { - "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 2,6 ) * u_nether_attunement_power_scaling" ] - } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 2,6 ) * u_nether_attunement_power_scaling" ] } ] }, { @@ -566,7 +558,7 @@ "effect_str": "downed", "shape": "blast", "extra_effects": [ { "id": "nether_attunement_everyone_dazed", "hit_self": true } ], - "min_aoe": { "math": [ "(clamp( (( u_val('vitamin', 'name:vitamin_psionic_drain') * 0.25) - 125), 0, 30)) + 2" ] } + "min_aoe": { "math": [ "(clamp( (( u_vitamin('vitamin_psionic_drain') * 0.25) - 125), 0, 30)) + 2" ] } }, { "id": "nether_attunement_everyone_dazed", @@ -578,7 +570,7 @@ "effect": "attack", "effect_str": "psi_dazed", "shape": "blast", - "min_aoe": { "math": [ "(clamp( (( u_val('vitamin', 'name:vitamin_psionic_drain') * 0.25) - 125), 0, 30)) + 2" ] }, + "min_aoe": { "math": [ "(clamp( (( u_vitamin('vitamin_psionic_drain') * 0.25) - 125), 0, 30)) + 2" ] }, "min_duration": 200, "max_duration": 1500 } diff --git a/data/mods/MindOverMatter/powers/photokinesis.json b/data/mods/MindOverMatter/powers/photokinesis.json index 788784f108ed5..0e847d73b1949 100644 --- a/data/mods/MindOverMatter/powers/photokinesis.json +++ b/data/mods/MindOverMatter/powers/photokinesis.json @@ -17,23 +17,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_light_local') * 30000) + 180000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_light_local') * 30000) + 180000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_light_local') * 90000) + 540000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_light_local') * 90000) + 540000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "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)" + "u_effect_intensity('effect_photokin_light_local') > -1 ? 0 : max((1500 - (u_spell_level('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)" + "u_effect_intensity('effect_photokin_light_local') > -1 ? 10 : max((125 -(u_spell_level('photokinetic_light_local') * 7.5)), 50)" ] }, "learn_spells": { "photokinetic_create_light": 5, "photokinetic_light_beam": 10, "photokinetic_light_image": 15 } @@ -86,13 +86,13 @@ "shape": "blast", "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: photokinetic_create_light') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 70)" + "min( (( (u_spell_level('photokinetic_create_light') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 70)" ] }, "max_range": 70, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: photokinetic_create_light') * 0.8) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" + "min( (( (u_spell_level('photokinetic_create_light') * 0.8) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" ] }, "max_aoe": 50, @@ -118,13 +118,13 @@ "shape": "blast", "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: photokinetic_create_light') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 70)" + "min( (( (u_spell_level('photokinetic_create_light') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 70)" ] }, "max_range": 70, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: photokinetic_create_light') * 0.8) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" + "min( (( (u_spell_level('photokinetic_create_light') * 0.8) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" ] }, "max_aoe": 50, @@ -150,13 +150,13 @@ "shape": "blast", "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: photokinetic_create_light') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 70)" + "min( (( (u_spell_level('photokinetic_create_light') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 70)" ] }, "max_range": 70, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: photokinetic_create_light') * 0.8) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" + "min( (( (u_spell_level('photokinetic_create_light') * 0.8) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" ] }, "max_aoe": 50, @@ -182,21 +182,17 @@ "min_field_intensity": 1, "max_field_intensity": 1, "shape": "blast", - "min_duration": { - "math": [ "((u_val('spell_level', 'spell: photokinetic_snuff_light') * 1000) + 5000) * u_nether_attunement_power_scaling" ] - }, - "max_duration": { - "math": [ "((u_val('spell_level', 'spell: photokinetic_snuff_light') * 1000) + 10000) * u_nether_attunement_power_scaling" ] - }, + "min_duration": { "math": [ "((u_spell_level('photokinetic_snuff_light') * 1000) + 5000) * u_nether_attunement_power_scaling" ] }, + "max_duration": { "math": [ "((u_spell_level('photokinetic_snuff_light') * 1000) + 10000) * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: photokinetic_snuff_light') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 70)" + "min( (( (u_spell_level('photokinetic_snuff_light') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 70)" ] }, "max_range": 70, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: photokinetic_snuff_light') * 0.8) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" + "min( (( (u_spell_level('photokinetic_snuff_light') * 0.8) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" ] }, "energy_source": "STAMINA", @@ -227,12 +223,12 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_light_dodge') * 2000) + 3000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_light_dodge') * 2000) + 3000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_light_dodge') * 2000) + 6000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_light_dodge') * 2000) + 6000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -263,18 +259,18 @@ "shape": "line", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_light_beam') * 2) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_light_beam') * 2) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_light_beam') * 2) + 15) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_light_beam') * 2) + 15) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "damage_type": "psi_photokinetic_damage", "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: photokinetic_light_beam') * 0.6) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 30)" + "min( (( (u_spell_level('photokinetic_light_beam') * 0.6) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 30)" ] }, "max_range": 30, @@ -316,23 +312,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_camouflage') * 5000) + 60000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_camouflage') * 5000) + 60000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_camouflage') * 10000) + 120000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_camouflage') * 10000) + 120000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_photokin_camouflage') > -1 ? 0 : max((3500 - (u_val('spell_level', 'spell: photokinetic_camouflage') * 75)), 1500)" + "u_effect_intensity('effect_photokin_camouflage') > -1 ? 0 : max((3500 - (u_spell_level('photokinetic_camouflage') * 75)), 1500)" ] }, "base_casting_time": { "math": [ - "u_effect_intensity('effect_photokin_camouflage') > -1 ? 10 : max((150 -(u_val('spell_level', 'spell: photokinetic_camouflage') * 8)), 75)" + "u_effect_intensity('effect_photokin_camouflage') > -1 ? 10 : max((150 -(u_spell_level('photokinetic_camouflage') * 8)), 75)" ] }, "learn_spells": { "photokinetic_light_image": 7, "photokinetic_hide_ugly": 10, "photokinetic_invisibility": 14 } @@ -355,23 +351,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_rad_immunity') * 3000) + 2000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_rad_immunity') * 3000) + 2000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_rad_immunity') * 3000) + 8000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_rad_immunity') * 3000) + 8000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "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)" + "u_effect_intensity('effect_photokin_light_barrier') > -1 ? 0 : max((3000 - (u_spell_level('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)" + "u_effect_intensity('effect_photokin_light_barrier') > -1 ? 10 : max((250 -(u_spell_level('photokinetic_rad_immunity') * 4.5)), 100)" ] }, "learn_spells": { "photokinetic_invisibility": 5, "photokinetic_light_flash": 7 } @@ -393,12 +389,12 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_light_arms') * 2000) + 3000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_light_arms') * 2000) + 3000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_light_arms') * 2000) + 6000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_light_arms') * 2000) + 6000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -431,23 +427,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_hide_ugly') * 2250) + 45000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_hide_ugly') * 2250) + 45000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_hide_ugly') * 5500) + 80000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_hide_ugly') * 5500) + 80000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_photokin_hide_ugly') > -1 ? 0 : max((6500 - (u_val('spell_level', 'spell: photokinetic_hide_ugly') * 150)), 2000)" + "u_effect_intensity('effect_photokin_hide_ugly') > -1 ? 0 : max((6500 - (u_spell_level('photokinetic_hide_ugly') * 150)), 2000)" ] }, "base_casting_time": { "math": [ - "u_effect_intensity('effect_photokin_hide_ugly') > -1 ? 10 : max((1500 -(u_val('spell_level', 'spell: photokinetic_hide_ugly') * 100)), 150)" + "u_effect_intensity('effect_photokin_hide_ugly') > -1 ? 10 : max((1500 -(u_spell_level('photokinetic_hide_ugly') * 100)), 150)" ] }, "learn_spells": { "photokinetic_light_image": 6 } @@ -471,18 +467,14 @@ "min_damage": 1, "max_damage": { "math": [ - " (u_val('spell_level', 'spell: photokinetic_light_beam') / 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + " (u_spell_level('photokinetic_light_beam') / 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, - "min_duration": { - "math": [ "((u_val('spell_level', 'spell: photokinetic_light_image') * 1000) + 5000) * u_nether_attunement_power_scaling" ] - }, - "max_duration": { - "math": [ "((u_val('spell_level', 'spell: photokinetic_light_image') * 1000) + 10000) * u_nether_attunement_power_scaling" ] - }, + "min_duration": { "math": [ "((u_spell_level('photokinetic_light_image') * 1000) + 5000) * u_nether_attunement_power_scaling" ] }, + "max_duration": { "math": [ "((u_spell_level('photokinetic_light_image') * 1000) + 10000) * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: photokinetic_light_image') * 0.8) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" + "min( (( (u_spell_level('photokinetic_light_image') * 0.8) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" ] }, "max_range": 40, @@ -514,23 +506,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_radio') * 12000) + 180000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_radio') * 12000) + 180000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_radio') * 18000) + 540000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_radio') * 18000) + 540000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_photokinetic_radio') > -1 ? 0 : max((4000 - (u_val('spell_level', 'spell: photokinetic_radio') * 100)), 1500)" + "u_effect_intensity('effect_photokinetic_radio') > -1 ? 0 : max((4000 - (u_spell_level('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)" + "u_effect_intensity('effect_photokinetic_radio') > -1 ? 10 : max((250 -(u_spell_level('biokin_hammerhand') * 10)), 75)" ] }, "learn_spells": { "photokinetic_rad_immunity": 6, "photokinetic_blinding_glare": 9 } @@ -554,12 +546,12 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_invisibility') * 500) + 1500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_invisibility') * 500) + 1500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_invisibility') * 1500) + 4000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_invisibility') * 1500) + 4000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -589,24 +581,24 @@ "shape": "line", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_light_flash') * 2.5) + 20) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_light_flash') * 2.5) + 20) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_light_flash') * 5) + 40) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_light_flash') * 5) + 40) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "damage_type": "psi_photokinetic_damage", "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: photokinetic_light_flash') * 0.6) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" + "min( (( (u_spell_level('photokinetic_light_flash') * 0.6) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" ] }, "max_range": 50, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: photokinetic_light_flash') * 0.3) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 20)" + "min( (( (u_spell_level('photokinetic_light_flash') * 0.3) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 20)" ] }, "max_aoe": 20, @@ -642,12 +634,12 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_blinding_glare') * 1000) + 6000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_blinding_glare') * 1000) + 6000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_blinding_glare') * 2500) + 18000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_blinding_glare') * 2500) + 18000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -677,18 +669,18 @@ "extra_effects": [ { "id": "psionic_drained_difficulty_eight", "hit_self": true } ], "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_light_disintegrate') * 5) + 40) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_light_disintegrate') * 5) + 40) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_light_disintegrate') * 7) + 120) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_light_disintegrate') * 7) + 120) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "damage_type": "psi_photokinetic_damage", "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: photokinetic_light_disintegrate') * 0.8) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" + "min( (( (u_spell_level('photokinetic_light_disintegrate') * 0.8) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" ] }, "max_range": 50, diff --git a/data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json b/data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json index fa589ab826534..b2242174c8a9b 100644 --- a/data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json +++ b/data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json @@ -12,12 +12,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_light_local') * 300) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_light_local') * 300) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_light_local') * 900) + 5400) * (scaling_factor(u_val('intelligence') ) ) *u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_light_local') * 900) + 5400) * (scaling_factor(u_val('intelligence') ) ) *u_nether_attunement_power_scaling" ] } ] @@ -38,21 +38,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_drained_difficulty_one", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(1)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: photokinetic_light_local')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('photokinetic_light_local')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_PHOTOKIN_LIGHT_LOCAL_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_light_local') * 150) + 2500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_light_local') * 150) + 2500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_light_local') * 360) + 4500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_light_local') * 360) + 4500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -76,12 +74,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_rad_immunity') * 150) + 2500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_rad_immunity') * 150) + 2500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_rad_immunity') * 360) + 4500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_rad_immunity') * 360) + 4500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -106,21 +104,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_three", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(3)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: photokinetic_rad_immunity')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('photokinetic_rad_immunity')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_PHOTOKIN_RAD_IMMUNITY_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_rad_immunity') * 150) + 2500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_rad_immunity') * 150) + 2500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_rad_immunity') * 360) + 4500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_rad_immunity') * 360) + 4500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -142,12 +138,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_camouflage') * 50) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_camouflage') * 50) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_camouflage') * 100) + 1200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_camouflage') * 100) + 1200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -203,12 +199,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_hide_ugly') * 22) + 450) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_hide_ugly') * 22) + 450) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_hide_ugly') * 55) + 800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_hide_ugly') * 55) + 800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -254,21 +250,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_four", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(4)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: photokinetic_hide_ugly')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('photokinetic_hide_ugly')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_PHOTOKIN_HIDE_UGLY_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_hide_ugly') * 22) + 450) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_hide_ugly') * 22) + 450) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_hide_ugly') * 55) + 800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_hide_ugly') * 55) + 800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -291,12 +285,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_radio') * 120) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_radio') * 120) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_radio') * 180) + 5400) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_radio') * 180) + 5400) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -327,12 +321,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_radio') * 120) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_radio') * 120) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: photokinetic_radio') * 180) + 5400) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('photokinetic_radio') * 180) + 5400) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] diff --git a/data/mods/MindOverMatter/powers/photokinesis_eocs.json b/data/mods/MindOverMatter/powers/photokinesis_eocs.json index e3f3db8bddf2e..631f4652c0247 100644 --- a/data/mods/MindOverMatter/powers/photokinesis_eocs.json +++ b/data/mods/MindOverMatter/powers/photokinesis_eocs.json @@ -69,7 +69,7 @@ "type": "effect_on_condition", "id": "EOC_PHOTOKIN_CREATE_LIGHT_SWITCH", "effect": { - "switch": { "math": [ "u_val('spell_level', 'spell: photokinetic_create_light')" ] }, + "switch": { "math": [ "u_spell_level('photokinetic_create_light')" ] }, "cases": [ { "case": 0, "effect": [ { "u_cast_spell": { "id": "photokinetic_create_light_01" }, "targeted": true } ] }, { "case": 8, "effect": [ { "u_cast_spell": { "id": "photokinetic_create_light_02" }, "targeted": true } ] }, diff --git a/data/mods/MindOverMatter/powers/pyrokinesis.json b/data/mods/MindOverMatter/powers/pyrokinesis.json index 69ce3bf788772..3bd5adbceb095 100644 --- a/data/mods/MindOverMatter/powers/pyrokinesis.json +++ b/data/mods/MindOverMatter/powers/pyrokinesis.json @@ -18,17 +18,17 @@ "damage_type": "heat", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_eruption') * 2) + 6) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_eruption') * 2) + 6) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_eruption') * 3) + 26) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_eruption') * 3) + 26) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: pyrokinetic_eruption') / 10) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 5)" + "min( (( (u_spell_level('pyrokinetic_eruption') / 10) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 5)" ] }, "max_range": 5, @@ -76,24 +76,24 @@ "affected_body_parts": [ "eyes" ], "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: pyrokinetic_flash') * 1.5) + 3 ) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" + "min( (( (u_spell_level('pyrokinetic_flash') * 1.5) + 3 ) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" ] }, "max_range": 50, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: pyrokinetic_flash') * 0.25) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 8)" + "min( (( (u_spell_level('pyrokinetic_flash') * 0.25) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 8)" ] }, "max_aoe": 8, "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_flash') * 150) + 100) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_flash') * 150) + 100) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_flash') * 150) + 800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_flash') * 150) + 800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -149,23 +149,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_call_flames') * 5000) + 50000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_call_flames') * 5000) + 50000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_call_flames') * 16000) + 180000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_call_flames') * 16000) + 180000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "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)" + "u_effect_intensity('effect_pyrokinetic_fire_tool') > -1 ? 0 : max((2500 - (u_spell_level('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)" + "u_effect_intensity('effect_pyrokinetic_fire_tool') > -1 ? 10 : max((250 -(u_spell_level('pyrokinetic_call_flames') * 10)), 75)" ] }, "learn_spells": { "pyrokinetic_lance": 5, "pyrokinetic_thermogenesis": 6, "pyrokinetic_blast": 8, "pyrokinetic_aura": 12 } @@ -192,13 +192,13 @@ "shape": "blast", "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: pyrokinetic_quell_flames') * 0.8) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 70)" + "min( (( (u_spell_level('pyrokinetic_quell_flames') * 0.8) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 70)" ] }, "max_range": 70, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: pyrokinetic_quell_flames') * 0.5) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" + "min( (( (u_spell_level('pyrokinetic_quell_flames') * 0.5) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" ] }, "max_aoe": 50, @@ -227,13 +227,13 @@ "shape": "blast", "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: pyrokinetic_quell_flames') * 0.8) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 70)" + "min( (( (u_spell_level('pyrokinetic_quell_flames') * 0.8) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 70)" ] }, "max_range": 70, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: pyrokinetic_quell_flames') * 0.5) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" + "min( (( (u_spell_level('pyrokinetic_quell_flames') * 0.5) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 50)" ] }, "max_aoe": 50 @@ -256,23 +256,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_cloak') * 2000) + 9000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_cloak') * 2000) + 9000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_cloak') * 2000) + 180000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_cloak') * 2000) + 180000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_pyrokinetic_cloak') > -1 ? 0 : max((4500 - (u_val('spell_level', 'spell: pyrokinetic_cloak') * 200)), 2000)" + "u_effect_intensity('effect_pyrokinetic_cloak') > -1 ? 0 : max((4500 - (u_spell_level('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)" + "u_effect_intensity('effect_pyrokinetic_cloak') > -1 ? 10 : max((250 -(u_spell_level('pyrokinetic_cloak') * 11)), 75)" ] }, "learn_spells": { "pyrokinetic_thermogenesis": 8, "pyrokinetic_aura": 9, "pyrokinetic_eruption": 12, "pyrokinetic_flame_immunity": 15 } @@ -296,23 +296,23 @@ "damage_type": "heat", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_flamethrower') * 1.5) + 15) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_flamethrower') * 1.5) + 15) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_flamethrower') * 2.5) + 40) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_flamethrower') * 2.5) + 40) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: pyrokinetic_flamethrower') * 0.2) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 20)" + "min( (( (u_spell_level('pyrokinetic_flamethrower') * 0.2) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 20)" ] }, "max_range": 20, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: pyrokinetic_flamethrower') * 3) + 27) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 145)" + "min( (( (u_spell_level('pyrokinetic_flamethrower') * 3) + 27) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 145)" ] }, "max_aoe": 145, @@ -350,23 +350,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_lance') * 12000) + 360000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_lance') * 12000) + 360000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_lance') * 36000) + 720000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_lance') * 36000) + 720000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_pyrokinetic_torch_weld') > -1 ? 0 : max((5000 - (u_val('spell_level', 'spell: pyrokinetic_lance') * 125)), 2000)" + "u_effect_intensity('effect_pyrokinetic_torch_weld') > -1 ? 0 : max((5000 - (u_spell_level('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)" + "u_effect_intensity('effect_pyrokinetic_torch_weld') > -1 ? 10 : max((650 -(u_spell_level('pyrokinetic_lance') * 12)), 320)" ] }, "learn_spells": { "pyrokinetic_incineration": 15 } @@ -389,12 +389,12 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_thermogenesis') * 15000) + 360000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_thermogenesis') * 15000) + 360000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_thermogenesis') * 30000) + 720000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_thermogenesis') * 30000) + 720000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -421,12 +421,12 @@ "min_range": 3, "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_thermogenesis') * 15000) + 360000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_thermogenesis') * 15000) + 360000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_thermogenesis') * 30000) + 720000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_thermogenesis') * 30000) + 720000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } }, @@ -445,12 +445,12 @@ "min_range": 3, "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_thermogenesis') * 15000) + 360000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_thermogenesis') * 15000) + 360000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_thermogenesis') * 30000) + 720000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_thermogenesis') * 30000) + 720000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } }, @@ -469,12 +469,12 @@ "min_range": 3, "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_thermogenesis') * 15000) + 360000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_thermogenesis') * 15000) + 360000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_thermogenesis') * 30000) + 720000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_thermogenesis') * 30000) + 720000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } }, @@ -493,12 +493,12 @@ "min_range": 3, "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_thermogenesis') * 15000) + 360000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_thermogenesis') * 15000) + 360000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_thermogenesis') * 30000) + 720000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_thermogenesis') * 30000) + 720000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } }, @@ -537,12 +537,12 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_aura') * 300) + 4500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_aura') * 300) + 4500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_aura') * 900) + 18000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_aura') * 900) + 18000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -573,23 +573,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_flame_immunity') * 2400) + 13000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_flame_immunity') * 2400) + 13000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_flame_immunity') * 4700) + 48000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_flame_immunity') * 4700) + 48000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_pyrokinetic_flame_immunity') > -1 ? 0 : max((7750 - (u_val('spell_level', 'spell: pyrokinetic_flame_immunity') * 255)), 3500)" + "u_effect_intensity('effect_pyrokinetic_flame_immunity') > -1 ? 0 : max((7750 - (u_spell_level('pyrokinetic_flame_immunity') * 255)), 3500)" ] }, "base_casting_time": { "math": [ - "u_effect_intensity('effect_pyrokinetic_flame_immunity') > -1 ? 10 : max((150 -(u_val('spell_level', 'spell: pyrokinetic_flame_immunity') * 6.5)), 75)" + "u_effect_intensity('effect_pyrokinetic_flame_immunity') > -1 ? 10 : max((150 -(u_spell_level('pyrokinetic_flame_immunity') * 6.5)), 75)" ] }, "learn_spells": { "pyrokinetic_thermogenesis": 6, "pyrokinetic_aoe_blast": 12 } @@ -613,23 +613,23 @@ "damage_type": "heat", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_blast') * 3) + 37) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_blast') * 3) + 37) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_blast') * 5) + 115) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_blast') * 5) + 115) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: pyrokinetic_blast') * 0.9) + 4) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 70)" + "min( (( (u_spell_level('pyrokinetic_blast') * 0.9) + 4) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 70)" ] }, "max_range": 80, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: pyrokinetic_blast') * 0.4) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 25)" + "min( (( (u_spell_level('pyrokinetic_blast') * 0.4) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 25)" ] }, "max_aoe": 25, @@ -672,17 +672,17 @@ "damage_type": "heat", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_aoe_blast') * 5) + 40) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_aoe_blast') * 5) + 40) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_aoe_blast') * 8) + 120) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_aoe_blast') * 8) + 120) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: pyrokinetic_aoe_blast') * 0.9) + 4) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 35)" + "min( (( (u_spell_level('pyrokinetic_aoe_blast') * 0.9) + 4) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 35)" ] }, "max_aoe": 35, @@ -739,17 +739,17 @@ "damage_type": "heat", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_incineration') * 10) + 150) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_incineration') * 10) + 150) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_incineration') * 25) + 400) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_incineration') * 25) + 400) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: pyrokinetic_incineration') * 0.5) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 20)" + "min( (( (u_spell_level('pyrokinetic_incineration') * 0.5) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 20)" ] }, "max_range": 20, diff --git a/data/mods/MindOverMatter/powers/pyrokinesis_concentration_eoc.json b/data/mods/MindOverMatter/powers/pyrokinesis_concentration_eoc.json index a800e8597f920..1bd62afa0db31 100644 --- a/data/mods/MindOverMatter/powers/pyrokinesis_concentration_eoc.json +++ b/data/mods/MindOverMatter/powers/pyrokinesis_concentration_eoc.json @@ -14,12 +14,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_call_flames') * 50) + 500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_call_flames') * 50) + 500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_call_flames') * 160) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_call_flames') * 160) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -45,21 +45,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_three", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(3)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: pyrokinetic_call_flames')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('pyrokinetic_call_flames')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_PYROKIN_CALL_FLAME_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_call_flames') * 50) + 500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_call_flames') * 50) + 500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_call_flames') * 160) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_call_flames') * 160) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -81,12 +79,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_cloak') * 30) + 180) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_cloak') * 30) + 180) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_cloak') * 60) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_cloak') * 60) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -107,21 +105,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_four", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(4)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: pyrokinetic_cloak')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('pyrokinetic_cloak')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_PYROKIN_WARMTH_CLOAK_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_cloak') * 30) + 180) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_cloak') * 30) + 180) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_cloak') * 60) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_cloak') * 60) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -144,12 +140,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_lance') * 120) + 3600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_lance') * 120) + 3600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_lance') * 360) + 7200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_lance') * 360) + 7200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -175,21 +171,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_five", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(5)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: pyrokinetic_lance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('pyrokinetic_lance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_PYROKIN_TORCH_WELD_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_lance') * 120) + 3600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_lance') * 120) + 3600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_lance') * 360) + 7200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_lance') * 360) + 7200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -211,12 +205,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_flame_immunity') * 24) + 130) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_flame_immunity') * 24) + 130) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_flame_immunity') * 47) + 480) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_flame_immunity') * 47) + 480) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -237,21 +231,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_seven", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(7)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: pyrokinetic_flame_immunity')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('pyrokinetic_flame_immunity')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_PYROKIN_FLAME_IMMUNITY_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_flame_immunity') * 24) + 130) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_flame_immunity') * 24) + 130) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: pyrokinetic_flame_immunity') * 47) + 480) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('pyrokinetic_flame_immunity') * 47) + 480) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] diff --git a/data/mods/MindOverMatter/powers/telekinesis.json b/data/mods/MindOverMatter/powers/telekinesis.json index 43a8e4e1ff444..54ecb68fff67f 100644 --- a/data/mods/MindOverMatter/powers/telekinesis.json +++ b/data/mods/MindOverMatter/powers/telekinesis.json @@ -18,17 +18,17 @@ "damage_type": "psi_telekinetic_damage", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_pull') * -1.5) - 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_pull') * -1.5) - 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_pull') * -1.5) - 6) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_pull') * -1.5) - 6) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: telekinetic_pull') * 0.9) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" + "min( (( (u_spell_level('telekinetic_pull') * 0.9) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" ] }, "max_range": 40, @@ -61,17 +61,17 @@ "damage_type": "psi_telekinetic_damage", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_push') * 0.25) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_push') * 0.25) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_push') * 0.25) + 6) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_push') * 0.25) + 6) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: telekinetic_push') * 0.9) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" + "min( (( (u_spell_level('telekinetic_push') * 0.9) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" ] }, "max_range": 40, @@ -103,12 +103,12 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_momentum') * 1000) + 9000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_momentum') * 1000) + 9000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_momentum') * 2000) + 60000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_momentum') * 2000) + 60000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -145,12 +145,12 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_slowfall') * 100) + 300) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_slowfall') * 100) + 300) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_slowfall') * 200) + 1500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_slowfall') * 200) + 1500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -226,12 +226,12 @@ "damage_type": "psi_telekinetic_damage", "min_damage": { "math": [ - "min( (( (u_val('spell_level', 'spell: telekinetic_wave') * 0.1) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" + "min( (( (u_spell_level('telekinetic_wave') * 0.1) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_wave') * 0.25) + 6) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_wave') * 0.25) + 6) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": 1, @@ -272,23 +272,23 @@ "min_damage": 1, "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_strength') * 1500) + 3000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_strength') * 1500) + 3000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_strength') * 3000) + 12000 )* (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_strength') * 3000) + 12000 )* (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_telekinetic_strength') > -1 ? 0 : max((4000 - (u_val('spell_level', 'spell: telekinetic_strength') * 150)), 2000)" + "u_effect_intensity('effect_telekinetic_strength') > -1 ? 0 : max((4000 - (u_spell_level('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)" + "u_effect_intensity('effect_telekinetic_strength') > -1 ? 10 : max((1500 -(u_spell_level('telekinetic_strength') * 86)), 200)" ] }, "learn_spells": { "telekinetic_vehicle_lift": 4, "telekinetic_shield": 8 } @@ -315,17 +315,17 @@ "shape": "blast", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_hammer') * 1.5) + 18) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_hammer') * 1.5) + 18) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_hammer') * 1.5) + 73) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_hammer') * 1.5) + 73) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: telekinetic_hammer') * 0.9) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 70)" + "min( (( (u_spell_level('telekinetic_hammer') * 0.9) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 70)" ] }, "max_range": 70, @@ -354,17 +354,17 @@ "damage_type": "bash", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_hammer') * 1.5) + 18) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_hammer') * 1.5) + 18) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_hammer') * 2) + 73) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_hammer') * 2) + 73) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: telekinetic_hammer') * 0.9) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 70)" + "min( (( (u_spell_level('telekinetic_hammer') * 0.9) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 70)" ] }, "max_range": 70, @@ -387,23 +387,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 18000) + 60000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_vehicle_lift') * 18000) + 60000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 36000) + 120000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_vehicle_lift') * 36000) + 120000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "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)" + "u_effect_intensity('effect_telekinetic_vehicle_lift') > -1 ? 0 : max((6500 - (u_spell_level('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)" + "u_effect_intensity('effect_telekinetic_vehicle_lift') > -1 ? 10 : max((250 -(u_spell_level('telekinetic_vehicle_lift') * 8)), 125)" ] }, "learn_spells": { "telekinetic_wave": 4, "telekinetic_explosion": 8, "telekinetic_earthshaker": 15 } @@ -426,23 +426,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_shield') * 1500) + 9000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_shield') * 1500) + 9000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_shield') * 2500) + 90000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_shield') * 2500) + 90000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_telekinetic_armor') > -1 ? 0 : max((6000 - (u_val('spell_level', 'spell: telekinetic_shield') * 250)), 3500)" + "u_effect_intensity('effect_telekinetic_armor') > -1 ? 0 : max((6000 - (u_spell_level('telekinetic_shield') * 250)), 3500)" ] }, "base_casting_time": { "math": [ - "u_effect_intensity('effect_telekinetic_armor') > -1 ? 10 : max((150 -(u_val('spell_level', 'spell: telekinetic_shield') * 5)), 75)" + "u_effect_intensity('effect_telekinetic_armor') > -1 ? 10 : max((150 -(u_spell_level('telekinetic_shield') * 5)), 75)" ] }, "learn_spells": { "telekinetic_push": 4, "telekinetic_wave": 6, "telekinetic_aegis": 8 } @@ -479,23 +479,23 @@ "shape": "blast", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_explosion') * 3) + 22) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_explosion') * 3) + 22) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_explosion') * 5) + 100) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_explosion') * 5) + 100) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: telekinetic_explosion') * 0.9) + 4) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 60)" + "min( (( (u_spell_level('telekinetic_explosion') * 0.9) + 4) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 60)" ] }, "max_range": 60, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: telekinetic_explosion') * 0.3) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 30)" + "min( (( (u_spell_level('telekinetic_explosion') * 0.3) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 30)" ] }, "max_aoe": 30, @@ -524,23 +524,23 @@ "damage_type": "psi_telekinetic_damage", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_explosion') * 3) + 22) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_explosion') * 3) + 22) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_explosion') * 5) + 100) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_explosion') * 5) + 100) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: telekinetic_explosion') * 0.9) + 4) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 60)" + "min( (( (u_spell_level('telekinetic_explosion') * 0.9) + 4) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 60)" ] }, "max_range": 60, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: telekinetic_explosion') * 0.3) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 30)" + "min( (( (u_spell_level('telekinetic_explosion') * 0.3) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 30)" ] }, "max_aoe": 30, @@ -564,23 +564,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_levitation') * 75) + 100) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_levitation') * 75) + 100) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_levitation') * 200) + 500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_levitation') * 200) + 500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_telekinetic_levitation') > -1 ? 0 : max((7500 - (u_val('spell_level', 'spell: telekinetic_levitation') * 250)), 3500)" + "u_effect_intensity('effect_telekinetic_levitation') > -1 ? 0 : max((7500 - (u_spell_level('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)" + "u_effect_intensity('effect_telekinetic_levitation') > -1 ? 10 : max((75 -(u_spell_level('telekinetic_levitation') * 7.5)), 15)" ] } }, @@ -604,7 +604,7 @@ "min_duration": 100, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_aegis') * 20) + 200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_aegis') * 20) + 200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -638,17 +638,17 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_earthshaker') * 45) + 200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_earthshaker') * 45) + 200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_earthshaker') * 75) + 500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_earthshaker') * 75) + 500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: telekinetic_earthshaker') * 0.8) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 35)" + "min( (( (u_spell_level('telekinetic_earthshaker') * 0.8) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 35)" ] }, "max_aoe": 30, @@ -673,17 +673,17 @@ "shape": "blast", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_earthshaker') * 2.5) + 30) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_earthshaker') * 2.5) + 30) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_earthshaker') * 7) + 80) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_earthshaker') * 7) + 80) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: telekinetic_earthshaker') * 0.7) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 35)" + "min( (( (u_spell_level('telekinetic_earthshaker') * 0.7) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 35)" ] }, "max_aoe": 35 @@ -700,7 +700,7 @@ "shape": "blast", "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: telekinetic_earthshaker') * 0.7) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 35)" + "min( (( (u_spell_level('telekinetic_earthshaker') * 0.7) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 35)" ] }, "max_aoe": 35 diff --git a/data/mods/MindOverMatter/powers/telekinesis_concentration_eoc.json b/data/mods/MindOverMatter/powers/telekinesis_concentration_eoc.json index 905b0e19cc32b..e9aa1f9df5188 100644 --- a/data/mods/MindOverMatter/powers/telekinesis_concentration_eoc.json +++ b/data/mods/MindOverMatter/powers/telekinesis_concentration_eoc.json @@ -13,12 +13,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_momentum') * 10) + 90) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_momentum') * 10) + 90) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_momentum') * 20) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_momentum') * 20) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -44,12 +44,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_momentum') * 10) + 90) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_momentum') * 10) + 90) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_momentum') * 20) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_momentum') * 20) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -71,12 +71,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_strength') * 15) + 30) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_strength') * 15) + 30) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_strength') * 30) + 120 )* (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_strength') * 30) + 120 )* (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -102,12 +102,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_strength') * 30) + 180) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_strength') * 30) + 180) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_strength') * 60) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_strength') * 60) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -129,12 +129,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_shield') * 15) + 90) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_shield') * 15) + 90) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_shield') * 25) + 900) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_shield') * 25) + 900) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -155,21 +155,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_six", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(6)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telekinetic_shield')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('telekinetic_shield')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_TELEKIN_SHIELD_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_shield') * 15) + 90) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_shield') * 15) + 90) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_shield') * 25) + 900) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_shield') * 25) + 900) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -191,12 +189,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 180) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_vehicle_lift') * 180) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 360) + 1200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_vehicle_lift') * 360) + 1200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -238,7 +236,7 @@ "type": "effect_on_condition", "id": "EOC_TELEKIN_SUMMON_JACKING_TOOL_SWITCHER", "effect": { - "switch": { "math": [ "u_val('spell_level', 'spell: telekinetic_vehicle_lift')" ] }, + "switch": { "math": [ "u_spell_level('telekinetic_vehicle_lift')" ] }, "cases": [ { "case": 1, "effect": [ { "u_spawn_item": "telekin_lifting_jack_1", "suppress_message": true } ] }, { "case": 2, "effect": [ { "u_spawn_item": "telekin_lifting_jack_2", "suppress_message": true } ] }, @@ -275,12 +273,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 180) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_vehicle_lift') * 180) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_vehicle_lift') * 360) + 1200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_vehicle_lift') * 360) + 1200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -302,12 +300,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_levitation') * 0.75) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_levitation') * 0.75) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_levitation') * 2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_levitation') * 2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -336,12 +334,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_levitation') * 0.75) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_levitation') * 0.75) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: telekinetic_levitation') * 2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telekinetic_levitation') * 2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] diff --git a/data/mods/MindOverMatter/powers/telepathy.json b/data/mods/MindOverMatter/powers/telepathy.json index a51c8b675be42..1d1658b60606d 100644 --- a/data/mods/MindOverMatter/powers/telepathy.json +++ b/data/mods/MindOverMatter/powers/telepathy.json @@ -17,23 +17,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_concentration') * 15000) + 180000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_concentration') * 15000) + 180000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_concentration') * 15000) + 720000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_concentration') * 15000) + 720000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_telepathic_learning_bonus') > -1 ? 0 : max((4000 - (u_val('spell_level', 'spell: telepathic_concentration') * 200)), 1500)" + "u_effect_intensity('effect_telepathic_learning_bonus') > -1 ? 0 : max((4000 - (u_spell_level('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)" + "u_effect_intensity('effect_telepathic_learning_bonus') > -1 ? 10 : max((300 -(u_spell_level('telepathic_concentration') * 12)), 150)" ] }, "learn_spells": { "telepathic_mind_sense": 5, "telepathic_blast": 7, "telepathic_confusion": 15 } @@ -56,23 +56,23 @@ "max_level": { "math": [ "int_to_level(1)" ] }, "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_shield') * 1500) + 18000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_shield') * 1500) + 18000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_shield') * 2500) + 72000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_shield') * 2500) + 72000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_telepathic_psi_armor') > -1 ? 0 : max((2500 - (u_val('spell_level', 'spell: telepathic_shield') * 125)), 500)" + "u_effect_intensity('effect_telepathic_psi_armor') > -1 ? 0 : max((2500 - (u_spell_level('telepathic_shield') * 125)), 500)" ] }, "base_casting_time": { "math": [ - "u_effect_intensity('effect_telepathic_psi_armor') > -1 ? 10 : max((100 -(u_val('spell_level', 'spell: telepathic_shield') * 7.5)), 10)" + "u_effect_intensity('effect_telepathic_psi_armor') > -1 ? 10 : max((100 -(u_spell_level('telepathic_shield') * 7.5)), 10)" ] }, "learn_spells": { "telepathic_invisibility": 13 } @@ -95,23 +95,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_morale') * 15000) + 180000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_morale') * 15000) + 180000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_morale') * 15000) + 720000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_morale') * 15000) + 720000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_telepathic_morale') > -1 ? 0 : max((5000 - (u_val('spell_level', 'spell: telepathic_morale') * 125)), 2000)" + "u_effect_intensity('effect_telepathic_morale') > -1 ? 0 : max((5000 - (u_spell_level('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)" + "u_effect_intensity('effect_telepathic_morale') > -1 ? 10 : max((300 -(u_spell_level('telepathic_morale') * 9.5)), 150)" ] }, "learn_spells": { @@ -139,18 +139,18 @@ "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') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_mind_sense') * 4000) + 9000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_mind_sense') * 5000) + 60000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_mind_sense') * 5000) + 60000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_telepath_sense_minds') > -1 ? 0 : max((3500 - (u_val('spell_level', 'spell: telepathic_mind_sense') * 115)), 1500)" + "u_effect_intensity('effect_telepath_sense_minds') > -1 ? 0 : max((3500 - (u_spell_level('telepathic_mind_sense') * 115)), 1500)" ] }, "base_casting_time": { "math": [ "u_effect_intensity('effect_telepath_sense_minds') > -1 ? 10 : 500" ] }, @@ -185,17 +185,17 @@ "damage_type": "psi_telepathic_damage", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_blast') * 1.5) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_blast') * 1.5) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_blast') * 3) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_blast') * 3) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: telepathic_blast') * 1.1) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" + "min( (( (u_spell_level('telepathic_blast') * 1.1) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" ] }, "max_range": 80, @@ -228,27 +228,27 @@ "damage_type": "psi_telepathic_damage", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_animal_mind_control') * 8) + 40) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_animal_mind_control') * 8) + 40) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_animal_mind_control') * 15) + 200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_animal_mind_control') * 15) + 200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_animal_mind_control') * 1125) + 18000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_animal_mind_control') * 1125) + 18000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_animal_mind_control') * 2500) + 36000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_animal_mind_control') * 2500) + 36000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: telepathic_animal_mind_control') * 1) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 70)" + "min( (( (u_spell_level('telepathic_animal_mind_control') * 1) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 70)" ] }, "max_range": 70, @@ -285,17 +285,17 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_confusion') * 50) + 200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_confusion') * 50) + 200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_confusion') * 100) + 800) * (scaling_factor(u_val('intelligence') ) ) *u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_confusion') * 100) + 800) * (scaling_factor(u_val('intelligence') ) ) *u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: telepathic_confusion') * 1.1) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" + "min( (( (u_spell_level('telepathic_confusion') * 1.1) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" ] }, "max_range": 80, @@ -324,17 +324,17 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_confusion') * 100) + 400) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_confusion') * 100) + 400) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_confusion') * 100) + 2000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_confusion') * 100) + 2000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_confusion') * 2) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_confusion') * 2) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "ignored_monster_species": [ "PSI_NULL" ] @@ -358,23 +358,23 @@ "//": "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": [ - "( ( ( (u_val('spell_level', 'spell: telepathic_fear') * 0.25 ) * 6 ) / ( (u_val('spell_level', 'spell: telepathic_fear') * 0.25 ) + 3) ) * 100) * (scaling_factor(u_val('intelligence') ) ) * -1 * u_nether_attunement_power_scaling" + "( ( ( (u_spell_level('telepathic_fear') * 0.25 ) * 6 ) / ( (u_spell_level('telepathic_fear') * 0.25 ) + 3) ) * 100) * (scaling_factor(u_val('intelligence') ) ) * -1 * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( ( ( (u_val('spell_level', 'spell: telepathic_fear') * 0.25 ) * 10 ) / ( (u_val('spell_level', 'spell: telepathic_fear') * 0.25 ) + 3) ) * 100) * (scaling_factor(u_val('intelligence') ) ) * -1 * u_nether_attunement_power_scaling" + "( ( ( (u_spell_level('telepathic_fear') * 0.25 ) * 10 ) / ( (u_spell_level('telepathic_fear') * 0.25 ) + 3) ) * 100) * (scaling_factor(u_val('intelligence') ) ) * -1 * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: telepathic_fear') * 1.1) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" + "min( (( (u_spell_level('telepathic_fear') * 1.1) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" ] }, "max_range": 80, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: telepathic_fear') * 0.15) + 0) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 4)" + "min( (( (u_spell_level('telepathic_fear') * 0.15) + 0) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 4)" ] }, "energy_source": "STAMINA", @@ -401,23 +401,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_fear') * 75) + 200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_fear') * 75) + 200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_fear') * 150) + 500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_fear') * 150) + 500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: telepathic_fear') * 1.1) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" + "min( (( (u_spell_level('telepathic_fear') * 1.1) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" ] }, "max_range": 80, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: telepathic_fear') * 0.15) + 0) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 4)" + "min( (( (u_spell_level('telepathic_fear') * 0.15) + 0) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 4)" ] }, "ignored_monster_species": [ "PSI_NULL" ] @@ -441,12 +441,12 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_invisibility') * 200) + 800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_invisibility') * 200) + 800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_invisibility') * 200) + 3000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_invisibility') * 200) + 3000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -489,17 +489,17 @@ "damage_type": "psi_telepathic_damage", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_blast_radius') * 1) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_blast_radius') * 1) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_blast_radius') * 2) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_blast_radius') * 2) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: telepathic_blast_radius') * 1.1 ) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" + "min( (( (u_spell_level('telepathic_blast_radius') * 1.1 ) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" ] }, "energy_source": "STAMINA", @@ -527,7 +527,7 @@ "damage_increment": 0.1, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: telepathic_blast_radius') * 1.2 ) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" + "min( (( (u_spell_level('telepathic_blast_radius') * 1.2 ) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 40)" ] } }, @@ -635,27 +635,27 @@ "damage_type": "psi_telepathic_damage", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_mind_control') * 4) + 30) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_mind_control') * 4) + 30) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_mind_control') * 6) + 120) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_mind_control') * 6) + 120) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_mind_control') * 350) + 1200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_mind_control') * 350) + 1200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_mind_control') * 450) + 5200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_mind_control') * 450) + 5200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: telepathic_mind_control') * 1) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 70)" + "min( (( (u_spell_level('telepathic_mind_control') * 1) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 70)" ] }, "max_range": 70, @@ -687,12 +687,12 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_network') * 700) + 10000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_network') * 700) + 10000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_network') * 1500) + 30000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_network') * 1500) + 30000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -723,12 +723,12 @@ "//": "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.", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_network') * 1500) + 30000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_network') * 1500) + 30000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: telepathic_network') * 3000) + 90000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_network') * 3000) + 90000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } } diff --git a/data/mods/MindOverMatter/powers/telepathy_concentration_eoc.json b/data/mods/MindOverMatter/powers/telepathy_concentration_eoc.json index 04307334e4251..7009839415c91 100644 --- a/data/mods/MindOverMatter/powers/telepathy_concentration_eoc.json +++ b/data/mods/MindOverMatter/powers/telepathy_concentration_eoc.json @@ -13,12 +13,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: telepathic_concentration') * 150) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_concentration') * 150) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: telepathic_concentration') * 150) + 7200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_concentration') * 150) + 7200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -44,12 +44,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: telepathic_concentration') * 150) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_concentration') * 150) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: telepathic_concentration') * 150) + 7200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_concentration') * 150) + 7200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -71,12 +71,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: telepathic_shield') * 15) + 180) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_shield') * 15) + 180) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: telepathic_shield') * 25) + 720) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_shield') * 25) + 720) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -97,21 +97,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_two", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(2)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telepathic_shield')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('telepathic_shield')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_TELEPATH_SHIELD_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: telepathic_shield') * 15) + 180) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_shield') * 15) + 180) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: telepathic_shield') * 25) + 720) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_shield') * 25) + 720) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -133,12 +131,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: telepathic_mind_sense') * 40) + 90) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_mind_sense') * 40) + 90) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: telepathic_mind_sense') * 50) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_mind_sense') * 50) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -159,21 +157,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_three", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(3)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telepathic_mind_sense')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('telepathic_mind_sense')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_TELEPATH_SENSE_MINDS_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: telepathic_mind_sense') * 40) + 90) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_mind_sense') * 40) + 90) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: telepathic_mind_sense') * 50) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_mind_sense') * 50) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -202,12 +198,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: telepathic_morale') * 150) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_morale') * 150) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: telepathic_morale') * 150) + 7200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_morale') * 150) + 7200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -240,12 +236,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: telepathic_morale') * 150) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_morale') * 150) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: telepathic_morale') * 150) + 7200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('telepathic_morale') * 150) + 7200) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] diff --git a/data/mods/MindOverMatter/powers/teleportation.json b/data/mods/MindOverMatter/powers/teleportation.json index 0c45363103f7f..8c1700f95590d 100644 --- a/data/mods/MindOverMatter/powers/teleportation.json +++ b/data/mods/MindOverMatter/powers/teleportation.json @@ -58,18 +58,18 @@ "aoe_increment": 0.2, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_slow') * 1.2) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" + "min( (( (u_spell_level('teleport_slow') * 1.2) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" ] }, "max_range": 80, "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: teleport_slow') * 75) + 125) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('teleport_slow') * 75) + 125) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: teleport_slow') * 75) + 1500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('teleport_slow') * 75) + 1500) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -100,7 +100,7 @@ "shape": "blast", "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_phase') * 0.1) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 4)" + "min( (( (u_spell_level('teleport_phase') * 0.1) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 4)" ] }, "max_range": 4, @@ -131,24 +131,22 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: teleport_stride') * 300) + 3000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('teleport_stride') * 300) + 3000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: teleport_stride') * 400) + 30000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('teleport_stride') * 400) + 30000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_teleport_stride') > -1 ? 0 : max((2500 - (u_val('spell_level', 'spell: teleport_stride') * 125)), 750)" + "u_effect_intensity('effect_teleport_stride') > -1 ? 0 : max((2500 - (u_spell_level('teleport_stride') * 125)), 750)" ] }, "base_casting_time": { - "math": [ - "u_effect_intensity('effect_teleport_stride') > -1 ? 10 : max((85 -(u_val('spell_level', 'spell: teleport_stride') * 7)), 25)" - ] + "math": [ "u_effect_intensity('effect_teleport_stride') > -1 ? 10 : max((85 -(u_spell_level('teleport_stride') * 7)), 25)" ] }, "learn_spells": { "teleport_collapse": 6, "teleport_phase": 8, "teleport_farstep": 14 } }, @@ -170,7 +168,7 @@ "shape": "blast", "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_transpose') * 1.5) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" + "min( (( (u_spell_level('teleport_transpose') * 1.5) + 1) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" ] }, "max_range": 80, @@ -261,18 +259,18 @@ "shape": "blast", "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" + "min( (( (u_spell_level('teleport_collapse') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" ] }, "max_range": 80, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" + "min( (( (u_spell_level('teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" ] }, "max_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" + "min( (( (u_spell_level('teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" ] } }, @@ -295,18 +293,18 @@ "shape": "blast", "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" + "min( (( (u_spell_level('teleport_collapse') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" ] }, "max_range": 80, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" + "min( (( (u_spell_level('teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" ] }, "max_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" + "min( (( (u_spell_level('teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" ] } }, @@ -330,18 +328,18 @@ "shape": "blast", "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" + "min( (( (u_spell_level('teleport_collapse') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" ] }, "max_range": 80, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" + "min( (( (u_spell_level('teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" ] }, "max_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" + "min( (( (u_spell_level('teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" ] } }, @@ -366,18 +364,18 @@ "shape": "blast", "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" + "min( (( (u_spell_level('teleport_collapse') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" ] }, "max_range": 80, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" + "min( (( (u_spell_level('teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" ] }, "max_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" + "min( (( (u_spell_level('teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" ] } }, @@ -403,18 +401,18 @@ "shape": "blast", "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" + "min( (( (u_spell_level('teleport_collapse') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" ] }, "max_range": 80, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" + "min( (( (u_spell_level('teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" ] }, "max_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" + "min( (( (u_spell_level('teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" ] } }, @@ -441,18 +439,18 @@ "shape": "blast", "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" + "min( (( (u_spell_level('teleport_collapse') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" ] }, "max_range": 80, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" + "min( (( (u_spell_level('teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" ] }, "max_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" + "min( (( (u_spell_level('teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" ] } }, @@ -480,18 +478,18 @@ "shape": "blast", "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" + "min( (( (u_spell_level('teleport_collapse') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" ] }, "max_range": 80, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" + "min( (( (u_spell_level('teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" ] }, "max_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" + "min( (( (u_spell_level('teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" ] } }, @@ -509,18 +507,18 @@ "shape": "blast", "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" + "min( (( (u_spell_level('teleport_collapse') * 1.2) + 5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" ] }, "max_range": 80, "min_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" + "min( (( (u_spell_level('teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" ] }, "max_aoe": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" + "min( (( (u_spell_level('teleport_collapse') * 0.25) + 3) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 15)" ] } }, @@ -545,7 +543,7 @@ "aoe_increment": -0.25, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_farstep') * 1.5) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" + "min( (( (u_spell_level('teleport_farstep') * 1.5) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" ] }, "max_range": 80, @@ -576,17 +574,17 @@ "shape": "blast", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: teleport_banish') * 15) + 15) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('teleport_banish') * 15) + 15) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: teleport_banish') * 35) + 350) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('teleport_banish') * 35) + 350) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_banish') * 2) + 1.5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" + "min( (( (u_spell_level('teleport_banish') * 2) + 1.5) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" ] }, "max_range": 80, @@ -644,7 +642,7 @@ "min_range": 1, "energy_source": "STAMINA", "base_energy_cost": 0, - "base_casting_time": { "math": [ "2880000 - max(( u_val('spell_level', 'spell: teleport_gateway') * 108000), 180000)" ] } + "base_casting_time": { "math": [ "2880000 - max(( u_spell_level('teleport_gateway') * 108000), 180000)" ] } }, { "id": "teleport_summon", @@ -666,7 +664,7 @@ "min_damage": 1, "min_range": { "math": [ - "min( (( (u_val('spell_level', 'spell: teleport_summon') * 1.3) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" + "min( (( (u_spell_level('teleport_summon') * 1.3) + 2) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 80)" ] }, "max_range": 80, diff --git a/data/mods/MindOverMatter/powers/teleportation_concentration_eoc.json b/data/mods/MindOverMatter/powers/teleportation_concentration_eoc.json index 254c9e8184859..f27acbabe1cec 100644 --- a/data/mods/MindOverMatter/powers/teleportation_concentration_eoc.json +++ b/data/mods/MindOverMatter/powers/teleportation_concentration_eoc.json @@ -13,12 +13,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: teleport_stride') * 3) + 30) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('teleport_stride') * 3) + 30) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: teleport_stride') * 4) + 300) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('teleport_stride') * 4) + 300) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -39,19 +39,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_three", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(3)" ] }, - { "math": [ "u_val('spell_exp', 'spell: teleport_stride')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, + { "math": [ "u_spell_exp('teleport_stride')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_TELEPORT_STRIDE_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: teleport_stride') * 3) + 30) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('teleport_stride') * 3) + 30) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: teleport_stride') * 4) + 300) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('teleport_stride') * 4) + 300) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] diff --git a/data/mods/MindOverMatter/powers/teleportation_eoc.json b/data/mods/MindOverMatter/powers/teleportation_eoc.json index 6408ded5d1f1e..86576288e7f42 100644 --- a/data/mods/MindOverMatter/powers/teleportation_eoc.json +++ b/data/mods/MindOverMatter/powers/teleportation_eoc.json @@ -5,7 +5,7 @@ "effect": [ { "u_cast_spell": { "id": "psionic_drained_difficulty_four", "hit_self": true } }, { - "switch": { "math": [ "u_val('spell_level', 'spell: teleport_collapse')" ] }, + "switch": { "math": [ "u_spell_level('teleport_collapse')" ] }, "cases": [ { "case": 0, "effect": [ { "u_cast_spell": { "id": "teleport_collapse_01", "hit_self": false }, "targeted": true } ] }, { diff --git a/data/mods/MindOverMatter/powers/vitakinesis.json b/data/mods/MindOverMatter/powers/vitakinesis.json index c067cdb7b856b..055ce61ef7b7f 100644 --- a/data/mods/MindOverMatter/powers/vitakinesis.json +++ b/data/mods/MindOverMatter/powers/vitakinesis.json @@ -104,24 +104,20 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: vita_health_power') * 2100) + 18000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_health_power') * 2100) + 18000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: vita_health_power') * 2700) + 145000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_health_power') * 2700) + 145000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "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)" - ] + "math": [ "u_effect_intensity('effect_vita_health') > -1 ? 0 : max((3500 - (u_spell_level('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)" - ] + "math": [ "u_effect_intensity('effect_vita_health') > -1 ? 10 : max((100 -(u_spell_level('vita_health_power') * 7.5)), 25)" ] }, "learn_spells": { "vita_health_power_ally": 5, @@ -155,12 +151,12 @@ "min_range": 1, "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: vita_hurt_touch') * 100) + 400) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_hurt_touch') * 100) + 400) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: vita_hurt_touch') * 100) + 3000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_hurt_touch') * 100) + 3000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -193,12 +189,12 @@ "min_range": 1, "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: vita_health_power_ally') * 2100) + 18000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_health_power_ally') * 2100) + 18000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: vita_health_power_ally') * 2700) + 145000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_health_power_ally') * 2700) + 145000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -230,12 +226,12 @@ "extra_effects": [ { "id": "psionic_drained_difficulty_three", "hit_self": true } ], "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: vita_remove_poison') * 500) + 15000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_remove_poison') * 500) + 15000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: vita_remove_poison') * 3000) + 40000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_remove_poison') * 3000) + 40000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -287,23 +283,23 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: vita_cure_disease') * 4500) + 125000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_cure_disease') * 4500) + 125000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: vita_cure_disease') * 12000) + 275000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_cure_disease') * 12000) + 275000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_vita_cure_disease') > -1 ? 0 : max((5500 - (u_val('spell_level', 'spell: vita_cure_disease') * 125)), 2500)" + "u_effect_intensity('effect_vita_cure_disease') > -1 ? 0 : max((5500 - (u_spell_level('vita_cure_disease') * 125)), 2500)" ] }, "base_casting_time": { "math": [ - "u_effect_intensity('effect_vita_cure_disease') > -1 ? 10 : max((500 -(u_val('spell_level', 'spell: vita_cure_disease') * 18)), 50)" + "u_effect_intensity('effect_vita_cure_disease') > -1 ? 10 : max((500 -(u_spell_level('vita_cure_disease') * 18)), 50)" ] }, "learn_spells": { "vita_stop_infection": 5, "vita_sleeping_trance": 7, "vita_healing_trance": 15, "vita_banish_illness": 18 } @@ -428,12 +424,12 @@ "shape": "blast", "min_damage": { "math": [ - "( (u_val('spell_level', 'spell: vita_healing_trance') * -1.5) - 6) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_healing_trance') * -1.5) - 6) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_damage": { "math": [ - "( (u_val('spell_level', 'spell: vita_healing_trance') * -2) - 12) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_healing_trance') * -2) - 12) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -549,18 +545,18 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: vita_super_heal') * 3000) + 15000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_super_heal') * 3000) + 15000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: vita_super_heal') * 6000) + 30000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_super_heal') * 6000) + 30000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_vita_super_heal') > -1 ? 0 : max((10000 - (u_val('spell_level', 'spell: vita_super_heal') * 150)), 8000)" + "u_effect_intensity('effect_vita_super_heal') > -1 ? 0 : max((10000 - (u_spell_level('vita_super_heal') * 150)), 8000)" ] }, "base_casting_time": { "math": [ "u_effect_intensity('effect_vita_health') > -1 ? 10 : 1000" ] }, @@ -608,12 +604,12 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: vita_limb_restore') * 3000) + 20000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_limb_restore') * 3000) + 20000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: vita_limb_restore') * 6000) + 35000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_limb_restore') * 6000) + 35000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", @@ -640,18 +636,18 @@ "shape": "blast", "min_duration": { "math": [ - "( (u_val('spell_level', 'spell: vita_return_from_death') * 90000) + 360000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_return_from_death') * 90000) + 360000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "max_duration": { "math": [ - "( (u_val('spell_level', 'spell: vita_return_from_death') * 270000) + 1440000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_return_from_death') * 270000) + 1440000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, "energy_source": "STAMINA", "base_energy_cost": { "math": [ - "u_effect_intensity('effect_vita_return_from_death') > -1 ? 0 : max((9000 - (u_val('spell_level', 'spell: vita_return_from_death') * 125)), 6000)" + "u_effect_intensity('effect_vita_return_from_death') > -1 ? 0 : max((9000 - (u_spell_level('vita_return_from_death') * 125)), 6000)" ] }, "base_casting_time": { "math": [ "u_effect_intensity('effect_vita_health') > -1 ? 10 : 3000" ] } diff --git a/data/mods/MindOverMatter/powers/vitakinesis_concentration_eoc.json b/data/mods/MindOverMatter/powers/vitakinesis_concentration_eoc.json index 826cd6262a4cc..adc7a2bb9902f 100644 --- a/data/mods/MindOverMatter/powers/vitakinesis_concentration_eoc.json +++ b/data/mods/MindOverMatter/powers/vitakinesis_concentration_eoc.json @@ -13,12 +13,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: vita_health_power') * 120) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_health_power') * 120) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: vita_health_power') * 360) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_health_power') * 360) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -39,21 +39,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_one", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(1)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: vita_health_power')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('vita_health_power')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_VITAKIN_HEALTH_POWER_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: vita_health_power') * 120) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_health_power') * 120) + 600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: vita_health_power') * 360) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_health_power') * 360) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -75,12 +73,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: vita_cure_disease') * 45) + 1250) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_cure_disease') * 45) + 1250) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: vita_cure_disease') * 120) + 1750) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_cure_disease') * 120) + 1750) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -102,21 +100,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_four", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(4)" ] }, - { - "math": [ "u_val('spell_exp', 'spell: vita_cure_disease')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('vita_cure_disease')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_VITAKIN_CURE_DISEASE_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: vita_cure_disease') * 45) + 1250) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_cure_disease') * 45) + 1250) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: vita_cure_disease') * 120) + 1750) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_cure_disease') * 120) + 1750) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -138,12 +134,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: vita_super_heal') * 30) + 150) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_super_heal') * 30) + 150) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: vita_super_heal') * 60) + 300) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_super_heal') * 60) + 300) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -167,19 +163,19 @@ "effect": [ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_nine", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(9)" ] }, - { "math": [ "u_val('spell_exp', 'spell: vita_super_heal')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, + { "math": [ "u_spell_exp('vita_super_heal')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_VITAKIN_SUPER_HEAL_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: vita_super_heal') * 30) + 150) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_super_heal') * 30) + 150) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: vita_super_heal') * 60) + 300) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_super_heal') * 60) + 300) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -202,12 +198,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: vita_return_from_death') * 900) + 3600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_return_from_death') * 900) + 3600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: vita_return_from_death') * 2700) + 14400) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_return_from_death') * 2700) + 14400) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -238,21 +234,19 @@ { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_ten", "hit_self": true } }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(10)" ] }, { "math": [ "u_vitakin_return_from_death_kcal", "=", "u_val('stored_kcal')" ] }, - { - "math": [ "u_val('spell_exp', 'spell: vita_return_from_death')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] - }, + { "math": [ "u_spell_exp('vita_return_from_death')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "queue_eocs": "EOC_VITAKIN_RETURN_FROM_DEATH_DRAIN", "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: vita_return_from_death') * 900) + 3600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_return_from_death') * 900) + 3600) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: vita_return_from_death') * 2700) + 14400) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_return_from_death') * 2700) + 14400) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] diff --git a/data/mods/MindOverMatter/powers/vitakinesis_eoc.json b/data/mods/MindOverMatter/powers/vitakinesis_eoc.json index 4acc864d3a05a..62b832669ccf2 100644 --- a/data/mods/MindOverMatter/powers/vitakinesis_eoc.json +++ b/data/mods/MindOverMatter/powers/vitakinesis_eoc.json @@ -18,11 +18,9 @@ { "queue_eocs": "EOC_VITAKIN_DEXTOXIFICATION_CHECK_2", "time_in_future": [ + { "math": [ "max( ( 15 - (u_spell_level('vita_remove_poison') * u_nether_attunement_power_scaling) ), 1)" ] }, { - "math": [ "max( ( 15 - (u_val('spell_level', 'spell: vita_remove_poison') * u_nether_attunement_power_scaling) ), 1)" ] - }, - { - "math": [ "max( ( 120 - ((u_val('spell_level', 'spell: vita_remove_poison') * u_nether_attunement_power_scaling ) * 2) ), 1)" ] + "math": [ "max( ( 120 - ((u_spell_level('vita_remove_poison') * u_nether_attunement_power_scaling ) * 2) ), 1)" ] } ] } @@ -56,12 +54,12 @@ "time_in_future": [ { "math": [ - "( (u_val('spell_level', 'spell: vita_remove_poison') * 5) + 150) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_remove_poison') * 5) + 150) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] }, { "math": [ - "( (u_val('spell_level', 'spell: vita_remove_poison') * 30) + 400) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" + "( (u_spell_level('vita_remove_poison') * 30) + 400) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling" ] } ] @@ -78,7 +76,7 @@ "type": "effect_on_condition", "id": "EOC_VITAKIN_STOP_BLEEDING_EOC", "effect": { - "switch": { "math": [ "u_val('spell_level', 'spell: vita_stop_bleeding')" ] }, + "switch": { "math": [ "u_spell_level('vita_stop_bleeding')" ] }, "cases": [ { "case": 0, @@ -168,7 +166,7 @@ { "x_in_y_chance": { "x": 1, - "y": { "math": [ "max( (55 - ( u_val('spell_level', 'spell: vita_sleeping_trance') * 2) - u_skill('metaphysics') ), 15 )" ] } + "y": { "math": [ "max( (55 - ( u_spell_level('vita_sleeping_trance') * 2) - u_skill('metaphysics') ), 15 )" ] } } } ] @@ -197,8 +195,8 @@ { "queue_eocs": "EOC_VITAKIN_CURE_DISEASE_CHECKS", "time_in_future": [ - { "math": [ "max( ( 600 - (u_val('spell_level', 'spell: vita_cure_disease') * 5 ) ), 1)" ] }, - { "math": [ "max( ( 3600 - (u_val('spell_level', 'spell: vita_cure_disease') * 30) ), 1)" ] } + { "math": [ "max( ( 600 - (u_spell_level('vita_cure_disease') * 5 ) ), 1)" ] }, + { "math": [ "max( ( 3600 - (u_spell_level('vita_cure_disease') * 30) ), 1)" ] } ] } ] @@ -209,9 +207,7 @@ "condition": { "and": [ { "or": [ { "u_has_effect": "pre_common_cold" }, { "u_has_effect": "common_cold" } ] }, - { - "x_in_y_chance": { "x": { "math": [ "10 + u_val('spell_level', 'spell: vita_cure_disease')" ] }, "y": 100 } - } + { "x_in_y_chance": { "x": { "math": [ "10 + u_spell_level('vita_cure_disease')" ] }, "y": 100 } } ] }, "effect": [ { "u_add_effect": "effect_vita_health_common_cold_protection", "duration": "10 days" } ] @@ -222,9 +218,7 @@ "condition": { "and": [ { "or": [ { "u_has_effect": "pre_flu" }, { "u_has_effect": "flu" } ] }, - { - "x_in_y_chance": { "x": { "math": [ "10 + u_val('spell_level', 'spell: vita_cure_disease')" ] }, "y": 100 } - } + { "x_in_y_chance": { "x": { "math": [ "10 + u_spell_level('vita_cure_disease')" ] }, "y": 100 } } ] }, "effect": [ { "u_add_effect": "effect_vita_health_flu_protection", "duration": "10 days" } ] @@ -235,9 +229,7 @@ "condition": { "and": [ { "or": [ { "u_has_effect": "pre_conjunctivitis_viral" }, { "u_has_effect": "conjunctivitis_viral" } ] }, - { - "x_in_y_chance": { "x": { "math": [ "10 + u_val('spell_level', 'spell: vita_cure_disease')" ] }, "y": 100 } - } + { "x_in_y_chance": { "x": { "math": [ "10 + u_spell_level('vita_cure_disease')" ] }, "y": 100 } } ] }, "effect": [ { "u_add_effect": "effect_vita_health_conjunctivitis_viral_protection", "duration": "10 days" } ] @@ -248,9 +240,7 @@ "condition": { "and": [ { "or": [ { "u_has_effect": "pre_conjunctivitis_bacterial" }, { "u_has_effect": "conjunctivitis_bacterial" } ] }, - { - "x_in_y_chance": { "x": { "math": [ "10 + u_val('spell_level', 'spell: vita_cure_disease')" ] }, "y": 100 } - } + { "x_in_y_chance": { "x": { "math": [ "10 + u_spell_level('vita_cure_disease')" ] }, "y": 100 } } ] }, "effect": [ { "u_add_effect": "effect_vita_health_conjunctivitis_bacterial_protection", "duration": "10 days" } ] @@ -259,7 +249,7 @@ "type": "effect_on_condition", "id": "EOC_VITAKIN_STOP_INFECTION_SWITCH", "effect": { - "switch": { "math": [ "u_val('spell_level', 'spell: vita_stop_infection')" ] }, + "switch": { "math": [ "u_spell_level('vita_stop_infection')" ] }, "cases": [ { "case": 0, @@ -313,37 +303,37 @@ "type": "effect_on_condition", "id": "EOC_VITAKIN_MUTAGEN_PURGE", "effect": [ - { "math": [ "u_val('vitamin', 'name: mutagen')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_alpha')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_batrachian')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_beast')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_bird')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_cattle')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_cephalopod')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_chelator')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_chimera')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_crustacean')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_elfa')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_feline')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_fish')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_gastropod')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_human')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_insect')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_lizard')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_lupine')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_medical')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_mouse')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_plant')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_rabbit')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_raptor')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_rat')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_slime')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_spider')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_troglobite')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_ursine')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagenic_slurry')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutant_toxin')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: mutagen_crustacean')", "=", "0" ] } + { "math": [ "u_vitamin('mutagen')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_alpha')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_batrachian')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_beast')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_bird')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_cattle')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_cephalopod')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_chelator')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_chimera')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_crustacean')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_elfa')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_feline')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_fish')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_gastropod')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_human')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_insect')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_lizard')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_lupine')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_medical')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_mouse')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_plant')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_rabbit')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_raptor')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_rat')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_slime')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_spider')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_troglobite')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_ursine')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagenic_slurry')", "=", "0" ] }, + { "math": [ "u_vitamin('mutant_toxin')", "=", "0" ] }, + { "math": [ "u_vitamin('mutagen_crustacean')", "=", "0" ] } ] }, { @@ -510,7 +500,7 @@ "type": "effect_on_condition", "id": "EOC_VITAKIN_BANISH_ILLNESS_MINOR_AILMENT_RESULT", "condition": { - "roll_contested": { "math": [ "(rand( u_val('spell_level', 'spell: vita_banish_illness')) + u_nether_attunement_power_scaling)" ] }, + "roll_contested": { "math": [ "(rand( u_spell_level('vita_banish_illness')) + u_nether_attunement_power_scaling)" ] }, "difficulty": 10 }, "effect": [ @@ -523,11 +513,11 @@ { "u_lose_effect": "conjunctivitis_viral" }, { "u_lose_effect": "pre_conjunctivitis_bacterial" }, { "u_lose_effect": "conjunctivitis_bacterial" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 15,30 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 15,30 )" ] } ], "false_effect": [ { "u_message": "The ailment proved tenacious. You'll have to try again.", "type": "bad" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 15,30 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 15,30 )" ] } ] }, { @@ -549,18 +539,18 @@ "type": "effect_on_condition", "id": "EOC_VITAKIN_BANISH_ILLNESS_ASTHMA_RESULT", "condition": { - "roll_contested": { "math": [ "(rand( u_val('spell_level', 'spell: vita_banish_illness')) + u_nether_attunement_power_scaling)" ] }, + "roll_contested": { "math": [ "(rand( u_spell_level('vita_banish_illness')) + u_nether_attunement_power_scaling)" ] }, "difficulty": 12 }, "effect": [ { "u_message": "You breathe easily once again.", "type": "good" }, { "u_lose_trait": "ASTHMA" }, { "u_lose_effect": "effect_asthma_disease_absorbed" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 20,45 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 20,45 )" ] } ], "false_effect": [ { "u_message": "The disease proved tenacious. You'll have to try again.", "type": "bad" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 20,45 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 20,45 )" ] } ] }, { @@ -582,17 +572,17 @@ "type": "effect_on_condition", "id": "EOC_VITAKIN_BANISH_ILLNESS_CHEMIMBALANCE_RESULT", "condition": { - "roll_contested": { "math": [ "(rand( u_val('spell_level', 'spell: vita_banish_illness')) + u_nether_attunement_power_scaling)" ] }, + "roll_contested": { "math": [ "(rand( u_spell_level('vita_banish_illness')) + u_nether_attunement_power_scaling)" ] }, "difficulty": 14 }, "effect": [ { "u_message": "You body feels more normal.", "type": "good" }, { "u_lose_trait": "CHEMIMBALANCE" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 35,65 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 35,65 )" ] } ], "false_effect": [ { "u_message": "The disease proved tenacious. You'll have to try again.", "type": "bad" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 35,65 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 35,65 )" ] } ] }, { @@ -614,17 +604,17 @@ "type": "effect_on_condition", "id": "EOC_VITAKIN_BANISH_ILLNESS_SCHIZOPHRENIC_RESULT", "condition": { - "roll_contested": { "math": [ "(rand( u_val('spell_level', 'spell: vita_banish_illness')) + u_nether_attunement_power_scaling)" ] }, + "roll_contested": { "math": [ "(rand( u_spell_level('vita_banish_illness')) + u_nether_attunement_power_scaling)" ] }, "difficulty": 16 }, "effect": [ { "u_message": "You mind feels more normal.", "type": "good" }, { "u_lose_trait": "SCHIZOPHRENIC" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 60,90 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 60,90 )" ] } ], "false_effect": [ { "u_message": "The disease proved tenacious. You'll have to try again.", "type": "bad" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 60,90 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 60,90 )" ] } ] }, { @@ -646,17 +636,17 @@ "type": "effect_on_condition", "id": "EOC_VITAKIN_BANISH_ILLNESS_JITTERY_RESULT", "condition": { - "roll_contested": { "math": [ "(rand( u_val('spell_level', 'spell: vita_banish_illness')) + u_nether_attunement_power_scaling)" ] }, + "roll_contested": { "math": [ "(rand( u_spell_level('vita_banish_illness')) + u_nether_attunement_power_scaling)" ] }, "difficulty": 12 }, "effect": [ { "u_message": "You muscles stop trembling.", "type": "good" }, { "u_lose_trait": "JITTERY" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 30,65 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 30,65 )" ] } ], "false_effect": [ { "u_message": "The disease proved tenacious. You'll have to try again.", "type": "bad" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 30,65 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 30,65 )" ] } ] }, { @@ -678,17 +668,17 @@ "type": "effect_on_condition", "id": "EOC_VITAKIN_BANISH_ILLNESS_MOODSWINGS_RESULT", "condition": { - "roll_contested": { "math": [ "(rand( u_val('spell_level', 'spell: vita_banish_illness')) + u_nether_attunement_power_scaling)" ] }, + "roll_contested": { "math": [ "(rand( u_spell_level('vita_banish_illness')) + u_nether_attunement_power_scaling)" ] }, "difficulty": 15 }, "effect": [ { "u_message": "You mood calms.", "type": "good" }, { "u_lose_trait": "MOODSWINGS" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 30,65 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 30,65 )" ] } ], "false_effect": [ { "u_message": "The disease proved tenacious. You'll have to try again.", "type": "bad" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 30,65 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 30,65 )" ] } ] }, { @@ -710,17 +700,17 @@ "type": "effect_on_condition", "id": "EOC_VITAKIN_BANISH_ILLNESS_WEAKENING_RESULT", "condition": { - "roll_contested": { "math": [ "(rand( u_val('spell_level', 'spell: vita_banish_illness')) + u_nether_attunement_power_scaling)" ] }, + "roll_contested": { "math": [ "(rand( u_spell_level('vita_banish_illness')) + u_nether_attunement_power_scaling)" ] }, "difficulty": 15 }, "effect": [ { "u_message": "New vigor fills your body.", "type": "good" }, { "u_lose_trait": "WEAKENING" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 45,75 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 45,75 )" ] } ], "false_effect": [ { "u_message": "The disease proved tenacious. You'll have to try again.", "type": "bad" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 45,75 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 45,75 )" ] } ] }, { @@ -742,17 +732,17 @@ "type": "effect_on_condition", "id": "EOC_VITAKIN_BANISH_ILLNESS_NARCOLEPTIC_RESULT", "condition": { - "roll_contested": { "math": [ "(rand( u_val('spell_level', 'spell: vita_banish_illness')) + u_nether_attunement_power_scaling)" ] }, + "roll_contested": { "math": [ "(rand( u_spell_level('vita_banish_illness')) + u_nether_attunement_power_scaling)" ] }, "difficulty": 13 }, "effect": [ { "u_message": "New vigor fills your body.", "type": "good" }, { "u_lose_trait": "NARCOLEPTIC" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 50,100 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 50,100 )" ] } ], "false_effect": [ { "u_message": "The disease proved tenacious. You'll have to try again.", "type": "bad" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 50,100 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 50,100 )" ] } ] }, { @@ -760,9 +750,9 @@ "id": "EOC_VITA_SUPER_HEAL_DRAIN", "effect": [ { "math": [ "u_val('stored_kcal')", "-=", "rng( 50,250 )" ] }, - { "math": [ "u_val('vitamin', 'name:iron')", "-=", "rng( 50,200 )" ] }, - { "math": [ "u_val('vitamin', 'name:calcium')", "-=", "rng( 100,200 )" ] }, - { "math": [ "u_val('vitamin', 'name:vitC')", "-=", "rng( 20,80 )" ] }, + { "math": [ "u_vitamin('iron')", "-=", "rng( 50,200 )" ] }, + { "math": [ "u_vitamin('calcium')", "-=", "rng( 100,200 )" ] }, + { "math": [ "u_vitamin('vitC')", "-=", "rng( 20,80 )" ] }, { "math": [ "u_val('fatigue')", "+=", "rng( 2,10 )" ] } ] }, @@ -813,18 +803,18 @@ { "type": "effect_on_condition", "id": "EOC_VITAKIN_RESTORE_LIMB_RIGHT_LEG_RESULT", - "condition": { "roll_contested": { "math": [ "rand( u_val('spell_level', 'spell: vita_limb_restore'))" ] }, "difficulty": 14 }, + "condition": { "roll_contested": { "math": [ "rand( u_spell_level('vita_limb_restore'))" ] }, "difficulty": 14 }, "effect": [ { "u_message": "Your right leg has been restored.", "type": "good" }, { "u_lose_trait": "NO_RIGHT_LEG" }, { "u_lose_var": "missing_right_leg", "type": "traits", "context": "limbs" }, { "u_add_trait": "HAS_RIGHT_LEG" }, { "run_eocs": "EOC_VITA_RESTORE_LIMB_DRAIN" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 45,75 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 45,75 )" ] } ], "false_effect": [ { "u_message": "Your healing powers were not great enough, you'll have to try again.", "type": "bad" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 45,75 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 45,75 )" ] } ] }, { @@ -850,18 +840,18 @@ { "type": "effect_on_condition", "id": "EOC_VITAKIN_RESTORE_LIMB_LEFT_LEG_RESULT", - "condition": { "roll_contested": { "math": [ "rand( u_val('spell_level', 'spell: vita_limb_restore'))" ] }, "difficulty": 14 }, + "condition": { "roll_contested": { "math": [ "rand( u_spell_level('vita_limb_restore'))" ] }, "difficulty": 14 }, "effect": [ { "u_message": "Your left leg has been restored.", "type": "good" }, { "u_lose_trait": "NO_LEFT_LEG" }, { "u_lose_var": "missing_left_leg", "type": "traits", "context": "limbs" }, { "u_add_trait": "HAS_LEFT_LEG" }, { "run_eocs": "EOC_VITA_RESTORE_LIMB_DRAIN" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 45,75 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 45,75 )" ] } ], "false_effect": [ { "u_message": "Your healing powers were not great enough, you'll have to try again.", "type": "bad" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 45,75 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 45,75 )" ] } ] }, { @@ -887,18 +877,18 @@ { "type": "effect_on_condition", "id": "EOC_VITAKIN_RESTORE_LIMB_RIGHT_ARM_RESULT", - "condition": { "roll_contested": { "math": [ "rand( u_val('spell_level', 'spell: vita_limb_restore'))" ] }, "difficulty": 14 }, + "condition": { "roll_contested": { "math": [ "rand( u_spell_level('vita_limb_restore'))" ] }, "difficulty": 14 }, "effect": [ { "u_message": "Your right arm had been restored.", "type": "good" }, { "u_lose_trait": "NO_RIGHT_ARM" }, { "u_lose_var": "missing_right_arm", "type": "traits", "context": "limbs" }, { "u_add_trait": "HAS_RIGHT_ARM" }, { "run_eocs": "EOC_VITA_RESTORE_LIMB_DRAIN" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 45,75 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 45,75 )" ] } ], "false_effect": [ { "u_message": "Your healing powers were not great enough, you'll have to try again.", "type": "bad" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 45,75 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 45,75 )" ] } ] }, { @@ -924,18 +914,18 @@ { "type": "effect_on_condition", "id": "EOC_VITAKIN_RESTORE_LIMB_LEFT_ARM_RESULT", - "condition": { "roll_contested": { "math": [ "rand( u_val('spell_level', 'spell: vita_limb_restore'))" ] }, "difficulty": 14 }, + "condition": { "roll_contested": { "math": [ "rand( u_spell_level('vita_limb_restore'))" ] }, "difficulty": 14 }, "effect": [ { "u_message": "Your left arm had been restored.", "type": "good" }, { "u_lose_trait": "NO_LEFT_ARM" }, { "u_lose_var": "missing_left_arm", "type": "traits", "context": "limbs" }, { "u_add_trait": "HAS_LEFT_ARM" }, { "run_eocs": "EOC_VITA_RESTORE_LIMB_DRAIN" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 45,75 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 45,75 )" ] } ], "false_effect": [ { "u_message": "Your healing powers were not great enough, you'll have to try again.", "type": "bad" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 45,75 )" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 45,75 )" ] } ] }, { @@ -944,9 +934,9 @@ "//": "About 2.5 times as costly as the super heal drain, factored for each tick of healing. Assuming you're using super heal at level twelve, it ticks 15 times. 15 * 2.5 = 37.5 times increase for proper scaling in a single tick of this. You are regrowing a whole body part, you know.", "effect": [ { "math": [ "u_val('stored_kcal')", "-=", "rng( 1875,9375 )" ] }, - { "math": [ "u_val('vitamin', 'name:iron')", "-=", "rng( 1875,7500 )" ] }, - { "math": [ "u_val('vitamin', 'name:calcium')", "-=", "rng( 3750,7500 )" ] }, - { "math": [ "u_val('vitamin', 'name:vitC')", "-=", "rng( 750,3000 )" ] }, + { "math": [ "u_vitamin('iron')", "-=", "rng( 1875,7500 )" ] }, + { "math": [ "u_vitamin('calcium')", "-=", "rng( 3750,7500 )" ] }, + { "math": [ "u_vitamin('vitC')", "-=", "rng( 750,3000 )" ] }, { "math": [ "u_val('fatigue')", "+=", "rng( 75,375 )" ] } ] }, @@ -973,9 +963,9 @@ { "u_set_hp": 5, "only_increase": true, "target_part": "leg_r" }, { "u_set_hp": 5, "only_increase": true, "target_part": "leg_l" }, { "u_cast_spell": { "id": "vita_pain_split", "hit_self": true } }, - { "math": [ "u_val('vitamin', 'name: redcells')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: bad_food')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: blood')", "=", "0" ] }, + { "math": [ "u_vitamin('redcells')", "=", "0" ] }, + { "math": [ "u_vitamin('bad_food')", "=", "0" ] }, + { "math": [ "u_vitamin('blood')", "=", "0" ] }, { "u_lose_effect": "corroding" }, { "u_lose_effect": "onfire" }, { "u_lose_effect": "dazed" }, diff --git a/data/mods/MindOverMatter/recipes/comestibles.json b/data/mods/MindOverMatter/recipes/comestibles.json index e8f60e06282b5..f3dd13f39156e 100644 --- a/data/mods/MindOverMatter/recipes/comestibles.json +++ b/data/mods/MindOverMatter/recipes/comestibles.json @@ -14,7 +14,7 @@ "result_eocs": [ { "id": "EOC_FOOD_PHOTOKIN_DRAIN", - "effect": [ { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] } ] + "effect": [ { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] } ] } ] }, diff --git a/data/mods/MindOverMatter/recipes/nether_attunement.json b/data/mods/MindOverMatter/recipes/nether_attunement.json index 7dd35ea02e77e..3e434f5068ffa 100644 --- a/data/mods/MindOverMatter/recipes/nether_attunement.json +++ b/data/mods/MindOverMatter/recipes/nether_attunement.json @@ -15,14 +15,14 @@ "result_eocs": [ { "id": "EOC_CENTERING_MEDITATION", - "condition": { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "10" ] }, - "effect": [ { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "-=", "10" ] } ], + "condition": { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "10" ] }, + "effect": [ { "math": [ "u_vitamin('vitamin_psionic_drain')", "-=", "10" ] } ], "false_effect": [ { "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" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "=", "0" ] } + { "math": [ "u_vitamin('vitamin_psionic_drain')", "=", "0" ] } ] } ] @@ -52,7 +52,7 @@ { "u_message": "You channel all of your powers into the drained matrix crystal in your hands. As you do, the faint light in its depths grows steadily brighter and the crystal begins to feel warm in your hands. Suddenly, the crystal shatters…and with it, the strange feelings caused by using your powers vanish." }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "=", "0" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "=", "0" ] }, { "u_spawn_item": "matrix_crystal_drained_dust", "count": 10 } ] } diff --git a/data/mods/MindOverMatter/recipes/practice/biokinetic_practice.json b/data/mods/MindOverMatter/recipes/practice/biokinetic_practice.json index 3c34bbb2b41d0..bfc990fd1968a 100644 --- a/data/mods/MindOverMatter/recipes/practice/biokinetic_practice.json +++ b/data/mods/MindOverMatter/recipes/practice/biokinetic_practice.json @@ -45,16 +45,14 @@ "id": "EOC_PRACTICE_BIOKIN_OVERCOME_PAIN", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: biokin_overcome_pain')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: biokin_overcome_pain')", "<=", "(difficulty_one_contemplation(1))" ] - } + { "math": [ "u_spell_level('biokin_overcome_pain')", ">=", "1" ] }, + { "math": [ "u_spell_exp('biokin_overcome_pain')", "<=", "(difficulty_one_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: biokin_overcome_pain')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('biokin_overcome_pain')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(1)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -62,7 +60,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_BIOKIN_OVERCOME_PAIN_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: biokin_overcome_pain')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('biokin_overcome_pain')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -96,16 +94,14 @@ "id": "EOC_PRACTICE_BIOKIN_PHYSICAL_ENHANCE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: biokin_physical_enhance')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: biokin_physical_enhance')", "<=", "(difficulty_two_contemplation(1))" ] - } + { "math": [ "u_spell_level('biokin_physical_enhance')", ">=", "1" ] }, + { "math": [ "u_spell_exp('biokin_physical_enhance')", "<=", "(difficulty_two_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: biokin_physical_enhance')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('biokin_physical_enhance')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(2)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -113,7 +109,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_BIOKIN_PHYSICAL_ENHANCE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: biokin_physical_enhance')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('biokin_physical_enhance')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -147,16 +143,14 @@ "id": "EOC_PRACTICE_BIOKIN_BREATHE_SKIN", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: biokin_breathe_skin')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: biokin_breathe_skin')", "<=", "(difficulty_two_contemplation(1))" ] - } + { "math": [ "u_spell_level('biokin_breathe_skin')", ">=", "1" ] }, + { "math": [ "u_spell_exp('biokin_breathe_skin')", "<=", "(difficulty_two_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: biokin_breathe_skin')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('biokin_breathe_skin')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(2)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -164,7 +158,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_BIOKIN_BREATHE_SKIN_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: biokin_breathe_skin')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('biokin_breathe_skin')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -198,16 +192,14 @@ "id": "EOC_PRACTICE_BIOKIN_FLEXIBILITY", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: biokin_flexibility')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: biokin_flexibility')", "<=", "(difficulty_three_contemplation(1))" ] - } + { "math": [ "u_spell_level('biokin_flexibility')", ">=", "1" ] }, + { "math": [ "u_spell_exp('biokin_flexibility')", "<=", "(difficulty_three_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: biokin_flexibility')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('biokin_flexibility')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(3)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -215,7 +207,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_BIOKIN_FLEXIBILITY_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: biokin_flexibility')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('biokin_flexibility')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -250,16 +242,14 @@ "id": "EOC_PRACTICE_BIOKIN_ARMOR_SKIN", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: biokin_armor_skin')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: biokin_armor_skin')", "<=", "(difficulty_four_contemplation(1))" ] - } + { "math": [ "u_spell_level('biokin_armor_skin')", ">=", "1" ] }, + { "math": [ "u_spell_exp('biokin_armor_skin')", "<=", "(difficulty_four_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: biokin_armor_skin')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('biokin_armor_skin')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(4)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -267,7 +257,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_BIOKIN_ARMOR_SKIN_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: biokin_armor_skin')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('biokin_armor_skin')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -302,16 +292,14 @@ "id": "EOC_PRACTICE_BIOKIN_CLIMATE_CONTROL", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: biokin_climate_control')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: biokin_climate_control')", "<=", "(difficulty_four_contemplation(1))" ] - } + { "math": [ "u_spell_level('biokin_climate_control')", ">=", "1" ] }, + { "math": [ "u_spell_exp('biokin_climate_control')", "<=", "(difficulty_four_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: biokin_climate_control')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('biokin_climate_control')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(4)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -319,7 +307,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_BIOKIN_CLIMATE_CONTROL_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: biokin_climate_control')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('biokin_climate_control')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -354,16 +342,14 @@ "id": "EOC_PRACTICE_BIOKIN_ENHANCE_MOBILITY", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: biokin_enhance_mobility')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: biokin_enhance_mobility')", "<=", "(difficulty_five_contemplation(1))" ] - } + { "math": [ "u_spell_level('biokin_enhance_mobility')", ">=", "1" ] }, + { "math": [ "u_spell_exp('biokin_enhance_mobility')", "<=", "(difficulty_five_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: biokin_enhance_mobility')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('biokin_enhance_mobility')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(5)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -371,7 +357,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_BIOKIN_ENHANCE_MOBILITY_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: biokin_enhance_mobility')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('biokin_enhance_mobility')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -406,16 +392,14 @@ "id": "EOC_PRACTICE_BIOKIN_HAMMERHAND", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: biokin_hammerhand')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: biokin_hammerhand')", "<=", "(difficulty_five_contemplation(1))" ] - } + { "math": [ "u_spell_level('biokin_hammerhand')", ">=", "1" ] }, + { "math": [ "u_spell_exp('biokin_hammerhand')", "<=", "(difficulty_five_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: biokin_hammerhand')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('biokin_hammerhand')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(5)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -423,7 +407,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_BIOKIN_HAMMERHAND_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: biokin_hammerhand')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('biokin_hammerhand')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -458,16 +442,14 @@ "id": "EOC_PRACTICE_BIOKIN_REFLEX_ENHANCE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: biokin_reflex_enhance')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: biokin_reflex_enhance')", "<=", "(difficulty_six_contemplation(1))" ] - } + { "math": [ "u_spell_level('biokin_reflex_enhance')", ">=", "1" ] }, + { "math": [ "u_spell_exp('biokin_reflex_enhance')", "<=", "(difficulty_six_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: biokin_reflex_enhance')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('biokin_reflex_enhance')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(6)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -475,7 +457,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_BIOKIN_REFLEX_ENHANCE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: biokin_reflex_enhance')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('biokin_reflex_enhance')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -510,16 +492,14 @@ "id": "EOC_PRACTICE_BIOKIN_SEALED_SYSTEM", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: biokin_sealed_system')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: biokin_sealed_system')", "<=", "(difficulty_seven_contemplation(1))" ] - } + { "math": [ "u_spell_level('biokin_sealed_system')", ">=", "1" ] }, + { "math": [ "u_spell_exp('biokin_sealed_system')", "<=", "(difficulty_seven_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: biokin_sealed_system')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('biokin_sealed_system')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(7)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -527,7 +507,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_BIOKIN_SEALED_SYSTEM_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: biokin_sealed_system')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('biokin_sealed_system')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -562,16 +542,14 @@ "id": "EOC_PRACTICE_BIOKIN_METABOLISM_ENHANCE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: biokin_metabolism_enhance')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: biokin_metabolism_enhance')", "<=", "(difficulty_seven_contemplation(1))" ] - } + { "math": [ "u_spell_level('biokin_metabolism_enhance')", ">=", "1" ] }, + { "math": [ "u_spell_exp('biokin_metabolism_enhance')", "<=", "(difficulty_seven_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: biokin_metabolism_enhance')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('biokin_metabolism_enhance')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(7)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -579,7 +557,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_BIOKIN_METABOLISM_ENHANCE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: biokin_metabolism_enhance')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('biokin_metabolism_enhance')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -614,16 +592,14 @@ "id": "EOC_PRACTICE_BIOKIN_COMBAT_DANCE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: biokin_combat_dance')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: biokin_combat_dance')", "<=", "(difficulty_eight_contemplation(1))" ] - } + { "math": [ "u_spell_level('biokin_combat_dance')", ">=", "1" ] }, + { "math": [ "u_spell_exp('biokin_combat_dance')", "<=", "(difficulty_eight_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: biokin_combat_dance')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('biokin_combat_dance')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(8)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -631,7 +607,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_BIOKIN_COMBAT_DANCE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: biokin_combat_dance')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('biokin_combat_dance')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -666,16 +642,14 @@ "id": "EOC_PRACTICE_BIOKIN_PERFECTED_MOTION", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: biokin_perfected_motion')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: biokin_perfected_motion')", "<=", "(difficulty_nine_contemplation(1))" ] - } + { "math": [ "u_spell_level('biokin_perfected_motion')", ">=", "1" ] }, + { "math": [ "u_spell_exp('biokin_perfected_motion')", "<=", "(difficulty_nine_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: biokin_perfected_motion')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('biokin_perfected_motion')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(9)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -683,7 +657,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_BIOKIN_PERFECTED_MOTION_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: biokin_perfected_motion')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('biokin_perfected_motion')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } diff --git a/data/mods/MindOverMatter/recipes/practice/clairsentient_practice.json b/data/mods/MindOverMatter/recipes/practice/clairsentient_practice.json index ca57408f3ae30..58874652911d0 100644 --- a/data/mods/MindOverMatter/recipes/practice/clairsentient_practice.json +++ b/data/mods/MindOverMatter/recipes/practice/clairsentient_practice.json @@ -47,16 +47,14 @@ "id": "EOC_PRACTICE_CLAIR_NIGHT_VISION", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: clair_night_vision')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: clair_night_vision')", "<=", "(difficulty_one_contemplation(1))" ] - } + { "math": [ "u_spell_level('clair_night_vision')", ">=", "1" ] }, + { "math": [ "u_spell_exp('clair_night_vision')", "<=", "(difficulty_one_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: clair_night_vision')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('clair_night_vision')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(1)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -64,7 +62,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_CLAIR_NIGHT_VISION_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_night_vision')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_night_vision')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -98,16 +96,14 @@ "id": "EOC_PRACTICE_CLAIR_DANGER_SENSE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: clair_danger_sense')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: clair_danger_sense')", "<=", "(difficulty_two_contemplation(1))" ] - } + { "math": [ "u_spell_level('clair_danger_sense')", ">=", "1" ] }, + { "math": [ "u_spell_exp('clair_danger_sense')", "<=", "(difficulty_two_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: clair_danger_sense')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('clair_danger_sense')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(2)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -115,7 +111,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_CLAIR_DANGER_SENSE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_danger_sense')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_danger_sense')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -149,16 +145,14 @@ "id": "EOC_PRACTICE_CLAIR_SPEED_READING", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: clair_speed_reading')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: clair_speed_reading')", "<=", "(difficulty_two_contemplation(1))" ] - } + { "math": [ "u_spell_level('clair_speed_reading')", ">=", "1" ] }, + { "math": [ "u_spell_exp('clair_speed_reading')", "<=", "(difficulty_two_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: clair_speed_reading')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('clair_speed_reading')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(2)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -166,7 +160,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_CLAIR_SPEED_READING_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_speed_reading')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_speed_reading')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -200,16 +194,14 @@ "id": "EOC_PRACTICE_CLAIR_SPOT_WEAKNESS", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: clair_spot_weakness')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: clair_spot_weakness')", "<=", "(difficulty_three_contemplation(1))" ] - } + { "math": [ "u_spell_level('clair_spot_weakness')", ">=", "1" ] }, + { "math": [ "u_spell_exp('clair_spot_weakness')", "<=", "(difficulty_three_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: clair_spot_weakness')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('clair_spot_weakness')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(3)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -217,7 +209,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_CLAIR_SPOT_WEAKNESS_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_spot_weakness')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_spot_weakness')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -251,16 +243,14 @@ "id": "EOC_PRACTICE_CLAIR_SENSE_RADS", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: clair_sense_rads')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: clair_sense_rads')", "<=", "(difficulty_three_contemplation(1))" ] - } + { "math": [ "u_spell_level('clair_sense_rads')", ">=", "1" ] }, + { "math": [ "u_spell_exp('clair_sense_rads')", "<=", "(difficulty_three_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: clair_sense_rads')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('clair_sense_rads')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(3)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -268,7 +258,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_CLAIR_SENSE_RADS_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_sense_rads')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_sense_rads')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -302,16 +292,14 @@ "id": "EOC_PRACTICE_CLAIR_SEE_AURAS", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: clair_see_auras')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: clair_see_auras')", "<=", "(difficulty_three_contemplation(1))" ] - } + { "math": [ "u_spell_level('clair_see_auras')", ">=", "1" ] }, + { "math": [ "u_spell_exp('clair_see_auras')", "<=", "(difficulty_three_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: clair_see_auras')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('clair_see_auras')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(3)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -319,7 +307,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_CLAIR_SEE_AURAS_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_see_auras')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_see_auras')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -354,16 +342,14 @@ "id": "EOC_PRACTICE_CLAIR_RANGED_ENHANCE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: clair_ranged_enhance')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: clair_ranged_enhance')", "<=", "(difficulty_four_contemplation(1))" ] - } + { "math": [ "u_spell_level('clair_ranged_enhance')", ">=", "1" ] }, + { "math": [ "u_spell_exp('clair_ranged_enhance')", "<=", "(difficulty_four_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: clair_ranged_enhance')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('clair_ranged_enhance')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(4)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -371,7 +357,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_CLAIR_RANGED_ENHANCE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_ranged_enhance')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_ranged_enhance')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -406,14 +392,14 @@ "id": "EOC_PRACTICE_CLAIR_VOYANCE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: clair_voyance')", ">=", "1" ] }, - { "math": [ "u_val('spell_exp', 'spell: clair_voyance')", "<=", "(difficulty_five_contemplation(1))" ] } + { "math": [ "u_spell_level('clair_voyance')", ">=", "1" ] }, + { "math": [ "u_spell_exp('clair_voyance')", "<=", "(difficulty_five_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: clair_voyance')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('clair_voyance')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(5)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -421,7 +407,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_CLAIR_VOYANCE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_voyance')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_voyance')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -456,16 +442,14 @@ "id": "EOC_PRACTICE_CLAIR_COMBAT_SENSE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: clair_dodge_power')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: clair_dodge_power')", "<=", "(difficulty_six_contemplation(1))" ] - } + { "math": [ "u_spell_level('clair_dodge_power')", ">=", "1" ] }, + { "math": [ "u_spell_exp('clair_dodge_power')", "<=", "(difficulty_six_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: clair_dodge_power')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('clair_dodge_power')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(6)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -473,7 +457,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_CLAIR_COMBAT_SENSE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_dodge_power')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_dodge_power')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -508,16 +492,14 @@ "id": "EOC_PRACTICE_CLAIR_CRAFT_BONUS", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: clair_craft_bonus')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: clair_craft_bonus')", "<=", "(difficulty_six_contemplation(1))" ] - } + { "math": [ "u_spell_level('clair_craft_bonus')", ">=", "1" ] }, + { "math": [ "u_spell_exp('clair_craft_bonus')", "<=", "(difficulty_six_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: clair_craft_bonus')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('clair_craft_bonus')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(6)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -525,7 +507,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_CLAIR_CRAFT_BONUS_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_craft_bonus')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_craft_bonus')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -560,14 +542,14 @@ "id": "EOC_PRACTICE_CLAIR_SEE_MAP", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: clair_see_map')", ">=", "1" ] }, - { "math": [ "u_val('spell_exp', 'spell: clair_see_map')", "<=", "(difficulty_seven_contemplation(1))" ] } + { "math": [ "u_spell_level('clair_see_map')", ">=", "1" ] }, + { "math": [ "u_spell_exp('clair_see_map')", "<=", "(difficulty_seven_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: clair_see_map')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('clair_see_map')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(7)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -575,7 +557,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_CLAIR_SEE_MAP_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_see_map')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_see_map')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -610,16 +592,14 @@ "id": "EOC_PRACTICE_CLAIR_PERFECT_SHOT", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: clair_perfect_shot')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: clair_perfect_shot')", "<=", "(difficulty_seven_contemplation(1))" ] - } + { "math": [ "u_spell_level('clair_perfect_shot')", ">=", "1" ] }, + { "math": [ "u_spell_exp('clair_perfect_shot')", "<=", "(difficulty_seven_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: clair_perfect_shot')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('clair_perfect_shot')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(7)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -627,7 +607,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_CLAIR_PERFECT_SHOT_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_perfect_shot')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_perfect_shot')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -662,16 +642,14 @@ "id": "EOC_PRACTICE_CLAIR_CLEAR_SIGHT", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: clair_clear_sight')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: clair_clear_sight')", "<=", "(difficulty_eight_contemplation(1))" ] - } + { "math": [ "u_spell_level('clair_clear_sight')", ">=", "1" ] }, + { "math": [ "u_spell_exp('clair_clear_sight')", "<=", "(difficulty_eight_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: clair_clear_sight')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('clair_clear_sight')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(8)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -679,7 +657,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_CLAIR_CLEAR_SIGHT_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_clear_sight')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_clear_sight')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -714,16 +692,14 @@ "id": "EOC_PRACTICE_CLAIR_GROUP_TACTICS", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: clair_group_tactics')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: clair_group_tactics')", "<=", "(difficulty_nine_contemplation(1))" ] - } + { "math": [ "u_spell_level('clair_group_tactics')", ">=", "1" ] }, + { "math": [ "u_spell_exp('clair_group_tactics')", "<=", "(difficulty_nine_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: clair_group_tactics')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('clair_group_tactics')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(9)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -731,7 +707,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_CLAIR_GROUP_TACTICS_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_group_tactics')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_group_tactics')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -766,16 +742,14 @@ "id": "EOC_PRACTICE_CLAIR_OMNISCENCE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: clair_omniscience')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: clair_omniscience')", "<=", "(difficulty_ten_contemplation(1))" ] - } + { "math": [ "u_spell_level('clair_omniscience')", ">=", "1" ] }, + { "math": [ "u_spell_exp('clair_omniscience')", "<=", "(difficulty_ten_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: clair_omniscience')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('clair_omniscience')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(10)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -783,7 +757,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_CLAIR_OMNISCENCE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: clair_omniscience')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('clair_omniscience')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } diff --git a/data/mods/MindOverMatter/recipes/practice/electrokinesis_practice.json b/data/mods/MindOverMatter/recipes/practice/electrokinesis_practice.json index f46bc443c4766..66b5d7211fb92 100644 --- a/data/mods/MindOverMatter/recipes/practice/electrokinesis_practice.json +++ b/data/mods/MindOverMatter/recipes/practice/electrokinesis_practice.json @@ -47,18 +47,14 @@ "id": "EOC_PRACTICE_ELECTROKIN_SPARK_SIGHT", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: electrokinetic_see_electric')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_see_electric')", "<=", "(difficulty_one_contemplation(1))" ] - } + { "math": [ "u_spell_level('electrokinetic_see_electric')", ">=", "1" ] }, + { "math": [ "u_spell_exp('electrokinetic_see_electric')", "<=", "(difficulty_one_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_see_electric')", "+=", "(contemplation_factor(1))" ] - }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('electrokinetic_see_electric')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(1)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -66,7 +62,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_ELECTROKIN_SPARK_SIGHT_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: electrokinetic_see_electric')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('electrokinetic_see_electric')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -100,16 +96,14 @@ "id": "EOC_PRACTICE_ELECTROKIN_SHOCK_TOUCH", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: electrokinetic_shock_touch')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_shock_touch')", "<=", "(difficulty_one_contemplation(1))" ] - } + { "math": [ "u_spell_level('electrokinetic_shock_touch')", ">=", "1" ] }, + { "math": [ "u_spell_exp('electrokinetic_shock_touch')", "<=", "(difficulty_one_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: electrokinetic_shock_touch')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('electrokinetic_shock_touch')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(1)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -117,7 +111,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_ELECTROKIN_SHOCK_TOUCH_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: electrokinetic_shock_touch')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('electrokinetic_shock_touch')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -151,16 +145,14 @@ "id": "EOC_PRACTICE_ELECTROKIN_ZAP_ENEMIES", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: electrokinetic_zap_enemies')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_zap_enemies')", "<=", "(difficulty_two_contemplation(1))" ] - } + { "math": [ "u_spell_level('electrokinetic_zap_enemies')", ">=", "1" ] }, + { "math": [ "u_spell_exp('electrokinetic_zap_enemies')", "<=", "(difficulty_two_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: electrokinetic_zap_enemies')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('electrokinetic_zap_enemies')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(2)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -168,7 +160,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_ELECTROKIN_ZAP_ENEMIES_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: electrokinetic_zap_enemies')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('electrokinetic_zap_enemies')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -202,18 +194,14 @@ "id": "EOC_PRACTICE_ELECTROKIN_MELEE_ATTACKS", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: electrokinetic_melee_attacks')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_melee_attacks')", "<=", "(difficulty_three_contemplation(1))" ] - } + { "math": [ "u_spell_level('electrokinetic_melee_attacks')", ">=", "1" ] }, + { "math": [ "u_spell_exp('electrokinetic_melee_attacks')", "<=", "(difficulty_three_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_melee_attacks')", "+=", "(contemplation_factor(1))" ] - }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('electrokinetic_melee_attacks')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(3)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -221,7 +209,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_ELECTROKIN_MELEE_ATTACKS_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: electrokinetic_melee_attacks')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('electrokinetic_melee_attacks')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -255,18 +243,16 @@ "id": "EOC_PRACTICE_ELECTRO_PERSONAL_BATTERY", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: electrokinetic_personal_battery')", ">=", "1" ] }, + { "math": [ "u_spell_level('electrokinetic_personal_battery')", ">=", "1" ] }, { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_personal_battery')", "<=", "(difficulty_three_contemplation(1))" ] + "math": [ "u_spell_exp('electrokinetic_personal_battery')", "<=", "(difficulty_three_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_personal_battery')", "+=", "(contemplation_factor(1))" ] - }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('electrokinetic_personal_battery')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(3)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -274,7 +260,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_ELECTRO_PERSONAL_BATTERY_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: electrokinetic_personal_battery')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('electrokinetic_personal_battery')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -309,16 +295,14 @@ "id": "EOC_PRACTICE_ELECTROKIN_PARALYSIS", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: electrokinetic_paralysis')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_paralysis')", "<=", "(difficulty_four_contemplation(1))" ] - } + { "math": [ "u_spell_level('electrokinetic_paralysis')", ">=", "1" ] }, + { "math": [ "u_spell_exp('electrokinetic_paralysis')", "<=", "(difficulty_four_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: electrokinetic_paralysis')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('electrokinetic_paralysis')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(4)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -326,7 +310,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_ELECTROKIN_PARALYSIS_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: electrokinetic_paralysis')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('electrokinetic_paralysis')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -361,16 +345,14 @@ "id": "EOC_PRACTICE_ELECTROKIN_REDUCE_PAIN", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: electrokinetic_reduce_pain')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_reduce_pain')", "<=", "(difficulty_four_contemplation(1))" ] - } + { "math": [ "u_spell_level('electrokinetic_reduce_pain')", ">=", "1" ] }, + { "math": [ "u_spell_exp('electrokinetic_reduce_pain')", "<=", "(difficulty_four_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: electrokinetic_reduce_pain')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('electrokinetic_reduce_pain')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(4)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -378,7 +360,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_ELECTROKIN_REDUCE_PAIN_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: electrokinetic_reduce_pain')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('electrokinetic_reduce_pain')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -413,18 +395,14 @@ "id": "EOC_PRACTICE_ELECTROKIN_LIGHTNING_BOLT", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: electrokinetic_lightning_bolt')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_lightning_bolt')", "<=", "(difficulty_five_contemplation(1))" ] - } + { "math": [ "u_spell_level('electrokinetic_lightning_bolt')", ">=", "1" ] }, + { "math": [ "u_spell_exp('electrokinetic_lightning_bolt')", "<=", "(difficulty_five_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_lightning_bolt')", "+=", "(contemplation_factor(1))" ] - }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('electrokinetic_lightning_bolt')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(5)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -432,7 +410,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_ELECTROKIN_LIGHTNING_BOLT_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: electrokinetic_lightning_bolt')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('electrokinetic_lightning_bolt')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -478,7 +456,7 @@ { "math": [ "u_val('spell_exp', 'spell: electrokinetic_recharge_vehicle')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(5)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -521,16 +499,14 @@ "id": "EOC_PRACTICE_ELECTROKIN_SPEED_BOOST", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: electrokinetic_speed_boost')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_speed_boost')", "<=", "(difficulty_six_contemplation(1))" ] - } + { "math": [ "u_spell_level('electrokinetic_speed_boost')", ">=", "1" ] }, + { "math": [ "u_spell_exp('electrokinetic_speed_boost')", "<=", "(difficulty_six_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: electrokinetic_speed_boost')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('electrokinetic_speed_boost')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(6)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -538,7 +514,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_ELECTROKIN_SPEED_BOOST_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: electrokinetic_speed_boost')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('electrokinetic_speed_boost')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -573,16 +549,14 @@ "id": "EOC_PRACTICE_ELECTROKIN_PAIN_IMMUNE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: electrokinetic_pain_immune')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_pain_immune')", "<=", "(difficulty_six_contemplation(1))" ] - } + { "math": [ "u_spell_level('electrokinetic_pain_immune')", ">=", "1" ] }, + { "math": [ "u_spell_exp('electrokinetic_pain_immune')", "<=", "(difficulty_six_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: electrokinetic_pain_immune')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('electrokinetic_pain_immune')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(6)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -590,7 +564,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_ELECTROKIN_PAIN_IMMUNE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: electrokinetic_pain_immune')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('electrokinetic_pain_immune')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -625,16 +599,14 @@ "id": "EOC_PRACTICE_ELECTROKIN_KILL_ROBOT", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: electrokinetic_kill_robot')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_kill_robot')", "<=", "(difficulty_seven_contemplation(1))" ] - } + { "math": [ "u_spell_level('electrokinetic_kill_robot')", ">=", "1" ] }, + { "math": [ "u_spell_exp('electrokinetic_kill_robot')", "<=", "(difficulty_seven_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: electrokinetic_kill_robot')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('electrokinetic_kill_robot')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(7)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -642,7 +614,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_ELECTROKIN_KILL_ROBOT_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: electrokinetic_kill_robot')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('electrokinetic_kill_robot')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -677,18 +649,16 @@ "id": "EOC_PRACTICE_ELECTROKIN_LIGHTNING_AURA", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: electrokinetic_lightning_aura')", ">=", "1" ] }, + { "math": [ "u_spell_level('electrokinetic_lightning_aura')", ">=", "1" ] }, { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_lightning_aura')", "<=", "(difficulty_eight_contemplation(1))" ] + "math": [ "u_spell_exp('electrokinetic_lightning_aura')", "<=", "(difficulty_eight_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_lightning_aura')", "+=", "(contemplation_factor(1))" ] - }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('electrokinetic_lightning_aura')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(8)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -696,7 +666,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_ELECTROKIN_LIGHTNING_AURA_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: electrokinetic_lightning_aura')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('electrokinetic_lightning_aura')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -731,18 +701,16 @@ "id": "EOC_PRACTICE_ELECTROKIN_LIGHTNING_BLAST", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: electrokinetic_lightning_blast')", ">=", "1" ] }, + { "math": [ "u_spell_level('electrokinetic_lightning_blast')", ">=", "1" ] }, { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_lightning_blast')", "<=", "(difficulty_nine_contemplation(1))" ] + "math": [ "u_spell_exp('electrokinetic_lightning_blast')", "<=", "(difficulty_nine_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_lightning_blast')", "+=", "(contemplation_factor(1))" ] - }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('electrokinetic_lightning_blast')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(9)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -750,7 +718,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_ELECTROKIN_LIGHTNING_BLAST_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: electrokinetic_lightning_blast')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('electrokinetic_lightning_blast')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -785,16 +753,14 @@ "id": "EOC_PRACTICE_ELECTROKIN_REVIVE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: electrokinetic_revive')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: electrokinetic_revive')", "<=", "(difficulty_ten_contemplation(1))" ] - } + { "math": [ "u_spell_level('electrokinetic_revive')", ">=", "1" ] }, + { "math": [ "u_spell_exp('electrokinetic_revive')", "<=", "(difficulty_ten_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: electrokinetic_revive')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('electrokinetic_revive')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(10)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -802,7 +768,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_ELECTROKIN_REVIVE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: electrokinetic_revive')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('electrokinetic_revive')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } diff --git a/data/mods/MindOverMatter/recipes/practice/photokinesis_practice.json b/data/mods/MindOverMatter/recipes/practice/photokinesis_practice.json index 04ac028ea230f..50fce9e58447b 100644 --- a/data/mods/MindOverMatter/recipes/practice/photokinesis_practice.json +++ b/data/mods/MindOverMatter/recipes/practice/photokinesis_practice.json @@ -47,16 +47,14 @@ "id": "EOC_PRACTICE_PHOTOKIN_LIGHT_LOCAL", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: photokinetic_light_local')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: photokinetic_light_local')", "<=", "(difficulty_one_contemplation(1))" ] - } + { "math": [ "u_spell_level('photokinetic_light_local')", ">=", "1" ] }, + { "math": [ "u_spell_exp('photokinetic_light_local')", "<=", "(difficulty_one_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: photokinetic_light_local')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('photokinetic_light_local')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(1)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -64,7 +62,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PHOTOKIN_LIGHT_LOCAL_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: photokinetic_light_local')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('photokinetic_light_local')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -98,16 +96,14 @@ "id": "EOC_PRACTICE_PHOTOKIN_CREATE_LIGHT", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: photokinetic_create_light')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: photokinetic_create_light')", "<=", "(difficulty_two_contemplation(1))" ] - } + { "math": [ "u_spell_level('photokinetic_create_light')", ">=", "1" ] }, + { "math": [ "u_spell_exp('photokinetic_create_light')", "<=", "(difficulty_two_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: photokinetic_create_light')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('photokinetic_create_light')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(2)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -115,7 +111,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PHOTOKIN_CREATE_LIGHT_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: photokinetic_create_light')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('photokinetic_create_light')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -149,16 +145,14 @@ "id": "EOC_PRACTICE_PHOTOKIN_SNUFF_LIGHT", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: photokinetic_snuff_light')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: photokinetic_snuff_light')", "<=", "(difficulty_two_contemplation(1))" ] - } + { "math": [ "u_spell_level('photokinetic_snuff_light')", ">=", "1" ] }, + { "math": [ "u_spell_exp('photokinetic_snuff_light')", "<=", "(difficulty_two_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: photokinetic_snuff_light')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('photokinetic_snuff_light')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(2)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -166,7 +160,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PHOTOKIN_SNUFF_LIGHT_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: photokinetic_snuff_light')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('photokinetic_snuff_light')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -200,16 +194,14 @@ "id": "EOC_PRACTICE_PHOTOKIN_LIGHT_DODGE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: photokinetic_light_dodge')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: photokinetic_light_dodge')", "<=", "(difficulty_two_contemplation(1))" ] - } + { "math": [ "u_spell_level('photokinetic_light_dodge')", ">=", "1" ] }, + { "math": [ "u_spell_exp('photokinetic_light_dodge')", "<=", "(difficulty_two_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: photokinetic_light_dodge')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('photokinetic_light_dodge')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(2)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -217,7 +209,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PHOTOKIN_LIGHT_DODGE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: photokinetic_light_dodge')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('photokinetic_light_dodge')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -251,16 +243,14 @@ "id": "EOC_PRACTICE_PHOTOKIN_LIGHT_BEAM", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: photokinetic_light_beam')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: photokinetic_light_beam')", "<=", "(difficulty_three_contemplation(1))" ] - } + { "math": [ "u_spell_level('photokinetic_light_beam')", ">=", "1" ] }, + { "math": [ "u_spell_exp('photokinetic_light_beam')", "<=", "(difficulty_three_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: photokinetic_light_beam')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('photokinetic_light_beam')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(3)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -268,7 +258,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PHOTOKIN_LIGHT_BEAM_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: photokinetic_light_beam')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('photokinetic_light_beam')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -303,16 +293,14 @@ "id": "EOC_PRACTICE_PHOTOKIN_CAMOUFLAGE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: photokinetic_camouflage')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: photokinetic_camouflage')", "<=", "(difficulty_three_contemplation(1))" ] - } + { "math": [ "u_spell_level('photokinetic_camouflage')", ">=", "1" ] }, + { "math": [ "u_spell_exp('photokinetic_camouflage')", "<=", "(difficulty_three_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: photokinetic_camouflage')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('photokinetic_camouflage')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(3)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -320,7 +308,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PHOTOKIN_CAMOUFLAGE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: photokinetic_camouflage')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('photokinetic_camouflage')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -355,16 +343,14 @@ "id": "EOC_PRACTICE_PHOTOKIN_RAD_IMMUNITY", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: photokinetic_rad_immunity')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: photokinetic_rad_immunity')", "<=", "(difficulty_three_contemplation(1))" ] - } + { "math": [ "u_spell_level('photokinetic_rad_immunity')", ">=", "1" ] }, + { "math": [ "u_spell_exp('photokinetic_rad_immunity')", "<=", "(difficulty_three_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: photokinetic_rad_immunity')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('photokinetic_rad_immunity')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(3)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -372,7 +358,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PHOTOKIN_RAD_IMMUNITY_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: photokinetic_rad_immunity')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('photokinetic_rad_immunity')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -407,16 +393,14 @@ "id": "EOC_PRACTICE_PHOTOKIN_LIGHT_ARMS", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: photokinetic_light_arms')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: photokinetic_light arms')", "<=", "(difficulty_four_contemplation(1))" ] - } + { "math": [ "u_spell_level('photokinetic_light_arms')", ">=", "1" ] }, + { "math": [ "u_spell_exp('photokinetic_light_arms')", "<=", "(difficulty_four_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: photokinetic_light_arms')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('photokinetic_light_arms')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(4)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -424,7 +408,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PHOTOKIN_LIGHT_ARMS_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: photokinetic_light_arms')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('photokinetic_light_arms')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -459,16 +443,14 @@ "id": "EOC_PRACTICE_PHOTOKIN_HIDE_UGLY", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: photokinetic_hide_ugly')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: photokinetic_hide_ugly')", "<=", "(difficulty_four_contemplation(1))" ] - } + { "math": [ "u_spell_level('photokinetic_hide_ugly')", ">=", "1" ] }, + { "math": [ "u_spell_exp('photokinetic_hide_ugly')", "<=", "(difficulty_four_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: photokinetic_hide_ugly')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('photokinetic_hide_ugly')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(4)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -476,7 +458,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PHOTOKIN_HIDE_UGLY_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: photokinetic_hide_ugly')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('photokinetic_hide_ugly')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -511,16 +493,14 @@ "id": "EOC_PRACTICE_PHOTOKIN_LIGHT_IMAGE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: photokinetic_light_image')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: photokinetic_light_image')", "<=", "(difficulty_five_contemplation(1))" ] - } + { "math": [ "u_spell_level('photokinetic_light_image')", ">=", "1" ] }, + { "math": [ "u_spell_exp('photokinetic_light_image')", "<=", "(difficulty_five_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: photokinetic_light_image')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('photokinetic_light_image')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(5)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -528,7 +508,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PHOTOKIN_LIGHT_IMAGE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: photokinetic_light_image')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('photokinetic_light_image')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -562,16 +542,14 @@ "id": "EOC_PRACTICE_PHOTOKIN_RADIO", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: photokinetic_radio')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: photokinetic_radio')", "<=", "(difficulty_five_contemplation(1))" ] - } + { "math": [ "u_spell_level('photokinetic_radio')", ">=", "1" ] }, + { "math": [ "u_spell_exp('photokinetic_radio')", "<=", "(difficulty_five_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: photokinetic_radio')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('photokinetic_radio')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(5)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -579,7 +557,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PHOTOKIN_RADIO_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: photokinetic_radio')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('photokinetic_radio')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -614,16 +592,14 @@ "id": "EOC_PRACTICE_PHOTOKIN_INVISIBILITY", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: photokinetic_invisibility')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: photokinetic_invisibility')", "<=", "(difficulty_six_contemplation(1))" ] - } + { "math": [ "u_spell_level('photokinetic_invisibility')", ">=", "1" ] }, + { "math": [ "u_spell_exp('photokinetic_invisibility')", "<=", "(difficulty_six_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: photokinetic_invisibility')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('photokinetic_invisibility')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(6)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -631,7 +607,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PHOTOKIN_INVISIBILITY_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: photokinetic_invisibility')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('photokinetic_invisibility')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -666,16 +642,14 @@ "id": "EOC_PRACTICE_PHOTOKIN_LIGHT_FLASH", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: photokinetic_light_flash')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: photokinetic_light_flash')", "<=", "(difficulty_six_contemplation(1))" ] - } + { "math": [ "u_spell_level('photokinetic_light_flash')", ">=", "1" ] }, + { "math": [ "u_spell_exp('photokinetic_light_flash')", "<=", "(difficulty_six_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: photokinetic_light_flash')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('photokinetic_light_flash')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(7)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -683,7 +657,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PHOTOKIN_LIGHT_FLASH_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: photokinetic_light_flash')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('photokinetic_light_flash')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -718,18 +692,14 @@ "id": "EOC_PRACTICE_PHOTOKIN_BLINDING_GLARE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: photokinetic_blinding_glare')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: photokinetic_blinding_glare')", "<=", "(difficulty_seven_contemplation(1))" ] - } + { "math": [ "u_spell_level('photokinetic_blinding_glare')", ">=", "1" ] }, + { "math": [ "u_spell_exp('photokinetic_blinding_glare')", "<=", "(difficulty_seven_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { - "math": [ "u_val('spell_exp', 'spell: photokinetic_blinding_glare')", "+=", "(contemplation_factor(1))" ] - }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('photokinetic_blinding_glare')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(7)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -737,7 +707,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PHOTOKIN_BLINDING_GLARE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: photokinetic_blinding_glare')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('photokinetic_blinding_glare')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -772,18 +742,16 @@ "id": "EOC_PRACTICE_PHOTOKIN_LIGHT_DISINTEGRATE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: photokinetic_light_disintegrate')", ">=", "1" ] }, + { "math": [ "u_spell_level('photokinetic_light_disintegrate')", ">=", "1" ] }, { - "math": [ "u_val('spell_exp', 'spell: photokinetic_light_disintegrate')", "<=", "(difficulty_eight_contemplation(1))" ] + "math": [ "u_spell_exp('photokinetic_light_disintegrate')", "<=", "(difficulty_eight_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { - "math": [ "u_val('spell_exp', 'spell: photokinetic_light_disintegrate')", "+=", "(contemplation_factor(1))" ] - }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('photokinetic_light_disintegrate')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(8)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -791,7 +759,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PHOTOKIN_LIGHT_DISINTEGRATE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: photokinetic_light_disintegrate')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('photokinetic_light_disintegrate')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } diff --git a/data/mods/MindOverMatter/recipes/practice/pyrokinesis_practice.json b/data/mods/MindOverMatter/recipes/practice/pyrokinesis_practice.json index 4cf9af7240365..57b5bd3c7fec5 100644 --- a/data/mods/MindOverMatter/recipes/practice/pyrokinesis_practice.json +++ b/data/mods/MindOverMatter/recipes/practice/pyrokinesis_practice.json @@ -46,16 +46,14 @@ "id": "EOC_PRACTICE_PYROKIN_FLASH", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: pyrokinetic_flash')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: pyrokinetic_flash')", "<=", "(difficulty_one_contemplation(1))" ] - } + { "math": [ "u_spell_level('pyrokinetic_flash')", ">=", "1" ] }, + { "math": [ "u_spell_exp('pyrokinetic_flash')", "<=", "(difficulty_one_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: pyrokinetic_flash')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('pyrokinetic_flash')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(1)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -63,7 +61,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PYROKIN_FLASH_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: pyrokinetic_flash')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('pyrokinetic_flash')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -97,16 +95,14 @@ "id": "EOC_PRACTICE_PYROKIN_FLAMES", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: pyrokinetic_eruption')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: pyrokinetic_eruption')", "<=", "(difficulty_two_contemplation(1))" ] - } + { "math": [ "u_spell_level('pyrokinetic_eruption')", ">=", "1" ] }, + { "math": [ "u_spell_exp('pyrokinetic_eruption')", "<=", "(difficulty_two_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: pyrokinetic_eruption')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('pyrokinetic_eruption')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(2)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -114,7 +110,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PYROKIN_FLAMES_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: pyrokinetic_eruption')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('pyrokinetic_eruption')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -157,7 +153,7 @@ "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, { "math": [ "u_val('spell_exp', 'spell: pyrokinetic_cauterize')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(2)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -199,16 +195,14 @@ "id": "EOC_PRACTICE_PYROKIN_QUELL_FIRE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: pyrokinetic_quell_flames')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: pyrokinetic_quell_flames')", "<=", "(difficulty_three_contemplation(1))" ] - } + { "math": [ "u_spell_level('pyrokinetic_quell_flames')", ">=", "1" ] }, + { "math": [ "u_spell_exp('pyrokinetic_quell_flames')", "<=", "(difficulty_three_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: pyrokinetic_quell_flames')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('pyrokinetic_quell_flames')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(3)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -216,7 +210,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PYROKIN_QUELL_FIRE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: pyrokinetic_quell_flames')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('pyrokinetic_quell_flames')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -250,16 +244,14 @@ "id": "EOC_PRACTICE_PYROKIN_CALL_FLAMES", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: pyrokinetic_call_flames')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: pyrokinetic_call_flames')", "<=", "(difficulty_three_contemplation(1))" ] - } + { "math": [ "u_spell_level('pyrokinetic_call_flames')", ">=", "1" ] }, + { "math": [ "u_spell_exp('pyrokinetic_call_flames')", "<=", "(difficulty_three_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: pyrokinetic_call_flames')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('pyrokinetic_call_flames')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(3)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -267,7 +259,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PYROKIN_CALL_FLAMES_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: pyrokinetic_call_flames')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('pyrokinetic_call_flames')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -302,16 +294,14 @@ "id": "EOC_PRACTICE_PYROKIN_CLOAK", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: pyrokinetic_cloak')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: pyrokinetic_cloak')", "<=", "(difficulty_four_contemplation(1))" ] - } + { "math": [ "u_spell_level('pyrokinetic_cloak')", ">=", "1" ] }, + { "math": [ "u_spell_exp('pyrokinetic_cloak')", "<=", "(difficulty_four_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: pyrokinetic_cloak')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('pyrokinetic_cloak')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(4)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -319,7 +309,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PYROKIN_CLOAK_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: pyrokinetic_cloak')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('pyrokinetic_cloak')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -354,16 +344,14 @@ "id": "EOC_PRACTICE_PYROKIN_FLAMETHROWER", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: pyrokinetic_flamethrower')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: pyrokinetic_flamethrower')", "<=", "(difficulty_five_contemplation(1))" ] - } + { "math": [ "u_spell_level('pyrokinetic_flamethrower')", ">=", "1" ] }, + { "math": [ "u_spell_exp('pyrokinetic_flamethrower')", "<=", "(difficulty_five_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: pyrokinetic_flamethrower')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('pyrokinetic_flamethrower')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(5)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -406,16 +394,14 @@ "id": "EOC_PRACTICE_PYROKIN_LANCE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: pyrokinetic_lance')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: pyrokinetic_lance')", "<=", "(difficulty_five_contemplation(1))" ] - } + { "math": [ "u_spell_level('pyrokinetic_lance')", ">=", "1" ] }, + { "math": [ "u_spell_exp('pyrokinetic_lance')", "<=", "(difficulty_five_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: pyrokinetic_lance')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('pyrokinetic_lance')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(5)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -423,7 +409,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PYROKIN_LANCE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: pyrokinetic_lance')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('pyrokinetic_lance')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -458,14 +444,14 @@ "id": "EOC_PRACTICE_PYROKIN_BLAZING", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: pyrokinetic_aura')", ">=", "1" ] }, - { "math": [ "u_val('spell_exp', 'spell: pyrokinetic_aura')", "<=", "(difficulty_six_contemplation(1))" ] } + { "math": [ "u_spell_level('pyrokinetic_aura')", ">=", "1" ] }, + { "math": [ "u_spell_exp('pyrokinetic_aura')", "<=", "(difficulty_six_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: pyrokinetic_aura')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('pyrokinetic_aura')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(6)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -473,7 +459,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PYROKIN_BLAZING_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: pyrokinetic_aura')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('pyrokinetic_aura')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -508,16 +494,14 @@ "id": "EOC_PRACTICE_PYROKIN_THERMOGENESIS", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: pyrokinetic_thermogenesis')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: pyrokinetic_thermogenesis')", "<=", "(difficulty_six_contemplation(1))" ] - } + { "math": [ "u_spell_level('pyrokinetic_thermogenesis')", ">=", "1" ] }, + { "math": [ "u_spell_exp('pyrokinetic_thermogenesis')", "<=", "(difficulty_six_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: pyrokinetic_thermogenesis')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('pyrokinetic_thermogenesis')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(6)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -525,7 +509,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PYROKIN_THERMOGENESIS_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: pyrokinetic_thermogenesis')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('pyrokinetic_thermogenesis')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -560,16 +544,14 @@ "id": "EOC_PRACTICE_PYROKIN_FLAME_IMMUNITY", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: pyrokinetic_flame_immunity')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: pyrokinetic_flame_immunity')", "<=", "(difficulty_seven_contemplation(1))" ] - } + { "math": [ "u_spell_level('pyrokinetic_flame_immunity')", ">=", "1" ] }, + { "math": [ "u_spell_exp('pyrokinetic_flame_immunity')", "<=", "(difficulty_seven_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: pyrokinetic_flame_immunity')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('pyrokinetic_flame_immunity')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(7)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -577,7 +559,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PYROKIN_FLAME_IMMUNITY_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: pyrokinetic_flame_immunity')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('pyrokinetic_flame_immunity')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -612,16 +594,14 @@ "id": "EOC_PRACTICE_PYROKIN_BLAST", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: pyrokinetic_blast')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: pyrokinetic_blast')", "<=", "(difficulty_seven_contemplation(1))" ] - } + { "math": [ "u_spell_level('pyrokinetic_blast')", ">=", "1" ] }, + { "math": [ "u_spell_exp('pyrokinetic_blast')", "<=", "(difficulty_seven_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: pyrokinetic_blast')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('pyrokinetic_blast')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(7)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -629,7 +609,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PYROKIN_BLAST_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: pyrokinetic_blast')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('pyrokinetic_blast')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -664,16 +644,14 @@ "id": "EOC_PRACTICE_PYROKIN_AOE_BLAST", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: pyrokinetic_aoe_blast')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: pyrokinetic_aoe_blast')", "<=", "(difficulty_nine_contemplation(1))" ] - } + { "math": [ "u_spell_level('pyrokinetic_aoe_blast')", ">=", "1" ] }, + { "math": [ "u_spell_exp('pyrokinetic_aoe_blast')", "<=", "(difficulty_nine_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: pyrokinetic_aoe_blast')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('pyrokinetic_aoe_blast')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(9)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -681,7 +659,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PYROKIN_AOE_BLAST_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: pyrokinetic_aoe_blast')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('pyrokinetic_aoe_blast')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -716,16 +694,14 @@ "id": "EOC_PRACTICE_PYROKIN_INCINERATION", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: pyrokinetic_incineration')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: pyrokinetic_incineration')", "<=", "(difficulty_ten_contemplation(1))" ] - } + { "math": [ "u_spell_level('pyrokinetic_incineration')", ">=", "1" ] }, + { "math": [ "u_spell_exp('pyrokinetic_incineration')", "<=", "(difficulty_ten_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: pyrokinetic_incineration')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('pyrokinetic_incineration')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(10)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -733,7 +709,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_PYROKIN_INCINERATION_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: pyrokinetic_incineration')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('pyrokinetic_incineration')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } diff --git a/data/mods/MindOverMatter/recipes/practice/telekinesis_practice.json b/data/mods/MindOverMatter/recipes/practice/telekinesis_practice.json index d24076cd8cc5c..63185aeda4842 100644 --- a/data/mods/MindOverMatter/recipes/practice/telekinesis_practice.json +++ b/data/mods/MindOverMatter/recipes/practice/telekinesis_practice.json @@ -45,14 +45,14 @@ "id": "EOC_PRACTICE_TELEKIN_PULL", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telekinetic_pull')", ">=", "1" ] }, - { "math": [ "u_val('spell_exp', 'spell: telekinetic_pull')", "<=", "(difficulty_one_contemplation(1))" ] } + { "math": [ "u_spell_level('telekinetic_pull')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telekinetic_pull')", "<=", "(difficulty_one_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telekinetic_pull')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telekinetic_pull')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(1)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -60,7 +60,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEKIN_PULL_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telekinetic_pull')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telekinetic_pull')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -94,14 +94,14 @@ "id": "EOC_PRACTICE_TELEKIN_PUSH", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telekinetic_push')", ">=", "1" ] }, - { "math": [ "u_val('spell_exp', 'spell: telekinetic_push')", "<=", "(difficulty_two_contemplation(1))" ] } + { "math": [ "u_spell_level('telekinetic_push')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telekinetic_push')", "<=", "(difficulty_two_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telekinetic_push')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telekinetic_push')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(2)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -109,7 +109,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEKIN_PUSH_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telekinetic_push')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telekinetic_push')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -143,16 +143,14 @@ "id": "EOC_PRACTICE_TELEKIN_MOMENTUM", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telekinetic_momentum')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telekinetic_momentum')", "<=", "(difficulty_three_contemplation(1))" ] - } + { "math": [ "u_spell_level('telekinetic_momentum')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telekinetic_momentum')", "<=", "(difficulty_three_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telekinetic_momentum')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telekinetic_momentum')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(3)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -160,7 +158,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEKIN_MOMENTUM_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telekinetic_momentum')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telekinetic_momentum')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -195,16 +193,14 @@ "id": "EOC_PRACTICE_TELEKIN_SLOWFALL", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telekinetic_slowfall')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telekinetic_slowfall')", "<=", "(difficulty_three_contemplation(1))" ] - } + { "math": [ "u_spell_level('telekinetic_slowfall')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telekinetic_slowfall')", "<=", "(difficulty_three_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telekinetic_slowfall')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telekinetic_slowfall')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(3)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -212,7 +208,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEKIN_SLOWFALL_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telekinetic_slowfall')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telekinetic_slowfall')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -247,16 +243,14 @@ "id": "EOC_PRACTICE_TELEKIN_FORCE_WAVE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telekinetic_wave')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telekinetic_wave')", "<=", "(difficulty_four_contemplation(1))" ] - } + { "math": [ "u_spell_level('telekinetic_wave')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telekinetic_wave')", "<=", "(difficulty_four_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telekinetic_wave')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telekinetic_wave')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(4)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -264,7 +258,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEKIN_FORCE_WAVE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telekinetic_wave')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telekinetic_wave')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -299,16 +293,14 @@ "id": "EOC_PRACTICE_TELEKIN_ENHANCE_STRENGTH", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telekinetic_strength')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telekinetic_strength')", "<=", "(difficulty_five_contemplation(1))" ] - } + { "math": [ "u_spell_level('telekinetic_strength')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telekinetic_strength')", "<=", "(difficulty_five_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telekinetic_strength')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telekinetic_strength')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(5)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -316,7 +308,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEKIN_ENHANCE_STRENGTH_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telekinetic_strength')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telekinetic_strength')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -351,16 +343,14 @@ "id": "EOC_PRACTICE_TELEKIN_MINDHAMMER", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telekinetic_hammer')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telekinetic_hammer')", "<=", "(difficulty_five_contemplation(1))" ] - } + { "math": [ "u_spell_level('telekinetic_hammer')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telekinetic_hammer')", "<=", "(difficulty_five_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telekinetic_hammer')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telekinetic_hammer')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(5)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -368,7 +358,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEKIN_MINDHAMMER_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telekinetic_hammer')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telekinetic_hammer')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -403,16 +393,14 @@ "id": "EOC_PRACTICE_TELEKIN_VEHICLE_LIFT", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telekinetic_vehicle_lift')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telekinetic_vehicle_lift')", "<=", "(difficulty_six_contemplation(1))" ] - } + { "math": [ "u_spell_level('telekinetic_vehicle_lift')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telekinetic_vehicle_lift')", "<=", "(difficulty_six_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telekinetic_vehicle_lift')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telekinetic_vehicle_lift')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(6)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -420,7 +408,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEKIN_VEHICLE_LIFT_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telekinetic_vehicle_lift')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telekinetic_vehicle_lift')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -455,16 +443,14 @@ "id": "EOC_PRACTICE_TELEKIN_BARRIER", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telekinetic_shield')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telekinetic_shield')", "<=", "(difficulty_six_contemplation(1))" ] - } + { "math": [ "u_spell_level('telekinetic_shield')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telekinetic_shield')", "<=", "(difficulty_six_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telekinetic_shield')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telekinetic_shield')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(6)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -472,7 +458,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEKIN_BARRIER_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telekinetic_shield')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telekinetic_shield')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -507,16 +493,14 @@ "id": "EOC_PRACTICE_TELEKIN_BLAST", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telekinetic_explosion')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telekinetic_explosion')", "<=", "(difficulty_seven_contemplation(1))" ] - } + { "math": [ "u_spell_level('telekinetic_explosion')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telekinetic_explosion')", "<=", "(difficulty_seven_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telekinetic_explosion')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telekinetic_explosion')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(7)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -524,7 +508,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEKIN_BLAST_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telekinetic_explosion')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telekinetic_explosion')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -559,16 +543,14 @@ "id": "EOC_PRACTICE_LEVITATION", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telekinetic_levitation')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telekinetic_levitation')", "<=", "(difficulty_seven_contemplation(1))" ] - } + { "math": [ "u_spell_level('telekinetic_levitation')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telekinetic_levitation')", "<=", "(difficulty_seven_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telekinetic_levitation')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telekinetic_levitation')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(7)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -576,7 +558,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_LEVITATION_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telekinetic_levitation')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telekinetic_levitation')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -611,16 +593,14 @@ "id": "EOC_PRACTICE_TELEKIN_AEGIS", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telekinetic_aegis')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telekinetic_aegis')", "<=", "(difficulty_nine_contemplation(1))" ] - } + { "math": [ "u_spell_level('telekinetic_aegis')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telekinetic_aegis')", "<=", "(difficulty_nine_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telekinetic_aegis')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telekinetic_aegis')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(9)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -628,7 +608,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEKIN_AEGIS_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telekinetic_aegis')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telekinetic_aegis')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -663,16 +643,14 @@ "id": "EOC_PRACTICE_TELEKIN_EARTHSHAKER", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telekinetic_earthshaker')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telekinetic_earthshaker')", "<=", "(difficulty_ten_contemplation(1))" ] - } + { "math": [ "u_spell_level('telekinetic_earthshaker')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telekinetic_earthshaker')", "<=", "(difficulty_ten_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telekinetic_earthshaker')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telekinetic_earthshaker')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(10)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -680,7 +658,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEKIN_EARTHSHAKER_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telekinetic_earthshaker')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telekinetic_earthshaker')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } diff --git a/data/mods/MindOverMatter/recipes/practice/telepathy_practice.json b/data/mods/MindOverMatter/recipes/practice/telepathy_practice.json index f261259b81e19..e75e83c154271 100644 --- a/data/mods/MindOverMatter/recipes/practice/telepathy_practice.json +++ b/data/mods/MindOverMatter/recipes/practice/telepathy_practice.json @@ -45,16 +45,14 @@ "id": "EOC_PRACTICE_TELEPATH_CONCENTRATION", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telepathic_concentration')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telepathic_concentration')", "<=", "(difficulty_one_contemplation(1))" ] - } + { "math": [ "u_spell_level('telepathic_concentration')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telepathic_concentration')", "<=", "(difficulty_one_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telepathic_concentration')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telepathic_concentration')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(1)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -62,7 +60,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPATH_CONCENTRATION_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telepathic_concentration')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telepathic_concentration')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -96,16 +94,14 @@ "id": "EOC_PRACTICE_TELEPATH_SHIELD", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telepathic_shield')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telepathic_shield')", "<=", "(difficulty_two_contemplation(1))" ] - } + { "math": [ "u_spell_level('telepathic_shield')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telepathic_shield')", "<=", "(difficulty_two_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telepathic_shield')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telepathic_shield')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(2)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -113,7 +109,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPATH_SHIELD_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telepathic_shield')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telepathic_shield')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -147,16 +143,14 @@ "id": "EOC_PRACTICE_TELEPATH_MORALE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telepathic_morale')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telepathic_morale')", "<=", "(difficulty_three_contemplation(1))" ] - } + { "math": [ "u_spell_level('telepathic_morale')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telepathic_morale')", "<=", "(difficulty_three_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telepathic_morale')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telepathic_morale')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(3)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -164,7 +158,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPATH_MORALE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telepathic_morale')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telepathic_morale')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -198,16 +192,14 @@ "id": "EOC_PRACTICE_TELEPATH_MIND_SENSE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telepathic_mind_sense')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telepathic_mind_sense')", "<=", "(difficulty_three_contemplation(1))" ] - } + { "math": [ "u_spell_level('telepathic_mind_sense')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telepathic_mind_sense')", "<=", "(difficulty_three_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telepathic_mind_sense')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telepathic_mind_sense')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(3)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -215,7 +207,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPATH_MIND_SENSE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telepathic_mind_sense')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telepathic_mind_sense')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -250,16 +242,14 @@ "id": "EOC_PRACTICE_TELEPATHIC_BLAST", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telepathic_blast')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telepathic_blast')", "<=", "(difficulty_four_contemplation(1))" ] - } + { "math": [ "u_spell_level('telepathic_blast')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telepathic_blast')", "<=", "(difficulty_four_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telepathic_blast')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telepathic_blast')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(4)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -267,7 +257,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPATHIC_BLAST_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telepathic_blast')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telepathic_blast')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -302,18 +292,16 @@ "id": "EOC_PRACTICE_TELEPATHIC_ANIMAL_MIND_CONTROL", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telepathic_animal_mind_control')", ">=", "1" ] }, + { "math": [ "u_spell_level('telepathic_animal_mind_control')", ">=", "1" ] }, { - "math": [ "u_val('spell_exp', 'spell: telepathic_animal_mind_control')", "<=", "(difficulty_four_contemplation(1))" ] + "math": [ "u_spell_exp('telepathic_animal_mind_control')", "<=", "(difficulty_four_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { - "math": [ "u_val('spell_exp', 'spell: telepathic_animal_mind_control')", "+=", "(contemplation_factor(1))" ] - }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telepathic_animal_mind_control')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(4)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -321,7 +309,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPATHIC_ANIMAL_MIND_CONTROL_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telepathic_animal_mind_control')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telepathic_animal_mind_control')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -356,16 +344,14 @@ "id": "EOC_PRACTICE_TELEPATH_CONFUSION", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telepathic_confusion')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telepathic_confusion')", "<=", "(difficulty_five_contemplation(1))" ] - } + { "math": [ "u_spell_level('telepathic_confusion')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telepathic_confusion')", "<=", "(difficulty_five_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telepathic_confusion')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telepathic_confusion')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(5)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -373,7 +359,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPATH_CONFUSION_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telepathic_confusion')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telepathic_confusion')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -408,16 +394,14 @@ "id": "EOC_PRACTICE_TELEPATH_OBSCURITY", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telepathic_invisibility')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telepathic_invisibility')", "<=", "(difficulty_six_contemplation(1))" ] - } + { "math": [ "u_spell_level('telepathic_invisibility')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telepathic_invisibility')", "<=", "(difficulty_six_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telepathic_invisibility')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telepathic_invisibility')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(6)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -425,7 +409,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPATH_OBSCURITY_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telepathic_invisibility')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telepathic_invisibility')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -460,14 +444,14 @@ "id": "EOC_PRACTICE_TELEPATH_PRIMAL_FEAR", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telepathic_fear')", ">=", "1" ] }, - { "math": [ "u_val('spell_exp', 'spell: telepathic_fear')", "<=", "(difficulty_six_contemplation(1))" ] } + { "math": [ "u_spell_level('telepathic_fear')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telepathic_fear')", "<=", "(difficulty_six_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telepathic_fear')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telepathic_fear')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(6)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -475,7 +459,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPATH_PRIMAL_FEAR_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telepathic_fear')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telepathic_fear')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -510,16 +494,14 @@ "id": "EOC_PRACTICE_TELEPATH_SCREAM_RADIUS", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telepathic_blast_radius')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telepathic_blast_radius')", "<=", "(difficulty_seven_contemplation(1))" ] - } + { "math": [ "u_spell_level('telepathic_blast_radius')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telepathic_blast_radius')", "<=", "(difficulty_seven_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telepathic_blast_radius')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telepathic_blast_radius')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(7)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -527,7 +509,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPATH_SCREAM_RADIUS_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telepathic_blast_radius')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telepathic_blast_radius')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -571,7 +553,7 @@ "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, { "math": [ "u_val('spell_exp', 'spell: telepathic_beast_taming')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(7)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -614,16 +596,14 @@ "id": "EOC_PRACTICE_TELEPATH_MIND_CONTROL", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telepathic_mind_control')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telepathic_mind_control')", "<=", "(difficulty_eight_contemplation(1))" ] - } + { "math": [ "u_spell_level('telepathic_mind_control')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telepathic_mind_control')", "<=", "(difficulty_eight_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telepathic_mind_control')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telepathic_mind_control')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(8)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -631,7 +611,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPATH_MIND_CONTROL_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telepathic_mind_control')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telepathic_mind_control')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -666,16 +646,14 @@ "id": "EOC_PRACTICE_TELEPATH_NETWORK_EFFECT", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: telepathic_network')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: telepathic_network')", "<=", "(difficulty_nine_contemplation(1))" ] - } + { "math": [ "u_spell_level('telepathic_network')", ">=", "1" ] }, + { "math": [ "u_spell_exp('telepathic_network')", "<=", "(difficulty_nine_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: telepathic_network')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('telepathic_network')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(9)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -683,7 +661,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPATH_NETWORK_EFFECT_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: telepathic_network')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('telepathic_network')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } diff --git a/data/mods/MindOverMatter/recipes/practice/teleportation_practice.json b/data/mods/MindOverMatter/recipes/practice/teleportation_practice.json index 4f651d089906a..7417d0bf7f423 100644 --- a/data/mods/MindOverMatter/recipes/practice/teleportation_practice.json +++ b/data/mods/MindOverMatter/recipes/practice/teleportation_practice.json @@ -43,14 +43,14 @@ "id": "EOC_PRACTICE_TELEPORT_BLINK", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: teleport_blink')", ">=", "1" ] }, - { "math": [ "u_val('spell_exp', 'spell: teleport_blink')", "<=", "(difficulty_one_contemplation(1))" ] } + { "math": [ "u_spell_level('teleport_blink')", ">=", "1" ] }, + { "math": [ "u_spell_exp('teleport_blink')", "<=", "(difficulty_one_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: teleport_blink')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('teleport_blink')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(1)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -58,7 +58,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPORT_BLINK_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: teleport_blink')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('teleport_blink')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -92,14 +92,14 @@ "id": "EOC_PRACTICE_TELEPORT_SLOW", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: teleport_slow')", ">=", "1" ] }, - { "math": [ "u_val('spell_exp', 'spell: teleport_slow')", "<=", "(difficulty_two_contemplation(1))" ] } + { "math": [ "u_spell_level('teleport_slow')", ">=", "1" ] }, + { "math": [ "u_spell_exp('teleport_slow')", "<=", "(difficulty_two_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: teleport_slow')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('teleport_slow')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(2)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -107,7 +107,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPORT_SLOW_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: teleport_slow')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('teleport_slow')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -141,14 +141,14 @@ "id": "EOC_PRACTICE_TELEPORT_PHASE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: teleport_phase')", ">=", "1" ] }, - { "math": [ "u_val('spell_exp', 'spell: teleport_phase')", "<=", "(difficulty_two_contemplation(1))" ] } + { "math": [ "u_spell_level('teleport_phase')", ">=", "1" ] }, + { "math": [ "u_spell_exp('teleport_phase')", "<=", "(difficulty_two_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: teleport_phase')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('teleport_phase')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(2)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -156,7 +156,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPORT_PHASE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: teleport_phase')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('teleport_phase')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -190,16 +190,14 @@ "id": "EOC_PRACTICE_TELEPORT_STRIDE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: teleport_stride')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: teleport_stride')", "<=", "(difficulty_three_contemplation(1))" ] - } + { "math": [ "u_spell_level('teleport_stride')", ">=", "1" ] }, + { "math": [ "u_spell_exp('teleport_stride')", "<=", "(difficulty_three_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: teleport_stride')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('teleport_stride')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(3)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -207,7 +205,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPORT_STRIDE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: teleport_stride')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('teleport_stride')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -241,16 +239,14 @@ "id": "EOC_PRACTICE_TELEPORT_SWAP", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: teleport_transpose')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: teleport_transpose')", "<=", "(difficulty_four_contemplation(1))" ] - } + { "math": [ "u_spell_level('teleport_transpose')", ">=", "1" ] }, + { "math": [ "u_spell_exp('teleport_transpose')", "<=", "(difficulty_four_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: teleport_transpose')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('teleport_transpose')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(4)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -258,7 +254,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPORT_SWAP_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: teleport_transpose')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('teleport_transpose')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -293,16 +289,14 @@ "id": "EOC_PRACTICE_TELEPORT_COLLAPSE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: teleport_collapse')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: teleport_collapse')", "<=", "(difficulty_five_contemplation(1))" ] - } + { "math": [ "u_spell_level('teleport_collapse')", ">=", "1" ] }, + { "math": [ "u_spell_exp('teleport_collapse')", "<=", "(difficulty_five_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: teleport_collapse')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('teleport_collapse')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(5)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -310,7 +304,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPORT_COLLAPSE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: teleport_collapse')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('teleport_collapse')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -345,16 +339,14 @@ "id": "EOC_PRACTICE_TELEPORT_DISPLACEMENT", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: teleport_displacement')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: teleport_displacement')", "<=", "(difficulty_five_contemplation(1))" ] - } + { "math": [ "u_spell_level('teleport_displacement')", ">=", "1" ] }, + { "math": [ "u_spell_exp('teleport_displacement')", "<=", "(difficulty_five_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: teleport_displacement')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('teleport_displacement')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(5)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -362,7 +354,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPORT_DISPLACEMENT_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: teleport_displacement')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('teleport_displacement')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -397,14 +389,14 @@ "id": "EOC_PRACTICE_TELEPORT_FARSTEP", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: teleport_farstep')", ">=", "1" ] }, - { "math": [ "u_val('spell_exp', 'spell: teleport_farstep')", "<=", "(difficulty_six_contemplation(1))" ] } + { "math": [ "u_spell_level('teleport_farstep')", ">=", "1" ] }, + { "math": [ "u_spell_exp('teleport_farstep')", "<=", "(difficulty_six_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: teleport_farstep')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('teleport_farstep')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(6)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -412,7 +404,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPORT_FARSTEP_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: teleport_farstep')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('teleport_farstep')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -447,16 +439,14 @@ "id": "EOC_PRACTICE_TELEPORT_BANISH", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: teleport_banish')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: teleport_banish')", "<=", "(difficulty_seven_contemplation(1))" ] - } + { "math": [ "u_spell_level('teleport_banish')", ">=", "1" ] }, + { "math": [ "u_spell_exp('teleport_banish')", "<=", "(difficulty_seven_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: teleport_banish')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('teleport_banish')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(7)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -464,7 +454,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPORT_BANISH_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: teleport_banish')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('teleport_banish')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -499,16 +489,14 @@ "id": "EOC_PRACTICE_TELEPORT_GATEWAY", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: teleport_gateway')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: teleport_gateway')", "<=", "(difficulty_eight_contemplation(1))" ] - } + { "math": [ "u_spell_level('teleport_gateway')", ">=", "1" ] }, + { "math": [ "u_spell_exp('teleport_gateway')", "<=", "(difficulty_eight_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: teleport_gateway')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('teleport_gateway')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(8)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -516,7 +504,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPORT_GATEWAY_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: teleport_gateway')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('teleport_gateway')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -551,14 +539,14 @@ "id": "EOC_PRACTICE_TELEPORT_BREACH", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: teleport_summon')", ">=", "1" ] }, - { "math": [ "u_val('spell_exp', 'spell: teleport_summon')", "<=", "(difficulty_nine_contemplation(1))" ] } + { "math": [ "u_spell_level('teleport_summon')", ">=", "1" ] }, + { "math": [ "u_spell_exp('teleport_summon')", "<=", "(difficulty_nine_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: teleport_summon')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('teleport_summon')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(9)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -566,7 +554,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_TELEPORT_BREACH_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: teleport_summon')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('teleport_summon')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } diff --git a/data/mods/MindOverMatter/recipes/practice/vitakinesis_practice.json b/data/mods/MindOverMatter/recipes/practice/vitakinesis_practice.json index 52cd850bff61b..775b213057639 100644 --- a/data/mods/MindOverMatter/recipes/practice/vitakinesis_practice.json +++ b/data/mods/MindOverMatter/recipes/practice/vitakinesis_practice.json @@ -48,16 +48,14 @@ "id": "EOC_PRACTICE_VITAKIN_HEALTH", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: vita_health_power')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: vita_health_power')", "<=", "(difficulty_one_contemplation(1))" ] - } + { "math": [ "u_spell_level('vita_health_power')", ">=", "1" ] }, + { "math": [ "u_spell_exp('vita_health_power')", "<=", "(difficulty_one_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: vita_health_power')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('vita_health_power')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(1)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -65,7 +63,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_VITAKIN_HEALTH_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: vita_health_power')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('vita_health_power')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -99,16 +97,14 @@ "id": "EOC_PRACTICE_VITAKIN_STAUNCHING", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: vita_stop_bleeding')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: vita_stop_bleeding')", "<=", "(difficulty_two_contemplation(1))" ] - } + { "math": [ "u_spell_level('vita_stop_bleeding')", ">=", "1" ] }, + { "math": [ "u_spell_exp('vita_stop_bleeding')", "<=", "(difficulty_two_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: vita_stop_bleeding')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('vita_stop_bleeding')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(2)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -116,7 +112,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_VITAKIN_STAUNCHING_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: vita_stop_bleeding')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('vita_stop_bleeding')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -150,16 +146,14 @@ "id": "EOC_PRACTICE_VITAKIN_HURT", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: vita_hurt_touch')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: vita_hurt_touch')", "<=", "(difficulty_three_contemplation(1))" ] - } + { "math": [ "u_spell_level('vita_hurt_touch')", ">=", "1" ] }, + { "math": [ "u_spell_exp('vita_hurt_touch')", "<=", "(difficulty_three_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: vita_hurt_touch')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('vita_hurt_touch')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(3)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -167,7 +161,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_VITAKIN_HURT_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: vita_hurt_touch')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('vita_hurt_touch')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -201,16 +195,14 @@ "id": "EOC_PRACTICE_VITAKIN_HEAL_TOUCH_ALLY", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: vita_health_power_ally')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: vita_health_power_ally')", "<=", "(difficulty_three_contemplation(1))" ] - } + { "math": [ "u_spell_level('vita_health_power_ally')", ">=", "1" ] }, + { "math": [ "u_spell_exp('vita_health_power_ally')", "<=", "(difficulty_three_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: vita_health_power_ally')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('vita_health_power_ally')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(3)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -218,7 +210,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_VITAKIN_HEAL_TOUCH_ALLY_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: vita_health_power_ally')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('vita_health_power_ally')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -252,16 +244,14 @@ "id": "EOC_PRACTICE_VITAKIN_REMOVE_POISON", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: vita_remove_poison')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: vita_remove_poison')", "<=", "(difficulty_three_contemplation(1))" ] - } + { "math": [ "u_spell_level('vita_remove_poison')", ">=", "1" ] }, + { "math": [ "u_spell_exp('vita_remove_poison')", "<=", "(difficulty_three_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: vita_remove_poison')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('vita_remove_poison')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(3)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -269,7 +259,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_VITAKIN_REMOVE_POISON_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: vita_remove_poison')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('vita_remove_poison')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -304,16 +294,14 @@ "id": "EOC_PRACTICE_VITAKIN_SLEEP", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: vita_sleeping_trance')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: vita_sleeping_trance')", "<=", "(difficulty_four_contemplation(1))" ] - } + { "math": [ "u_spell_level('vita_sleeping_trance')", ">=", "1" ] }, + { "math": [ "u_spell_exp('vita_sleeping_trance')", "<=", "(difficulty_four_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: vita_sleeping_trance')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('vita_sleeping_trance')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(4)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -321,7 +309,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_VITAKIN_SLEEP_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: vita_sleeping_trance')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('vita_sleeping_trance')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -356,16 +344,14 @@ "id": "EOC_PRACTICE_VITAKIN_CURE_DISEASE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: vita_cure_disease')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: vita_cure_disease')", "<=", "(difficulty_four_contemplation(1))" ] - } + { "math": [ "u_spell_level('vita_cure_disease')", ">=", "1" ] }, + { "math": [ "u_spell_exp('vita_cure_disease')", "<=", "(difficulty_four_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: vita_cure_disease')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('vita_cure_disease')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(4)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -373,7 +359,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_VITAKIN_CURE_DISEASE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: vita_cure_disease')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('vita_cure_disease')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -408,14 +394,14 @@ "id": "EOC_PRACTICE_VITAKIN_DAMAGE_BALANCE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: vita_pain_split')", ">=", "1" ] }, - { "math": [ "u_val('spell_exp', 'spell: vita_pain_split')", "<=", "(difficulty_five_contemplation(1))" ] } + { "math": [ "u_spell_level('vita_pain_split')", ">=", "1" ] }, + { "math": [ "u_spell_exp('vita_pain_split')", "<=", "(difficulty_five_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: vita_pain_split')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('vita_pain_split')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(5)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -423,7 +409,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_VITAKIN_DAMAGE_BALANCE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: vita_pain_split')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('vita_pain_split')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -458,16 +444,14 @@ "id": "EOC_PRACTICE_VITAKIN_STOP_INFECTION", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: vita_stop_infection')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: vita_stop_infection')", "<=", "(difficulty_five_contemplation(1))" ] - } + { "math": [ "u_spell_level('vita_stop_infection')", ">=", "1" ] }, + { "math": [ "u_spell_exp('vita_stop_infection')", "<=", "(difficulty_five_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: vita_stop_infection')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('vita_stop_infection')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(5)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -475,7 +459,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_VITAKIN_STOP_INFECTION_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: vita_stop_infection')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('vita_stop_infection')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -510,16 +494,14 @@ "id": "EOC_PRACTICE_VITAKIN_HEALING_TRANCE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: vita_healing_trance')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: vita_healing_trance')", "<=", "(difficulty_six_contemplation(1))" ] - } + { "math": [ "u_spell_level('vita_healing_trance')", ">=", "1" ] }, + { "math": [ "u_spell_exp('vita_healing_trance')", "<=", "(difficulty_six_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: vita_healing_trance')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('vita_healing_trance')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(6)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -527,7 +509,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_VITAKIN_HEALING_TRANCE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: vita_healing_trance')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('vita_healing_trance')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -562,14 +544,14 @@ "id": "EOC_PRACTICE_VITAKIN_PURGE_RADS", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: vita_purge_rads')", ">=", "1" ] }, - { "math": [ "u_val('spell_exp', 'spell: vita_purge_rads')", "<=", "(difficulty_six_contemplation(1))" ] } + { "math": [ "u_spell_level('vita_purge_rads')", ">=", "1" ] }, + { "math": [ "u_spell_exp('vita_purge_rads')", "<=", "(difficulty_six_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: vita_purge_rads')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('vita_purge_rads')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(6)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -577,7 +559,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_VITAKIN_PURGE_RADS_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: vita_purge_rads')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('vita_purge_rads')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -612,16 +594,14 @@ "id": "EOC_PRACTICE_VITAKIN_PURGE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: vita_blood_purge')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: vita_blood_purge')", "<=", "(difficulty_seven_contemplation(1))" ] - } + { "math": [ "u_spell_level('vita_blood_purge')", ">=", "1" ] }, + { "math": [ "u_spell_exp('vita_blood_purge')", "<=", "(difficulty_seven_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: vita_blood_purge')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('vita_blood_purge')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(7)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -629,7 +609,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_VITAKIN_PURGE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: vita_blood_purge')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('vita_blood_purge')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -664,16 +644,14 @@ "id": "EOC_PRACTICE_VITAKIN_BANISH_ILLNESS", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: vita_banish_illness')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: vita_banish_illness')", "<=", "(difficulty_eight_contemplation(1))" ] - } + { "math": [ "u_spell_level('vita_banish_illness')", ">=", "1" ] }, + { "math": [ "u_spell_exp('vita_banish_illness')", "<=", "(difficulty_eight_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: vita_banish_illness')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('vita_banish_illness')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(8)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -681,7 +659,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_VITAKIN_BANISH_ILLNESS_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: vita_banish_illness')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('vita_banish_illness')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -716,14 +694,14 @@ "id": "EOC_PRACTICE_VITAKIN_SUPER_HEAL", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: vita_super_heal')", ">=", "1" ] }, - { "math": [ "u_val('spell_exp', 'spell: vita_super_heal')", "<=", "(difficulty_nine_contemplation(1))" ] } + { "math": [ "u_spell_level('vita_super_heal')", ">=", "1" ] }, + { "math": [ "u_spell_exp('vita_super_heal')", "<=", "(difficulty_nine_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend some time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: vita_super_heal')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('vita_super_heal')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(9)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -731,7 +709,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_VITAKIN_SUPER_HEAL_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: vita_super_heal')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('vita_super_heal')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -766,16 +744,14 @@ "id": "EOC_PRACTICE_VITAKIN_LIMB_RESTORE", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: vita_limb_restore')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: vita_limb_restore')", "<=", "(difficulty_ten_contemplation(1))" ] - } + { "math": [ "u_spell_level('vita_limb_restore')", ">=", "1" ] }, + { "math": [ "u_spell_exp('vita_limb_restore')", "<=", "(difficulty_ten_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend a lot of time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: vita_limb_restore')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('vita_limb_restore')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(10)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -783,7 +759,7 @@ "run_eocs": [ { "id": "EOC_PRACTICE_VITAKIN_LIMB_RESTORE_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: vita_limb_restore')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('vita_limb_restore')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } @@ -818,16 +794,14 @@ "id": "EOC_PRACTICE_VITAKIN_RETURN_FROM_DEATH", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: vita_return_from_death')", ">=", "1" ] }, - { - "math": [ "u_val('spell_exp', 'spell: vita_return_from_death')", "<=", "(difficulty_ten_contemplation(1))" ] - } + { "math": [ "u_spell_level('vita_return_from_death')", ">=", "1" ] }, + { "math": [ "u_spell_exp('vita_return_from_death')", "<=", "(difficulty_ten_contemplation(1))" ] } ] }, "effect": [ { "u_message": "You spend a lot of time meditating and contemplating your powers and emerge with new knowledge." }, - { "math": [ "u_val('spell_exp', 'spell: vita_return_from_death')", "+=", "(contemplation_factor(1))" ] }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, + { "math": [ "u_spell_exp('vita_return_from_death')", "+=", "(contemplation_factor(1))" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 0,2 )" ] }, { "math": [ "u_val('stored_kcal')", "-=", "psionics_contemplation_kcal_cost(10)" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], @@ -835,7 +809,7 @@ "run_eocs": [ { "id": "EEOC_PRACTICE_VITAKIN_RETURN_FROM_DEATH_FALSE", - "condition": { "math": [ "u_val('spell_level', 'spell: vita_return_from_death')", ">=", "1" ] }, + "condition": { "math": [ "u_spell_level('vita_return_from_death')", ">=", "1" ] }, "effect": [ { "u_message": "Your knowledge of your powers is so deep that mere contemplation is of no further use to you." }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } diff --git a/data/mods/MindOverMatter/recipes/research.json b/data/mods/MindOverMatter/recipes/research.json index 16b4e8cc19bb3..c05857f1aff32 100644 --- a/data/mods/MindOverMatter/recipes/research.json +++ b/data/mods/MindOverMatter/recipes/research.json @@ -77,9 +77,9 @@ "and": [ { "roll_contested": { "math": [ "u_skill('metaphysics')" ] }, "difficulty": 10 }, { "roll_contested": { "math": [ "u_skill('chemistry')" ] }, "difficulty": 8 }, - { "math": [ "u_val('spell_level', 'spell: clair_spot_weakness')", ">=", "6" ] }, - { "math": [ "u_val('spell_level', 'spell: clair_danger_sense')", ">=", "8" ] }, - { "math": [ "u_val('spell_level', 'spell: clair_voyance')", ">=", "5" ] } + { "math": [ "u_spell_level('clair_spot_weakness')", ">=", "6" ] }, + { "math": [ "u_spell_level('clair_danger_sense')", ">=", "8" ] }, + { "math": [ "u_spell_level('clair_voyance')", ">=", "5" ] } ] }, "effect": [ @@ -148,9 +148,9 @@ "and": [ { "roll_contested": { "math": [ "u_skill('metaphysics')" ] }, "difficulty": 11 }, { "roll_contested": { "math": [ "u_skill('chemistry')" ] }, "difficulty": 8 }, - { "math": [ "u_val('spell_level', 'spell: vita_pain_split')", ">=", "8" ] }, - { "math": [ "u_val('spell_level', 'spell: vita_stop_infection')", ">=", "6" ] }, - { "math": [ "u_val('spell_level', 'spell: vita_healing_trance')", ">=", "2" ] } + { "math": [ "u_spell_level('vita_pain_split')", ">=", "8" ] }, + { "math": [ "u_spell_level('vita_stop_infection')", ">=", "6" ] }, + { "math": [ "u_spell_level('vita_healing_trance')", ">=", "2" ] } ] }, "effect": [ diff --git a/data/mods/MindOverMatter/recipes/rituals.json b/data/mods/MindOverMatter/recipes/rituals.json index 1522255dcb400..513871f0d5eb1 100644 --- a/data/mods/MindOverMatter/recipes/rituals.json +++ b/data/mods/MindOverMatter/recipes/rituals.json @@ -21,11 +21,11 @@ "id": "EOC_UNLOCK_PSIONIC_COMBAT", "condition": { "and": [ - { "math": [ "u_val('spell_level', 'spell: biokin_physical_enhance')", ">=", "8" ] }, - { "math": [ "u_val('spell_level', 'spell: biokin_reflex_enhance')", ">=", "6" ] }, - { "math": [ "u_val('spell_level', 'spell: biokin_flexibility')", ">=", "8" ] }, - { "math": [ "u_val('spell_level', 'spell: biokin_overcome_pain')", ">=", "5" ] }, - { "math": [ "u_val('spell_level', 'spell: biokin_armor_skin')", ">=", "4" ] } + { "math": [ "u_spell_level('biokin_physical_enhance')", ">=", "8" ] }, + { "math": [ "u_spell_level('biokin_reflex_enhance')", ">=", "6" ] }, + { "math": [ "u_spell_level('biokin_flexibility')", ">=", "8" ] }, + { "math": [ "u_spell_level('biokin_overcome_pain')", ">=", "5" ] }, + { "math": [ "u_spell_level('biokin_armor_skin')", ">=", "4" ] } ] }, "effect": { @@ -43,7 +43,7 @@ "type": "good" }, { "u_add_trait": "KI_STRIKE" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 10,30 )" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 10,30 )" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ], "false_effect": [ @@ -51,7 +51,7 @@ "u_message": "You just couldn't master the forms and the meditations eluded you. You'll need to try again.", "type": "bad" }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 10,30 )" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 10,30 )" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ] } @@ -60,7 +60,7 @@ { "u_message": "Your mastery of biokinesis isn't deep enough to succeed. You'll need to develop your powers and try again." }, - { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 10,30 )" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 10,30 )" ] }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" } ] } diff --git a/data/mods/Xedra_Evolved/effects/effects.json b/data/mods/Xedra_Evolved/effects/effects.json index 13e5d87ce605f..71c587d9b1c2b 100644 --- a/data/mods/Xedra_Evolved/effects/effects.json +++ b/data/mods/Xedra_Evolved/effects/effects.json @@ -524,9 +524,7 @@ "rating": "good", "//": "+0.2x smamina regen for each level", "enchantments": [ - { - "values": [ { "value": "REGEN_STAMINA", "multiply": { "math": [ "u_val('spell_level', 'spell: spell_stamina_wonder') / 5" ] } } ] - } + { "values": [ { "value": "REGEN_STAMINA", "multiply": { "math": [ "u_spell_level('spell_stamina_wonder') / 5" ] } } ] } ] }, { @@ -539,11 +537,7 @@ "rating": "good", "show_intensity": false, "//": "+1 dodge initially, +1 each 6 levels", - "enchantments": [ - { - "values": [ { "value": "BONUS_DODGE", "add": { "math": [ "(u_val('spell_level', 'spell: spell_dodge') / 6 ) + 1" ] } } ] - } - ] + "enchantments": [ { "values": [ { "value": "BONUS_DODGE", "add": { "math": [ "(u_spell_level('spell_dodge') / 6 ) + 1" ] } } ] } ] }, { "id": "effect_endurance", @@ -558,15 +552,15 @@ "enchantments": [ { "values": [ - { "value": "ARMOR_BASH", "add": { "math": [ "-1 * u_val('spell_level', 'spell: spell_endurance')" ] } }, - { "value": "ARMOR_CUT", "add": { "math": [ "-1 * u_val('spell_level', 'spell: spell_endurance')" ] } }, - { "value": "ARMOR_STAB", "add": { "math": [ "-1 * u_val('spell_level', 'spell: spell_endurance')" ] } }, - { "value": "ARMOR_BULLET", "add": { "math": [ "-1 * u_val('spell_level', 'spell: spell_endurance')" ] } }, - { "value": "ARMOR_ACID", "add": { "math": [ "-1 * u_val('spell_level', 'spell: spell_endurance')" ] } }, - { "value": "ARMOR_BIO", "add": { "math": [ "-1 * u_val('spell_level', 'spell: spell_endurance')" ] } }, - { "value": "ARMOR_COLD", "add": { "math": [ "-1 * u_val('spell_level', 'spell: spell_endurance')" ] } }, - { "value": "ARMOR_ELEC", "add": { "math": [ "-1 * u_val('spell_level', 'spell: spell_endurance')" ] } }, - { "value": "ARMOR_HEAT", "add": { "math": [ "-1 * u_val('spell_level', 'spell: spell_endurance')" ] } } + { "value": "ARMOR_BASH", "add": { "math": [ "-1 * u_spell_level('spell_endurance')" ] } }, + { "value": "ARMOR_CUT", "add": { "math": [ "-1 * u_spell_level('spell_endurance')" ] } }, + { "value": "ARMOR_STAB", "add": { "math": [ "-1 * u_spell_level('spell_endurance')" ] } }, + { "value": "ARMOR_BULLET", "add": { "math": [ "-1 * u_spell_level('spell_endurance')" ] } }, + { "value": "ARMOR_ACID", "add": { "math": [ "-1 * u_spell_level('spell_endurance')" ] } }, + { "value": "ARMOR_BIO", "add": { "math": [ "-1 * u_spell_level('spell_endurance')" ] } }, + { "value": "ARMOR_COLD", "add": { "math": [ "-1 * u_spell_level('spell_endurance')" ] } }, + { "value": "ARMOR_ELEC", "add": { "math": [ "-1 * u_spell_level('spell_endurance')" ] } }, + { "value": "ARMOR_HEAT", "add": { "math": [ "-1 * u_spell_level('spell_endurance')" ] } } ] } ] @@ -586,12 +580,9 @@ "enchantments": [ { "values": [ - { "value": "ATTACK_SPEED", "add": { "math": [ "u_val('spell_level', 'spell: spell_melee_damage') * 2" ] } }, - { "value": "BONUS_DODGE", "add": { "math": [ "u_val('spell_level', 'spell: spell_melee_damage') / 10" ] } }, - { - "value": "MELEE_DAMAGE", - "multiply": { "math": [ "u_val('spell_level', 'spell: spell_melee_damage') / 20" ] } - } + { "value": "ATTACK_SPEED", "add": { "math": [ "u_spell_level('spell_melee_damage') * 2" ] } }, + { "value": "BONUS_DODGE", "add": { "math": [ "u_spell_level('spell_melee_damage') / 10" ] } }, + { "value": "MELEE_DAMAGE", "multiply": { "math": [ "u_spell_level('spell_melee_damage') / 20" ] } } ] } ] @@ -606,9 +597,7 @@ "rating": "good", "show_intensity": false, "//": "+5 speed for each level", - "enchantments": [ - { "values": [ { "value": "SPEED", "add": { "math": [ "u_val('spell_level', 'spell: spell_speed_wonder') * 5" ] } } ] } - ] + "enchantments": [ { "values": [ { "value": "SPEED", "add": { "math": [ "u_spell_level('spell_speed_wonder') * 5" ] } } ] } ] }, { "id": "effect_weakening", @@ -895,9 +884,7 @@ { "value": "SPEED", "add": { - "math": [ - "( ( 5 + ( u_val('spell_level', 'spell: salamander_increase_speed_spell') * 1.5 ) ) ) * (scaling_factor(u_val('strength') ) )" - ] + "math": [ "( ( 5 + ( u_spell_level('salamander_increase_speed_spell') * 1.5 ) ) ) * (scaling_factor(u_val('strength') ) )" ] } } ] @@ -965,9 +952,7 @@ { "value": "BONUS_DODGE", "add": { - "math": [ - "( ( 1 + ( u_val('spell_level', 'spell: paraclesian_spell_dodge_bonus') / 10 ) ) ) * (scaling_factor(u_val('perception') ) )" - ] + "math": [ "( ( 1 + ( u_spell_level('paraclesian_spell_dodge_bonus') / 10 ) ) ) * (scaling_factor(u_val('perception') ) )" ] } } ] @@ -989,9 +974,7 @@ { "value": "BONUS_DODGE", "add": { - "math": [ - "( ( 1 + ( u_val('spell_level', 'spell: paraclesian_spell_dodge_bonus') / 10 ) ) ) * (scaling_factor(u_val('perception') ) )" - ] + "math": [ "( ( 1 + ( u_spell_level('paraclesian_spell_dodge_bonus') / 10 ) ) ) * (scaling_factor(u_val('perception') ) )" ] } } ] @@ -1014,9 +997,7 @@ { "value": "BONUS_DODGE", "add": { - "math": [ - "( ( 1 + ( u_val('spell_level', 'spell: paraclesian_spell_dodge_bonus') / 10 ) ) ) * (scaling_factor(u_val('perception') ) )" - ] + "math": [ "( ( 1 + ( u_spell_level('paraclesian_spell_dodge_bonus') / 10 ) ) ) * (scaling_factor(u_val('perception') ) )" ] } } ] diff --git a/data/mods/Xedra_Evolved/enchantments/weapon.json b/data/mods/Xedra_Evolved/enchantments/weapon.json index d6fbc19297a01..d6f901efac004 100644 --- a/data/mods/Xedra_Evolved/enchantments/weapon.json +++ b/data/mods/Xedra_Evolved/enchantments/weapon.json @@ -74,9 +74,7 @@ "values": [ { "value": "ITEM_DAMAGE_HEAT", - "add": { - "math": [ "(5 + (u_val('spell_level', 'spell: salamander_flaming_whip_spell') * 1) * (scaling_factor(u_val('dexterity') ) ) )" ] - } + "add": { "math": [ "(5 + (u_spell_level('salamander_flaming_whip_spell') * 1) * (scaling_factor(u_val('dexterity') ) ) )" ] } } ] } diff --git a/data/mods/Xedra_Evolved/eocs/inventor.json b/data/mods/Xedra_Evolved/eocs/inventor.json index 2c41fe5fc080d..ca2b8d7dce034 100644 --- a/data/mods/Xedra_Evolved/eocs/inventor.json +++ b/data/mods/Xedra_Evolved/eocs/inventor.json @@ -3,9 +3,9 @@ "type": "effect_on_condition", "id": "EOC_INVENTOR_RESEARCH_BASE_1", "//": "Check, do player has enough processed sparks to beat the difficulty. If true, substract difficulty from vitamin, increase difficulty for 5, roll_remainder recipe, process sparks, print success message. If false, give 1 processed spark, process sparks, print a fail message.", - "condition": { "math": [ "u_val('vitamin', 'name:creative_spark_research')", ">=", "base_difficulty_1" ] }, + "condition": { "math": [ "u_vitamin('creative_spark_research')", ">=", "base_difficulty_1" ] }, "effect": [ - { "math": [ "u_val('vitamin', 'name:creative_spark_research')", "-=", "base_difficulty_1" ] }, + { "math": [ "u_vitamin('creative_spark_research')", "-=", "base_difficulty_1" ] }, { "math": [ "base_difficulty_1", "+=", "2" ] }, { "u_roll_remainder": [ @@ -38,15 +38,15 @@ "false_effect": [ { "u_message": "inventor_fail", "snippet": true, "type": "bad" }, { "run_eocs": "EOC_INVENTOR_PROCESS_SPARKS" }, - { "math": [ "u_val('vitamin', 'name:creative_spark_research')", "+=", "1" ] } + { "math": [ "u_vitamin('creative_spark_research')", "+=", "1" ] } ] }, { "type": "effect_on_condition", "id": "EOC_INVENTOR_RESEARCH_BASE_2", - "condition": { "math": [ "u_val('vitamin', 'name:creative_spark_research')", ">=", "base_difficulty_2" ] }, + "condition": { "math": [ "u_vitamin('creative_spark_research')", ">=", "base_difficulty_2" ] }, "effect": [ - { "math": [ "u_val('vitamin', 'name:creative_spark_research')", "-=", "base_difficulty_2" ] }, + { "math": [ "u_vitamin('creative_spark_research')", "-=", "base_difficulty_2" ] }, { "math": [ "base_difficulty_2", "+=", "3" ] }, { "run_eocs": "EOC_INVENTOR_PROCESS_SPARKS" }, { @@ -84,15 +84,15 @@ "false_effect": [ { "u_message": "inventor_fail", "snippet": true, "type": "bad" }, { "run_eocs": "EOC_INVENTOR_PROCESS_SPARKS" }, - { "math": [ "u_val('vitamin', 'name:creative_spark_research')", "+=", "2" ] } + { "math": [ "u_vitamin('creative_spark_research')", "+=", "2" ] } ] }, { "type": "effect_on_condition", "id": "EOC_INVENTOR_RESEARCH_BASE_3", - "condition": { "math": [ "u_val('vitamin', 'name:creative_spark_research')", ">=", "base_difficulty_3" ] }, + "condition": { "math": [ "u_vitamin('creative_spark_research')", ">=", "base_difficulty_3" ] }, "effect": [ - { "math": [ "u_val('vitamin', 'name:creative_spark_research')", "-=", "base_difficulty_3" ] }, + { "math": [ "u_vitamin('creative_spark_research')", "-=", "base_difficulty_3" ] }, { "math": [ "base_difficulty_3", "+=", "4" ] }, { "run_eocs": "EOC_INVENTOR_PROCESS_SPARKS" }, { @@ -114,15 +114,15 @@ "false_effect": [ { "u_message": "inventor_fail", "snippet": true, "type": "bad" }, { "run_eocs": "EOC_INVENTOR_PROCESS_SPARKS" }, - { "math": [ "u_val('vitamin', 'name:creative_spark_research')", "+=", "3" ] } + { "math": [ "u_vitamin('creative_spark_research')", "+=", "3" ] } ] }, { "type": "effect_on_condition", "id": "EOC_INVENTOR_RESEARCH_ENERGY_1", - "condition": { "math": [ "u_val('vitamin', 'name:creative_spark_research')", ">=", "energy_difficulty_1" ] }, + "condition": { "math": [ "u_vitamin('creative_spark_research')", ">=", "energy_difficulty_1" ] }, "effect": [ - { "math": [ "u_val('vitamin', 'name:creative_spark_research')", "-=", "energy_difficulty_1" ] }, + { "math": [ "u_vitamin('creative_spark_research')", "-=", "energy_difficulty_1" ] }, { "math": [ "energy_difficulty_1", "+=", "2" ] }, { "u_roll_remainder": [ @@ -155,15 +155,15 @@ "false_effect": [ { "u_message": "inventor_fail", "snippet": true, "type": "bad" }, { "run_eocs": "EOC_INVENTOR_PROCESS_SPARKS" }, - { "math": [ "u_val('vitamin', 'name:creative_spark_research')", "+=", "1" ] } + { "math": [ "u_vitamin('creative_spark_research')", "+=", "1" ] } ] }, { "type": "effect_on_condition", "id": "EOC_INVENTOR_RESEARCH_ENERGY_2", - "condition": { "math": [ "u_val('vitamin', 'name:creative_spark_research')", ">=", "energy_difficulty_2" ] }, + "condition": { "math": [ "u_vitamin('creative_spark_research')", ">=", "energy_difficulty_2" ] }, "effect": [ - { "math": [ "u_val('vitamin', 'name:creative_spark_research')", "-=", "energy_difficulty_2" ] }, + { "math": [ "u_vitamin('creative_spark_research')", "-=", "energy_difficulty_2" ] }, { "math": [ "energy_difficulty_2", "+=", "3" ] }, { "u_roll_remainder": [ @@ -203,15 +203,15 @@ "false_effect": [ { "u_message": "inventor_fail", "snippet": true, "type": "bad" }, { "run_eocs": "EOC_INVENTOR_PROCESS_SPARKS" }, - { "math": [ "u_val('vitamin', 'name:creative_spark_research')", "+=", "2" ] } + { "math": [ "u_vitamin('creative_spark_research')", "+=", "2" ] } ] }, { "type": "effect_on_condition", "id": "EOC_INVENTOR_RESEARCH_ENERGY_3", - "condition": { "math": [ "u_val('vitamin', 'name:creative_spark_research')", ">=", "energy_difficulty_3" ] }, + "condition": { "math": [ "u_vitamin('creative_spark_research')", ">=", "energy_difficulty_3" ] }, "effect": [ - { "math": [ "u_val('vitamin', 'name:creative_spark_research')", "-=", "energy_difficulty_3" ] }, + { "math": [ "u_vitamin('creative_spark_research')", "-=", "energy_difficulty_3" ] }, { "math": [ "energy_difficulty_3", "+=", "4" ] }, { "u_roll_remainder": [ @@ -245,7 +245,7 @@ "false_effect": [ { "u_message": "inventor_fail", "snippet": true, "type": "bad" }, { "run_eocs": "EOC_INVENTOR_PROCESS_SPARKS" }, - { "math": [ "u_val('vitamin', 'name:creative_spark_research')", "+=", "3" ] } + { "math": [ "u_vitamin('creative_spark_research')", "+=", "3" ] } ] }, { @@ -253,12 +253,12 @@ "id": "EOC_INVENTOR_RESEARCH_AI_1", "condition": { "and": [ - { "math": [ "u_val('vitamin', 'name:creative_spark_research')", ">=", "base_difficulty_3" ] }, + { "math": [ "u_vitamin('creative_spark_research')", ">=", "base_difficulty_3" ] }, { "math": [ "AI_sparks", ">=", "AI_difficulty_1" ] } ] }, "effect": [ - { "math": [ "u_val('vitamin', 'name:creative_spark_research')", "-=", "base_difficulty_3" ] }, + { "math": [ "u_vitamin('creative_spark_research')", "-=", "base_difficulty_3" ] }, { "math": [ "AI_sparks", "+=", "AI_difficulty_1" ] }, { "math": [ "base_difficulty_3", "+=", "5" ] }, { "math": [ "AI_difficulty_1", "+=", "5" ] }, @@ -281,23 +281,23 @@ ], "false_effect": [ { "u_message": "inventor_fail", "snippet": true, "type": "bad" }, - { "math": [ "u_val('vitamin', 'name:creative_spark_research')", "+=", "4" ] }, + { "math": [ "u_vitamin('creative_spark_research')", "+=", "4" ] }, { "math": [ "AI_sparks", "+=", "4" ] } ] }, { "type": "effect_on_condition", "id": "EOC_INVENTOR_PROCESS_SPARKS", - "condition": { "math": [ "u_val('vitamin', 'name:creative_spark')", ">", "0" ] }, + "condition": { "math": [ "u_vitamin('creative_spark')", ">", "0" ] }, "effect": [ { "math": [ - "u_val('vitamin', 'name:creative_spark_research')", + "u_vitamin('creative_spark_research')", "+=", - "u_val('vitamin', 'name:creative_spark') * floor( (base_difficulty_1 + base_difficulty_2 + base_difficulty_3 + energy_difficulty_1 + energy_difficulty_2 + energy_difficulty_3 + AI_difficulty_1 + dimension_difficulty_1) / 8 )" + "u_vitamin('creative_spark') * floor( (base_difficulty_1 + base_difficulty_2 + base_difficulty_3 + energy_difficulty_1 + energy_difficulty_2 + energy_difficulty_3 + AI_difficulty_1 + dimension_difficulty_1) / 8 )" ] }, - { "math": [ "u_val('vitamin', 'name:creative_spark')", "=", "0" ] }, + { "math": [ "u_vitamin('creative_spark')", "=", "0" ] }, { "u_message": "creative_spark_research = ,\n base_difficulty_1 = ,\n base_difficulty_2 = ,\n base_difficulty_3 = ,\n energy_difficulty_1 = ,\n energy_difficulty_2 = ,\n energy_difficulty_3 = ,\n dimension_sparks = ,\n dimension_difficulty_1 = .", "type": "debug" diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json index ac109702035d7..b114b10c89a49 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json @@ -43,14 +43,14 @@ "effect": [ { "u_add_effect": "natures_commune", - "duration": { "math": [ "( 300 + (u_val('spell_level', 'spell: arvore_commune_with_nature') * 165)) " ] } + "duration": { "math": [ "( 300 + (u_spell_level('arvore_commune_with_nature') * 165)) " ] } }, { "u_add_morale": "morale_forest_unity", "bonus": 10, "max_bonus": 15, - "duration": { "math": [ "( 300 + (u_val('spell_level', 'spell: arvore_commune_with_nature') * 165) )" ] }, - "decay_start": { "math": [ "(( 300 + (u_val('spell_level', 'spell: arvore_commune_with_nature') * 165) ) / 2)" ] } + "duration": { "math": [ "( 300 + (u_spell_level('arvore_commune_with_nature') * 165) )" ] }, + "decay_start": { "math": [ "(( 300 + (u_spell_level('arvore_commune_with_nature') * 165) ) / 2)" ] } } ], "false_effect": [ { "u_message": "You must be surrounded by nature to commune with nature.", "type": "bad" } ] @@ -59,7 +59,7 @@ "type": "effect_on_condition", "id": "EOC_APPLY_PARACLESIAN_DODGE_BONUS", "effect": { - "switch": { "math": [ "u_val('spell_level', 'spell: paraclesian_spell_dodge_bonus')" ] }, + "switch": { "math": [ "u_spell_level('paraclesian_spell_dodge_bonus')" ] }, "cases": [ { "case": 0, @@ -67,9 +67,7 @@ { "u_add_effect": "effect_paraclesian_dodge_bonus_1", "duration": { - "math": [ - "( (u_val('spell_level', 'spell: paraclesian_spell_dodge_bonus') * 3000) + 30000) * (scaling_factor(u_val('perception') ) )" - ] + "math": [ "( (u_spell_level('paraclesian_spell_dodge_bonus') * 3000) + 30000) * (scaling_factor(u_val('perception') ) )" ] } } ] @@ -80,9 +78,7 @@ { "u_add_effect": "effect_paraclesian_dodge_bonus_2", "duration": { - "math": [ - "( (u_val('spell_level', 'spell: paraclesian_spell_dodge_bonus') * 3000) + 30000) * (scaling_factor(u_val('perception') ) )" - ] + "math": [ "( (u_spell_level('paraclesian_spell_dodge_bonus') * 3000) + 30000) * (scaling_factor(u_val('perception') ) )" ] } } ] @@ -93,9 +89,7 @@ { "u_add_effect": "effect_paraclesian_dodge_bonus_3", "duration": { - "math": [ - "( (u_val('spell_level', 'spell: paraclesian_spell_dodge_bonus') * 3000) + 30000) * (scaling_factor(u_val('perception') ) )" - ] + "math": [ "( (u_spell_level('paraclesian_spell_dodge_bonus') * 3000) + 30000) * (scaling_factor(u_val('perception') ) )" ] } } ] @@ -279,10 +273,10 @@ { "u_set_hp": 45, "only_increase": false, "target_part": "leg_l" }, { "math": [ "u_val('stored_kcal')", "=", "70000" ] }, { "math": [ "u_val('thirst')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: redcells')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: bad_food')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: blood')", "=", "0" ] }, - { "math": [ "u_val('vitamin', 'name: instability')", "=", "0" ] }, + { "math": [ "u_vitamin('redcells')", "=", "0" ] }, + { "math": [ "u_vitamin('bad_food')", "=", "0" ] }, + { "math": [ "u_vitamin('blood')", "=", "0" ] }, + { "math": [ "u_vitamin('instability')", "=", "0" ] }, { "math": [ "u_pain()", "=", "0" ] }, { "math": [ "u_val('rad')", "=", "0" ] }, { "u_lose_effect": "corroding" }, diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json index 363640e344eab..62cfa87527987 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json @@ -123,9 +123,7 @@ "max_level": { "math": [ "per_to_level(1)" ] }, "difficulty": 5, "min_damage": -1, - "max_damage": { - "math": [ "( (u_val('spell_level', 'spell: arvore_verdant_infusion') * -1) * (scaling_factor(u_val('perception') ) ) ) " ] - }, + "max_damage": { "math": [ "( (u_spell_level('arvore_verdant_infusion') * -1) * (scaling_factor(u_val('perception') ) ) ) " ] }, "min_range": 1, "max_range": 20, "range_increment": 0.4, @@ -152,12 +150,8 @@ "flags": [ "CONCENTRATE", "SOMATIC", "VERBAL", "IGNORE_WALLS", "RANDOM_DAMAGE", "NO_LEGS", "NO_HANDS" ], "max_level": { "math": [ "per_to_level(1)" ] }, "difficulty": 7, - "min_damage": { - "math": [ "( (u_val('spell_level', 'spell: arvore_verdant_infusion') * 1.5) * (scaling_factor(u_val('perception') ) ) )" ] - }, - "max_damage": { - "math": [ "( (u_val('spell_level', 'spell: arvore_verdant_infusion') * 5.5) * (scaling_factor(u_val('perception') ) ) )" ] - }, + "min_damage": { "math": [ "( (u_spell_level('arvore_verdant_infusion') * 1.5) * (scaling_factor(u_val('perception') ) ) )" ] }, + "max_damage": { "math": [ "( (u_spell_level('arvore_verdant_infusion') * 5.5) * (scaling_factor(u_val('perception') ) ) )" ] }, "min_range": 2, "max_range": 8, "min_aoe": 30, @@ -229,10 +223,10 @@ "teachable": false, "flags": [ "SILENT", "NO_PROJECTILE" ], "max_level": 15, - "min_range": { "math": [ "( (u_val('spell_level', 'spell: arvore_summon_briars') * 0.6) + 1)" ] }, - "max_range": { "math": [ "( (u_val('spell_level', 'spell: arvore_summon_briars') * 0.6) + 1)" ] }, - "min_aoe": { "math": [ "( (u_val('spell_level', 'spell: arvore_summon_briars') * 1.9) + 30)" ] }, - "max_aoe": { "math": [ "( (u_val('spell_level', 'spell: arvore_summon_briars') * 1.9) + 30)" ] } + "min_range": { "math": [ "( (u_spell_level('arvore_summon_briars') * 0.6) + 1)" ] }, + "max_range": { "math": [ "( (u_spell_level('arvore_summon_briars') * 0.6) + 1)" ] }, + "min_aoe": { "math": [ "( (u_spell_level('arvore_summon_briars') * 1.9) + 30)" ] }, + "max_aoe": { "math": [ "( (u_spell_level('arvore_summon_briars') * 1.9) + 30)" ] } }, { "id": "arvore_summon_briars_line", @@ -248,8 +242,8 @@ "teachable": false, "flags": [ "SILENT", "NO_PROJECTILE" ], "max_level": 15, - "min_range": { "math": [ "( (u_val('spell_level', 'spell: arvore_summon_briars') * 1) + 1)" ] }, - "max_range": { "math": [ "( (u_val('spell_level', 'spell: arvore_summon_briars') * 1) + 1)" ] } + "min_range": { "math": [ "( (u_spell_level('arvore_summon_briars') * 1) + 1)" ] }, + "max_range": { "math": [ "( (u_spell_level('arvore_summon_briars') * 1) + 1)" ] } }, { "id": "arvore_anti_plant_spell", @@ -268,28 +262,16 @@ "shape": "blast", "spell_class": "ARVORE", "teachable": false, - "min_damage": { - "math": [ "(10 + (u_val('spell_level', 'spell: arvore_anti_plant_spell') * 2.5) * (scaling_factor(u_val('perception') ) ) )" ] - }, - "max_damage": { - "math": [ "(15 + (u_val('spell_level', 'spell: arvore_anti_plant_spell') * 5.5) * (scaling_factor(u_val('perception') ) ) )" ] - }, + "min_damage": { "math": [ "(10 + (u_spell_level('arvore_anti_plant_spell') * 2.5) * (scaling_factor(u_val('perception') ) ) )" ] }, + "max_damage": { "math": [ "(15 + (u_spell_level('arvore_anti_plant_spell') * 5.5) * (scaling_factor(u_val('perception') ) ) )" ] }, "min_dot": 1, "max_dot": 3, "dot_increment": 0.1, - "min_duration": { - "math": [ "(200 + (u_val('spell_level', 'spell: arvore_anti_plant_spell') * 150) * (scaling_factor(u_val('perception') ) ) )" ] - }, - "max_duration": { - "math": [ "(1000 + (u_val('spell_level', 'spell: arvore_anti_plant_spell') * 350) * (scaling_factor(u_val('perception') ) ) )" ] - }, - "min_range": { - "math": [ "(2 + (u_val('spell_level', 'spell: arvore_anti_plant_spell') * 1.5) * (scaling_factor(u_val('perception') ) ) )" ] - }, + "min_duration": { "math": [ "(200 + (u_spell_level('arvore_anti_plant_spell') * 150) * (scaling_factor(u_val('perception') ) ) )" ] }, + "max_duration": { "math": [ "(1000 + (u_spell_level('arvore_anti_plant_spell') * 350) * (scaling_factor(u_val('perception') ) ) )" ] }, + "min_range": { "math": [ "(2 + (u_spell_level('arvore_anti_plant_spell') * 1.5) * (scaling_factor(u_val('perception') ) ) )" ] }, "max_range": 70, - "min_aoe": { - "math": [ "(0 + (u_val('spell_level', 'spell: arvore_anti_plant_spell') * 0.25) * (scaling_factor(u_val('perception') ) ) )" ] - }, + "min_aoe": { "math": [ "(0 + (u_spell_level('arvore_anti_plant_spell') * 0.25) * (scaling_factor(u_val('perception') ) ) )" ] }, "max_aoe": 8, "energy_source": "MANA", "base_energy_cost": 400, @@ -315,16 +297,10 @@ "shape": "blast", "spell_class": "ARVORE", "teachable": false, - "min_range": { - "math": [ "(2 + (u_val('spell_level', 'spell: arvore_anti_plant_spell') * 1.5) * (scaling_factor(u_val('perception') ) ) )" ] - }, + "min_range": { "math": [ "(2 + (u_spell_level('arvore_anti_plant_spell') * 1.5) * (scaling_factor(u_val('perception') ) ) )" ] }, "max_range": 70, - "min_aoe": { - "math": [ "(1 + (u_val('spell_level', 'spell: arvore_anti_plant_spell') * 0.5) * (scaling_factor(u_val('perception') ) ) )" ] - }, - "max_aoe": { - "math": [ "(1 + (u_val('spell_level', 'spell: arvore_anti_plant_spell') * 1) * (scaling_factor(u_val('perception') ) ) )" ] - } + "min_aoe": { "math": [ "(1 + (u_spell_level('arvore_anti_plant_spell') * 0.5) * (scaling_factor(u_val('perception') ) ) )" ] }, + "max_aoe": { "math": [ "(1 + (u_spell_level('arvore_anti_plant_spell') * 1) * (scaling_factor(u_val('perception') ) ) )" ] } }, { "id": "arvore_nurture_the_green", @@ -469,12 +445,8 @@ "min_dot": 0, "max_dot": 5, "dot_increment": 0.1, - "min_duration": { - "math": [ "( ( (u_val('spell_level', 'spell: arvore_roots_spell') * 50) + 300) * (scaling_factor(u_val('perception') ) ) )" ] - }, - "max_duration": { - "math": [ "( ( (u_val('spell_level', 'spell: arvore_roots_spell') * 100) + 1000) * (scaling_factor(u_val('perception') ) ) )" ] - }, + "min_duration": { "math": [ "( ( (u_spell_level('arvore_roots_spell') * 50) + 300) * (scaling_factor(u_val('perception') ) ) )" ] }, + "max_duration": { "math": [ "( ( (u_spell_level('arvore_roots_spell') * 100) + 1000) * (scaling_factor(u_val('perception') ) ) )" ] }, "energy_source": "MANA", "base_casting_time": 150, "final_casting_time": 50, @@ -527,21 +499,13 @@ "difficulty": 9, "spell_class": "ARVORE", "damage_type": "biological", - "min_aoe": { - "math": [ "( ( (u_val('spell_level', 'spell: arvore_cause_decay') * 0.8) + 3) * (scaling_factor(u_val('perception') ) ) )" ] - }, - "max_aoe": { - "math": [ "( ( (u_val('spell_level', 'spell: arvore_cause_decay') * 0.8) + 3) * (scaling_factor(u_val('perception') ) ) )" ] - }, + "min_aoe": { "math": [ "( ( (u_spell_level('arvore_cause_decay') * 0.8) + 3) * (scaling_factor(u_val('perception') ) ) )" ] }, + "max_aoe": { "math": [ "( ( (u_spell_level('arvore_cause_decay') * 0.8) + 3) * (scaling_factor(u_val('perception') ) ) )" ] }, "min_dot": 1, "max_dot": 5, "dot_increment": 0.2, - "min_duration": { - "math": [ "( ( (u_val('spell_level', 'spell: arvore_cause_decay') * 100) + 500) * (scaling_factor(u_val('perception') ) ) )" ] - }, - "max_duration": { - "math": [ "( ( (u_val('spell_level', 'spell: arvore_cause_decay') * 300) + 3000) * (scaling_factor(u_val('perception') ) ) )" ] - }, + "min_duration": { "math": [ "( ( (u_spell_level('arvore_cause_decay') * 100) + 500) * (scaling_factor(u_val('perception') ) ) )" ] }, + "max_duration": { "math": [ "( ( (u_spell_level('arvore_cause_decay') * 300) + 3000) * (scaling_factor(u_val('perception') ) ) )" ] }, "energy_source": "MANA", "base_energy_cost": 1000, "final_energy_cost": 500, @@ -588,14 +552,10 @@ "max_aoe": 1, "aoe_increment": -0.25, "min_range": { - "math": [ - "( ( (u_val('spell_level', 'spell: arvore_traverse_the_wilds') * 100) + 500) * (scaling_factor(u_val('perception') ) ) )" - ] + "math": [ "( ( (u_spell_level('arvore_traverse_the_wilds') * 100) + 500) * (scaling_factor(u_val('perception') ) ) )" ] }, "max_range": { - "math": [ - "( ( (u_val('spell_level', 'spell: arvore_traverse_the_wilds') * 300) + 3000) * (scaling_factor(u_val('perception') ) ) )" - ] + "math": [ "( ( (u_spell_level('arvore_traverse_the_wilds') * 300) + 3000) * (scaling_factor(u_val('perception') ) ) )" ] } }, { diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutation_spells.json b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutation_spells.json index 7d96361bd4b89..42fc2a280cba7 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutation_spells.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutation_spells.json @@ -141,14 +141,10 @@ "shape": "blast", "difficulty": 5, "min_duration": { - "math": [ - "( ( (u_val('spell_level', 'spell: paraclesian_spell_dodge_bonus') * 3000) + 30000) * (scaling_factor(u_val('perception') ) ) )" - ] + "math": [ "( ( (u_spell_level('paraclesian_spell_dodge_bonus') * 3000) + 30000) * (scaling_factor(u_val('perception') ) ) )" ] }, "max_duration": { - "math": [ - "( ( (u_val('spell_level', 'spell: paraclesian_spell_dodge_bonus') * 3000) + 30000) * (scaling_factor(u_val('perception') ) ) )" - ] + "math": [ "( ( (u_spell_level('paraclesian_spell_dodge_bonus') * 3000) + 30000) * (scaling_factor(u_val('perception') ) ) )" ] }, "energy_source": "MANA", "base_energy_cost": 600, @@ -193,7 +189,7 @@ "effect": "spawn_item", "effect_str": "gossamer_patchwork", "shape": "blast", - "min_damage": { "math": [ "(u_val('spell_level', 'spell: paraclesian_spell_make_gossamer') )" ] }, - "max_damage": { "math": [ "(u_val('spell_level', 'spell: paraclesian_spell_make_gossamer') )" ] } + "min_damage": { "math": [ "(u_spell_level('paraclesian_spell_make_gossamer') )" ] }, + "max_damage": { "math": [ "(u_spell_level('paraclesian_spell_make_gossamer') )" ] } } ] diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_eocs.json index 377ef1ee1a2d7..1a4834aeb95cf 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_eocs.json @@ -33,11 +33,11 @@ "effect": [ { "u_add_effect": "effect_salamander_levitation", - "duration": { "math": [ "( 12 + (u_val('spell_level', 'spell: salamander_fire_fly') * rng(2,4) )) " ] } + "duration": { "math": [ "( 12 + (u_spell_level('salamander_fire_fly') * rng(2,4) )) " ] } }, { "u_add_effect": "effect_salamander_featherfall", - "duration": { "math": [ "( 15 + (u_val('spell_level', 'spell: salamander_fire_fly') * 4 )) " ] } + "duration": { "math": [ "( 15 + (u_spell_level('salamander_fire_fly') * 4 )) " ] } }, { "u_cast_spell": { "id": "salamander_fire_fly_real" }, "targeted": true } ], diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutation_spells.json b/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutation_spells.json index 266c7c6891fde..9c0e1ab4e9ca6 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutation_spells.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutation_spells.json @@ -51,9 +51,7 @@ "shape": "blast", "damage_type": "heat", "difficulty": 1, - "min_range": { - "math": [ "(1 + (u_val('spell_level', 'spell: salamander_make_fire') * 0.15) * (scaling_factor(u_val('strength') ) ) )" ] - }, + "min_range": { "math": [ "(1 + (u_spell_level('salamander_make_fire') * 0.15) * (scaling_factor(u_val('strength') ) ) )" ] }, "max_range": 5, "energy_source": "MANA", "base_energy_cost": 200, @@ -85,14 +83,8 @@ "damage_type": "heat", "difficulty": 3, "max_level": { "math": [ "str_to_level(1)" ] }, - "min_damage": { - "math": [ "(6 + (u_val('spell_level', 'spell: salamander_flame_punch_spell') * 2) * (scaling_factor(u_val('strength') ) ) )" ] - }, - "max_damage": { - "math": [ - "(15 + (u_val('spell_level', 'spell: salamander_flame_punch_spell') * 4.5) * (scaling_factor(u_val('strength') ) ) )" - ] - }, + "min_damage": { "math": [ "(6 + (u_spell_level('salamander_flame_punch_spell') * 2) * (scaling_factor(u_val('strength') ) ) )" ] }, + "max_damage": { "math": [ "(15 + (u_spell_level('salamander_flame_punch_spell') * 4.5) * (scaling_factor(u_val('strength') ) ) )" ] }, "min_range": 1, "max_range": 1, "energy_source": "MANA", @@ -121,14 +113,10 @@ "min_damage": 1, "max_damage": 1, "min_duration": { - "math": [ - "(24000 + (u_val('spell_level', 'spell: salamander_flaming_whip_spell') * 20000) * (scaling_factor(u_val('dexterity') ) ) )" - ] + "math": [ "(24000 + (u_spell_level('salamander_flaming_whip_spell') * 20000) * (scaling_factor(u_val('dexterity') ) ) )" ] }, "max_duration": { - "math": [ - "(48000 + (u_val('spell_level', 'spell: salamander_flaming_whip_spell') * 35000) * (scaling_factor(u_val('dexterity') ) ) )" - ] + "math": [ "(48000 + (u_spell_level('salamander_flaming_whip_spell') * 35000) * (scaling_factor(u_val('dexterity') ) ) )" ] }, "energy_source": "MANA", "base_energy_cost": 250, @@ -248,14 +236,10 @@ "difficulty": 6, "min_range": 1, "min_duration": { - "math": [ - "(10000 + (u_val('spell_level', 'spell: salamander_increase_speed_spell') * 5000) * (scaling_factor(u_val('strength') ) ) )" - ] + "math": [ "(10000 + (u_spell_level('salamander_increase_speed_spell') * 5000) * (scaling_factor(u_val('strength') ) ) )" ] }, "max_duration": { - "math": [ - "(30000 + (u_val('spell_level', 'spell: salamander_increase_speed_spell') * 8000) * (scaling_factor(u_val('strength') ) ) )" - ] + "math": [ "(30000 + (u_spell_level('salamander_increase_speed_spell') * 8000) * (scaling_factor(u_val('strength') ) ) )" ] }, "energy_source": "MANA", "base_energy_cost": 550, @@ -278,12 +262,8 @@ "flags": [ "CONCENTRATE", "SOMATIC", "VERBAL", "NO_LEGS", "NO_HANDS" ], "max_level": { "math": [ "str_to_level(1)" ] }, "difficulty": 6, - "min_duration": { - "math": [ "(15000 + (u_val('spell_level', 'spell: salamander_emit_heat') * 3000) * (scaling_factor(u_val('strength') ) ) )" ] - }, - "max_duration": { - "math": [ "(45000 + (u_val('spell_level', 'spell: salamander_emit_heat') * 9000) * (scaling_factor(u_val('strength') ) ) )" ] - }, + "min_duration": { "math": [ "(15000 + (u_spell_level('salamander_emit_heat') * 3000) * (scaling_factor(u_val('strength') ) ) )" ] }, + "max_duration": { "math": [ "(45000 + (u_spell_level('salamander_emit_heat') * 9000) * (scaling_factor(u_val('strength') ) ) )" ] }, "energy_source": "MANA", "base_energy_cost": 700, "base_casting_time": 500 @@ -331,20 +311,12 @@ "damage_type": "heat", "difficulty": 5, "max_level": { "math": [ "str_to_level(1)" ] }, - "min_damage": { - "math": [ "( (u_val('spell_level', 'spell: salamander_fire_breath') * 2) + 15) * (scaling_factor(u_val('strength') ) )" ] - }, - "max_damage": { - "math": [ "( (u_val('spell_level', 'spell: salamander_fire_breath') * 3) + 30) * (scaling_factor(u_val('strength') ) )" ] - }, - "min_range": { - "math": [ "( (u_val('spell_level', 'spell: salamander_fire_breath') * 0.2) + 2) * (scaling_factor(u_val('strength') ) )" ] - }, + "min_damage": { "math": [ "( (u_spell_level('salamander_fire_breath') * 2) + 15) * (scaling_factor(u_val('strength') ) )" ] }, + "max_damage": { "math": [ "( (u_spell_level('salamander_fire_breath') * 3) + 30) * (scaling_factor(u_val('strength') ) )" ] }, + "min_range": { "math": [ "( (u_spell_level('salamander_fire_breath') * 0.2) + 2) * (scaling_factor(u_val('strength') ) )" ] }, "max_range": 8, "range_increment": 0.2, - "min_aoe": { - "math": [ "( (u_val('spell_level', 'spell: salamander_fire_breath') * 3) + 27) * (scaling_factor(u_val('strength') ) )" ] - }, + "min_aoe": { "math": [ "( (u_spell_level('salamander_fire_breath') * 3) + 27) * (scaling_factor(u_val('strength') ) )" ] }, "max_aoe": 180, "field_id": "fd_fire", "min_field_intensity": 1, @@ -377,12 +349,8 @@ "shape": "cone", "min_damage": 0, "max_damage": 0, - "min_range": { - "math": [ "(3 + (u_val('spell_level', 'spell: salamander_dash_boom_spell') * 0.75) * (scaling_factor(u_val('strength') ) ) )" ] - }, - "max_range": { - "math": [ "(3 + (u_val('spell_level', 'spell: salamander_dash_boom_spell') * 0.75) * (scaling_factor(u_val('strength') ) ) )" ] - }, + "min_range": { "math": [ "(3 + (u_spell_level('salamander_dash_boom_spell') * 0.75) * (scaling_factor(u_val('strength') ) ) )" ] }, + "max_range": { "math": [ "(3 + (u_spell_level('salamander_dash_boom_spell') * 0.75) * (scaling_factor(u_val('strength') ) ) )" ] }, "energy_source": "MANA", "base_energy_cost": 350, "final_energy_cost": 200, @@ -445,12 +413,8 @@ "extra_effects": [ { "id": "salamander_aoe_explosion", "hit_self": true, "max_level": 5 } ], "shape": "blast", "max_level": { "math": [ "str_to_level(1)" ] }, - "min_range": { - "math": [ "(2 + (u_val('spell_level', 'spell: salamander_fire_fly') * 0.35) * (scaling_factor(u_val('strength') ) ) )" ] - }, - "max_range": { - "math": [ "(2 + (u_val('spell_level', 'spell: salamander_fire_fly') * 0.35) * (scaling_factor(u_val('strength') ) ) )" ] - } + "min_range": { "math": [ "(2 + (u_spell_level('salamander_fire_fly') * 0.35) * (scaling_factor(u_val('strength') ) ) )" ] }, + "max_range": { "math": [ "(2 + (u_spell_level('salamander_fire_fly') * 0.35) * (scaling_factor(u_val('strength') ) ) )" ] } }, { "id": "salamander_ally_flame_immune_spell", diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/sylph_mutation_spells.json b/data/mods/Xedra_Evolved/mutations/paraclesians/sylph_mutation_spells.json index d7446f91ae5e7..37acb11cb0e54 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/sylph_mutation_spells.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/sylph_mutation_spells.json @@ -13,12 +13,8 @@ "valid_targets": [ "ally", "hostile", "ground" ], "flags": [ "LOUD", "NO_PROJECTILE", "RANDOM_DAMAGE", "NO_HANDS", "NO_LEGS" ], "max_level": { "math": [ "dex_to_level(1)" ] }, - "min_damage": { - "math": [ "( (u_val('spell_level', 'spell: zap_electrical_emission') * 1) + 3) * (scaling_factor(u_val('dexterity') ) )" ] - }, - "max_damage": { - "math": [ "( (u_val('spell_level', 'spell: zap_electrical_emission') * 4) + 7) * (scaling_factor(u_val('dexterity') ) )" ] - }, + "min_damage": { "math": [ "( (u_spell_level('zap_electrical_emission') * 1) + 3) * (scaling_factor(u_val('dexterity') ) )" ] }, + "max_damage": { "math": [ "( (u_spell_level('zap_electrical_emission') * 4) + 7) * (scaling_factor(u_val('dexterity') ) )" ] }, "min_range": 2, "max_range": 6, "range_increment": 0.25, @@ -47,15 +43,9 @@ "valid_targets": [ "ally", "hostile", "ground" ], "flags": [ "LOUD", "SOMATIC", "NO_LEGS", "NO_HANDS" ], "max_level": { "math": [ "dex_to_level(1)" ] }, - "min_damage": { - "math": [ "( (u_val('spell_level', 'spell: sylph_call_lightning') * 3) + 6) * (scaling_factor(u_val('dexterity') ) )" ] - }, - "max_damage": { - "math": [ "( (u_val('spell_level', 'spell: sylph_call_lightning') * 4) + 26) * (scaling_factor(u_val('dexterity') ) )" ] - }, - "min_range": { - "math": [ "( (u_val('spell_level', 'spell: sylph_call_lightning') * 1.5) + 2) * (scaling_factor(u_val('dexterity') ) )" ] - }, + "min_damage": { "math": [ "( (u_spell_level('sylph_call_lightning') * 3) + 6) * (scaling_factor(u_val('dexterity') ) )" ] }, + "max_damage": { "math": [ "( (u_spell_level('sylph_call_lightning') * 4) + 26) * (scaling_factor(u_val('dexterity') ) )" ] }, + "min_range": { "math": [ "( (u_spell_level('sylph_call_lightning') * 1.5) + 2) * (scaling_factor(u_val('dexterity') ) )" ] }, "max_range": 70, "difficulty": 6, "min_aoe": 1, @@ -88,15 +78,9 @@ "extra_effects": [ { "id": "crash", "hit_self": false, "max_level": 3 } ], "flags": [ "LOUD", "SOMATIC", "NO_LEGS", "NO_HANDS" ], "max_level": { "math": [ "dex_to_level(1)" ] }, - "min_damage": { - "math": [ "( (u_val('spell_level', 'spell: sylph_crash_of_lightning') * 3) + 6) * (scaling_factor(u_val('dexterity') ) )" ] - }, - "max_damage": { - "math": [ "( (u_val('spell_level', 'spell: sylph_crash_of_lightning') * 4) + 26) * (scaling_factor(u_val('dexterity') ) )" ] - }, - "min_range": { - "math": [ "( (u_val('spell_level', 'spell: sylph_crash_of_lightning') * 1.5) + 2) * (scaling_factor(u_val('dexterity') ) )" ] - }, + "min_damage": { "math": [ "( (u_spell_level('sylph_crash_of_lightning') * 3) + 6) * (scaling_factor(u_val('dexterity') ) )" ] }, + "max_damage": { "math": [ "( (u_spell_level('sylph_crash_of_lightning') * 4) + 26) * (scaling_factor(u_val('dexterity') ) )" ] }, + "min_range": { "math": [ "( (u_spell_level('sylph_crash_of_lightning') * 1.5) + 2) * (scaling_factor(u_val('dexterity') ) )" ] }, "max_range": 70, "difficulty": 6, "min_aoe": 1, @@ -126,9 +110,7 @@ "shape": "line", "flags": [ "LOUD" ], "max_level": { "math": [ "dex_to_level(1)" ] }, - "min_range": { - "math": [ "( (u_val('spell_level', 'spell: sylph_crash_of_lightning') * 1.5) + 2) * (scaling_factor(u_val('dexterity') ) )" ] - }, + "min_range": { "math": [ "( (u_spell_level('sylph_crash_of_lightning') * 1.5) + 2) * (scaling_factor(u_val('dexterity') ) )" ] }, "max_range": 70 }, { @@ -177,9 +159,7 @@ "max_field_intensity": 4, "field_intensity_increment": 1, "max_level": { "math": [ "dex_to_level(1)" ] }, - "min_range": { - "math": [ "( (u_val('spell_level', 'spell: electrical_field') * 1.5) + 2) * (scaling_factor(u_val('dexterity') ) )" ] - }, + "min_range": { "math": [ "( (u_spell_level('electrical_field') * 1.5) + 2) * (scaling_factor(u_val('dexterity') ) )" ] }, "max_range": 70, "energy_source": "MANA", "base_energy_cost": 500, @@ -215,7 +195,7 @@ "max_field_intensity": 10, "field_intensity_increment": 1, "max_level": { "math": [ "dex_to_level(1)" ] }, - "min_range": { "math": [ "( (u_val('spell_level', 'spell: lightning_field') * 1.5) + 2) * (scaling_factor(u_val('dexterity') ) )" ] }, + "min_range": { "math": [ "( (u_spell_level('lightning_field') * 1.5) + 2) * (scaling_factor(u_val('dexterity') ) )" ] }, "max_range": 70, "energy_source": "MANA", "base_energy_cost": 800, @@ -323,9 +303,9 @@ "difficulty": 2, "max_level": { "math": [ "int_to_level(1)" ] }, "damage_type": "bashing", - "min_damage": { "math": [ "( (u_val('spell_level', 'spell: pushing_wind') * 0.25) + 2) * (scaling_factor(u_val('dexterity') ) )" ] }, - "max_damage": { "math": [ "( (u_val('spell_level', 'spell: pushing_wind') * 0.25) + 6) * (scaling_factor(u_val('dexterity') ) )" ] }, - "min_range": { "math": [ "( (u_val('spell_level', 'spell: pushing_wind') * 1.2) + 1) * (scaling_factor(u_val('dexterity') ) )" ] }, + "min_damage": { "math": [ "( (u_spell_level('pushing_wind') * 0.25) + 2) * (scaling_factor(u_val('dexterity') ) )" ] }, + "max_damage": { "math": [ "( (u_spell_level('pushing_wind') * 0.25) + 6) * (scaling_factor(u_val('dexterity') ) )" ] }, + "min_range": { "math": [ "( (u_spell_level('pushing_wind') * 1.2) + 1) * (scaling_factor(u_val('dexterity') ) )" ] }, "max_range": 40, "energy_source": "MANA", "base_energy_cost": 100, diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/undine_mutation_spells.json b/data/mods/Xedra_Evolved/mutations/paraclesians/undine_mutation_spells.json index cdf89782e9d05..b656cc9783cbb 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/undine_mutation_spells.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/undine_mutation_spells.json @@ -34,7 +34,7 @@ "max_field_intensity": 8, "field_intensity_increment": 1, "max_level": { "math": [ "dex_to_level(1)" ] }, - "min_range": { "math": [ "( (u_val('spell_level', 'spell: create_fog') * 1.5) + 2) * (scaling_factor(u_val('dexterity') ) )" ] }, + "min_range": { "math": [ "( (u_spell_level('create_fog') * 1.5) + 2) * (scaling_factor(u_val('dexterity') ) )" ] }, "max_range": 70, "energy_source": "MANA", "base_energy_cost": 100, @@ -70,7 +70,7 @@ "max_field_intensity": 10, "field_intensity_increment": 1, "max_level": { "math": [ "dex_to_level(1)" ] }, - "min_range": { "math": [ "( (u_val('spell_level', 'spell: fog_bank') * 1.5) + 2) * (scaling_factor(u_val('dexterity') ) )" ] }, + "min_range": { "math": [ "( (u_spell_level('fog_bank') * 1.5) + 2) * (scaling_factor(u_val('dexterity') ) )" ] }, "max_range": 70, "energy_source": "MANA", "base_energy_cost": 300, @@ -129,7 +129,7 @@ "max_field_intensity": 3, "field_intensity_increment": 0.3, "max_level": { "math": [ "dex_to_level(1)" ] }, - "min_range": { "math": [ "( (u_val('spell_level', 'spell: acidic_mist') * 1.5) + 2) * (scaling_factor(u_val('dexterity') ) )" ] }, + "min_range": { "math": [ "( (u_spell_level('acidic_mist') * 1.5) + 2) * (scaling_factor(u_val('dexterity') ) )" ] }, "max_range": 70, "energy_source": "MANA", "base_energy_cost": 140, @@ -165,7 +165,7 @@ "max_field_intensity": 5, "field_intensity_increment": 0.2, "max_level": { "math": [ "dex_to_level(1)" ] }, - "min_range": { "math": [ "( (u_val('spell_level', 'spell: deadly_mist') * 1.5) + 2) * (scaling_factor(u_val('dexterity') ) )" ] }, + "min_range": { "math": [ "( (u_spell_level('deadly_mist') * 1.5) + 2) * (scaling_factor(u_val('dexterity') ) )" ] }, "max_range": 70, "energy_source": "MANA", "base_energy_cost": 500, diff --git a/data/mods/Xedra_Evolved/mutations/spells.json b/data/mods/Xedra_Evolved/mutations/spells.json index 687109100158a..462a09ce5f96d 100644 --- a/data/mods/Xedra_Evolved/mutations/spells.json +++ b/data/mods/Xedra_Evolved/mutations/spells.json @@ -93,6 +93,6 @@ "effect": "map", "shape": "blast", "max_level": 1, - "min_aoe": { "math": [ "( 7 + (u_val('spell_level', 'spell: vampire_reveal_world_map') * 2.2) )" ] } + "min_aoe": { "math": [ "( 7 + (u_spell_level('vampire_reveal_world_map') * 2.2) )" ] } } ] diff --git a/data/mods/Xedra_Evolved/obsoletion_and_migration/tool_to_obsolete_spells.json b/data/mods/Xedra_Evolved/obsoletion_and_migration/tool_to_obsolete_spells.json index 604d15e628b7a..814d6ac17925b 100644 --- a/data/mods/Xedra_Evolved/obsoletion_and_migration/tool_to_obsolete_spells.json +++ b/data/mods/Xedra_Evolved/obsoletion_and_migration/tool_to_obsolete_spells.json @@ -3,18 +3,18 @@ "type": "effect_on_condition", "id": "EOC_MIGRATE_SPELL", "effect": [ - { "math": [ "u_val('spell_level', 'spell: summon_battery_gun')", "=", "-1" ] }, - { "math": [ "u_val('spell_level', 'spell: summon_ray_gun')", "=", "-1" ] }, - { "math": [ "u_val('spell_level', 'spell: summon_death_ray')", "=", "-1" ] }, - { "math": [ "u_val('spell_level', 'spell: summon_mace_magic')", "=", "-1" ] }, - { "math": [ "u_val('spell_level', 'spell: summon_bio_launcher')", "=", "-1" ] }, - { "math": [ "u_val('spell_level', 'spell: summon_bio_warhead')", "=", "-1" ] }, - { "math": [ "u_val('spell_level', 'spell: summon_rip_ticket')", "=", "-1" ] }, - { "math": [ "u_val('spell_level', 'spell: summon_helmet_inventor')", "=", "-1" ] }, - { "math": [ "u_val('spell_level', 'spell: summon_ion_gun')", "=", "-1" ] }, - { "math": [ "u_val('spell_level', 'spell: spark_of_inspiration')", "=", "-1" ] }, - { "math": [ "u_val('spell_level', 'spell: research_dreamdross')", "=", "-1" ] }, - { "math": [ "u_val('spell_level', 'spell: forge_dreamdross')", "=", "-1" ] } + { "math": [ "u_spell_level('summon_battery_gun')", "=", "-1" ] }, + { "math": [ "u_spell_level('summon_ray_gun')", "=", "-1" ] }, + { "math": [ "u_spell_level('summon_death_ray')", "=", "-1" ] }, + { "math": [ "u_spell_level('summon_mace_magic')", "=", "-1" ] }, + { "math": [ "u_spell_level('summon_bio_launcher')", "=", "-1" ] }, + { "math": [ "u_spell_level('summon_bio_warhead')", "=", "-1" ] }, + { "math": [ "u_spell_level('summon_rip_ticket')", "=", "-1" ] }, + { "math": [ "u_spell_level('summon_helmet_inventor')", "=", "-1" ] }, + { "math": [ "u_spell_level('summon_ion_gun')", "=", "-1" ] }, + { "math": [ "u_spell_level('spark_of_inspiration')", "=", "-1" ] }, + { "math": [ "u_spell_level('research_dreamdross')", "=", "-1" ] }, + { "math": [ "u_spell_level('forge_dreamdross')", "=", "-1" ] } ] } ] diff --git a/data/mods/Xedra_Evolved/spells/spell_eocs.json b/data/mods/Xedra_Evolved/spells/spell_eocs.json index 5ecdae0b988fa..ac0749b6c7fb7 100644 --- a/data/mods/Xedra_Evolved/spells/spell_eocs.json +++ b/data/mods/Xedra_Evolved/spells/spell_eocs.json @@ -2,10 +2,10 @@ { "type": "effect_on_condition", "id": "EOC_DREAMER_ARTIFACT_SPAWN", - "condition": { "math": [ "u_val('vitamin', 'name:dreamer_vit')", ">=", "600" ] }, + "condition": { "math": [ "u_vitamin('dreamer_vit')", ">=", "600" ] }, "effect": [ { "u_spawn_item": "dreamer_artifact", "use_item_group": true, "suppress_message": true }, - { "math": [ "u_val('vitamin', 'name:dreamer_vit')", "-=", "600" ] }, + { "math": [ "u_vitamin('dreamer_vit')", "-=", "600" ] }, { "u_message": "You pull your power into this world, and something outside of it places an object in your hand.", "type": "info" diff --git a/src/math_parser_diag.cpp b/src/math_parser_diag.cpp index 3159ca6d65a88..2446410f7ae58 100644 --- a/src/math_parser_diag.cpp +++ b/src/math_parser_diag.cpp @@ -732,7 +732,9 @@ std::function vitamin_eval( char scope, { return[beta = is_beta( scope ), id = params[0]]( dialogue const & d ) { if( d.actor( beta )->get_character() ) { - return d.actor( beta )->get_character()->vitamin_get( vitamin_id( id.str( d ) ) ); + return static_cast( d.actor( beta ) ) + ->get_character() + ->vitamin_get( vitamin_id( id.str( d ) ) ); } return 0; };