Merge branch 'buff_argoniel' into 'master'

Buff argoniel

Nerfed Aryn, Buffed Argoniel

I did some extensive testing on this.  She can tank for around 70-110 turns before being killed by Argoniel.  Tested on normal, nightmare, and insane.  Insane will have more variance because of the random classes but Aryn is no longer soloing the boss.  I talked it out with Supermini quite a bit as he has a lot of experience on harder difficulties.

I also adjusted Argoniel's talents.  Gave her Elemental Discord and Blood Splash from Vile Life, swapped soul rot out for drain since she has natural vim regen.  Dropped Bone Spear.  She only uses a talent 50% of the time so having a lot of mediocre talents really makes her less effective.  Gave her prodigies that I felt suited her bette (Spine of the World and Endless Woes).  I didn't give her healing inversion.  Supermini sounded scared ;)  Also gave her the same inscription load out as Elandar, but replaced invis with heroism.

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

@@ -172,12 +172,10 @@ newEntity{
 	resolvers.talents{
 		[Talents.T_RUSH]=6,
 		[Talents.T_BONE_GRAB]={base=7, every=6},
-		[Talents.T_BONE_SPEAR]={base=7, every=6},
 		[Talents.T_BONE_SHIELD]={base=7, every=6},
 		[Talents.T_BURNING_HEX]={base=7, every=6},
 		[Talents.T_EMPATHIC_HEX]={base=7, every=6},
 		[Talents.T_CURSE_OF_VULNERABILITY]={base=7, every=6},
-		[Talents.T_CURSE_OF_DEFENSELESSNESS]={base=7, every=6},
 		[Talents.T_CURSE_OF_DEATH]={base=7, every=6},
 		[Talents.T_VIRULENT_DISEASE]={base=7, every=6},
 		[Talents.T_CYST_BURST]={base=7, every=6},
@@ -189,23 +187,24 @@ newEntity{
 		[Talents.T_CORRUPTED_STRENGTH]={base=7, every=6},
 		[Talents.T_BLOODLUST]={base=7, every=6},
 		[Talents.T_ACID_BLOOD]={base=7, every=6},
-		[Talents.T_DRAIN]={base=7, every=6},
+		[Talents.T_SOUL_ROT]={base=7, every=6},
+		[Talents.T_ACID_STRIKE]={base=7, every=6},
+		[Talents.T_ELEMENTAL_DISCORD]={base=7, every=6},
+		[Talents.T_BLOOD_SPLASH]={base=7, every=6},
 
 		[Talents.T_WEAPON_COMBAT]=5,
 		[Talents.T_WEAPONS_MASTERY]={base=4, every=10},
 		[Talents.T_ARMOUR_TRAINING]={base=5, every=6},
 
-		[Talents.T_LUCKY_DAY]=1,
-		[Talents.T_EYE_OF_THE_TIGER]=1,
-		[Talents.T_IRRESISTIBLE_SUN]=1,
+		[Talents.T_ENDLESS_WOES]=1,
+		[Talents.T_SPINE_OF_THE_WORLD]=1,
 	},
 	resolvers.sustains_at_birth(),
 
 	autolevel = "warriormage",
 	ai = "tactical", ai_state = { talent_in=2, ai_move="move_astar", },
 	ai_tactic = resolvers.tactic"melee",
-	resolvers.inscriptions(2, {"shielding rune", "shielding rune"}),
-	resolvers.inscriptions(3, {}),
+	resolvers.inscriptions(6, {"healing infusion", "regeneration infusion", "shielding rune", "heroism infusion", "movement infusion", "wild infusion"}),
 
 	on_die = function(self, who)
 		game.player:resolveSource():setQuestStatus("high-peak", engine.Quest.COMPLETED, "argoniel-dead")
@@ -237,6 +236,8 @@ newEntity{ define_as = "FALLEN_SUN_PALADIN_AERYN",
 	ai = "tactical", ai_state = { talent_in=2, ai_move="move_astar", },
 	ai_tactic = resolvers.tactic"melee",
 	resolvers.inscriptions(4, {}),
+	
+	no_auto_resists = true,
 
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, HEAD=1, FEET=1 },
 	resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
@@ -259,33 +260,25 @@ newEntity{ define_as = "FALLEN_SUN_PALADIN_AERYN",
 		chat:invoke()
 	end,
 
-	positive_regen = 25,
-
 	resolvers.talents{
 		[Talents.T_ARMOUR_TRAINING]=4,
 		[Talents.T_WEAPON_COMBAT]=5,
 		[Talents.T_WEAPONS_MASTERY]=5,
 		[Talents.T_RUSH]=3,
 
-		[Talents.T_CHANT_OF_FORTITUDE]=7,
-		[Talents.T_SEARING_LIGHT]=7,
-		[Talents.T_MARTYRDOM]=7,
-		[Talents.T_BARRIER]=7,
-		[Talents.T_WEAPON_OF_LIGHT]=7,
-		[Talents.T_MARTYRDOM]=7,
-		[Talents.T_HEALING_LIGHT]=7,
-		[Talents.T_CRUSADE]=8,
-		[Talents.T_SUN_FLARE]=7,
-		[Talents.T_FIREBEAM]=7,
-		[Talents.T_SUNBURST]=8,
-		[Talents.T_SHIELD_OF_LIGHT]=6,
-		[Talents.T_SECOND_LIFE]=7,
-		[Talents.T_BATHE_IN_LIGHT]=7,
-		[Talents.T_PROVIDENCE]=7,
+		[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_THICK_SKIN]=5,
 
 		[Talents.T_IRRESISTIBLE_SUN]=1,
-		[Talents.T_DRACONIC_BODY]=1,
 	},
 	resolvers.sustains_at_birth(),
 }
@@ -311,6 +304,8 @@ newEntity{ define_as = "HIGH_SUN_PALADIN_AERYN",
 	never_anger = true,
 
 	open_door = true,
+	
+	no_auto_resists = true,
 
 	autolevel = "warriormage",
 	ai = "tactical", ai_state = { talent_in=2, ai_move="move_astar", },
@@ -327,32 +322,26 @@ newEntity{ define_as = "HIGH_SUN_PALADIN_AERYN",
 		{type="armor", subtype="feet", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
 		{type="armor", subtype="head", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
 	},
-
-	positive_regen = 25,
-
+	
 	resolvers.talents{
-		[Talents.T_ARMOUR_TRAINING]=5,
+		[Talents.T_ARMOUR_TRAINING]=4,
 		[Talents.T_WEAPON_COMBAT]=5,
 		[Talents.T_WEAPONS_MASTERY]=5,
-		[Talents.T_RUSH]=8,
+		[Talents.T_RUSH]=3,
 
-		[Talents.T_CHANT_OF_FORTITUDE]=5,
-		[Talents.T_SEARING_LIGHT]=5,
-		[Talents.T_MARTYRDOM]=5,
+		[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]=8,
-		[Talents.T_FIREBEAM]=7,
-		[Talents.T_SUNBURST]=8,
-		[Talents.T_SHIELD_OF_LIGHT]=6,
+		[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_THICK_SKIN]=5,
 
 		[Talents.T_IRRESISTIBLE_SUN]=1,
-		[Talents.T_DRACONIC_BODY]=1,
 	},
 	resolvers.sustains_at_birth(),
 }