[Magiclysm] Small tweaks for mage armor and mage blade (CleverRaven#6…

…5508) * Rebalance magiclysm's mage armor spell to also scale with intelligence See CleverRaven#64405 * Update item_enchants.json * Update ethereal_items.json * Update item_enchants.json * Update item_enchants.json --------- Co-authored-by: Zack Shoylev <[email protected]>
Nebnis · May 11, 2023 · 2154707 · 2154707
1 parent a1d32e7
commit 2154707
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 11 deletions.
diff --git a/data/mods/Magiclysm/items/ethereal_items.json b/data/mods/Magiclysm/items/ethereal_items.json
@@ -959,7 +959,7 @@
     "category": "armor",
     "copy-from": "armor_lightplate",
     "name": { "str_sp": "mage armor" },
-    "description": "A summoned magic armor.  It gets shinier and sturdier with each spell level.",
+    "description": "A summoned magic armor.  It gets shinier and sturdier with each spell level and is affected by your intelligence.",
     "weight": "1 g",
     "material": [ "concentrated_mana" ],
     "warmth": 0,

diff --git a/data/mods/Magiclysm/items/item_enchants.json b/data/mods/Magiclysm/items/item_enchants.json
@@ -4,16 +4,24 @@
     "id": "ench_longsword_holy",
     "has": "WIELD",
     "condition": "ALWAYS",
-    "name": { "str": "magical blade" },
+    "name": { "str": "Magic blade" },
     "description": "The damage done and light emitted by this sword increase with intelligence.",
     "values": [
       {
         "value": "ITEM_DAMAGE_CUT",
-        "add": { "arithmetic": [ { "u_val": "spell_level", "spell": "holy_blade" }, "+", { "u_val": "intelligence" } ] }
+        "add": {
+          "math": [
+            "(u_val('intelligence') * 2) + (u_val('spell_level', 'spell: holy_blade') + u_val('spell_level', 'spell: holy_blade_plus'))"
+          ]
+        }
       },
       {
         "value": "LUMINATION",
-        "add": { "arithmetic": [ { "u_val": "spell_level", "spell": "holy_blade" }, "+", { "u_val": "intelligence" } ] }
+        "add": {
+          "math": [
+            "((u_val('intelligence') * 2) + (u_val('spell_level', 'spell: holy_blade') + u_val('spell_level', 'spell: holy_blade_plus'))) * 3"
+          ]
+        }
       }
     ]
   },
@@ -22,28 +30,48 @@
     "id": "ench_armor_spirit",
     "has": "WORN",
     "condition": "ALWAYS",
-    "name": { "str": "magic armor" },
-    "description": "This armor is made better as your spell level improves.",
+    "name": { "str": "Magic armor" },
+    "description": "This magical armor improves with your intelligence and the spell's level.",
     "values": [
       {
         "value": "ARMOR_BASH",
-        "add": { "arithmetic": [ { "u_val": "spell_level", "spell": "spirit_armor" }, "*", { "const": -1 } ] }
+        "add": {
+          "math": [
+            "((u_val('intelligence') * 1.5) + (u_val('spell_level', 'spell: spirit_armor') + u_val('spell_level', 'spell: spirit_armor_plus')) * 0.5) * -1"
+          ]
+        }
       },
       {
         "value": "ARMOR_CUT",
-        "add": { "arithmetic": [ { "u_val": "spell_level", "spell": "spirit_armor" }, "*", { "const": -1 } ] }
+        "add": {
+          "math": [
+            "((u_val('intelligence') * 1.5) + (u_val('spell_level', 'spell: spirit_armor') + u_val('spell_level', 'spell: spirit_armor_plus')) * 0.5) * -1"
+          ]
+        }
       },
       {
         "value": "ARMOR_STAB",
-        "add": { "arithmetic": [ { "u_val": "spell_level", "spell": "spirit_armor" }, "*", { "const": -1 } ] }
+        "add": {
+          "math": [
+            "((u_val('intelligence') * 1.5) + (u_val('spell_level', 'spell: spirit_armor') + u_val('spell_level', 'spell: spirit_armor_plus')) * 0.5) * -1"
+          ]
+        }
       },
       {
         "value": "ARMOR_BULLET",
-        "add": { "arithmetic": [ { "u_val": "spell_level", "spell": "spirit_armor" }, "*", { "const": -1 } ] }
+        "add": {
+          "math": [
+            "((u_val('intelligence') * 1.5) + (u_val('spell_level', 'spell: spirit_armor') + u_val('spell_level', 'spell: spirit_armor_plus')) * 0.5) * -1"
+          ]
+        }
       },
       {
         "value": "LUMINATION",
-        "add": { "arithmetic": [ { "u_val": "spell_level", "spell": "spirit_armor" }, "*", { "const": 3 } ] }
+        "add": {
+          "math": [
+            "((u_val('intelligence') * 1.5) + (u_val('spell_level', 'spell: spirit_armor') + u_val('spell_level', 'spell: spirit_armor_plus')) * 0.5) * 3"
+          ]
+        }
       }
     ]
   }