[MoM] Add Torrential Channeling, revamp Extended Channeling

data/mods/MindOverMatter/effectoncondition/eoc_mutations.json

@@ -285,5 +285,61 @@
       { "u_lose_trait": "TELEKINETIC_LIFTER_2" },
       { "u_lose_trait": "TELEKINETIC_LIFTER_1" }
     ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_PSI_EXTENDED_CHANNELING_ON",
+    "condition": { "not": { "u_has_trait": "PSI_EXTENDED_CHANNELING_active" } },
+    "effect": [
+      {
+        "run_eocs": [
+          {
+            "id": "EOC_PSI_EXTENDED_CHANNELING_ON_2",
+            "condition": { "u_has_trait": "PSI_TORRENTIAL_CHANNELING_active" },
+            "effect": [
+              { "u_deactivate_trait": "PSI_TORRENTIAL_CHANNELING" },
+              { "u_add_trait": "PSI_EXTENDED_CHANNELING_active" },
+              { "u_message": "You begin to take more care in channeling your powers.", "type": "good" }
+            ],
+            "false_effect": [
+              { "u_add_trait": "PSI_EXTENDED_CHANNELING_active" },
+              { "u_message": "You begin to take more care in channeling your powers.", "type": "good" }
+            ]
+          }
+        ]
+      }
+    ],
+    "false_effect": [
+      { "u_lose_trait": "PSI_EXTENDED_CHANNELING_active" },
+      { "u_message": "You return to your previous speed in channeling your powers.", "type": "neutral" }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_PSI_TORRENTIAL_CHANNELING_ON",
+    "condition": { "not": { "u_has_trait": "PSI_TORRENTIAL_CHANNELING_active" } },
+    "effect": [
+      {
+        "run_eocs": [
+          {
+            "id": "EOC_PSI_TORRENTIAL_CHANNELING_ON_2",
+            "condition": { "u_has_trait": "PSI_EXTENDED_CHANNELING_active" },
+            "effect": [
+              { "u_deactivate_trait": "PSI_EXTENDED_CHANNELING" },
+              { "u_add_trait": "PSI_TORRENTIAL_CHANNELING_active" },
+              { "u_message": "You begin drawing deeply on the Nether.", "type": "good" }
+            ],
+            "false_effect": [
+              { "u_add_trait": "PSI_TORRENTIAL_CHANNELING_active" },
+              { "u_message": "You begin drawing deeply on the Nether.", "type": "good" }
+            ]
+          }
+        ]
+      }
+    ],
+    "false_effect": [
+      { "u_lose_trait": "PSI_TORRENTIAL_CHANNELING_active" },
+      { "u_message": "The cut off the overflow of Nether power.", "type": "neutral" }
+    ]
   }
 ]

data/mods/MindOverMatter/effectoncondition/eoc_nether_attunement_events.json

