Initial commit

CleverRaven · Jul 28, 2024 · 529e4df · 529e4df
1 parent a334d3d
commit 529e4df
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 15 deletions.
diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json
@@ -265,6 +265,7 @@
           "EOC_PHOTOKIN_REMOVE_RADIO",
           "EOC_PYRO_REMOVE_FIRE_TOOL",
           "EOC_PYRO_REMOVE_WARMTH_CLOAK",
+          "EOC_PYROKIN_REMOVE_BLAZING_AURA",
           "EOC_PYRO_REMOVE_TORCH_WELD",
           "EOC_PYROKIN_REMOVE_FLAME_IMMUNITY",
           "EOC_TELEKIN_REMOVE_MOMENTUM",
@@ -345,6 +346,7 @@
           "EOC_PHOTOKIN_REMOVE_RADIO",
           "EOC_PYRO_REMOVE_FIRE_TOOL",
           "EOC_PYRO_REMOVE_WARMTH_CLOAK",
+          "EOC_PYROKIN_REMOVE_BLAZING_AURA",
           "EOC_PYRO_REMOVE_TORCH_WELD",
           "EOC_PYROKIN_REMOVE_FLAME_IMMUNITY",
           "EOC_TELEKIN_REMOVE_MOMENTUM",

diff --git a/data/mods/MindOverMatter/effects/effects_psionic.json b/data/mods/MindOverMatter/effects/effects_psionic.json
@@ -1350,12 +1350,9 @@
     "desc": [ "You are surrounded by flames." ],
     "apply_message": "",
     "remove_message": "The flames surrounding you gutter out.",
-    "decay_messages": [ [ "The flames around you spark fitfully.", "bad" ], [ "Your aura of flames is beginning to fade.", "bad" ] ],
     "rating": "good",
-    "max_duration": "15 minutes",
+    "max_duration": "7 days",
     "max_intensity": 31,
-    "dur_add_perc": 10,
-    "int_dur_factor": "29 s",
     "enchantments": [ "enchant_pyrokinetic_aura" ]
   },
   {

diff --git a/data/mods/MindOverMatter/powers/pyrokinesis.json b/data/mods/MindOverMatter/powers/pyrokinesis.json
@@ -499,18 +499,18 @@
   {
     "id": "pyrokinetic_aura",
     "type": "SPELL",
-    "name": "[Ψ]Blazing Aura",
-    "description": "Surround yourself with a cloud of flames, damaging anyone in melee combat with you.  The flames also produce light.",
-    "message": "You set the air around yourself ablaze.",
+    "name": "[Ψ]Blazing Aura (C)",
+    "description": "Surround yourself with a cloud of flames, damaging anyone in melee combat with you.  The flames also produce light.\n\nThis power <color_yellow>is maintained by concentration</color> and <color_red>may fail</color> if <color_yellow>concentration is interrupted</color>.",
+    "message": "",
     "teachable": false,
     "valid_targets": [ "self" ],
     "spell_class": "PYROKINETIC",
     "skill": "metaphysics",
     "flags": [ "PSIONIC", "CONCENTRATE", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION" ],
     "difficulty": 6,
     "max_level": { "math": [ "int_to_level(1)" ] },
-    "effect": "attack",
-    "effect_str": "effect_pyrokinetic_aura",
+    "effect": "effect_on_condition",
+    "effect_str": "EOC_PYROKIN_BLAZING_AURA_INITIATE",
     "shape": "blast",
     "min_duration": {
       "math": [
@@ -523,12 +523,16 @@
       ]
     },
     "energy_source": "STAMINA",
-    "base_energy_cost": 6500,
-    "final_energy_cost": 3500,
-    "energy_increment": -175,
-    "base_casting_time": 125,
-    "final_casting_time": 50,
-    "casting_time_increment": -6.5,
+    "base_energy_cost": {
+      "math": [
+        "u_effect_intensity('effect_pyrokinetic_aura') > -1 ? 0 : max((6500 - (u_spell_level('pyrokinetic_aura') * 175)), 3500)"
+      ]
+    },
+    "base_casting_time": {
+      "math": [
+        "u_effect_intensity('effect_pyrokinetic_aura') > -1 ? 10 : max((125 -(u_spell_level('pyrokinetic_aura') * 6.5)), 50)"
+      ]
+    },
     "sound_id": "fire_spell"
   },
   {

diff --git a/data/mods/MindOverMatter/powers/pyrokinesis_concentration_eoc.json b/data/mods/MindOverMatter/powers/pyrokinesis_concentration_eoc.json
@@ -191,6 +191,66 @@
     ],
     "false_effect": [  ]
   },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_PYROKIN_BLAZING_AURA_INITIATE",
+    "condition": { "not": { "u_has_effect": "effect_pyrokinetic_aura" } },
+    "effect": [
+      { "u_message": "You set the air around yourself ablaze.", "type": "good" },
+      { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" },
+      { "u_add_effect": "effect_pyrokinetic_aura", "duration": "PERMANENT" },
+      {
+        "queue_eocs": "EOC_PYROKIN_BLAZING_AURA_DRAIN",
+        "time_in_future": [
+          {
+            "math": [
+              "( (u_spell_level('pyrokinetic_aura') * 7) + 45) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling"
+            ]
+          },
+          {
+            "math": [
+              "( (u_spell_level('pyrokinetic_aura') * 19) + 180) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling"
+            ]
+          }
+        ]
+      }
+    ],
+    "false_effect": [ { "run_eocs": "EOC_PYROKIN_REMOVE_BLAZING_AURA" } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_PYROKIN_REMOVE_BLAZING_AURA",
+    "condition": { "u_has_effect": "effect_pyrokinetic_aura" },
+    "effect": [ { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" }, { "u_lose_effect": "effect_pyrokinetic_aura" } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_PYROKIN_BLAZING_AURA_DRAIN",
+    "condition": { "u_has_effect": "effect_pyrokinetic_aura" },
+    "effect": [
+      { "math": [ "u_latest_channeled_power_difficulty", "=", "6" ] },
+      { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(6)" ] },
+      { "math": [ "u_spell_exp('pyrokinetic_flame_immunity')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
+      { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
+      {
+        "queue_eocs": "EOC_PYROKIN_BLAZING_AURA_DRAIN",
+        "time_in_future": [
+          {
+            "math": [
+              "( (u_spell_level('pyrokinetic_aura') * 7) + 45) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling"
+            ]
+          },
+          {
+            "math": [
+              "( (u_spell_level('pyrokinetic_aura') * 19) + 180) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling"
+            ]
+          }
+        ]
+      }
+    ],
+    "false_effect": [  ]
+  },
   {
     "type": "effect_on_condition",
     "id": "EOC_PYROKIN_FLAME_IMMUNITY_INITIATE",