Add back mutations and move skill bonus to them + fix EOCs for them

CleverRaven · Mar 7, 2024 · 1c96f83 · 1c96f83
1 parent 8a53ce4
commit 1c96f83
Show file tree

Hide file tree

Showing 3 changed files with 119 additions and 52 deletions.
diff --git a/data/mods/MindOverMatter/effects/effects_psionic.json b/data/mods/MindOverMatter/effects/effects_psionic.json
@@ -806,56 +806,6 @@
               ]
             }
           }
-        ],
-        "skills": [
-          {
-            "value": "electronics",
-            "add": {
-              "math": [
-                "min( ( 1 + ( u_spell_level('clair_craft_bonus') * 0.25 ) * scaling_factor( u_val('intelligence') ) ) * u_nether_attunement_power_scaling, 6 )"
-              ]
-            }
-          },
-          {
-            "value": "fabrication",
-            "add": {
-              "math": [
-                "min( ( 1 + ( u_spell_level('clair_craft_bonus') * 0.25 ) * scaling_factor( u_val('intelligence') ) ) * u_nether_attunement_power_scaling, 6 )"
-              ]
-            }
-          },
-          {
-            "value": "mechanics",
-            "add": {
-              "math": [
-                "min( ( 1 + ( u_spell_level('clair_craft_bonus') * 0.25 ) * scaling_factor( u_val('intelligence') ) ) * u_nether_attunement_power_scaling, 6 )"
-              ]
-            }
-          },
-          {
-            "value": "tailor",
-            "add": {
-              "math": [
-                "min( ( 1 + ( u_spell_level('clair_craft_bonus') * 0.25 ) * scaling_factor( u_val('intelligence') ) ) * u_nether_attunement_power_scaling, 6 )"
-              ]
-            }
-          },
-          {
-            "value": "chemistry",
-            "add": {
-              "math": [
-                "min( ( 1 + ( u_spell_level('clair_craft_bonus') * 0.25 ) * scaling_factor( u_val('intelligence') ) ) * u_nether_attunement_power_scaling, 6 )"
-              ]
-            }
-          },
-          {
-            "value": "cooking",
-            "add": {
-              "math": [
-                "min( ( 1 + ( u_spell_level('clair_craft_bonus') * 0.25 ) * scaling_factor( u_val('intelligence') ) ) * u_nether_attunement_power_scaling, 6 )"
-              ]
-            }
-          }
         ]
       }
     ],