@@ -78,7 +78,7 @@
   {
     "type": "effect_on_condition",
     "id": "EOC_RAISE_ATTUNEMENT_BELOW_THRESHOLD",
-    "condition": { "u_has_effect": "effect_noetic_resilience" },
+    "condition": { "or": [ { "u_has_effect": "effect_noetic_resilience" }, { "u_has_trait": "PSI_EXTENDED_CHANNELING_active" } ] },
     "effect": [
       { "u_message": "As you unleash your powers, you feel a strange tingling sensation.", "type": "mixed" },
       {
@@ -95,7 +95,7 @@
   {
     "type": "effect_on_condition",
     "id": "EOC_RAISE_ATTUNEMENT_ABOVE_THRESHOLD",
-    "condition": { "u_has_effect": "effect_noetic_resilience" },
+    "condition": { "or": [ { "u_has_effect": "effect_noetic_resilience" }, { "u_has_trait": "PSI_EXTENDED_CHANNELING_active" } ] },
     "effect": [
       { "u_message": "As you unleash your powers, you feel a strange tingling sensation.", "type": "mixed" },
       {
@@ -166,7 +166,7 @@
   {
     "type": "effect_on_condition",
     "id": "EOC_RAISE_ATTUNEMENT_BELOW_THRESHOLD_MAINTENANCE",
-    "condition": { "u_has_effect": "effect_noetic_resilience" },
+    "condition": { "or": [ { "u_has_effect": "effect_noetic_resilience" }, { "u_has_trait": "PSI_EXTENDED_CHANNELING_active" } ] },
     "effect": [
       { "u_message": "As you concentrate on your powers, you feel a strange tingling sensation.", "type": "mixed" },
       {
@@ -183,7 +183,7 @@
   {
     "type": "effect_on_condition",
     "id": "EOC_RAISE_ATTUNEMENT_ABOVE_THRESHOLD_MAINTENANCE",
-    "condition": { "u_has_effect": "effect_noetic_resilience" },
+    "condition": { "or": [ { "u_has_effect": "effect_noetic_resilience" }, { "u_has_trait": "PSI_EXTENDED_CHANNELING_active" } ] },
     "effect": [
       { "u_message": "As you concentrate on your powers, you feel a strange tingling sensation.", "type": "mixed" },
       {
@@ -215,29 +215,62 @@
     "effect": [ { "math": [ "u_nether_conduit_repeated_channeling_value", "-=", "1" ] } ],
     "false_effect": [ { "math": [ "u_nether_conduit_repeated_channeling_value", "=", "0" ] } ]
   },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_TORRENTIAL_active",
+    "eoc_type": "EVENT",
+    "required_event": "spellcasting_finish",
+    "condition": {
+      "and": [
+        { "test_eoc": "EOC_CONDITION_SPELLCASTING_FINISH_TRAIT_AND_SCHOOL_LIST" },
+        { "u_has_trait": "PSI_TORRENTIAL_CHANNELING_active" }
+      ]
+    },
+    "effect": [ { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rand(2 + (u_nether_conduit_repeated_channeling_value / 4 ) )" ] } ]
+  },
   {
     "type": "effect_on_condition",
     "id": "EOC_PSIONICS_SET_NETHER_ATTUNEMENT_BOOST",
     "eoc_type": "EVENT",
     "required_event": "opens_spellbook",
     "condition": { "not": { "u_has_effect": "effect_noetic_resilience" } },
-    "effect": {
-      "switch": { "math": [ "u_vitamin('vitamin_psionic_drain')" ] },
-      "cases": [
-        { "case": 0, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "0.75" ] } },
-        { "case": 15, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "1" ] } },
-        { "case": 35, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "1.05" ] } },
-        { "case": 55, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "1.1" ] } },
-        { "case": 85, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "1.17" ] } },
-        { "case": 115, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "1.25" ] } },
-        { "case": 145, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "1.35" ] } },
-        { "case": 175, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "1.5" ] } },
-        { "case": 195, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "1.75" ] } },
-        { "case": 215, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "2" ] } },
-        { "case": 235, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "3" ] } },
-        { "case": 245, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "4" ] } }
-      ]
-    },
+    "effect": [
+      {
+        "run_eocs": [
+          {
+            "id": "EOC_PSIONICS_SET_NETHER_ATTUNEMENT_BOOST_2",
+            "condition": { "not": { "u_has_trait": "PSI_TORRENTIAL_CHANNELING_active" } },
+            "effect": {
+              "switch": { "math": [ "u_vitamin('vitamin_psionic_drain')" ] },
+              "cases": [
+                { "case": 0, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "0.75" ] } },
+                { "case": 15, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "1" ] } },
+                { "case": 35, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "1.05" ] } },
+                { "case": 55, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "1.1" ] } },
+                { "case": 85, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "1.17" ] } },
+                { "case": 115, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "1.25" ] } },
+                { "case": 145, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "1.35" ] } },
+                { "case": 175, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "1.5" ] } },
+                { "case": 195, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "1.75" ] } },
+                { "case": 215, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "2" ] } },
+                { "case": 235, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "3" ] } },
+                { "case": 245, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "4" ] } }
+              ]
+            },
+            "false_effect": {
+              "switch": { "math": [ "u_vitamin('vitamin_psionic_drain')" ] },
+              "cases": [
+                { "case": 0, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "1.5" ] } },
+                { "case": 195, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "1.75" ] } },
+                { "case": 215, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "2" ] } },
+                { "case": 235, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "3" ] } },
+                { "case": 245, "effect": { "math": [ "u_nether_attunement_power_scaling", "=", "4" ] } }
+              ]
+            }
+          }
+        ]
+      }
+    ],
     "false_effect": { "math": [ "u_nether_attunement_power_scaling", "=", "1.05" ] }
   },
   {

data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json

@@ -179,12 +179,20 @@
     "id": "EOC_PSI_EXTENDED_CHANNELING",
     "eoc_type": "EVENT",
     "required_event": "opens_spellbook",
-    "condition": { "u_has_trait": "PSI_EXTENDED_CHANNELING_ON" },
+    "condition": { "u_has_trait": "PSI_EXTENDED_CHANNELING_active" },
     "effect": [
       { "math": [ "u_spellcasting_adjustment('casting_time', 'flag_whitelist': 'PSIONIC')", "=", "25" ] },
       { "math": [ "u_spellcasting_adjustment('concentration', 'flag_whitelist': 'PSIONIC' )", "=", "-1" ] }
     ]
   },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_PSI_TORRENTIAL_CHANNELING",
