Initial commit

CleverRaven · Sep 6, 2024 · aa39515 · aa39515
1 parent 1a13be3
commit aa39515
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 15 deletions.
diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json b/data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json
@@ -1091,12 +1091,6 @@
     "condition": { "and": [ { "u_has_trait": "VITAKINETIC" }, { "math": [ "u_spell_level('vita_sleeping_trance')", ">=", "0" ] } ] },
     "effect": [ { "u_learn_recipe": "practice_vita_sleeping_trance" } ]
   },
-  {
-    "type": "effect_on_condition",
-    "id": "EOC_CHECK_GAMEBEGIN_VITAKIN_RECIPE_PAIN_SPLIT",
-    "condition": { "and": [ { "u_has_trait": "VITAKINETIC" }, { "math": [ "u_spell_level('vita_pain_split')", ">=", "0" ] } ] },
-    "effect": [ { "u_learn_recipe": "practice_vita_pain_split" } ]
-  },
   {
     "type": "effect_on_condition",
     "id": "EOC_CHECK_GAMEBEGIN_VITAKIN_RECIPE_STOP_INFECTION",

diff --git a/data/mods/MindOverMatter/hobbies.json b/data/mods/MindOverMatter/hobbies.json
@@ -480,11 +480,12 @@
       { "id": "vita_health_power", "level": 8 },
       { "id": "vita_slow_bleeding", "level": 8 },
       { "id": "vita_stop_bleeding", "level": 6 },
+      { "id": "vita_concentrated_healing", "level": 6 },
       { "id": "vita_health_power_ally", "level": 4 },
       { "id": "vita_remove_poison", "level": 6 },
       { "id": "vita_sleeping_trance", "level": 5 },
-      { "id": "vita_cure_disease", "level": 5 },
-      { "id": "vita_pain_split", "level": 6 }
+      { "id": "vita_cure_disease", "level": 5 }
+
     ]
   },
   {
@@ -500,11 +501,11 @@
       { "id": "vita_health_power", "level": 10 },
       { "id": "vita_slow_bleeding", "level": 9 },
       { "id": "vita_stop_bleeding", "level": 8 },
+      { "id": "vita_concentrated_healing", "level": 8 }
       { "id": "vita_health_power_ally", "level": 8 },
       { "id": "vita_remove_poison", "level": 6 },
       { "id": "vita_sleeping_trance", "level": 7 },
       { "id": "vita_cure_disease", "level": 7 },
-      { "id": "vita_pain_split", "level": 8 },
       { "id": "vita_stop_infection", "level": 12 },
       { "id": "vita_healing_trance", "level": 6 },
       { "id": "vita_blood_purge", "level": 6 },

diff --git a/data/mods/MindOverMatter/powers/learning_eocs/vitakinesis.json b/data/mods/MindOverMatter/powers/learning_eocs/vitakinesis.json
@@ -301,7 +301,7 @@
             {
               "and": [
                 { "math": [ "u_spell_level('vita_stop_infection')", ">=", "5" ] },
-                { "math": [ "u_spell_level('vita_pain_split')", ">=", "6" ] }
+                { "math": [ "u_spell_level('vita_concentrated_healing')", ">=", "6" ] }
               ]
             }
           ]
@@ -420,7 +420,7 @@
                 { "math": [ "u_spell_level('vita_stop_infection')", ">=", "12" ] },
                 {
                   "or": [
-                    { "math": [ "u_spell_level('vita_pain_split')", ">=", "8" ] },
+                    { "math": [ "u_spell_level('vita_concentrated_healing')", ">=", "8" ] },
                     { "math": [ "u_spell_level('vita_cure_disease')", ">=", "12" ] }
                   ]
                 }
@@ -469,7 +469,7 @@
                 },
                 {
                   "or": [
-                    { "math": [ "u_spell_level('vita_pain_split')", ">=", "10" ] },
+                    { "math": [ "u_spell_level('vita_concentrated_healing')", ">=", "10" ] },
                     { "math": [ "u_spell_level('vita_remove_poison')", ">=", "7" ] },
                     { "math": [ "u_spell_level('vita_blood_purge')", ">=", "5" ] }
                   ]

diff --git a/data/mods/MindOverMatter/powers/vitakinesis_eoc.json b/data/mods/MindOverMatter/powers/vitakinesis_eoc.json
@@ -1035,8 +1035,7 @@
       { "math": [ "u_hp('arm_r')", "=", "max( u_hp('arm_r'), 5)" ] },
       { "math": [ "u_hp('leg_l')", "=", "max( u_hp('leg_l'), 5)" ] },
       { "math": [ "u_hp('leg_r')", "=", "max( u_hp('leg_r'), 5)" ] },
-      { "u_cast_spell": { "id": "vita_pain_split", "hit_self": true } },
-      { "math": [ "u_vitamin('redcells')", "=", "0" ] },
+       { "math": [ "u_vitamin('redcells')", "=", "0" ] },
       { "math": [ "u_vitamin('bad_food')", "=", "0" ] },
       { "math": [ "u_vitamin('blood')", "=", "0" ] },
       { "u_lose_effect": "corroding" },

diff --git a/data/mods/MindOverMatter/recipes/research.json b/data/mods/MindOverMatter/recipes/research.json
@@ -142,7 +142,7 @@
           "and": [
             { "roll_contested": { "math": [ "u_skill('metaphysics')" ] }, "difficulty": 11 },
             { "roll_contested": { "math": [ "u_skill('chemistry')" ] }, "difficulty": 8 },
-            { "math": [ "u_spell_level('vita_pain_split')", ">=", "8" ] },
+            { "math": [ "u_spell_level('vita_concentrated_healing')", ">=", "8" ] },
             { "math": [ "u_spell_level('vita_stop_infection')", ">=", "6" ] },
             { "math": [ "u_spell_level('vita_healing_trance')", ">=", "2" ] }
           ]