diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_game_initialization.json b/data/mods/MindOverMatter/effectoncondition/eoc_game_initialization.json index 3ae9bb6500075..4bcbab19b99d0 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_game_initialization.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_game_initialization.json @@ -70,5 +70,21 @@ "required_event": "game_start", "condition": { "u_has_trait": "VITAKINETIC" }, "effect": [ { "math": [ "u_awakening_countup", "+=", "1" ] } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_MOM_GAMESTART_POWER_LEARNING_VARIABLES", + "eoc_type": "EVENT", + "required_event": "game_start", + "effect": [ + { "math": [ "global_insight_power_learning_time_low", "=", "43200" ] }, + { "math": [ "global_insight_power_learning_time_high", "=", "604800" ] }, + { "math": [ "global_tier_one_power_learning_time_low", "=", "43200" ] }, + { "math": [ "global_tier_one_power_learning_time_high", "=", "86400" ] }, + { "math": [ "global_tier_two_power_learning_time_low", "=", "129600" ] }, + { "math": [ "global_tier_two_power_learning_time_high", "=", "259200" ] }, + { "math": [ "global_tier_three_power_learning_time_low", "=", "345600" ] }, + { "math": [ "global_tier_three_power_learning_time_high", "=", "604800" ] } + ] } ] diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json b/data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json index a240e6770adae..d5ff7682b0263 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json @@ -1127,7 +1127,10 @@ { "type": "effect_on_condition", "id": "EOC_PSI_LEARNING_VITAMIN_COUNTER", - "recurrence": [ "12 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_psi_learning_counter_time_low(global_insight_power_learning_time_low)" ] }, + { "math": [ "jmath_psi_learning_counter_time_high(global_insight_power_learning_time_high)" ] } + ], "condition": { "and": [ { diff --git a/data/mods/MindOverMatter/jmath.json b/data/mods/MindOverMatter/jmath.json index 75fb523c24bb0..c9b6950859fba 100644 --- a/data/mods/MindOverMatter/jmath.json +++ b/data/mods/MindOverMatter/jmath.json @@ -57,7 +57,7 @@ "type": "jmath_function", "id": "contemplation_factor", "num_args": 1, - "return": "(u_val('focus') * 9) * (_0)" + "return": "(u_val('focus') * 18) * (_0)" }, { "type": "jmath_function", @@ -73,62 +73,69 @@ }, { "type": "jmath_function", - "id": "difficulty_one_contemplation", + "id": "jmath_psi_learning_counter_time_low", "num_args": 1, - "return": "_0 * 49417" + "//": "Reduces time between insight moments by 3% per point of Intelligence above 10 (increase by 3% per point below 10), to a max of 60% faster from intelligence, and by 5% per point of Metaphysics skill above 5.", + "return": "_0 * max(( 1 - ( ( ( u_val('intelligence') + 23.33) / 33.33 ) ) + 1 ),0.4) * clamp(( 1 - (((u_skill('metaphysics') - 4) + 20 ) / 21) + 1),0.75,1)" }, { "type": "jmath_function", - "id": "difficulty_two_contemplation", + "id": "jmath_psi_learning_counter_time_high", "num_args": 1, - "return": "_0 * 49417" + "return": "_0 * max(( 1 - ( ( ( u_val('intelligence') + 23.33) / 33.33 ) ) + 1 ),0.4) * clamp(( 1 - (((u_skill('metaphysics') - 4) + 20 ) / 21) + 1),0.75,1)" }, { "type": "jmath_function", - "id": "difficulty_three_contemplation", + "id": "jmath_biokinesis_learning_eocs_modifiers", "num_args": 1, - "return": "_0 * 49417" + "return": "_0 * max(( 1 - ( ( ( u_val('intelligence') + 23.33) / 33.33 ) ) + 1 ),0.4) * (1 - (0.2 * u_has_proficiency('prof_contemplation_biokinesis')))" }, { "type": "jmath_function", - "id": "difficulty_four_contemplation", + "id": "jmath_clairsentience_learning_eocs_modifiers", "num_args": 1, - "return": "_0 * 35278" + "return": "_0 * max(( 1 - ( ( ( u_val('intelligence') + 23.33) / 33.33 ) ) + 1 ),0.4) * (1 - (0.2 * u_has_proficiency('prof_contemplation_clairsentience')))" }, { "type": "jmath_function", - "id": "difficulty_five_contemplation", + "id": "jmath_electrokinesis_learning_eocs_modifiers", "num_args": 1, - "return": "_0 * 35278" + "return": "_0 * max(( 1 - ( ( ( u_val('intelligence') + 23.33) / 33.33 ) ) + 1 ),0.4) * (1 - (0.2 * u_has_proficiency('prof_contemplation_electrokinesis')))" }, { "type": "jmath_function", - "id": "difficulty_six_contemplation", + "id": "jmath_photokinesis_learning_eocs_modifiers", "num_args": 1, - "return": "_0 * 20513" + "return": "_0 * max(( 1 - ( ( ( u_val('intelligence') + 23.33) / 33.33 ) ) + 1 ),0.4) * (1 - (0.2 * u_has_proficiency('prof_contemplation_photokinesis')))" }, { "type": "jmath_function", - "id": "difficulty_seven_contemplation", + "id": "jmath_pyrokinesis_learning_eocs_modifiers", "num_args": 1, - "return": "_0 * 20513" + "return": "_0 * max(( 1 - ( ( ( u_val('intelligence') + 23.33) / 33.33 ) ) + 1 ),0.4) * (1 - (0.2 * u_has_proficiency('prof_contemplation_pyrokinesis')))" }, { "type": "jmath_function", - "id": "difficulty_eight_contemplation", + "id": "jmath_telekinesis_learning_eocs_modifiers", "num_args": 1, - "return": "_0 * 13722" + "return": "_0 * max(( 1 - ( ( ( u_val('intelligence') + 23.33) / 33.33 ) ) + 1 ),0.4) * (1 - (0.2 * u_has_proficiency('prof_contemplation_telekinesis')))" }, { "type": "jmath_function", - "id": "difficulty_nine_contemplation", + "id": "jmath_telepathy_learning_eocs_modifiers", "num_args": 1, - "return": "_0 * 13722" + "return": "_0 * max(( 1 - ( ( ( u_val('intelligence') + 23.33) / 33.33 ) ) + 1 ),0.4) * (1 - (0.2 * u_has_proficiency('prof_contemplation_telepathy')))" }, { "type": "jmath_function", - "id": "difficulty_ten_contemplation", + "id": "jmath_teleportation_learning_eocs_modifiers", "num_args": 1, - "return": "_0 * 13722" + "return": "_0 * max(( 1 - ( ( ( u_val('intelligence') + 23.33) / 33.33 ) ) + 1 ),0.4) * (1 - (0.2 * u_has_proficiency('prof_contemplation_teleportation')))" + }, + { + "type": "jmath_function", + "id": "jmath_vitakinesis_learning_eocs_modifiers", + "num_args": 1, + "return": "_0 * max(( 1 - ( ( ( u_val('intelligence') + 23.33) / 33.33 ) ) + 1 ),0.4) * (1 - (0.2 * u_has_proficiency('prof_contemplation_vitakinesis')))" } ] diff --git a/data/mods/MindOverMatter/obsolete/eocs.json b/data/mods/MindOverMatter/obsolete/eocs.json new file mode 100644 index 0000000000000..7bde0e3ba9c3c --- /dev/null +++ b/data/mods/MindOverMatter/obsolete/eocs.json @@ -0,0 +1,20 @@ +[ + { + "type": "effect_on_condition", + "id": "EOC_MOM_GAMELOAD_POWER_LEARNING_VARIABLES_UPDATER", + "eoc_type": "EVENT", + "required_event": "game_load", + "condition": { "math": [ "global_updated_power_learning_variables", "!=", "1" ] }, + "effect": [ + { "math": [ "global_insight_power_learning_time_low", "=", "43200" ] }, + { "math": [ "global_insight_power_learning_time_high", "=", "604800" ] }, + { "math": [ "global_tier_one_power_learning_time_low", "=", "43200" ] }, + { "math": [ "global_tier_one_power_learning_time_high", "=", "86400" ] }, + { "math": [ "global_tier_two_power_learning_time_low", "=", "129600" ] }, + { "math": [ "global_tier_two_power_learning_time_high", "=", "259200" ] }, + { "math": [ "global_tier_three_power_learning_time_low", "=", "345600" ] }, + { "math": [ "global_tier_three_power_learning_time_high", "=", "604800" ] }, + { "math": [ "global_updated_power_learning_variables", "=", "1" ] } + ] + } +] diff --git a/data/mods/MindOverMatter/powers/learning_eocs/biokinesis.json b/data/mods/MindOverMatter/powers/learning_eocs/biokinesis.json index f605644fa0d98..cdf1b909fcf87 100644 --- a/data/mods/MindOverMatter/powers/learning_eocs/biokinesis.json +++ b/data/mods/MindOverMatter/powers/learning_eocs/biokinesis.json @@ -2,7 +2,10 @@ { "type": "effect_on_condition", "id": "EOC_BIOKIN_LEARNING_OXYGEN_ABSORPTION", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "BIOKINETIC" }, @@ -38,7 +41,10 @@ { "type": "effect_on_condition", "id": "EOC_BIOKIN_LEARNING_FLEXIBILITY", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "BIOKINETIC" }, @@ -66,7 +72,10 @@ { "type": "effect_on_condition", "id": "EOC_BIOKIN_LEARNING_DASH", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "BIOKINETIC" }, @@ -110,7 +119,10 @@ { "type": "effect_on_condition", "id": "EOC_BIOKIN_LEARNING_ARMOR_SKIN", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "BIOKINETIC" }, @@ -156,7 +168,10 @@ { "type": "effect_on_condition", "id": "EOC_BIOKIN_LEARNING_CLIMATE_CONTROL", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "BIOKINETIC" }, @@ -197,7 +212,10 @@ { "type": "effect_on_condition", "id": "EOC_BIOKIN_LEARNING_ADRENALINE", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "BIOKINETIC" }, @@ -238,7 +256,10 @@ { "type": "effect_on_condition", "id": "EOC_BIOKIN_LEARNING_ENHANCE_MOBILITY", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "BIOKINETIC" }, @@ -286,7 +307,10 @@ { "type": "effect_on_condition", "id": "EOC_BIOKIN_LEARNING_HAMMERHAND", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "BIOKINETIC" }, @@ -322,7 +346,10 @@ { "type": "effect_on_condition", "id": "EOC_BIOKIN_LEARNING_REFLEX_ENHANCE", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "BIOKINETIC" }, @@ -364,7 +391,10 @@ { "type": "effect_on_condition", "id": "EOC_BIOKIN_LEARNING_SEALED_SYSTEM", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "BIOKINETIC" }, @@ -410,7 +440,10 @@ { "type": "effect_on_condition", "id": "EOC_BIOKIN_LEARNING_METABOLISM_ENHANCE", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "BIOKINETIC" }, @@ -451,7 +484,10 @@ { "type": "effect_on_condition", "id": "EOC_BIOKIN_LEARNING_COMBAT_DANCE", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "BIOKINETIC" }, @@ -493,7 +529,10 @@ { "type": "effect_on_condition", "id": "EOC_BIOKIN_LEARNING_PERFECTED_MOTION", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "BIOKINETIC" }, @@ -529,7 +568,10 @@ { "type": "effect_on_condition", "id": "EOC_BIOKIN_LEARNING_HURRICANE_BLOWS", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_biokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "BIOKINETIC" }, diff --git a/data/mods/MindOverMatter/powers/learning_eocs/clairsentience.json b/data/mods/MindOverMatter/powers/learning_eocs/clairsentience.json index bf1fcf60c074a..79cee43e2d349 100644 --- a/data/mods/MindOverMatter/powers/learning_eocs/clairsentience.json +++ b/data/mods/MindOverMatter/powers/learning_eocs/clairsentience.json @@ -2,7 +2,10 @@ { "type": "effect_on_condition", "id": "EOC_CLAIR_LEARNING_PREMONITION", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "CLAIRSENTIENT" }, @@ -27,7 +30,10 @@ { "type": "effect_on_condition", "id": "EOC_CLAIR_LEARNING_SPOT_WEAKNESS", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "CLAIRSENTIENT" }, @@ -63,7 +69,10 @@ { "type": "effect_on_condition", "id": "EOC_CLAIR_LEARNING_AURA_SIGHT", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "CLAIRSENTIENT" }, @@ -99,7 +108,10 @@ { "type": "effect_on_condition", "id": "EOC_CLAIR_LEARNING_RANGED_ENHANCE", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "CLAIRSENTIENT" }, @@ -127,7 +139,10 @@ { "type": "effect_on_condition", "id": "EOC_CLAIR_LEARNING_VOYANCE", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "CLAIRSENTIENT" }, @@ -166,7 +181,10 @@ { "type": "effect_on_condition", "id": "EOC_CLAIR_LEARNING_DODGE_POWER", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "CLAIRSENTIENT" }, @@ -208,7 +226,10 @@ { "type": "effect_on_condition", "id": "EOC_CLAIR_LEARNING_CRAFT_BONUS", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "CLAIRSENTIENT" }, @@ -245,7 +266,10 @@ { "type": "effect_on_condition", "id": "EOC_CLAIR_LEARNING_PERFECT_SHOT", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "CLAIRSENTIENT" }, @@ -273,7 +297,10 @@ { "type": "effect_on_condition", "id": "EOC_CLAIR_LEARNING_SEE_MAP", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "CLAIRSENTIENT" }, @@ -312,7 +339,10 @@ { "type": "effect_on_condition", "id": "EOC_CLAIR_LEARNING_CLEAR_SIGHT", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "CLAIRSENTIENT" }, @@ -354,7 +384,10 @@ { "type": "effect_on_condition", "id": "EOC_CLAIR_LEARNING_ASTRAL_PROJECTION", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "CLAIRSENTIENT" }, @@ -400,7 +433,10 @@ { "type": "effect_on_condition", "id": "EOC_CLAIR_LEARNING_GROUP_TACTICS", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "CLAIRSENTIENT" }, @@ -437,7 +473,10 @@ { "type": "effect_on_condition", "id": "EOC_CLAIR_LEARNING_OMNISCIENCE", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_clairsentience_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "CLAIRSENTIENT" }, diff --git a/data/mods/MindOverMatter/powers/learning_eocs/electrokinesis.json b/data/mods/MindOverMatter/powers/learning_eocs/electrokinesis.json index de70038041bdb..f34679413d6cc 100644 --- a/data/mods/MindOverMatter/powers/learning_eocs/electrokinesis.json +++ b/data/mods/MindOverMatter/powers/learning_eocs/electrokinesis.json @@ -2,7 +2,10 @@ { "type": "effect_on_condition", "id": "EOC_ELECTROKIN_LEARNING_ZAP_ENEMIES", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, @@ -36,7 +39,10 @@ { "type": "effect_on_condition", "id": "EOC_ELECTROKIN_LEARNING_MELEE_ATTACKS", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, @@ -72,90 +78,13 @@ } ] }, - { - "type": "effect_on_condition", - "id": "EOC_ELECTROKIN_LEARNING_HACKING_INTERFACE", - "recurrence": [ "36 hours", "72 hours" ], - "condition": { - "and": [ - { "u_has_trait": "ELECTROKINETIC" }, - { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "==", "1" ] }, - { - "or": [ - { "x_in_y_chance": { "x": 1, "y": 40 } }, - { - "and": [ - { "math": [ "u_spell_level('electrokinetic_see_electric')", ">=", "4" ] }, - { "math": [ "u_spell_level('electrokinetic_shock_touch')", ">=", "4" ] }, - { "math": [ "u_spell_level('electrokinetic_personal_battery')", ">=", "4" ] } - ] - } - ] - }, - { "test_eoc": "EOC_PSI_LEARNING_BANNED_EFFECTS" }, - { "math": [ "u_spell_level('electrokinetic_hacking_interface')", "<=", "0" ] }, - { "not": { "u_know_recipe": "practice_electrokinetic_hacking_interface" } } - ] - }, - "deactivate_condition": { - "or": [ - { "not": { "u_has_trait": "ELECTROKINETIC" } }, - { "math": [ "u_spell_level('electrokinetic_hacking_interface')", ">=", "1" ] } - ] - }, - "effect": [ - { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, - { "u_learn_recipe": "practice_electrokinetic_hacking_interface" }, - { - "u_message": "Use of your powers has led to an insight. You could create an electrical interface to hack nearby devices, if you can figure out the technique.", - "popup": true - } - ] - }, - { - "type": "effect_on_condition", - "id": "EOC_ELECTROKIN_LEARNING_ROBOT_INTERFACE", - "recurrence": [ "96 hours", "168 hours" ], - "condition": { - "and": [ - { "u_has_trait": "ELECTROKINETIC" }, - { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "==", "1" ] }, - { - "or": [ - { "x_in_y_chance": { "x": 1, "y": 80 } }, - { - "and": [ - { "math": [ "u_spell_level('electrokinetic_see_electric')", ">=", "12" ] }, - { "math": [ "u_spell_level('electrokinetic_hacking_interface')", ">=", "8" ] }, - { "math": [ "u_spell_level('electrokinetic_kill_robot')", ">=", "8" ] } - ] - } - ] - }, - { "test_eoc": "EOC_PSI_LEARNING_BANNED_EFFECTS" }, - { "math": [ "u_spell_level('electrokinetic_robot_interface')", "<=", "0" ] }, - { "not": { "u_know_recipe": "practice_electrokinetic_robot_interface" } } - ] - }, - "deactivate_condition": { - "or": [ - { "not": { "u_has_trait": "ELECTROKINETIC" } }, - { "math": [ "u_spell_level('electrokinetic_robot_interface')", ">=", "1" ] } - ] - }, - "effect": [ - { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, - { "u_learn_recipe": "practice_electrokinetic_robot_interface" }, - { - "u_message": "Use of your powers has led to an insight. You could directly manipulate a nearby robot's circuitry, if you can figure out the technique.", - "popup": true - } - ] - }, { "type": "effect_on_condition", "id": "EOC_ELECTROKIN_LEARNING_PERSONAL_BATTERY", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, @@ -194,7 +123,10 @@ { "type": "effect_on_condition", "id": "EOC_ELECTROKIN_LEARNING_PARALYSIS", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, @@ -238,7 +170,10 @@ { "type": "effect_on_condition", "id": "EOC_ELECTROKIN_LEARNING_REDUCE_PAIN", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, @@ -279,10 +214,56 @@ } ] }, + { + "type": "effect_on_condition", + "id": "EOC_ELECTROKIN_LEARNING_HACKING_INTERFACE", + "recurrence": [ + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], + "condition": { + "and": [ + { "u_has_trait": "ELECTROKINETIC" }, + { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "==", "1" ] }, + { + "or": [ + { "x_in_y_chance": { "x": 1, "y": 40 } }, + { + "and": [ + { "math": [ "u_spell_level('electrokinetic_see_electric')", ">=", "4" ] }, + { "math": [ "u_spell_level('electrokinetic_shock_touch')", ">=", "4" ] }, + { "math": [ "u_spell_level('electrokinetic_personal_battery')", ">=", "4" ] } + ] + } + ] + }, + { "test_eoc": "EOC_PSI_LEARNING_BANNED_EFFECTS" }, + { "math": [ "u_spell_level('electrokinetic_hacking_interface')", "<=", "0" ] }, + { "not": { "u_know_recipe": "practice_electrokinetic_hacking_interface" } } + ] + }, + "deactivate_condition": { + "or": [ + { "not": { "u_has_trait": "ELECTROKINETIC" } }, + { "math": [ "u_spell_level('electrokinetic_hacking_interface')", ">=", "1" ] } + ] + }, + "effect": [ + { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, + { "u_learn_recipe": "practice_electrokinetic_hacking_interface" }, + { + "u_message": "Use of your powers has led to an insight. You could create an electrical interface to hack nearby devices, if you can figure out the technique.", + "popup": true + } + ] + }, { "type": "effect_on_condition", "id": "EOC_ELECTROKIN_LEARNING_LIGHTNING_BOLT", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, @@ -326,7 +307,10 @@ { "type": "effect_on_condition", "id": "EOC_ELECTROKIN_LEARNING_RECHARGE_VEHICLE", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, @@ -370,7 +354,10 @@ { "type": "effect_on_condition", "id": "EOC_ELECTROKIN_LEARNING_PAIN_IMMUNE", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, @@ -401,7 +388,10 @@ { "type": "effect_on_condition", "id": "EOC_ELECTROKIN_LEARNING_SPEED_BOOST", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, @@ -447,10 +437,56 @@ } ] }, + { + "type": "effect_on_condition", + "id": "EOC_ELECTROKIN_LEARNING_ROBOT_INTERFACE", + "recurrence": [ + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], + "condition": { + "and": [ + { "u_has_trait": "ELECTROKINETIC" }, + { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "==", "1" ] }, + { + "or": [ + { "x_in_y_chance": { "x": 1, "y": 80 } }, + { + "and": [ + { "math": [ "u_spell_level('electrokinetic_see_electric')", ">=", "12" ] }, + { "math": [ "u_spell_level('electrokinetic_hacking_interface')", ">=", "8" ] }, + { "math": [ "u_spell_level('electrokinetic_kill_robot')", ">=", "8" ] } + ] + } + ] + }, + { "test_eoc": "EOC_PSI_LEARNING_BANNED_EFFECTS" }, + { "math": [ "u_spell_level('electrokinetic_robot_interface')", "<=", "0" ] }, + { "not": { "u_know_recipe": "practice_electrokinetic_robot_interface" } } + ] + }, + "deactivate_condition": { + "or": [ + { "not": { "u_has_trait": "ELECTROKINETIC" } }, + { "math": [ "u_spell_level('electrokinetic_robot_interface')", ">=", "1" ] } + ] + }, + "effect": [ + { "math": [ "u_vitamin('vitamin_psi_learning_counter')", "=", "0" ] }, + { "u_learn_recipe": "practice_electrokinetic_robot_interface" }, + { + "u_message": "Use of your powers has led to an insight. You could directly manipulate a nearby robot's circuitry, if you can figure out the technique.", + "popup": true + } + ] + }, { "type": "effect_on_condition", "id": "EOC_ELECTROKIN_LEARNING_KILL_ROBOT", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, @@ -495,7 +531,10 @@ { "type": "effect_on_condition", "id": "EOC_ELECTROKIN_LEARNING_LIGHTNING_AURA", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, @@ -539,7 +578,10 @@ { "type": "effect_on_condition", "id": "EOC_ELECTROKIN_LEARNING_LIGHTNING_BLAST", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, @@ -588,7 +630,10 @@ { "type": "effect_on_condition", "id": "EOC_ELECTROKIN_LEARNING_REVIVE", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_electrokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "ELECTROKINETIC" }, diff --git a/data/mods/MindOverMatter/powers/learning_eocs/photokinesis.json b/data/mods/MindOverMatter/powers/learning_eocs/photokinesis.json index e4dc26fdd26a1..70f7f695a3ee8 100644 --- a/data/mods/MindOverMatter/powers/learning_eocs/photokinesis.json +++ b/data/mods/MindOverMatter/powers/learning_eocs/photokinesis.json @@ -2,7 +2,10 @@ { "type": "effect_on_condition", "id": "EOC_PHOTOKIN_LEARNING_SNUFF_LIGHT", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PHOTOKINETIC" }, @@ -38,7 +41,10 @@ { "type": "effect_on_condition", "id": "EOC_PHOTO_LEARNING_LIGHT_DODGE", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PHOTOKINETIC" }, @@ -74,7 +80,10 @@ { "type": "effect_on_condition", "id": "EOC_PHOTO_LEARNING_LIGHT_BEAM", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PHOTOKINETIC" }, @@ -110,7 +119,10 @@ { "type": "effect_on_condition", "id": "EOC_PHOTO_LEARNING_CAMOUFLAGE", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PHOTOKINETIC" }, @@ -141,7 +153,10 @@ { "type": "effect_on_condition", "id": "EOC_PHOTO_LEARNING_RAD_IMMUNITY", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PHOTOKINETIC" }, @@ -185,7 +200,10 @@ { "type": "effect_on_condition", "id": "EOC_PHOTOKIN_LEARNING_LIGHT_ARMS", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PHOTOKINETIC" }, @@ -222,7 +240,10 @@ { "type": "effect_on_condition", "id": "EOC_PHOTOKIN_LEARNING_HIDE_UGLY", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PHOTOKINETIC" }, @@ -258,7 +279,10 @@ { "type": "effect_on_condition", "id": "EOC_PHOTOKIN_LEARNING_LIGHT_IMAGE", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PHOTOKINETIC" }, @@ -299,7 +323,10 @@ { "type": "effect_on_condition", "id": "EOC_PHOTOKIN_LEARNING_RADIO", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PHOTOKINETIC" }, @@ -340,7 +367,10 @@ { "type": "effect_on_condition", "id": "EOC_PHOTOKIN_LEARNING_INVISIBILITY", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PHOTOKINETIC" }, @@ -389,7 +419,10 @@ { "type": "effect_on_condition", "id": "EOC_PHOTOKIN_LEARNING_LIGHT_FLASH", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PHOTOKINETIC" }, @@ -430,7 +463,10 @@ { "type": "effect_on_condition", "id": "EOC_PHOTOKIN_LEARNING_LIGHT_BLINDING_GLARE", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PHOTOKINETIC" }, @@ -474,7 +510,10 @@ { "type": "effect_on_condition", "id": "EOC_PHOTOKIN_LEARNING_LIGHT_DISINTEGRATE", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_photokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PHOTOKINETIC" }, diff --git a/data/mods/MindOverMatter/powers/learning_eocs/pyrokinesis.json b/data/mods/MindOverMatter/powers/learning_eocs/pyrokinesis.json index 23c6a5f345894..a7d4ad05d0108 100644 --- a/data/mods/MindOverMatter/powers/learning_eocs/pyrokinesis.json +++ b/data/mods/MindOverMatter/powers/learning_eocs/pyrokinesis.json @@ -2,7 +2,10 @@ { "type": "effect_on_condition", "id": "EOC_PYROKIN_LEARNING_CAUTERIZE", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PYROKINETIC" }, @@ -43,7 +46,10 @@ { "type": "effect_on_condition", "id": "EOC_PYROKIN_LEARNING_CALL_FLAMES", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PYROKINETIC" }, @@ -74,7 +80,10 @@ { "type": "effect_on_condition", "id": "EOC_PYROKIN_LEARNING_QUELL_FLAMES", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PYROKINETIC" }, @@ -105,7 +114,10 @@ { "type": "effect_on_condition", "id": "EOC_PYROKIN_LEARNING_CLOAK", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PYROKINETIC" }, @@ -141,7 +153,10 @@ { "type": "effect_on_condition", "id": "EOC_PYROKIN_LEARNING_FLAMETHROWER", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PYROKINETIC" }, @@ -177,7 +192,10 @@ { "type": "effect_on_condition", "id": "EOC_PYROKIN_LEARNING_LANCE", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PYROKINETIC" }, @@ -218,7 +236,10 @@ { "type": "effect_on_condition", "id": "EOC_PYROKIN_LEARNING_THERMOGENESIS", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PYROKINETIC" }, @@ -259,7 +280,10 @@ { "type": "effect_on_condition", "id": "EOC_PYROKIN_LEARNING_AURA", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PYROKINETIC" }, @@ -301,7 +325,10 @@ { "type": "effect_on_condition", "id": "EOC_PYROKIN_LEARNING_FLAME_IMMUNITY", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PYROKINETIC" }, @@ -345,7 +372,10 @@ { "type": "effect_on_condition", "id": "EOC_PYROKIN_LEARNING_BLAST", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PYROKINETIC" }, @@ -391,7 +421,10 @@ { "type": "effect_on_condition", "id": "EOC_PYROKIN_LEARNING_AOE_BLAST", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PYROKINETIC" }, @@ -437,7 +470,10 @@ { "type": "effect_on_condition", "id": "EOC_PYROKIN_LEARNING_INCINERATION", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_pyrokinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "PYROKINETIC" }, diff --git a/data/mods/MindOverMatter/powers/learning_eocs/telekinesis.json b/data/mods/MindOverMatter/powers/learning_eocs/telekinesis.json index 215d3c7fdebfa..596e5341bc1f6 100644 --- a/data/mods/MindOverMatter/powers/learning_eocs/telekinesis.json +++ b/data/mods/MindOverMatter/powers/learning_eocs/telekinesis.json @@ -2,7 +2,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEKIN_LEARNING_NOISEMAKER", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEKINETIC" }, @@ -63,7 +66,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEKIN_LEARNING_MOMENTUM", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEKINETIC" }, @@ -99,7 +105,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEKIN_LEARNING_SLOWFALL", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEKINETIC" }, @@ -130,7 +139,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEKIN_LEARNING_WAVE", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEKINETIC" }, @@ -166,7 +178,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEKIN_LEARNING_STRENGTH", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEKINETIC" }, @@ -207,7 +222,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEKIN_LEARNING_HAMMER", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEKINETIC" }, @@ -248,7 +266,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEKIN_LEARNING_VEHICLE_LIFT", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEKINETIC" }, @@ -289,7 +310,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEKIN_LEARNING_SHIELD", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEKINETIC" }, @@ -325,7 +349,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEKIN_LEARNING_EXPLOSION", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEKINETIC" }, @@ -371,7 +398,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEKIN_LEARNING_LEVITATION", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEKINETIC" }, @@ -412,7 +442,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEKIN_LEARNING_MEGAKINESIS", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEKINETIC" }, @@ -461,7 +494,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEKIN_LEARNING_AEGIS", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEKINETIC" }, @@ -508,7 +544,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEKIN_LEARNING_EARTHSHAKER", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_telekinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEKINETIC" }, diff --git a/data/mods/MindOverMatter/powers/learning_eocs/telepathy.json b/data/mods/MindOverMatter/powers/learning_eocs/telepathy.json index e936d0a254b4c..eb87f98b2c9a8 100644 --- a/data/mods/MindOverMatter/powers/learning_eocs/telepathy.json +++ b/data/mods/MindOverMatter/powers/learning_eocs/telepathy.json @@ -2,7 +2,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEPATH_LEARNING_SHIELD", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_telepathy_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_telepathy_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEPATH" }, @@ -31,7 +34,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEPATH_LEARNING_MORALE", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_telepathy_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_telepathy_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEPATH" }, @@ -65,7 +71,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEPATH_LEARNING_BLAST", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_telepathy_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_telepathy_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEPATH" }, @@ -99,7 +108,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEPATH_LEARNING_BEASTMASTER", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_telepathy_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_telepathy_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEPATH" }, @@ -130,7 +142,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEPATH_LEARNING_CONFUSION", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_telepathy_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_telepathy_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEPATH" }, @@ -171,7 +186,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEPATH_LEARNING_FEAR", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_telepathy_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_telepathy_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEPATH" }, @@ -205,7 +223,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEPATH_LEARNING_INVISIBILITY", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_telepathy_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_telepathy_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEPATH" }, @@ -247,7 +268,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEPATH_LEARNING_AOE_BLAST", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_telepathy_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_telepathy_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEPATH" }, @@ -288,7 +312,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEPATH_LEARNING_BEAST_TAMING", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_telepathy_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_telepathy_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEPATH" }, @@ -319,7 +346,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEPATH_LEARNING_MIND_CONTROL", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_telepathy_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_telepathy_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEPATH" }, @@ -366,7 +396,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEPATH_LEARNING_NETWORK", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_telepathy_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_telepathy_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEPATH" }, diff --git a/data/mods/MindOverMatter/powers/learning_eocs/teleportation.json b/data/mods/MindOverMatter/powers/learning_eocs/teleportation.json index 32c718ff3d7e5..509967540734b 100644 --- a/data/mods/MindOverMatter/powers/learning_eocs/teleportation.json +++ b/data/mods/MindOverMatter/powers/learning_eocs/teleportation.json @@ -2,7 +2,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEPORT_LEARNING_PHASE", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_teleportation_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_teleportation_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEPORTER" }, @@ -28,7 +31,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEPORT_LEARNING_STRIDE", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_teleportation_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_teleportation_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEPORTER" }, @@ -62,7 +68,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEPORT_LEARNING_TRANSPOSE", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_teleportation_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_teleportation_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEPORTER" }, @@ -98,7 +107,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEPORT_LEARNING_DISPLACEMENT", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_teleportation_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_teleportation_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEPORTER" }, @@ -134,7 +146,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEPORT_LEARNING_COLLAPSE", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_teleportation_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_teleportation_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEPORTER" }, @@ -175,7 +190,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEPORT_LEARNING_FARSTEP", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_teleportation_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_teleportation_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEPORTER" }, @@ -214,7 +232,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEPORT_LEARNING_BANISH", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_teleportation_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_teleportation_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEPORTER" }, @@ -254,7 +275,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEPORT_LEARNING_GATEWAY", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_teleportation_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_teleportation_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEPORTER" }, @@ -288,7 +312,10 @@ { "type": "effect_on_condition", "id": "EOC_TELEPORT_LEARNING_BREACH", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_teleportation_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_teleportation_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "TELEPORTER" }, diff --git a/data/mods/MindOverMatter/powers/learning_eocs/vitakinesis.json b/data/mods/MindOverMatter/powers/learning_eocs/vitakinesis.json index dd3a3954df90b..35883868f11a7 100644 --- a/data/mods/MindOverMatter/powers/learning_eocs/vitakinesis.json +++ b/data/mods/MindOverMatter/powers/learning_eocs/vitakinesis.json @@ -2,7 +2,10 @@ { "type": "effect_on_condition", "id": "EOC_VITAKIN_LEARNING_STOP_BLEEDING", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "VITAKINETIC" }, @@ -30,7 +33,10 @@ { "type": "effect_on_condition", "id": "EOC_VITAKIN_LEARNING_HEALING_TOUCH", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "VITAKINETIC" }, @@ -58,7 +64,10 @@ { "type": "effect_on_condition", "id": "EOC_VITAKIN_LEARNING_HURT_TOUCH", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "VITAKINETIC" }, @@ -92,7 +101,10 @@ { "type": "effect_on_condition", "id": "EOC_VITAKIN_LEARNING_REMOVE_POISON", - "recurrence": [ "12 hours", "24 hours" ], + "recurrence": [ + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_low)" ] }, + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_one_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "VITAKINETIC" }, @@ -133,7 +145,10 @@ { "type": "effect_on_condition", "id": "EOC_VITAKIN_LEARNING_CURE_DISEASE", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "VITAKINETIC" }, @@ -161,7 +176,10 @@ { "type": "effect_on_condition", "id": "EOC_VITAKIN_LEARNING_SLEEPING_TRANCE", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "VITAKINETIC" }, @@ -197,7 +215,10 @@ { "type": "effect_on_condition", "id": "EOC_VITAKIN_LEARNING_PAIN_SPLIT", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "VITAKINETIC" }, @@ -241,7 +262,10 @@ { "type": "effect_on_condition", "id": "EOC_VITAKIN_LEARNING_STOP_INFECTION", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "VITAKINETIC" }, @@ -269,7 +293,10 @@ { "type": "effect_on_condition", "id": "EOC_VITAKIN_LEARNING_HEALING_TRANCE", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "VITAKINETIC" }, @@ -305,7 +332,10 @@ { "type": "effect_on_condition", "id": "EOC_VITAKIN_LEARNING_ATTACK_TOUCH", - "recurrence": [ "36 hours", "72 hours" ], + "recurrence": [ + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_low)" ] }, + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_two_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "VITAKINETIC" }, @@ -333,7 +363,10 @@ { "type": "effect_on_condition", "id": "EOC_VITAKIN_LEARNING_BLOOD_PURGE", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "VITAKINETIC" }, @@ -374,7 +407,10 @@ { "type": "effect_on_condition", "id": "EOC_VITAKIN_LEARNING_BANISH_ILLNESS", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "VITAKINETIC" }, @@ -415,7 +451,10 @@ { "type": "effect_on_condition", "id": "EOC_VITAKIN_LEARNING_SUPER_HEAL", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "VITAKINETIC" }, @@ -460,7 +499,10 @@ { "type": "effect_on_condition", "id": "EOC_VITAKIN_LEARNING_RETURN_FROM_DEATH", - "recurrence": [ "96 hours", "168 hours" ], + "recurrence": [ + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_low)" ] }, + { "math": [ "jmath_vitakinesis_learning_eocs_modifiers(global_tier_three_power_learning_time_high)" ] } + ], "condition": { "and": [ { "u_has_trait": "VITAKINETIC" }, diff --git a/data/mods/MindOverMatter/recipes/proficiencies.json b/data/mods/MindOverMatter/recipes/proficiencies.json index a66d1311760b7..9158bae231732 100644 --- a/data/mods/MindOverMatter/recipes/proficiencies.json +++ b/data/mods/MindOverMatter/recipes/proficiencies.json @@ -55,8 +55,7 @@ "can_learn": true, "default_time_multiplier": 1.0, "default_skill_penalty": 0.2, - "time_to_learn": "200 h", - "//": "Length is deliberate" + "time_to_learn": "32 h" }, { "type": "proficiency", @@ -67,8 +66,7 @@ "can_learn": true, "default_time_multiplier": 1.0, "default_skill_penalty": 0.2, - "time_to_learn": "200 h", - "//": "Length is deliberate" + "time_to_learn": "32 h" }, { "type": "proficiency", @@ -79,8 +77,7 @@ "can_learn": true, "default_time_multiplier": 1.0, "default_skill_penalty": 0.2, - "time_to_learn": "200 h", - "//": "Length is deliberate" + "time_to_learn": "32 h" }, { "type": "proficiency", @@ -91,8 +88,7 @@ "can_learn": true, "default_time_multiplier": 1.0, "default_skill_penalty": 0.2, - "time_to_learn": "200 h", - "//": "Length is deliberate" + "time_to_learn": "32 h" }, { "type": "proficiency", @@ -103,8 +99,7 @@ "can_learn": true, "default_time_multiplier": 1.0, "default_skill_penalty": 0.2, - "time_to_learn": "200 h", - "//": "Length is deliberate" + "time_to_learn": "32 h" }, { "type": "proficiency", @@ -115,8 +110,7 @@ "can_learn": true, "default_time_multiplier": 1.0, "default_skill_penalty": 0.2, - "time_to_learn": "200 h", - "//": "Length is deliberate" + "time_to_learn": "32 h" }, { "type": "proficiency", @@ -127,8 +121,7 @@ "can_learn": true, "default_time_multiplier": 1.0, "default_skill_penalty": 0.2, - "time_to_learn": "200 h", - "//": "Length is deliberate" + "time_to_learn": "32 h" }, { "type": "proficiency", @@ -139,8 +132,7 @@ "can_learn": true, "default_time_multiplier": 1.0, "default_skill_penalty": 0.2, - "time_to_learn": "200 h", - "//": "Length is deliberate" + "time_to_learn": "32 h" }, { "type": "proficiency", @@ -151,8 +143,7 @@ "can_learn": true, "default_time_multiplier": 1.0, "default_skill_penalty": 0.2, - "time_to_learn": "200 h", - "//": "Length is deliberate" + "time_to_learn": "32 h" }, { "type": "proficiency_category",