+    "eoc_type": "EVENT",
+    "required_event": "opens_spellbook",
+    "condition": { "u_has_trait": "PSI_TORRENTIAL_CHANNELING_active" },
+    "effect": [ { "math": [ "u_spellcasting_adjustment('concentration', 'flag_whitelist': 'PSIONIC' )", "=", "0.75" ] } ]
+  },
   {
     "type": "effect_on_condition",
     "id": "EOC_NETHER_ATTUNEMENT_BOOST",

data/mods/MindOverMatter/mutations/traits.json

@@ -170,31 +170,43 @@
   {
     "type": "mutation",
     "id": "PSI_EXTENDED_CHANNELING",
-    "name": { "str": "Standard Channeling" },
+    "name": { "str": "Extended Channeling" },
     "points": 0,
-    "description": "You are channeling your powers as quickly as you can.",
+    "description": "You can take more time and care in channeling your powers.  It will take 25x as long to evoke them, but it will be much easier to activate them and you will be less likely to gain Nether Attunement while doing so.",
     "active": true,
+    "activated_is_setup": true,
     "valid": false,
-    "transform": {
-      "target": "PSI_EXTENDED_CHANNELING_ON",
-      "msg_transform": "You start to take more care in channeling your powers.",
-      "active": true,
-      "moves": 0
-    }
+    "activated_eocs": [ "EOC_PSI_EXTENDED_CHANNELING_ON" ],
+    "deactivated_eocs": [ "EOC_PSI_EXTENDED_CHANNELING_ON" ]
   },
   {
     "type": "mutation",
-    "id": "PSI_EXTENDED_CHANNELING_ON",
-    "name": { "str": "Extended Channeling" },
+    "id": "PSI_EXTENDED_CHANNELING_active",
+    "name": { "str": "Extended Channeling Active" },
+    "points": 0,
+    "description": "The active trait for Extended Channeling.  It's a bug if you can see it.",
+    "valid": false,
+    "player_display": false
+  },
+  {
+    "type": "mutation",
+    "id": "PSI_TORRENTIAL_CHANNELING",
+    "name": { "str": "Torrential Channeling" },
     "points": 0,
-    "description": "You are taking more time and care in channeling your powers.  It takes 25x as long to evoke them, but your Focus has no effect on their chance of success.",
+    "description": "You can draw deeply on the Nether, increasing the strength of your powers but making making them harder to initiate and control.",
     "active": true,
+    "activated_is_setup": true,
     "valid": false,
-    "transform": {
-      "target": "PSI_EXTENDED_CHANNELING",
-      "msg_transform": "Your return to channeling your powers as fast as you can.",
-      "active": false,
-      "moves": 0
-    }
+    "activated_eocs": [ "EOC_PSI_TORRENTIAL_CHANNELING_ON" ],
+    "deactivated_eocs": [ "EOC_PSI_TORRENTIAL_CHANNELING_ON" ]
+  },
+  {
+    "type": "mutation",
+    "id": "PSI_TORRENTIAL_CHANNELING_active",
+    "name": { "str": "Torrential Channeling Active" },
+    "points": 0,
+    "description": "The active trait for Torrential Channeling.  It's a bug if you can see it.",
+    "valid": false,
+    "player_display": false
   }
 ]

