From 1e1830c55ecb9ef0ae1729333102eba94fd515d9 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Tue, 25 Dec 2012 20:09:34 +0000
Subject: [PATCH] Pure Aether at level 5 allows Aegis spells to be used while
Aether Avatar is active
git-svn-id: http://svn.net-core.org/repos/t-engine4@6225 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Actor.lua | 6 +++++-
game/modules/tome/data/talents/spells/aether.lua | 3 ++-
game/modules/tome/data/timed_effects/magical.lua | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index 4313727688..8715ab5743 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -3590,7 +3590,11 @@ function _M:preUseTalent(ab, silent, fake)
-- Special checks
if ab.on_pre_use and not (ab.mode == "sustained" and self:isTalentActive(ab.id)) and not ab.on_pre_use(self, ab, silent, fake) then return false end
- if self:attr("use_only_arcane") and ab.type[1] ~= "spell/arcane" and ab.type[1] ~= "spell/aether" then return false end
+ if self:attr("use_only_arcane") then
+ if self:attr("use_only_arcane") >= 2 then if ab.type[1] ~= "spell/arcane" and ab.type[1] ~= "spell/aether" and ab.type[1] ~= "spell/aegis" then return false end
+ elseif self:attr("use_only_arcane") >= 1 then if ab.type[1] ~= "spell/arcane" and ab.type[1] ~= "spell/aether" then return false end
+ end
+ end
-- Cant heal
if ab.is_heal and self:attr("no_healing") then return false end
diff --git a/game/modules/tome/data/talents/spells/aether.lua b/game/modules/tome/data/talents/spells/aether.lua
index c41796eb4a..47d613fa8e 100644
--- a/game/modules/tome/data/talents/spells/aether.lua
+++ b/game/modules/tome/data/talents/spells/aether.lua
@@ -223,7 +223,8 @@ newTalent{
info = function(self, t)
local damageinc = t.getDamageIncrease(self, t)
local ressistpen = t.getResistPenalty(self, t)
- return ([[Surround yourself with Pure Aether, increasing all your arcane damage by %d%% and ignoring %d%% arcane resistance of your targets.]])
+ return ([[Surround yourself with Pure Aether, increasing all your arcane damage by %d%% and ignoring %d%% arcane resistance of your targets.
+ At level 5 it allows Aegis spells to be used while in Aether Avatar form.]])
:format(damageinc, ressistpen)
end,
}
diff --git a/game/modules/tome/data/timed_effects/magical.lua b/game/modules/tome/data/timed_effects/magical.lua
index 85e36358c6..88539b416c 100644
--- a/game/modules/tome/data/timed_effects/magical.lua
+++ b/game/modules/tome/data/timed_effects/magical.lua
@@ -1926,7 +1926,7 @@ newEffect{
activate = function(self, eff)
self:effectTemporaryValue(eff, "inc_damage", {[DamageType.ARCANE]=25})
self:effectTemporaryValue(eff, "max_mana", self:getMaxMana() * 0.33)
- self:effectTemporaryValue(eff, "use_only_arcane", 1)
+ self:effectTemporaryValue(eff, "use_only_arcane", (self:isTalentActive(self.T_PURE_AETHER) and self:getTalentLevel(self.T_PURE_AETHER) >= 5) and 2 or 1)
self:effectTemporaryValue(eff, "arcane_cooldown_divide", 3)
if not self.shader then
--
GitLab