Merge branch 'buff_argoniel' into 'master'

Buff argoniel

Elandar no longer ignores irresistible sun since Argoniel no longer has it
Buffed Aeryn back up a bit so she can tank a bit longer (or tank them both briefly)
Argoniel will still eventually win if the two are left alone

game/modules/tome/data/zones/high-peak/npcs.lua

@@ -73,7 +73,6 @@ newEntity{
 	stun_immune = 0.5,
 	confusion_immune = 0.5,
 	blind_immune = 1,
-	ignore_irresistible_sun = 1, -- Do not let Argoniel annoy Elandar
 
 	combat_armor = 20,
 	combat_def = 20,
@@ -266,18 +265,19 @@ newEntity{ define_as = "FALLEN_SUN_PALADIN_AERYN",
 		[Talents.T_WEAPONS_MASTERY]=5,
 		[Talents.T_RUSH]=3,
 
-		[Talents.T_CHANT_OF_FORTRESS]=5,
-		[Talents.T_SUN_BEAM]=5,
-		[Talents.T_BARRIER]=5,
-		[Talents.T_WEAPON_OF_LIGHT]=5,
-		[Talents.T_HEALING_LIGHT]=5,
-		[Talents.T_CRUSADE]=5,
-		[Talents.T_SHIELD_OF_LIGHT]=5,
-		[Talents.T_SECOND_LIFE]=5,
-		[Talents.T_BATHE_IN_LIGHT]=5,
-		[Talents.T_PROVIDENCE]=5,
+		[Talents.T_CHANT_OF_FORTRESS]=7,
+		[Talents.T_SUN_BEAM]=7,
+		[Talents.T_BARRIER]=7,
+		[Talents.T_WEAPON_OF_LIGHT]=7,
+		[Talents.T_HEALING_LIGHT]=7,
+		[Talents.T_CRUSADE]=7,
+		[Talents.T_SHIELD_OF_LIGHT]=7,
+		[Talents.T_SECOND_LIFE]=7,
+		[Talents.T_BATHE_IN_LIGHT]=7,
+		[Talents.T_PROVIDENCE]=7,
 		[Talents.T_THICK_SKIN]=5,
 
+		[Talents.T_SPECTRAL_SHIELD]=1,
 		[Talents.T_IRRESISTIBLE_SUN]=1,
 	},
 	resolvers.sustains_at_birth(),
@@ -329,18 +329,19 @@ newEntity{ define_as = "HIGH_SUN_PALADIN_AERYN",
 		[Talents.T_WEAPONS_MASTERY]=5,
 		[Talents.T_RUSH]=3,
 
-		[Talents.T_CHANT_OF_FORTRESS]=5,
-		[Talents.T_SUN_BEAM]=5,
-		[Talents.T_BARRIER]=5,
-		[Talents.T_WEAPON_OF_LIGHT]=5,
-		[Talents.T_HEALING_LIGHT]=5,
-		[Talents.T_CRUSADE]=5,
-		[Talents.T_SHIELD_OF_LIGHT]=5,
-		[Talents.T_SECOND_LIFE]=5,
-		[Talents.T_BATHE_IN_LIGHT]=5,
-		[Talents.T_PROVIDENCE]=5,
+		[Talents.T_CHANT_OF_FORTRESS]=7,
+		[Talents.T_SUN_BEAM]=7,
+		[Talents.T_BARRIER]=7,
+		[Talents.T_WEAPON_OF_LIGHT]=7,
+		[Talents.T_HEALING_LIGHT]=7,
+		[Talents.T_CRUSADE]=7,
+		[Talents.T_SHIELD_OF_LIGHT]=7,
+		[Talents.T_SECOND_LIFE]=7,
+		[Talents.T_BATHE_IN_LIGHT]=7,
+		[Talents.T_PROVIDENCE]=7,
 		[Talents.T_THICK_SKIN]=5,
 
+		[Talents.T_SPECTRAL_SHIELD]=1,
 		[Talents.T_IRRESISTIBLE_SUN]=1,
 	},
 	resolvers.sustains_at_birth(),