data/mods/MindOverMatter/obsolete/temporary.json

@@ -40,5 +40,11 @@
     "id": "PHOTOKINETIC_CAMOUFLAGE_6",
     "//": "remove after 0.I",
     "remove": true
+  },
+  {
+    "type": "TRAIT_MIGRATION",
+    "id": "PSI_EXTENDED_CHANNELING_ON",
+    "//": "remove after 0.I",
+    "trait": "PSI_EXTENDED_CHANNELING"
   }
 ]

data/mods/MindOverMatter/recipes/research.json

@@ -197,7 +197,7 @@
         "condition": { "and": [ { "roll_contested": { "math": [ "u_skill('metaphysics')" ] }, "difficulty": 8 } ] },
         "effect": [
           {
-            "u_message": "You've figured it out.  The concept of \"taking more time\" wasn't exactly hard to grasp, but maintain the images in your mind, keeping your focus on a single train of thought, that was harder.  Now you've got it down, though.  If you take meticulous care in channeling your powers, it will take much longer but you'll be more likely to succeed.",
+            "u_message": "You've figured it out.  The concept of \"taking more time\" wasn't exactly hard to grasp, but maintaining the images in your mind, keeping your focus on a single train of thought, that was harder.  Now you've got it down, though.  If you take meticulous care in channeling your powers, it will take much longer but you'll be more likely to succeed.",
             "type": "good"
           },
           { "u_add_trait": "PSI_EXTENDED_CHANNELING" },
@@ -213,5 +213,46 @@
         ]
       }
     ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "MODERATE_EXERCISE",
+    "name": "research torrential channeling",
+    "id": "psi_research_torrential_channeling",
+    "description": "You have more of an understanding of the way the Nether ebbs and flows, sometimes surging forth like a flood when you least expect it.  There has to be a way to direct that more purposefully, to call forth more energy than you need and direct it into your powers instead of letting it wash over you.  It might be risky, sure, but you need every edge you can get in this post-Cataclysmic world.",
+    "category": "CC_PSIONIC",
+    "subcategory": "CSC_PSIONIC_OTHER",
+    "skill_used": "metaphysics",
+    "difficulty": 6,
+    "time": "14 h",
+    "autolearn": true,
+    "proficiencies": [
+      { "proficiency": "prof_psionic_basic", "required": true },
+      { "proficiency": "prof_psionic_ritual", "required": false }
+    ],
+    "flags": [ "SECRET", "BLIND_HARD" ],
+    "result_eocs": [
+      {
+        "id": "EOC_UNLOCK_TORRENTIAL_CHANNELING",
+        "condition": { "and": [ { "roll_contested": { "math": [ "u_skill('metaphysics')" ] }, "difficulty": 13 } ] },
+        "effect": [
+          {
+            "u_message": "You've figured it out.  Your first few attempts were overwhelming, a raging crush of power than nearly knocked you unconscious…or perhaps worse.  But after you recovered, you tried again, and again, and you gained more and more control over the flood and now you can tame its flow.  Mostly.",
+            "type": "good"
+          },
+          { "u_add_trait": "PSI_TORRENTIAL_CHANNELING" },
+          { "u_forget_recipe": "psi_research_torrential_channeling" },
+          { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }
+        ],
+        "false_effect": [
+          {
+            "u_message": "There's just something you're not grasping.  You need more practice before you can get it down…but you might want to wait.  The flow of Nether energy hasn't completely stopped.",
+            "type": "bad"
+          },
+          { "u_add_effect": "effect_nether_attunement_raiser", "duration": "24 hours" },
+          { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }
+        ]
+      }
+    ]
   }
 ]