Revise Archmage

@@ -131,7 +131,7 @@ newTalent{
 	no_energy = true,
 	tactical = { DEFEND = 2 },
 	getShield = function(self, t) return 40 + self:combatTalentSpellDamage(t, 5, 500) / 10 end,
-	getDisruption = function(self, t) return self:combatTalentSpellDamage(t, 10, 20) end,
+	getDisruption = function(self, t) return 20 + self:combatTalentSpellDamage(t, 1, 10) end,
 	getNumEffects = function(self, t) return math.max(1,math.floor(self:combatTalentScale(t, 3, 7, "log"))) end,
 	on_pre_use = function(self, t)
 		for eff_id, p in pairs(self.tmp) do

@@ -158,7 +158,7 @@ newTalent{
 		return tg
 	end,
 	getNb = function(self, t) return math.floor(self:combatTalentScale(t, 3.3, 4.7)) end,
-	getDamage = function(self, t) return self:combatTalentSpellDamage(t, 20, 180) end,
+	getDamage = function(self, t) return self:combatTalentSpellDamage(t, 20, 180) end,  -- 100, 900 at 6.5 assuming all hit.  Not bad.
 	action = function(self, t)
 		local tg = self:getTalentTarget(t)
 		local x, y = self:getTarget(tg)
@@ -201,10 +201,13 @@ newTalent{
 	getNb = function(self, t) return math.floor(self:combatTalentLimit(t, 15, 5, 9)) end, -- Limit duration < 15	
 	callbackOnTalentPost = function(self, t, ab)
 		if not self:hasEffect(self.EFF_AETHER_AVATAR) then return end
-		if ab.type[1]:find("^aether/") or ab.type[1]:find("^arcane/") then return end
-		if ab.type[1]:find("^aegis/") and self:hasEffect(self.EFF_AETHER_AVATAR).aegis then return end
+		if ab.mode == "sustained" then return end
+		if ab.use_only_arcane then return end
+		if ab.type[1] == "spell/aegis" and self:hasEffect(self.EFF_AETHER_AVATAR).aegis then return end
 		if self.turn_procs.aether_avatar_penalty then return end
 		self:incMana(-50)
+		game.logSeen(self, "#VIOLET#%s loses 50 mana from using a non-Arcane talent!#LAST#", self.name:capitalize())
+
 		self.turn_procs.aether_avatar_penalty = true
 	end,
 	action = function(self, t)
@@ -215,7 +218,7 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[Fill yourself with aether forces, completely surrounding your body for %d turns.
-		While active, you lose 50 mana the first time you use a non-Arcane or Aether talent each turn, your cooldown for them is divided by 3, your arcane damage is increased by 25%%, your Disruption Shield radius is increased to 10, and your maximum mana is increased by 33%%.]]):
+		While active, you lose 50 mana the first time you use a non-sustain, non-Arcane or Aether talent each turn, your cooldown for them is divided by 3, your arcane damage and penetration is increased by 25%%, your Disruption Shield radius is increased to 10, and your maximum mana is increased by 33%%.]]):
 		format(t.getNb(self, t))
 	end,
 }

