[MoM] Convert recipe powers into spell powers, add new powers (Clever…

…Raven#67225) * Add pyrokinetic flame to requirements * Create pyrokinetic flame * Create pyrokinesis_ritual.json * capitalize name * temr->term * Add spells * Add learning recipe * Add proficiency, lint * Update data/mods/MindOverMatter/items/psions_summon_items.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/MindOverMatter/items/psions_summon_items.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Further changes * Fixes * Add relic_data to telekinetic jack to indicate summon status --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
ampersand55 · Jul 28, 2023 · 125a961 · 125a961
1 parent 60649c0
commit 125a961
Show file tree

Hide file tree

Showing 22 changed files with 806 additions and 453 deletions.
diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json b/data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json
@@ -31,6 +31,7 @@
     "effect": [
       { "u_learn_recipe": "practice_pyrokinetic_flash" },
       { "u_learn_recipe": "practice_pyrokinetic_eruption" },
+      { "u_learn_recipe": "practice_pyrokinetic_call_flames" },
       { "u_learn_recipe": "practice_pyrokinetic_quell_flames" },
       { "u_learn_recipe": "practice_pyrokinetic_cloak" },
       { "u_learn_recipe": "practice_pyrokinetic_flamethrower" },
@@ -46,7 +47,9 @@
       { "u_learn_recipe": "practice_telekinetic_push" },
       { "u_learn_recipe": "practice_telekinetic_momentum" },
       { "u_learn_recipe": "practice_telekinetic_wave" },
+      { "u_learn_recipe": "practice_telekinetic_strength" },
       { "u_learn_recipe": "practice_telekinetic_hammer" },
+      { "u_learn_recipe": "practice_telekinetic_vehicle_lift" },
       { "u_learn_recipe": "practice_telekinetic_shield" },
       { "u_learn_recipe": "practice_telekinetic_explosion" },
       { "u_learn_recipe": "improve_telekinesis_lifting_field" }
@@ -88,75 +91,64 @@
       { "u_learn_recipe": "practice_vita_sleeping_trance" },
       { "u_learn_recipe": "practice_vita_pain_split" },
       { "u_learn_recipe": "practice_vita_healing_trance" },
-      { "u_learn_recipe": "practice_vita_blood_purge" }
+      { "u_learn_recipe": "practice_vita_blood_purge" },
+      { "u_learn_recipe": "practice_vita_banish_illness" }
     ]
   },
   {
     "type": "effect_on_condition",
-    "id": "EOC_TEACH_TELEKIN_RITUAL_ENHANCE_STRENGTH",
-    "recurrence": [ "24 hour", "24 hours" ],
-    "condition": {
-      "and": [
-        { "math": [ "u_val('spell_level', 'school: TELEKINETIC')", ">=", "5" ] },
-        { "not": { "u_know_recipe": "telekin_push_heavy_things" } }
-      ]
-    },
-    "deactivate_condition": { "u_know_recipe": "telekin_push_heavy_things" },
-    "effect": [
-      { "u_learn_recipe": "telekin_push_heavy_things" },
-      {
-        "u_message": "Your increased mastery of telekinesis now allows you to focus your powers to lift or drag heavy objects.",
-        "type": "good"
-      }
-    ]
+    "id": "EOC_BIOKIN_RECIPE_TEACHER",
+    "eoc_type": "EVENT",
+    "required_event": "game_load",
+    "condition": { "u_has_trait": "BIOKINETIC" },
+    "effect": [ { "queue_eocs": "EOC_TEACH_BIOKIN_CONTEMPLATE_RECIPES", "time_in_future": [ "10 seconds", "15 seconds" ] } ]
   },
   {
     "type": "effect_on_condition",
-    "id": "EOC_TEACH_TELEKIN_RITUAL_LIFT_CARS",
-    "recurrence": [ "24 hour", "24 hours" ],
-    "condition": {
-      "and": [
-        {
-          "math": [
-            "(((u_val('spell_level', 'spell: telekinetic_pull') + u_val('spell_level', 'spell: telekinetic_momentum') + u_val('spell_level', 'spell: telekinetic_shield') + u_val('spell_level', 'spell: telekinetic_push') + u_val('spell_level', 'spell: telekinetic_wave')) / 4 ) - 5)",
-            ">=",
-            "1"
-          ]
-        },
-        { "not": { "u_know_recipe": "telekin_lift_cars" } }
-      ]
-    },
-    "deactivate_condition": { "u_know_recipe": "telekin_lift_cars" },
-    "effect": [
-      { "u_learn_recipe": "telekin_lift_cars" },
-      {
-        "u_message": "Your increased mastery of telekinesis now allows you to focus your powers to raise a car just enough to do some work on it.",
-        "type": "good"
-      }
-    ]
+    "id": "EOC_CLAIR_RECIPE_TEACHER",
+    "eoc_type": "EVENT",
+    "required_event": "game_load",
+    "condition": { "u_has_trait": "CLAIRSENTIENT" },
+    "effect": [ { "queue_eocs": "EOC_TEACH_CLAIR_CONTEMPLATE_RECIPES", "time_in_future": [ "10 seconds", "15 seconds" ] } ]
   },
   {
     "type": "effect_on_condition",
-    "id": "EOC_TEACH_VITAKIN_RITUAL_DISEASE_PURGE",
-    "recurrence": [ "24 hour", "24 hours" ],
-    "condition": {
-      "and": [
-        {
-          "or": [
-            { "math": [ "u_val('spell_level', 'spell: vita_blood_purge')", ">=", "0" ] },
-            { "math": [ "u_val('spell_level', 'spell: vita_healing_trance')", ">=", "0" ] }
-          ]
-        },
-        { "not": { "u_know_recipe": "vitakin_disease_purge" } }
-      ]
-    },
-    "deactivate_condition": { "u_know_recipe": "vitakin_disease_purge" },
-    "effect": [
-      { "u_learn_recipe": "vitakin_disease_purge" },
-      {
-        "u_message": "Your increased mastery of vitakinesis now allows you to cure even virulent diseases or those incurable with pre-Cataclysmic medicine.",
-        "type": "good"
-      }
-    ]
+    "id": "EOC_PYROKIN_RECIPE_TEACHER",
+    "eoc_type": "EVENT",
+    "required_event": "game_load",
+    "condition": { "u_has_trait": "PYROKINETIC" },
+    "effect": [ { "queue_eocs": "EOC_TEACH_PYROKIN_CONTEMPLATE_RECIPES", "time_in_future": [ "10 seconds", "15 seconds" ] } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_TELEKIN_RECIPE_TEACHER",
+    "eoc_type": "EVENT",
+    "required_event": "game_load",
+    "condition": { "u_has_trait": "TELEKINETIC" },
+    "effect": [ { "queue_eocs": "EOC_TEACH_TELEKIN_CONTEMPLATE_RECIPES", "time_in_future": [ "10 seconds", "15 seconds" ] } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_TELEPATH_RECIPE_TEACHER",
+    "eoc_type": "EVENT",
+    "required_event": "game_load",
+    "condition": { "u_has_trait": "TELEPATH" },
+    "effect": [ { "queue_eocs": "EOC_TEACH_TELEPATH_CONTEMPLATE_RECIPES", "time_in_future": [ "10 seconds", "15 seconds" ] } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_TELEPORT_RECIPE_TEACHER",
+    "eoc_type": "EVENT",
+    "required_event": "game_load",
+    "condition": { "u_has_trait": "TELEPORTER" },
+    "effect": [ { "queue_eocs": "EOC_TEACH_TELEPORT_CONTEMPLATE_RECIPES", "time_in_future": [ "10 seconds", "15 seconds" ] } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_VITAKIN_RECIPE_TEACHER",
+    "eoc_type": "EVENT",
+    "required_event": "game_load",
+    "condition": { "u_has_trait": "VITAKINETIC" },
+    "effect": [ { "queue_eocs": "EOC_TEACH_VITAKIN_CONTEMPLATE_RECIPES", "time_in_future": [ "10 seconds", "15 seconds" ] } ]
   }
 ]
diff --git a/data/mods/MindOverMatter/effects/effects_overload.json b/data/mods/MindOverMatter/effects/effects_overload.json
@@ -30,8 +30,46 @@
       "Simply moving takes almost all of your effort and you have to fight to stay awake.  You've very nearly drained your life away.",
       "Simply moving takes almost all of your effort and you have to fight to stay awake.  You've very nearly drained your life away."
     ],
-    "rating": "bad",
-    "apply_message": "You feel a little tired.  All that psionic channeling is starting to wear you down.",
+    "apply_message": [
+      [ "You feel a little tired.  All that psionic channeling is starting to wear you down.", "bad" ],
+      [ "", "bad" ],
+      [ "", "bad" ],
+      [ "Your breath catches in your lungs.  Use of your powers is really tiring you out.", "bad" ],
+      [ "", "bad" ],
+      [ "", "bad" ],
+      [ "Even standing is an effort.  You've really worn yourself out with all this psionic channeling.", "bad" ],
+      [ "", "bad" ],
+      [
+        "Your muscles ache and your eyes are starting to close on your own.  Constant channeling is draining you dry.",
+        "bad"
+      ],
+      [ "", "bad" ],
+      [
+        "It hurts to move.  It hurts to breathe.  It hurts to think.  You need rest and to stop using your powers.  Now.",
+        "bad"
+      ],
+      [ "", "bad" ]
+    ],
+    "decay_messages": [
+      [ "", "good" ],
+      [ "", "good" ],
+      [
+        "All that's left is a bit of weariness and some slight soreness.  You've almost totally recovered from the aftereffects of drain.",
+        "good"
+      ],
+      [ "", "good" ],
+      [ "", "good" ],
+      [
+        "It's slow but you're recovering.  Some more rest and you'll be ready to use your powers freely again.",
+        "good"
+      ],
+      [ "", "good" ],
+      [ "Your muscles ache less and you feel more energetic.  You must be getting your strength back.", "good" ],
+      [ "", "good" ],
+      [ "", "good" ],
+      [ "", "good" ],
+      [ "", "good" ]
+    ],
     "remove_message": "You take a deep breath as the last of the unnatural tiredness of psionic channeling leaves you.",
     "max_intensity": 12,
     "base_mods": {
@@ -40,6 +78,9 @@
       "stamina_min": [ -5 ],
       "stamina_chance": [ 30 ],
       "stamina_tick": [ 30 ],
+      "health_amount": [ -1 ],
+      "health_chance": [ 200 ],
+      "health_tick": [ 2000 ],
       "hunger_min": [ 1 ],
       "hunger_chance": [ 100 ],
       "hunger_tick": [ 400 ],
@@ -55,6 +96,8 @@
       "stamina_amount": [ -300 ],
       "stamina_min": [ -1 ],
       "stamina_tick": [ -1 ],
+      "health_chance": [ -15 ],
+      "health_tick": [ -165 ],
       "hunger_min": [ 0.6 ],
       "hunger_chance": [ -4 ],
       "hunger_tick": [ -30 ],

diff --git a/data/mods/MindOverMatter/items/psions_summon_items.json b/data/mods/MindOverMatter/items/psions_summon_items.json
@@ -1,4 +1,20 @@
 [
+  {
+    "id": "pyrokinetic_fire_tool",
+    "type": "TOOL",
+    "name": { "str": "pyrokinetic fire" },
+    "description": "Dancing flames hovering over your hand.  You can use this to provide heat and light when necessary.",
+    "weight": "0 g",
+    "volume": "0 L",
+    "price": 1,
+    "price_postapoc": 1,
+    "symbol": "$",
+    "color": "red",
+    "flags": [ "UNBREAKABLE", "ZERO_WEIGHT", "LIGHT_20", "FIRE" ],
+    "qualities": [ [ "BLOW_HOT_AIR", 1 ] ],
+    "use_action": [ { "type": "firestarter", "moves": 30 }, { "type": "HEAT_FOOD" } ],
+    "relic_data": { "passive_effects": [ { "has": "HELD", "condition": "ALWAYS", "values": [ { "value": "MAX_MANA", "add": 0 } ] } ] }
+  },
   {
     "id": "telekinetic_container_1",
     "type": "TOOL",
@@ -865,7 +881,8 @@
     "weight": "0 g",
     "volume": "0 L",
     "flags": [ "ZERO_WEIGHT" ],
-    "qualities": [ [ "JACK", 1 ], [ "LIFT", 1 ] ]
+    "qualities": [ [ "JACK", 1 ], [ "LIFT", 1 ] ],
+    "relic_data": { "passive_effects": [ { "has": "HELD", "condition": "ALWAYS", "values": [ { "value": "MAX_MANA", "add": 0 } ] } ] }
   },
   {
     "id": "telekin_lifting_jack_2",

diff --git a/data/mods/MindOverMatter/obsolete/obsolete.json b/data/mods/MindOverMatter/obsolete/obsolete.json
@@ -65,5 +65,10 @@
       "fatigue_chance": [ -1.5 ],
       "fatigue_tick": [ -1 ]
     }
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_OBSOLETE",
+    "effect": [ { "u_message": "This is an obsolete recipe--check your powers", "type": "mixed" } ]
   }
 ]
diff --git a/data/mods/MindOverMatter/obsolete/telekinesis_ritual.json b/data/mods/MindOverMatter/obsolete/telekinesis_ritual.json
@@ -0,0 +1,32 @@
+[
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "name": "Enhance Strength",
+    "id": "telekin_push_heavy_things",
+    "description": "Focus your powers to allow you move much heavier objects and smash through walls.  The concentration required means you will be unable to engage in combat with any real aptitude while concentrating.\n\n[(d)rop the Enhanced Strength to stop concentrating and regain your combat ability]",
+    "category": "CC_PSIONIC",
+    "subcategory": "CSC_PSIONIC_RITUALS",
+    "skill_used": "metaphysics",
+    "difficulty": 1,
+    "time": "10 s",
+    "flags": [ "SECRET", "BLIND_EASY" ],
+    "proficiencies": [ { "proficiency": "prof_psionic_ritual", "required": false } ],
+    "result_eocs": [ "EOC_OBSOLETE" ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "name": "Vehicular Lifting",
+    "id": "telekin_lift_cars",
+    "description": "Focus your powers to raise a vehicle just enough to change a tire or perform repairs.  As your powers increase, you will be able to lift heavier vehicles.",
+    "category": "CC_PSIONIC",
+    "subcategory": "CSC_PSIONIC_RITUALS",
+    "skill_used": "metaphysics",
+    "difficulty": 3,
+    "time": "5 s",
+    "flags": [ "SECRET", "BLIND_EASY" ],
+    "proficiencies": [ { "proficiency": "prof_psionic_ritual", "required": false } ],
+    "result_eocs": [ "EOC_OBSOLETE" ]
+  }
+]
diff --git a/data/mods/MindOverMatter/obsolete/vitakinesis_ritual.json b/data/mods/MindOverMatter/obsolete/vitakinesis_ritual.json
@@ -0,0 +1,16 @@
+[
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "name": "Purge Disease",
+    "id": "vitakin_disease_purge",
+    "description": "Enter a deep meditative trance and purge your body of illness, even serious ones like cancer or multiple sclerosis.  It will not cure mutation.  Some illnesses are more difficult to successfully eradicate than others.",
+    "category": "CC_PSIONIC",
+    "subcategory": "CSC_PSIONIC_RITUALS",
+    "skill_used": "metaphysics",
+    "difficulty": 6,
+    "time": "5 s",
+    "flags": [ "SECRET", "BLIND_EASY" ],
+    "result_eocs": [ "EOC_OBSOLETE" ]
+  }
+]
diff --git a/data/mods/MindOverMatter/powers/pyrokinesis.json b/data/mods/MindOverMatter/powers/pyrokinesis.json
@@ -38,7 +38,13 @@
     "casting_time_increment": -4,
     "sound_type": "combat",
     "sound_description": "a crackle!",
-    "learn_spells": { "pyrokinetic_flamethrower": 7, "pyrokinetic_flash": 9, "pyrokinetic_blast": 15, "pyrokinetic_cloak": 17 }
+    "learn_spells": {
+      "pyrokinetic_call_flames": 5,
+      "pyrokinetic_flamethrower": 7,
+      "pyrokinetic_flash": 9,
+      "pyrokinetic_blast": 15,
+      "pyrokinetic_cloak": 17
+    }
   },
   {
     "id": "pyrokinetic_flash",
@@ -82,6 +88,66 @@
     "casting_time_increment": -8,
     "learn_spells": { "pyrokinetic_cloak": 7, "pyrokinetic_blast": 15 }
   },
