[MoM] Add Flameshield power (#68381)

* Initial commit * Fixes
CleverRaven · Oct 2, 2023 · 0b00ccb · 0b00ccb
1 parent 9bb87a6
commit 0b00ccb
Show file tree

Hide file tree

Showing 4 changed files with 95 additions and 4 deletions.
diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json b/data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json
@@ -45,6 +45,7 @@
       { "u_learn_recipe": "practice_pyrokinetic_thermogenesis" },
       { "u_learn_recipe": "practice_pyrokinetic_flamethrower" },
       { "u_learn_recipe": "practice_pyrokinetic_aura" },
+      { "u_learn_recipe": "practice_pyrokinetic_flame_immunity" },
       { "u_learn_recipe": "practice_pyrokinetic_blast" },
       { "u_learn_recipe": "practice_pyrokinetic_aoe_blast" }
     ]

diff --git a/data/mods/MindOverMatter/effects/effects_psionic.json b/data/mods/MindOverMatter/effects/effects_psionic.json
@@ -788,8 +788,10 @@
     "desc": [ "You are completely immune to fire." ],
     "apply_message": "",
     "rating": "good",
-    "max_duration": "10 minutes",
-    "show_in_info": false,
+    "max_duration": "30 minutes",
+    "max_intensity": 95,
+    "dur_add_perc": 10,
+    "int_dur_factor": "19 s",
     "enchantments": [ { "values": [ { "value": "CLIMATE_CONTROL_CHILL", "add": 1000 }, { "value": "ARMOR_HEAT", "multiply": -1.0 } ] } ],
     "flags": [ "HEAT_IMMUNE" ]
   },

diff --git a/data/mods/MindOverMatter/powers/pyrokinesis.json b/data/mods/MindOverMatter/powers/pyrokinesis.json
@@ -187,7 +187,7 @@
     "base_casting_time": 125,
     "final_casting_time": 50,
     "casting_time_increment": -7.5,
-    "learn_spells": { "pyrokinetic_call_flames": 5, "pyrokinetic_cloak": 7, "pyrokinetic_aura": 15 }
+    "learn_spells": { "pyrokinetic_call_flames": 5, "pyrokinetic_cloak": 7, "pyrokinetic_aura": 15, "pyrokinetic_flame_immunity": 20 }
   },
   {
     "id": "pyro_quell_flames_1",
@@ -272,7 +272,7 @@
     "base_casting_time": 200,
     "final_casting_time": 75,
     "casting_time_increment": -11,
-    "learn_spells": { "pyrokinetic_thermogenesis": 8, "pyrokinetic_aura": 9, "pyrokinetic_eruption": 12 }
+    "learn_spells": { "pyrokinetic_thermogenesis": 8, "pyrokinetic_aura": 9, "pyrokinetic_eruption": 12, "pyrokinetic_flame_immunity": 15 }
   },
   {
     "id": "pyrokinetic_flamethrower",
@@ -533,6 +533,42 @@
     "base_casting_time": 125,
     "final_casting_time": 50,
     "casting_time_increment": -6.5,
+    "learn_spells": { "pyrokinetic_eruption": 5, "pyrokinetic_thermogenesis": 6, "pyrokinetic_flame_immunity": 15 }
+  },
+  {
+    "id": "pyrokinetic_flame_immunity",
+    "type": "SPELL",
+    "name": "[Ψ]Flameshield",
+    "description": "Your power over fire is such that you can now step directly into raging flames and walk through them unharmed, feeling no more than a pleasant warmth.",
+    "message": "The nearby air loses any heat.",
+    "teachable": false,
+    "valid_targets": [ "self" ],
+    "spell_class": "PYROKINETIC",
+    "skill": "metaphysics",
+    "flags": [ "CONCENTRATE", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION" ],
+    "effect": "attack",
+    "effect_str": "effect_pyrokinetic_flame_immunity",
+    "extra_effects": [ { "id": "psionic_drained_difficulty_seven", "hit_self": true } ],
+    "shape": "blast",
+    "difficulty": 7,
+    "max_level": { "math": [ "int_to_level(1)" ] },
+    "min_duration": {
+      "math": [
+        "( (u_val('spell_level', 'spell: pyrokinetic_flame_immunity') * 600) + 4500) * (scaling_factor(u_val('intelligence') ) )"
+      ]
+    },
+    "max_duration": {
+      "math": [
+        "( (u_val('spell_level', 'spell: pyrokinetic_flame_immunity') * 600) + 30000) * (scaling_factor(u_val('intelligence') ) )"
+      ]
+    },
+    "energy_source": "STAMINA",
+    "base_energy_cost": 6750,
+    "final_energy_cost": 3500,
+    "energy_increment": -255,
+    "base_casting_time": 150,
+    "final_casting_time": 75,
+    "casting_time_increment": -6.5,
     "learn_spells": { "pyrokinetic_thermogenesis": 6, "pyrokinetic_aoe_blast": 12 }
   },
   {

diff --git a/data/mods/MindOverMatter/recipes/practice/pyrokinesis_practice.json b/data/mods/MindOverMatter/recipes/practice/pyrokinesis_practice.json
@@ -19,6 +19,7 @@
       "practice_pyrokinetic_cloak",
       "practice_pyrokinetic_flamethrower",
       "practice_pyrokinetic_aura",
+      "practice_pyrokinetic_flame_immunity",
       "practice_pyrokinetic_blast",
       "practice_pyrokinetic_aoe_blast"
     ],
@@ -477,6 +478,57 @@
       }
     ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "name": "contemplation: flameshield",
+    "id": "practice_pyrokinetic_flame_immunity",
+    "description": "Contemplate your powers and improve your immunity to fire.",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "skill_used": "metaphysics",
+    "difficulty": 6,
+    "time": "30 m",
+    "autolearn": false,
+    "tools": [ [ [ "matrix_crystal_drained", -1 ] ] ],
+    "components": [ [ [ "matrix_crystal_pyrokin_dust", 1 ] ] ],
+    "flags": [ "SECRET", "BLIND_HARD" ],
+    "result_eocs": [
+      {
+        "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))" ]
+            }
+          ]
+        },
+        "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 )" ] },
+          { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }
+        ],
+        "false_effect": {
+          "run_eocs": [
+            {
+              "id": "EOC_PRACTICE_PYROKIN_FLAME_IMMUNITY_FALSE",
+              "condition": { "math": [ "u_val('spell_level', 'spell: 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" }
+              ],
+              "false_effect": [
+                { "u_message": "Without even a basic understanding of the power, your meditation is nothing but idle musings." },
+                { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }
+              ]
+            }
+          ]
+        }
+      }
+    ]
+  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",