@@ -22,7 +22,6 @@ newTalent{
 	type = {"spell/air", 1},
 	require = spells_req1,
 	points = 5,
-	random_ego = "attack",
 	mana = 10,
 	cooldown = 3,
 	tactical = { ATTACK = {LIGHTNING = 2} },
@@ -50,10 +49,12 @@ newTalent{
 	end,
 	info = function(self, t)
 		local damage = t.getDamage(self, t)
-		return ([[Conjures up mana into a powerful beam of lightning, doing %0.2f to %0.2f damage
+		return ([[Conjures up mana into a powerful beam of lightning, doing %0.2f to %0.2f damage (%0.2f average)
 		The damage will increase with your Spellpower.]]):
 		format(damDesc(self, DamageType.LIGHTNING, damage / 3),
-		damDesc(self, DamageType.LIGHTNING, damage))
+		damDesc(self, DamageType.LIGHTNING, damage),
+		damDesc(self, DamageType.LIGHTNING, (damage + damage / 3) / 2))
+
 	end,
 }
 
@@ -62,8 +63,7 @@ newTalent{
 	type = {"spell/air", 2},
 	require = spells_req2,
 	points = 5,
-	random_ego = "attack",
-	mana = 30,
+	mana = 20,
 	cooldown = 8,
 	tactical = { ATTACKAREA = {LIGHTNING = 2} }, --note: only considers the primary target
 	range = 10,
@@ -71,7 +71,7 @@ newTalent{
 	reflectable = true,
 	requires_target = true,
 	target = function(self, t) return {type="bolt", range=self:getTalentRange(t), talent=t} end,
-	getDamage = function(self, t) return self:combatTalentSpellDamage(t, 10, 250) end,
+	getDamage = function(self, t) return self:combatTalentSpellDamage(t, 28, 330) end,
 	getTargetCount = function(self, t) return math.floor(self:combatTalentScale(t, 4, 8, "log")) end,
 	action = function(self, t)
 		local tg = self:getTalentTarget(t)
@@ -132,11 +132,12 @@ newTalent{
 	info = function(self, t)
 		local damage = t.getDamage(self, t)
 		local targets = t.getTargetCount(self, t)
-		return ([[Invokes a forking beam of lightning doing %0.2f to %0.2f damage and forking to another target.
+		return ([[Invokes a forking beam of lightning doing %0.2f to %0.2f damage (%0.2f average) and forking to another target.
 		It can hit up to %d targets up to 10 grids apart, and will never hit the same one twice; nor will it hit the caster.
 		The damage will increase with your Spellpower.]]):
 		format(damDesc(self, DamageType.LIGHTNING, damage / 3),
 			damDesc(self, DamageType.LIGHTNING, damage),
+			damDesc(self, DamageType.LIGHTNING, (damage + damage / 3) / 2),
 			targets)
 	end,
 }
@@ -199,18 +200,14 @@ newTalent{
 	require = spells_req4,
 	points = 5,
 	mode = "sustained",
-	sustain_mana = 30,
+	sustain_mana = 50,
 	cooldown = 15,
 	tactical = { ATTACKAREA = {LIGHTNING = 2} },
 	range = 6,
 	direct_hit = true,
 	getDamage = function(self, t) return self:combatTalentSpellDamage(t, 15, 80) end,
 	getTargetCount = function(self, t) return math.floor(self:getTalentLevel(t)) end,
-	getManaDrain = function(self, t) return -1.5 * self:getTalentLevelRaw(t) end,
 	callbackOnActBase = function(self, t)
-		local mana = t.getManaDrain(self, t)
-		if self:getMana() <= mana + 1 then return end
-
 		local tgts = {}
 		local grids = core.fov.circle_grids(self.x, self.y, 6, true)
 		for x, yy in pairs(grids) do for y, _ in pairs(grids[x]) do
@@ -231,7 +228,6 @@ newTalent{
 			if core.shader.active() then game.level.map:particleEmitter(a.x, a.y, tg.radius, "ball_lightning_beam", {radius=tg.radius, tx=x, ty=y}, {type="lightning"})
 			else game.level.map:particleEmitter(a.x, a.y, tg.radius, "ball_lightning_beam", {radius=tg.radius, tx=x, ty=y}) end
 			game:playSoundNear(self, "talents/lightning")
-			self:incMana(mana)
 		end
 	end,
 	activate = function(self, t)
@@ -247,11 +243,9 @@ newTalent{
 	info = function(self, t)
 		local targetcount = t.getTargetCount(self, t)
 		local damage = t.getDamage(self, t)
-		local manadrain = t.getManaDrain(self, t)
 		return ([[Conjures a furious, raging lightning storm with a radius of 6 that follows you as long as this spell is active.
-		Each turn, a random lightning bolt will hit up to %d of your foes for 1 to %0.2f damage in a radius of 1.
-		This powerful spell will drain %0.2f mana with each hit.
+		Each turn, a random lightning bolt will hit up to %d of your foes for 1 to %0.2f damage (%0.2f average) in a radius of 1.
 		The damage will increase with your Spellpower.]]):
-		format(targetcount, damDesc(self, DamageType.LIGHTNING, damage),-manadrain)
+		format(targetcount, damDesc(self, DamageType.LIGHTNING, damage), damDesc(self, DamageType.LIGHTNING, damage / 2))
 	end,
 }

@@ -100,7 +100,7 @@ newTalent{
 	type = {"spell/arcane", 3},
 	require = spells_req3,
 	points = 5,
-	mana = 35,
+	mana = 20,
 	cooldown = 12,
 	use_only_arcane = 1,
 	range = 10,
@@ -117,7 +117,7 @@ newTalent{
 		target = game.level.map(tx, ty, Map.ACTOR)
 		if not target then return nil end
 
-		target:setEffect(target.EFF_ARCANE_VORTEX, 6, {src=self, dam=t.getDamage(self, t)})
+		target:setEffect(target.EFF_ARCANE_VORTEX, 6, {src=self, dam=self:spellCrit(t.getDamage(self, t))})
 		game:playSoundNear(self, "talents/arcane")
 		return true
 	end,
@@ -131,6 +131,7 @@ newTalent{
 	end,
 }
 
+-- Mana gain on deactivation is mostly to preserve this talent's role as a counter to mana drain
 newTalent{
 	name = "Disruption Shield",
 	type = {"spell/arcane",4},
@@ -157,11 +158,10 @@ newTalent{
 		game.logSeen(self, "#VIOLET#%s's disruption shield collapses and then explodes in a powerful manastorm!", self.name:capitalize())
 		dam = math.min(dam, t.getMaxDamage(self, t)) -- Damage cap
 		-- Add a lasting map effect
-		--self:setEffect(self.EFF_ARCANE_STORM, 10, {power=t.getArcaneResist(self, t)})
 		local radius = self:hasEffect(self.EFF_AETHER_AVATAR) and 10 or 3
 		game.level.map:addEffect(self,
 			self.x, self.y, 10,
-			DamageType.ARCANE, dam / 10,
+			DamageType.ARCANE, self:spellCrit(dam / 10),
 			radius,
 			5, nil,
 			{type="arcanestorm", only_one=true},
@@ -203,7 +203,7 @@ newTalent{
 		self.disruption_shield_absorb = (self.disruption_shield_absorb or 0) + amt
 		self:incMana(-mana)
 
-		if self:getMana() / self:getMaxMana() <= 0.25 then 
+		if self:getMana() / self:getMaxMana() <= 0.1 then 
 			local dam = self.disruption_shield_absorb
 
 			-- Deactivate without losing energy
@@ -231,20 +231,23 @@ newTalent{
 	end,
 	deactivate = function(self, t, p)
 		self:removeParticles(p.particle)
+		if self:attr("save_cleanup") then return true end
+
 		local dam = self.disruption_shield_absorb
 
 		-- Explode!
 		local t = self:getTalentFromId(self.T_DISRUPTION_SHIELD)
 		t.explode(self, t, dam)
 		self.disruption_shield_absorb = nil
+		self:incMana(100)
 		return true
 	end,
 	info = function(self, t)
 		local radius = self:hasEffect(self.EFF_AETHER_AVATAR) and 10 or 3
 		return ([[Surround yourself with arcane forces, disrupting any attempts to harm you and instead redirecting it to your mana.
 		25%% of all damage taken is redirected to your mana at a ratio of %0.2f mana per damage.  Damage shield bonuses will reduce this cost.
-		If your mana is brought below 25%% by the shield, it will de-activate and the chain reaction will release a deadly arcane storm around you with radius %d for 10 turns, dealing 10%% of the damage absorbed each turn, up to a maximum of %d total damage.
-		Dropping below 25%% mana will automatically deactivate this talent.
+		On deactivation you will gain 100 mana and release a deadly arcane storm around you with radius %d for 10 turns, dealing 10%% of the damage absorbed each turn, up to a maximum of %d total damage.
+		Dropping below 10%% mana will automatically deactivate this talent.
 		The mana to damage ratio improves with your Spellpower.]]):
 		format(t.getManaRatio(self, t), radius, damDesc(self, DamageType.ARCANE, t.getMaxDamage(self, t)))
 	end,

@@ -65,7 +65,7 @@ newTalent{
 	mode = "sustained",
 	require = spells_req2,
 	points = 5,
-	sustain_mana = 30,
+	sustain_mana = 15,
 	cooldown = 10,
 	tactical = { BUFF = 2 },
 	getArmor = function(self, t) return self:combatTalentSpellDamage(t, 10, 23) end,
@@ -118,7 +118,7 @@ newTalent{
 	require = spells_req3,
 	points = 5,
 	random_ego = "attack",
-	mana = 40,
+	mana = 20,
 	cooldown = 12,
 	direct_hit = true,
 	tactical = { ATTACKAREA = { PHYSICAL = 2 }, DISABLE = { knockback = 2 }, ESCAPE = { knockback = 1 } },

@@ -130,8 +130,7 @@ newTalent{
 	type = {"spell/fire",3},
 	require = spells_req3,
 	points = 5,
-	random_ego = "attack",
-	mana = 40,
+	mana = 20,
 	cooldown = 8,
 	tactical = { ATTACKAREA = { FIRE = 2 } },
 	range = 7,
@@ -142,7 +141,7 @@ newTalent{
 	target = function(self, t)
 		return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), selffire=self:spellFriendlyFire(), talent=t, display={particle="bolt_fire", particle_args={size_factor=1.5}, trail="firetrail"}, sound_stop="talents/fireflash"}
 	end,
-	getDamage = function(self, t) return self:combatTalentSpellDamage(t, 28, 280) end,
+	getDamage = function(self, t) return self:combatTalentSpellDamage(t, 28, 330) end,
 	action = function(self, t)
 		local tg = self:getTalentTarget(t)
 		local x, y = self:getTarget(tg)
@@ -177,7 +176,6 @@ newTalent{
 	type = {"spell/fire",4},
 	require = spells_req4,
 	points = 5,
-	random_ego = "attack",
 	mana = 100,
 	cooldown = 30,
 	tactical = { ATTACKAREA = { FIRE = 3 } },

@@ -22,7 +22,6 @@ newTalent{
 	type = {"spell/water",1},
 	require = spells_req1,
 	points = 5,
-	random_ego = "attack",
 	mana = 12,
 	cooldown = 8,
 	tactical = { DISABLE = {stun = 0.5}, ATTACKAREA = { COLD = 1 } },
@@ -34,7 +33,7 @@ newTalent{
 		return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t)}
 	end,
 	getDamage = function(self, t) return self:combatTalentSpellDamage(t, 4, 50) end,
-	getDuration = function(self, t) return math.floor(self:combatTalentScale(t, 3, 7)) end,
+	getDuration = function(self, t) return 8 end,
 	action = function(self, t)
 		local tg = self:getTalentTarget(t)
 		local x, y = self:getTarget(tg)
@@ -43,7 +42,7 @@ newTalent{
 		-- Add a lasting map effect
 		game.level.map:addEffect(self,
 			x, y, t.getDuration(self, t),
-			DamageType.GLACIAL_VAPOUR, t.getDamage(self, t),
+			DamageType.GLACIAL_VAPOUR, self:spellCrit(t.getDamage(self, t)),
 			self:getTalentRadius(t),
 			5, nil,
 			{type="ice_vapour"},
@@ -113,8 +112,7 @@ newTalent{
 	type = {"spell/water",3},
 	require = spells_req3,
 	points = 5,
-	random_ego = "attack",
-	mana = 25,
+	mana = 10,
 	cooldown = 10,
 	tactical = { ESCAPE = { knockback = 2 }, ATTACKAREA = { COLD = 0.5, PHYSICAL = 0.5 }, DISABLE = { knockback = 1 } },
 	direct_hit = true,

@@ -103,7 +103,7 @@ newTalent{
 	points = 5,
 	getChance = function(self, t) return self:getTalentLevelRaw(t) * 10 end,
 	info = function(self, t)
-		return ([[When your Burning Wake talent is active, your Inferno and Burning Wake effects have a %d%% chance, each turn, to remove a status effect (physical, magical, curse or hex) from the targets.
+		return ([[When your Burning Wake talent is active, your Inferno and Burning Wake effects have a %d%% chance, each turn, to remove a status effect (physical or magical) from the targets.
 		If the target is hostile, it will remove a beneficial effect.
 		If the target is friendly, it will remove a detrimental effect (but still burn).]]):format(t.getChance(self, t))
 	end,

@@ -2564,10 +2564,13 @@ newEffect{
 	status = "beneficial",
 	parameters = { },
 	activate = function(self, eff)
+		local inc_mana = self:getMaxMana() * 0.33
 		self:effectTemporaryValue(eff, "inc_damage", {[DamageType.ARCANE]=25})
-		self:effectTemporaryValue(eff, "max_mana", self:getMaxMana() * 0.33)
-		self:effectTemporaryValue(eff, "arcane_cooldown_divide", 3)
+		self:effectTemporaryValue(eff, "resists_pen", {[DamageType.ARCANE]=25})
 
+		self:effectTemporaryValue(eff, "max_mana", inc_mana)
+		self:effectTemporaryValue(eff, "arcane_cooldown_divide", 3)
+		self:incMana(inc_mana)
 		if not self.shader then
 			eff.set_shader = true
 			self.shader = "shadow_simulacrum"
@@ -2582,6 +2585,7 @@ newEffect{
 			self:removeAllMOs()
 			game.level.map:updateMap(self.x, self.y)
 		end
+		self.mana = math.min(self.mana, self.max_mana)
 	end,
 }