+  {
+    "id": "pyrokinetic_call_flames",
+    "type": "SPELL",
+    "name": "[Ψ]Banked Flames",
+    "description": "Call up flames over your outstretched hand.  You can use them to heat up food, boil water, start fires, or anything else fire can accomplish.",
+    "message": "Flames begin dancing in the air above your hand.",
+    "valid_targets": [ "self" ],
+    "spell_class": "PYROKINETIC",
+    "flags": [ "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "NO_EXPLOSION_SFX" ],
+    "effect": "effect_on_condition",
+    "effect_str": "EOC_SPELL_PYROKIN_CALL_FLAME_SELECTOR",
+    "extra_effects": [ { "id": "psionic_drained_difficulty_three", "hit_self": true } ],
+    "shape": "blast",
+    "difficulty": 3,
+    "max_level": { "math": [ "int_to_level(1)" ] },
+    "energy_source": "STAMINA",
+    "base_energy_cost": 2500,
+    "final_energy_cost": 800,
+    "energy_increment": -150,
+    "base_casting_time": 250,
+    "final_casting_time": 75,
+    "casting_time_increment": -10,
+    "learn_spells": { "pyrokinetic_blast": 8, "pyrokinetic_aura": 12 }
+  },
+  {
+    "id": "pyrokin_call_flame_short_term",
+    "type": "SPELL",
+    "name": "[Ψ]Call Flame Short Spell",
+    "description": "The spell that summons the flame for Call Flame.  It's a bug if you have it directly.",
+    "message": "",
+    "valid_targets": [ "self" ],
+    "spell_class": "PYROKINETIC",
+    "skill": "metaphysics",
+    "flags": [ "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "NO_EXPLOSION_SFX", "RANDOM_DURATION" ],
+    "effect": "spawn_item",
+    "effect_str": "pyrokinetic_fire_tool",
+    "shape": "blast",
+    "min_damage": 1,
+    "max_damage": 1,
+    "min_duration": { "math": [ "((u_val('spell_level', 'spell: pyrokinetic_call_flames') * 1500) + 30000)" ] },
+    "max_duration": { "math": [ "((u_val('spell_level', 'spell: pyrokinetic_call_flames') * 3000) + 60000)" ] }
+  },
+  {
+    "id": "pyrokin_call_flame_long_term",
+    "type": "SPELL",
+    "name": "[Ψ]Call Flame Long Spell",
+    "description": "The spell that summons the flame for Call Flame but for longer.  It's a bug if you have it directly.",
+    "message": "",
+    "valid_targets": [ "self" ],
+    "spell_class": "PYROKINETIC",
+    "skill": "metaphysics",
+    "flags": [ "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "NO_EXPLOSION_SFX", "RANDOM_DURATION" ],
+    "effect": "spawn_item",
+    "effect_str": "pyrokinetic_fire_tool",
+    "shape": "blast",
+    "min_damage": 1,
+    "max_damage": 1,
+    "min_duration": { "math": [ "((u_val('spell_level', 'spell: pyrokinetic_call_flames') * 6000) + 360000)" ] },
+    "max_duration": { "math": [ "((u_val('spell_level', 'spell: pyrokinetic_call_flames') * 6000) + 540000)" ] }
+  },
   {
     "id": "pyrokinetic_quell_flames",
     "type": "SPELL",
@@ -116,7 +182,7 @@
     "base_casting_time": 125,
     "final_casting_time": 50,
     "casting_time_increment": -7.5,
-    "learn_spells": { "pyrokinetic_cloak": 7, "pyrokinetic_aura": 15 }
+    "learn_spells": { "pyrokinetic_call_flames": 5, "pyrokinetic_cloak": 7, "pyrokinetic_aura": 15 }
   },
   {
     "id": "pyro_quell_flames_1",