Misc. mage tree fixes

also merge abilities

js/atree.js

@@ -264,7 +264,10 @@ const atree_merge = new (class extends ComputeNode {
         let abils_merged = new Map();
         for (const abil of default_abils[build.weapon.statMap.get('type')]) {
             let tmp_abil = deepcopy(abil);
-            if (!Array.isArray(tmp_abil.desc)) {
+            if (!('desc' in tmp_abil)) {
+                tmp_abil.desc = [];
+            }
+            else if (!Array.isArray(tmp_abil.desc)) {
                 tmp_abil.desc = [tmp_abil.desc];
             }
             tmp_abil.subparts = [abil.id];
@@ -429,11 +432,15 @@ const atree_render_active = new (class extends ComputeNode {
             }
         }
         const ret_map = new Map();
+        const to_render_id = [999, 998];
         for (const node of atree_order) {
             if (!merged_abils.has(node.ability.id)) {
                 continue;
             }
-            const abil = merged_abils.get(node.ability.id);
+            to_render_id.push(node.ability.id);
+        }
+        for (const id of to_render_id) {
+            const abil = merged_abils.get(id);
 
             let active_tooltip = document.createElement('div');
             active_tooltip.classList.add("rounded-bottom", "dark-4", "border", "p-0", "mx-2", "my-4", "dark-shadow");

js/atree_constants.js

@@ -4380,7 +4380,6 @@ const atrees = {
             "desc": "For every 2% or 2 Raw Spell Damage you have from items, gain +1/5s mana regen (Max 5/5s)",
             "archetype": "Arcanist",
             "archetype_req": 0,
-            "base_abil": 999,
             "parents": ["Teleport"],
             "dependencies": [],
             "blockers": ["Wand Proficiency II"],
@@ -4501,7 +4500,7 @@ const atrees = {
         },
         {
             "display_name": "Stronger Meteor",
-            "desc": "Incrase the damage of Meteor.",
+            "desc": "Increase the damage of Meteor.",
             "base_abil": "Meteor",
             "archetype": "Arcanist", 
             "archetype_req": 2, 
@@ -4568,7 +4567,6 @@ const atrees = {
             "parents": ["Water Mastery"],
             "dependencies": ["Heal"],
             "blockers": ["Arcane Transfer"],
-            "cost": 2,
             "display": {
                 "row": 13,
                 "col": 4,
@@ -4719,7 +4717,7 @@ const atrees = {
         {
             "display_name": "Eye Piercer",
             "desc": "Teleport will blind enemies, confusing them for a short amount of time.",
-            "base_abil": 2,
+            "base_abil": "Heal",
             "parents": ["Cheaper Heal"],
             "dependencies": ["Teleport"],
             "blockers": [],
@@ -4989,6 +4987,7 @@ const atrees = {
             "desc": "For every 1% Water Damage Bonus you have, buff Heal's healing power by +0.3%.",
             "archetype": "Light Bender",
             "archetype_req": 0,
+            "base_abil": "Heal",
             "parents": ["Healthier Ophanim I", "Transonic Warp"],
             "dependencies": [],
             "blockers": [],
@@ -5142,6 +5141,7 @@ const atrees = {
         {
             "display_name": "Arcane Speed",
             "desc": "After casting Heal or Arcane Transfer, gain +80% speed for 3s. (8s Cooldown)",
+            "base_abil": "Heal",
             "parents": ["Lightweaver", "Larger Mana Bank II"],
             "dependencies": ["Heal"],
             "blockers": [],