diff --git a/data/mods/MindOverMatter/mutations/temporary.json b/data/mods/MindOverMatter/mutations/temporary.json
@@ -1,4 +1,100 @@
 [
+  {
+    "type": "mutation",
+    "id": "CLAIR_CRAFT_BONUS_01",
+    "name": { "str": "Intuitive Artistry" },
+    "points": 0,
+    "description": "Gazing into the near future lets you know what part goes where.",
+    "valid": false,
+    "craft_skill_bonus": [
+      [ "electronics", 1 ],
+      [ "tailor", 1 ],
+      [ "mechanics", 1 ],
+      [ "cooking", 1 ],
+      [ "chemistry", 1 ],
+      [ "fabrication", 1 ]
+    ]
+  },
+  {
+    "type": "mutation",
+    "id": "CLAIR_CRAFT_BONUS_02",
+    "name": { "str": "Intuitive Artistry" },
+    "points": 0,
+    "description": "Gazing into the near future lets you know what part goes where.",
+    "valid": false,
+    "craft_skill_bonus": [
+      [ "electronics", 2 ],
+      [ "tailor", 2 ],
+      [ "mechanics", 2 ],
+      [ "cooking", 2 ],
+      [ "chemistry", 2 ],
+      [ "fabrication", 2 ]
+    ]
+  },
+  {
+    "type": "mutation",
+    "id": "CLAIR_CRAFT_BONUS_03",
+    "name": { "str": "Intuitive Artistry" },
+    "points": 0,
+    "description": "Gazing into the near future lets you know what part goes where.",
+    "valid": false,
+    "craft_skill_bonus": [
+      [ "electronics", 3 ],
+      [ "tailor", 3 ],
+      [ "mechanics", 3 ],
+      [ "cooking", 3 ],
+      [ "chemistry", 3 ],
+      [ "fabrication", 3 ]
+    ]
+  },
+  {
+    "type": "mutation",
+    "id": "CLAIR_CRAFT_BONUS_04",
+    "name": { "str": "Intuitive Artistry" },
+    "points": 0,
+    "description": "Gazing into the near future lets you know what part goes where.",
+    "valid": false,
+    "craft_skill_bonus": [
+      [ "electronics", 4 ],
+      [ "tailor", 4 ],
+      [ "mechanics", 4 ],
+      [ "cooking", 4 ],
+      [ "chemistry", 4 ],
+      [ "fabrication", 4 ]
+    ]
+  },
+  {
+    "type": "mutation",
+    "id": "CLAIR_CRAFT_BONUS_05",
+    "name": { "str": "Intuitive Artistry" },
+    "points": 0,
+    "description": "Gazing into the near future lets you know what part goes where.",
+    "valid": false,
+    "craft_skill_bonus": [
+      [ "electronics", 5 ],
+      [ "tailor", 5 ],
+      [ "mechanics", 5 ],
+      [ "cooking", 5 ],
+      [ "chemistry", 5 ],
+      [ "fabrication", 5 ]
+    ]
+  },
+  {
+    "type": "mutation",
+    "id": "CLAIR_CRAFT_BONUS_06",
+    "name": { "str": "Intuitive Artistry" },
+    "points": 0,
+    "description": "Gazing into the near future lets you know what part goes where.",
+    "valid": false,
+    "craft_skill_bonus": [
+      [ "electronics", 6 ],
+      [ "tailor", 6 ],
+      [ "mechanics", 6 ],
+      [ "cooking", 6 ],
+      [ "chemistry", 6 ],
+      [ "fabrication", 6 ]
+    ]
+  },
   {
     "id": "PHOTOKIN_HIDE_UGLY_01",
     "type": "mutation",

diff --git a/data/mods/MindOverMatter/powers/clairsentience_concentration_eocs.json b/data/mods/MindOverMatter/powers/clairsentience_concentration_eocs.json
@@ -380,7 +380,7 @@
     "condition": { "not": { "u_has_effect": "effect_clair_craft_bonus" } },
     "effect": [
       { "u_message": "You can see how it all fits together, and how it *should* fit together.", "type": "good" },
-      { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE" ] },
+      { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_CLAIR_CRAFT_BONUS_SWITCHER" ] },
       { "u_add_effect": "effect_clair_craft_bonus", "duration": "PERMANENT" },
       { "u_cast_spell": { "id": "psionic_drained_difficulty_six", "hit_self": true } },
       {
@@ -401,13 +401,34 @@
     ],
     "false_effect": [ { "run_eocs": "EOC_CLAIR_REMOVE_CRAFT_BONUS" } ]
   },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_CLAIR_CRAFT_BONUS_SWITCHER",
+    "effect": {
+      "switch": { "math": [ "u_spell_level('clair_craft_bonus')" ] },
+      "cases": [
+        { "case": 0, "effect": { "u_add_trait": "CLAIR_CRAFT_BONUS_01" } },
+        { "case": 4, "effect": { "u_add_trait": "CLAIR_CRAFT_BONUS_02" } },
+        { "case": 8, "effect": { "u_add_trait": "CLAIR_CRAFT_BONUS_03" } },
+        { "case": 12, "effect": { "u_add_trait": "CLAIR_CRAFT_BONUS_04" } },
+        { "case": 16, "effect": { "u_add_trait": "CLAIR_CRAFT_BONUS_05" } },
+        { "case": 20, "effect": { "u_add_trait": "CLAIR_CRAFT_BONUS_06" } }
+      ]
+    }
+  },
   {
     "type": "effect_on_condition",
     "id": "EOC_CLAIR_REMOVE_CRAFT_BONUS",
     "condition": { "u_has_effect": "effect_clair_craft_bonus" },
     "effect": [
       { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" },
-      { "u_lose_effect": "effect_clair_craft_bonus" }
+      { "u_lose_effect": "effect_clair_craft_bonus" },
+      { "u_lose_trait": "CLAIR_CRAFT_BONUS_01" },
+      { "u_lose_trait": "CLAIR_CRAFT_BONUS_02" },
+      { "u_lose_trait": "CLAIR_CRAFT_BONUS_03" },
+      { "u_lose_trait": "CLAIR_CRAFT_BONUS_04" },
+      { "u_lose_trait": "CLAIR_CRAFT_BONUS_05" },
+      { "u_lose_trait": "CLAIR_CRAFT_BONUS_06" }
     ]
   },
   {