Merge elemental mastery nodes

js/atree.js

@@ -92,6 +92,9 @@ scaling_target: {
 }
 */
 
+
+const elem_mastery_abil = { display_name: "Elemental Mastery", id: 998, properties: {}, effects: [] };
+
 // TODO: Range numbers
 const default_abils = {
     wand: [{
@@ -100,35 +103,35 @@ const default_abils = {
         desc: "Mage basic attack.",
         properties: {range: 5000},
         effects: [default_spells.wand[0]]
-    }],
+    }, elem_mastery_abil ],
     spear: [{
         display_name: "Warrior Melee",
         id: 999,
         desc: "Warrior basic attack.",
         properties: {range: 2},
         effects: [default_spells.spear[0]]
-    }],
+    }, elem_mastery_abil ],
     bow: [{
         display_name: "Archer Melee",
         id: 999,
         desc: "Archer basic attack.",
         properties: {range: 20},
         effects: [default_spells.bow[0]]
-    }],
+    }, elem_mastery_abil ],
     dagger: [{
         display_name: "Assassin Melee",
         id: 999,
         desc: "Assassin basic attack.",
         properties: {range: 2},
         effects: [default_spells.dagger[0]]
-    }],
+    }, elem_mastery_abil ],
     relik: [{
         display_name: "Shaman Melee",
         id: 999,
         desc: "Shaman basic attack.",
         properties: {range: 15, speed: 0},
         effects: [default_spells.relik[0]]
-    }],
+    }, elem_mastery_abil ],
 };
 
 

js/atree_constants.js

@@ -989,6 +989,7 @@ const atrees = {
         },
         {
             "display_name": "Earth Mastery",
+            "base_abil": 998,
             "desc": "Increases your base damage from all Earth attacks",
             "archetype": "Trapper", 
             "archetype_req": 0, 
@@ -1027,6 +1028,7 @@ const atrees = {
         },
         {
             "display_name": "Thunder Mastery",
+            "base_abil": 998,
             "desc": "Increases your base damage from all Thunder attacks",
             "archetype": "Boltslinger", 
             "archetype_req": 0, 
@@ -1065,6 +1067,7 @@ const atrees = {
         },
         {
             "display_name": "Water Mastery",
+            "base_abil": 998,
             "desc": "Increases your base damage from all Water attacks",
             "archetype": "Sharpshooter", 
             "archetype_req": 0, 
@@ -1103,6 +1106,7 @@ const atrees = {
         },
         {
             "display_name": "Air Mastery",
+            "base_abil": 998,
             "desc": "Increases base damage from all Air attacks",
             "archetype": "Boltslinger", 
             "archetype_req": 0, 
@@ -1141,6 +1145,7 @@ const atrees = {
         },
         {
             "display_name": "Fire Mastery",
+            "base_abil": 998,
             "desc": "Increases base damage from all Fire attacks",
             "archetype": "Sharpshooter", 
             "archetype_req": 0, 
@@ -2364,6 +2369,7 @@ const atrees = {
 
         {
             "display_name": "Earth Mastery",
+            "base_abil": 998,
             "desc": "Increases base damage from all Earth attacks",
             "archetype": "Fallen", 
             "archetype_req": 0, 
@@ -2392,6 +2398,7 @@ const atrees = {
 
         {
             "display_name": "Thunder Mastery",
+            "base_abil": 998,
             "desc": "Increases base damage from all Thunder attacks",
             "archetype": "Fallen", 
             "archetype_req": 0, 
@@ -2420,6 +2427,7 @@ const atrees = {
 
         {
             "display_name": "Water Mastery",
+            "base_abil": 998,
             "desc": "Increases base damage from all Water attacks",
             "archetype": "Battle Monk", 
             "archetype_req": 0, 
@@ -2448,6 +2456,7 @@ const atrees = {
 
         {
             "display_name": "Air Mastery",
+            "base_abil": 998,
             "desc": "Increases base damage from all Air attacks",
             "archetype": "Battle Monk", 
             "archetype_req": 0, 
@@ -2476,6 +2485,7 @@ const atrees = {
 
         {
             "display_name": "Fire Mastery",
+            "base_abil": 998,
             "desc": "Increases base damage from all Fire attacks",
             "archetype": "Paladin", 
             "archetype_req": 0, 
@@ -4156,6 +4166,7 @@ const atrees = {
         },
         {
             "display_name": "Earth Mastery",
+            "base_abil": 998,
             "desc": "Increases your base damage from all Earth attacks",
             "archetype": "Arcanist", 
             "archetype_req": 0, 
@@ -4194,6 +4205,7 @@ const atrees = {
         },
         {
             "display_name": "Thunder Mastery",
+            "base_abil": 998,
             "desc": "Increases your base damage from all Thunder attacks",
             "archetype": "Riftwalker", 
             "archetype_req": 0, 
@@ -4232,6 +4244,7 @@ const atrees = {
         },
         {
             "display_name": "Water Mastery",
+            "base_abil": 998,
             "desc": "Increases your base damage from all Water attacks",
             "archetype": "Light Bender", 
             "archetype_req": 0, 
@@ -4270,6 +4283,7 @@ const atrees = {
         },
         {
             "display_name": "Air Mastery",
+            "base_abil": 998,
             "desc": "Increases base damage from all Air attacks",
             "archetype": "Riftwalker", 
             "archetype_req": 0, 
@@ -4308,6 +4322,7 @@ const atrees = {
         },
         {
             "display_name": "Fire Mastery",
+            "base_abil": 998,
             "desc": "Increases base damage from all Fire attacks",
             "archetype": "Arcanist", 
             "archetype_req": 0, 
@@ -4549,6 +4564,7 @@ const atrees = {
             "desc": "Heal emit a strong light, damaging nearby enemies.",
             "archetype": "Light Bender",
             "archetype_req": 0,
+            "base_abil": "Heal",
             "parents": ["Water Mastery"],
             "dependencies": ["Heal"],
             "blockers": ["Arcane Transfer"],