diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index d066e80db075ad591ba24b67f9ef94440b18d74f..0ae3c4446561c1e3e93dc9df3323c54a83b3714a 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -360,6 +360,7 @@ function _M:useEnergy(val)
end
end
+-- Called at the start of a turn before the actor chooses their action, energy is handled, etc
function _M:actBase()
-- Stupid sanity check that is actualy useful
if self.life ~= self.life then self.life = self.max_life end
@@ -2163,7 +2164,10 @@ function _M:onTakeHit(value, src, death_note)
end
if self:getPositive() >= drain then
self:incPositive(- drain)
- self:heal(self:combatTalentSpellDamage(self.T_SHIELD_OF_LIGHT, 5, 25), tal)
+
+ local t = self:getTalentFromId(self.T_SHIELD_OF_LIGHT)
+
+ self:heal(self:spellCrit(t.getHeal(self, t)), tal)
end
end
@@ -2173,7 +2177,8 @@ function _M:onTakeHit(value, src, death_note)
if tal then
local sl = self:callTalent(self.T_SECOND_LIFE,"getLife")
value = 0
- self.life = sl
+ self.life = 1
+ self:heal(sl, self)
game.logSeen(self, "#YELLOW#%s has been saved by a blast of positive energy!#LAST#", self.name:capitalize())
game:delayedLogDamage(tal, self, -sl, ("#LIGHT_GREEN#%d healing#LAST#"):format(sl), false)
self:forceUseTalent(self.T_SECOND_LIFE, {ignore_energy=true})
@@ -2756,7 +2761,10 @@ end
function _M:resetToFull()
if self.dead then return end
self.life = self.max_life
- self.mana = self.max_mana
+ -- Make Disruption Shield not kill Archmages on levelup or we risk Archmages being mortal
+ if not (self.isTalentActive and self:isTalentActive(self.T_DISRUPTION_SHIELD)) then
+ self.mana = self.max_mana
+ end
self.vim = self.max_vim
self.stamina = self.max_stamina
self.equilibrium = self.min_equilibrium
@@ -4731,6 +4739,57 @@ function _M:removeEffectsFilter(t, nb, silent, force)
return removed
end
+--- Randomly reduce talent cooldowns based on a filter
+-- @param t the function to use as a filter on the talent definition or nil to apply to all talents on cooldown
+-- @param change the amount to change the cooldown by
+-- @param nb the number of times to reduce a talent cooldown
+-- @param duplicate boolean representing whether the same talent can be reduced more than once
+-- @return the number of times a talent cooldown was reduced
+function _M:talentCooldownFilter(t, change, nb, duplicate)
+ nb = nb or 100000
+ change = change or 1
+
+ local changed = 0
+ local talents = {}
+
+ -- For each talent currently on cooldown find its definition (e) and add it to another table if the filter (t) applies
+ for tid, cd in pairs(self.talents_cd) do
+ if type(t) == "function" then
+ local e = self:getTalentFromId(tid)
+ if t(e) then talents[#talents+1] = {tid, cd} end
+ else -- Apply to all talents on cooldown the filter isn't a function
+ talents[#talents+1] = {tid, cd}
+ end
+ end
+
+ -- Pick random talents in the new table and apply the cooldown change to them
+ while #talents > 0 and nb > 0 do
+ local i = rng.range(1, #talents)
+ local t = talents[i]
+ local removed = false
+
+ ---[[ Change the cooldown to the reduced value or mark it as off cooldown
+ t[2] = t[2] - change
+ if t[2] <= 0 then
+ self.talents_cd[ t[1] ] = nil
+ table.remove(talents, i)
+ removed = true
+ else
+ self.talents_cd[ t[1] ] = t[2]
+ end
+ --]]
+
+ if not duplicate then
+ if not removed then table.remove(talents, i) end -- only remove if it hasn't already been removed
+ end
+
+ nb = nb - 1
+ changed = changed + 1
+ end
+
+ return changed
+end
+
--- Suffocate a bit, lose air
function _M:suffocate(value, src, death_message)
if self:attr("no_breath") then return false, false end
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index 7202d3ac0811c91338b3bc3afb574b6669d745c0..606acc89f62987bd6d6f53a2b7601ebdfb2dcc59 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -344,8 +344,8 @@ function _M:loaded()
elseif self.difficulty == self.DIFFICULTY_INSANE then
zone.base_level_range = table.clone(zone.level_range, true)
zone.specific_base_level.object = -10 -zone.level_range[1]
- zone.level_range[1] = zone.level_range[1] * 1.7 + 5
- zone.level_range[2] = zone.level_range[2] * 1.7 + 5
+ zone.level_range[1] = zone.level_range[1] * 1.5 + 5
+ zone.level_range[2] = zone.level_range[2] * 1.5 + 5
elseif self.difficulty == self.DIFFICULTY_MADNESS then
zone.base_level_range = table.clone(zone.level_range, true)
zone.specific_base_level.object = -10 -zone.level_range[1]
diff --git a/game/modules/tome/class/interface/Combat.lua b/game/modules/tome/class/interface/Combat.lua
index ca69b2c2cc2ef3426b5034845b29a0a70149f2f5..d0ee9fa98a05a34725a516a1be3b50f6e91cfe61 100644
--- a/game/modules/tome/class/interface/Combat.lua
+++ b/game/modules/tome/class/interface/Combat.lua
@@ -576,15 +576,6 @@ function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
end
end end
- -- Weapon of light cast
- if hitted and not target.dead and self:knowTalent(self.T_WEAPON_OF_LIGHT) and self:isTalentActive(self.T_WEAPON_OF_LIGHT) then
- if self:getPositive() >= 3 then
- local dam = 7 + self:getTalentLevel(self.T_WEAPON_OF_LIGHT) * self:combatSpellpower(0.092)
- DamageType:get(DamageType.LIGHT).projector(self, target.x, target.y, DamageType.LIGHT, dam)
- self:incPositive(-3)
- end
- end
-
-- Shadow cast
if hitted and not target.dead and self:knowTalent(self.T_SHADOW_COMBAT) and self:isTalentActive(self.T_SHADOW_COMBAT) and self:getMana() > 0 then
local dam = 2 + self:combatTalentSpellDamage(self.T_SHADOW_COMBAT, 2, 50)
diff --git a/game/modules/tome/data/birth/classes/celestial.lua b/game/modules/tome/data/birth/classes/celestial.lua
index 4658924699fca4fcc500d2ec55c9c41986481cfb..f042c8f20d3f58b88ca87b433413c631738a49bf 100644
--- a/game/modules/tome/data/birth/classes/celestial.lua
+++ b/game/modules/tome/data/birth/classes/celestial.lua
@@ -69,6 +69,7 @@ newBirthDescriptor{
stats = { mag=4, str=5, },
talents_types = {
["technique/shield-offense"]={true, 0.1},
+ ["technique/2hweapon-assault"]={true, 0.1},
["technique/combat-techniques-active"]={false, 0.1},
["technique/combat-techniques-passive"]={true, 0.1},
["technique/combat-training"]={true, 0.1},
@@ -79,7 +80,7 @@ newBirthDescriptor{
["celestial/light"]={true, 0.3},
["celestial/guardian"]={false, 0.3},
["celestial/radiance"]={false, 0.3},
- ["celestial/crusader"]={true, 0.3},
+ ["celestial/crusader"]={false, 0.3},
},
birth_example_particles = "golden_shield",
talents = {
diff --git a/game/modules/tome/data/birth/classes/wilder.lua b/game/modules/tome/data/birth/classes/wilder.lua
index 087f3f70d3387880f355bba81cba2788e7e7791e..ec526bbdb81f9356566c28f7f3ed9b16192ca282 100644
--- a/game/modules/tome/data/birth/classes/wilder.lua
+++ b/game/modules/tome/data/birth/classes/wilder.lua
@@ -137,7 +137,7 @@ newBirthDescriptor{
["wild-gift/fungus"]={true, 0.1},
["cunning/survival"]={false, 0},
["technique/shield-offense"]={true, 0.1},
- ["technique/2hweapon-offense"]={true, 0.1},
+ ["technique/2hweapon-assault"]={true, 0.1},
["technique/combat-techniques-active"]={false, 0},
["technique/combat-techniques-passive"]={true, 0},
["technique/combat-training"]={true, 0},
diff --git a/game/modules/tome/data/birth/descriptors.lua b/game/modules/tome/data/birth/descriptors.lua
index 1467261ca1ac27f772ccc51af3ba91a2f6a560e3..456c525ec3336a2ae7d218a0abc411d3299f6d88 100644
--- a/game/modules/tome/data/birth/descriptors.lua
+++ b/game/modules/tome/data/birth/descriptors.lua
@@ -211,10 +211,12 @@ newBirthDescriptor{
desc =
{
"#GOLD##{bold}#Insane mode#WHITE##{normal}#",
- "Absolutely unfair game setting. You are really mentally ill to play this mode!",
- "All zone levels increased by 120% + 5",
- "All creature talent levels increased by 100%",
- "Bosses will have randomly selected talents",
+ "Similar rules to Nightmare, but with more random bosses!",
+ "All zone levels increased by 50% + 5",
+ "All creature talent levels increased by 50%",
+ "Rare creatures are far more frequent and random bosses start to appear",
+ "Nonrandom bosses will have randomly selected talents",
+ "All enemies have 20% more life",
"Player rank is normal instead of elite",
"Player can earn Insane version of achievements if also playing in Roguelike or Adventure permadeath mode.",
},
diff --git a/game/modules/tome/data/damage_types.lua b/game/modules/tome/data/damage_types.lua
index 6b5dff5d6030db97a5761894f1547dfe063ae097..64bb9cd144113f1946161fe33472a6d8147edae5 100644
--- a/game/modules/tome/data/damage_types.lua
+++ b/game/modules/tome/data/damage_types.lua
@@ -327,7 +327,7 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
end
if src:attr("stunned") then
- dam = dam * 0.3
+ dam = dam * 0.4
print("[PROJECTOR] stunned dam", dam)
end
if src:attr("invisible_damage_penalty") then
@@ -372,6 +372,19 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
end
end
+ -- Chant of Fortress, reduces damage from attackers over range 3
+ if target.isTalentActive and target:isTalentActive(target.T_CHANT_OF_FORTRESS) and target:knowTalent(target.T_CHANT_OF_FORTRESS) then
+ if src and src.x and src.y then
+ -- assume instantaneous projection and check range to source
+ local t = target:getTalentFromId(target.T_CHANT_OF_FORTRESS)
+ if core.fov.distance(target.x, target.y, src.x, src.y) > 3 then
+ t = target:getTalentFromId(target.T_CHANT_OF_FORTRESS)
+ dam = dam * (100 + t.getDamageChange(target, t)) / 100
+ print("[PROJECTOR] Chant of Fortress (source) dam", dam)
+ end
+ end
+ end
+
-- Psychic Projection
if src.attr and src:attr("is_psychic_projection") and not game.zone.is_dream_scape then
if (target.subtype and target.subtype == "ghost") or mind_linked then
@@ -652,7 +665,8 @@ newDamageType{
end,
death_message = {"electrocuted", "shocked", "bolted", "volted", "amped", "zapped"},
}
--- Acid destroys potions
+
+-- Acid, few specific interactions currently aside from damage types later derived from this
newDamageType{
name = "acid", type = "ACID", text_color = "#GREEN#",
antimagic_resolve = true,
@@ -724,6 +738,7 @@ newDamageType{
}
-- Mind damage
+-- Most uses of this have their damage effected by mental save and do not trigger cross tiers, ie, melee items
newDamageType{
name = "mind", type = "MIND", text_color = "#YELLOW#",
projector = function(src, x, y, type, dam)
@@ -749,6 +764,8 @@ newDamageType{
death_message = {"psyched", "mentally tortured", "mindraped"},
}
+-- Cold damage+turn energy drain, used exclusively by the Wintertide weapon
+-- If you use this for something else make sure to note it has no power check or sanity check on how much turn energy is drained
newDamageType{
name = "winter", type = "WINTER",
projector = function(src, x, y, type, dam)
@@ -827,7 +844,7 @@ newDamageType{
if target:canBe("silence") then
target:setEffect(target.EFF_SILENCED, math.ceil(dam.dur), {apply_power=dam.power_check or src:combatMindpower() * 0.7})
else
- game.logSeen(target, "%s resists!", target.name:capitalize())
+ game.logSeen(target, "%s resists the silence!", target.name:capitalize())
end
end
end,
@@ -862,7 +879,7 @@ newDamageType{
if target:canBe("silence") then
target:setEffect(target.EFF_SILENCED, 4, {apply_power=src:combatAttack()*0.7, no_ct_effect=true})
else
- game.logSeen(target, "%s resists!", target.name:capitalize())
+ game.logSeen(target, "%s resists the silence!", target.name:capitalize())
end
end
end,
@@ -1071,7 +1088,8 @@ newDamageType{
end,
}
--- Freezes target, checks for spellresistance
+-- Freezes target, checks for spellresistance and stun resistance
+-- Used on melee items but abnormally strong, not currently checking accuracy
newDamageType{
name = "freeze", type = "FREEZE",
projector = function(src, x, y, type, dam)
@@ -1106,6 +1124,7 @@ newDamageType{
}
-- Acid damage + blind chance
+-- Used on melee items so check Accuracy too
newDamageType{
name = "acid blind", type = "ACID_BLIND", text_color = "#GREEN#",
projector = function(src, x, y, type, dam)
@@ -1113,7 +1132,7 @@ newDamageType{
local target = game.level.map(x, y, Map.ACTOR)
if target and rng.percent(25) then
if target:canBe("blind") then
- target:setEffect(target.EFF_BLINDED, 3, {src=src, apply_power=math.max(src:combatSpellpower(), src:combatMindpower())})
+ target:setEffect(target.EFF_BLINDED, 3, {src=src, apply_power=math.max(src:combatAttack(), src:combatSpellpower(), src:combatMindpower())})
else
game.logSeen(target, "%s resists!", target.name:capitalize())
end
@@ -1415,6 +1434,7 @@ newDamageType{
}
-- Spydric poison: prevents movement
+-- Very special, does not have a power check
newDamageType{
name = "spydric poison", type = "SPYDRIC_POISON",
projector = function(src, x, y, type, dam)
@@ -1819,19 +1839,50 @@ newDamageType{
end,
}
+-- Used by Bathe in Light, symmetric healing+shielding, damage to Undead
+-- Keep an eye on this and Weapon of Light for any infinite stack shield then engage combos
newDamageType{
name = "healing light", type = "HEALING_POWER",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target and not target:attr("undead") then
- target:setEffect(target.EFF_EMPOWERED_HEALING, 1, {power=(dam/100)})
+
+ target:setEffect(target.EFF_EMPOWERED_HEALING, 1, {power=(dam/200)})
if dam >= 100 then target:attr("allow_on_heal", 1) end
target:heal(dam, src)
- if not target:hasEffect(target.EFF_DAMAGE_SHIELD) then target:setEffect(target.EFF_DAMAGE_SHIELD, 2, {power=dam * util.bound((target.healing_factor or 1), 0, 2.5)}) end
+
+ -- If the target is shielded already then add to the shield power, else add a shield
+ local shield_power = dam * util.bound((target.healing_factor or 1), 0, 2.5)
+ if not target:hasEffect(target.EFF_DAMAGE_SHIELD) then
+ target:setEffect(target.EFF_DAMAGE_SHIELD, 2, {power=shield_power})
+ else
+ -- Shields can't usually merge, so change the parameters manually
+ local shield = target:hasEffect(target.EFF_DAMAGE_SHIELD)
+ shield.power = shield.power + shield_power
+ target.damage_shield_absorb = target.damage_shield_absorb + shield_power
+ target.damage_shield_absorb_max = target.damage_shield_absorb_max + shield_power
+ shield.dur = math.max(2, shield.dur)
+ end
if dam >= 100 then target:attr("allow_on_heal", -1) end
elseif target then
DamageType:get(DamageType.LIGHT).projector(src, x, y, DamageType.LIGHT, dam)
- DamageType:get(DamageType.FIREBURN).projector(src, x, y, DamageType.FIREBURN, {dam=dam, dur=2, initial=0})
+ end
+ end,
+}
+
+-- Light damage+heal source, used by Radiance
+newDamageType{
+ name = "judgement", type = "JUDGEMENT",
+ projector = function(src, x, y, type, dam)
+ local target = game.level.map(x, y, Map.ACTOR)
+ if target and target ~= src then
+ --print("[JUDGEMENT] src ", src, "target", target, "src", src )
+ DamageType:get(DamageType.LIGHT).projector(src, x, y, DamageType.LIGHT, dam)
+ if dam >= 100 then src:attr("allow_on_heal", 1) end
+ src:heal(dam / 2, src)
+ if dam >= 100 then src:attr("allow_on_heal", -1) end
+
+
end
end,
}
diff --git a/game/modules/tome/data/general/objects/special-artifacts.lua b/game/modules/tome/data/general/objects/special-artifacts.lua
index 2505610f3e74d114aaf59cf5c5c600dae1cbf539..d247186b5a49f1a77b519c8d786afcf0fe8b5589 100644
--- a/game/modules/tome/data/general/objects/special-artifacts.lua
+++ b/game/modules/tome/data/general/objects/special-artifacts.lua
@@ -64,11 +64,11 @@ newEntity{ base = "BASE_STAFF", define_as = "TELOS_SPIRE",
confusion_immune = 0.4,
vim_on_crit = 6,
},
- max_power = 30, power_regen = 1,
+ max_power = 15, power_regen = 1,
use_power = { name = "turn into a corrupted losgoroth (poison, disease, cut and confusion immune; converts half damage into life drain; does not require breath", power = 30,
use = function(self, who)
game.logSeen(who, "%s brandishes %s, turning into a corrupted losgoroth!", who.name:capitalize(), self:getName())
- who:setEffect(who.EFF_CORRUPT_LOSGOROTH_FORM, 8, {})
+ who:setEffect(who.EFF_CORRUPT_LOSGOROTH_FORM, 9, {})
return {id=true, used=true}
end
},
diff --git a/game/modules/tome/data/gfx/talents/weapon_of_wrath.png b/game/modules/tome/data/gfx/talents/weapon_of_wrath.png
new file mode 100644
index 0000000000000000000000000000000000000000..a344eba37b40ec545d7c70da2ffe39cc69a7a963
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/weapon_of_wrath.png differ
diff --git a/game/modules/tome/data/talents/celestial/chants.lua b/game/modules/tome/data/talents/celestial/chants.lua
index 437d9fa248f23eacb0461190c840c4647b68cfb4..ea5a78a93da14f6f49b2d419b0af54da54170a28 100644
--- a/game/modules/tome/data/talents/celestial/chants.lua
+++ b/game/modules/tome/data/talents/celestial/chants.lua
@@ -26,6 +26,7 @@ local function cancelChants(self)
end
end
+-- Synergizes with melee classes (escort), Weapon of Wrath, healing mod (avoid overheal > healing efficiency), and low spellpower
newTalent{
name = "Chant of Fortitude",
type = {"celestial/chants", 1},
@@ -39,15 +40,18 @@ newTalent{
tactical = { BUFF = 2 },
range = 10,
getResists = function(self, t) return self:combatTalentSpellDamage(t, 5, 70) end,
+ getLifePct = function(self, t) return math.min(0.55, self:combatTalentScale(t, 0.05, 0.25, 1)) end,
getDamageOnMeleeHit = function(self, t) return self:combatTalentSpellDamage(t, 5, 25) end,
activate = function(self, t)
cancelChants(self)
local power = t.getResists(self, t)
game:playSoundNear(self, "talents/spell_generic2")
+
local ret = {
onhit = self:addTemporaryValue("on_melee_hit", {[DamageType.LIGHT]=t.getDamageOnMeleeHit(self, t)}),
phys = self:addTemporaryValue("combat_physresist", power),
spell = self:addTemporaryValue("combat_spellresist", power),
+ life = self:addTemporaryValue("max_life", t.getLifePct(self, t)*self.max_life),
particle = self:addParticles(Particles.new("golden_shield", 1))
}
return ret
@@ -57,19 +61,24 @@ newTalent{
self:removeTemporaryValue("on_melee_hit", p.onhit)
self:removeTemporaryValue("combat_physresist", p.phys)
self:removeTemporaryValue("combat_spellresist", p.spell)
+ self:removeTemporaryValue("max_life", p.life)
return true
end,
info = function(self, t)
local saves = t.getResists(self, t)
+ local life = t.getLifePct(self, t)
local damageonmeleehit = t.getDamageOnMeleeHit(self, t)
- return ([[You chant the glory of the Sun, granting you %d Physical Save and Spell Save.
+ return ([[You chant the glory of the Sun, granting you %d Physical Save and Spell Save and increasing your maximum life by %d%% (Currently: %d).
In addition, this talent surrounds you with a shield of light, dealing %0.2f light damage to anything that attacks you.
You may only have one Chant active at once.
- The effects will increase with your Spellpower.]]):
- format(saves, damDesc(self, DamageType.LIGHT, damageonmeleehit))
+ The saves and light damage will increase with your Spellpower and the life with talent level.]]):
+ format(saves, life*100, life*self.max_life, damDesc(self, DamageType.LIGHT, damageonmeleehit))
end,
}
+-- Mostly the same code as Sanctuary
+-- Just like Fortress we limit the interaction with spellpower a bit because this is an escort reward
+-- This can be swapped to reactively with a projectile already in the air
newTalent{
name = "Chant of Fortress",
type = {"celestial/chants", 2},
@@ -82,14 +91,15 @@ newTalent{
dont_provide_pool = true,
tactical = { BUFF = 2 },
range = 10,
- getPhysicalResistance = function(self, t) return self:combatTalentSpellDamage(t, 5, 23) end,
getDamageOnMeleeHit = function(self, t) return self:combatTalentSpellDamage(t, 5, 25) end,
+ getDamageChange = function(self, t)
+ return math.max(-40, -math.sqrt(self:getTalentLevel(t)) * 14)
+ end,
activate = function(self, t)
cancelChants(self)
game:playSoundNear(self, "talents/spell_generic2")
local ret = {
onhit = self:addTemporaryValue("on_melee_hit", {[DamageType.LIGHT]=t.getDamageOnMeleeHit(self, t)}),
- phys = self:addTemporaryValue("resists", {[DamageType.PHYSICAL] = t.getPhysicalResistance(self, t)}),
particle = self:addParticles(Particles.new("golden_shield", 1))
}
return ret
@@ -97,20 +107,22 @@ newTalent{
deactivate = function(self, t, p)
self:removeParticles(p.particle)
self:removeTemporaryValue("on_melee_hit", p.onhit)
- self:removeTemporaryValue("resists", p.phys)
return true
end,
info = function(self, t)
- local physicalresistance = t.getPhysicalResistance(self, t)
+ local range = -t.getDamageChange(self, t)
local damageonmeleehit = t.getDamageOnMeleeHit(self, t)
- return ([[You chant the glory of the Sun, granting you %d%% physical damage resistance.
+ return ([[You chant the glory of the Sun, reducing the damage enemies 3 or more spaces away deal by %d%%.
In addition, this talent surrounds you with a shield of light, dealing %0.2f light damage to anything that attacks you.
You may only have one Chant active at once.
- The effects will increase with your Spellpower.]]):
- format(physicalresistance, damDesc(self, DamageType.LIGHT, damageonmeleehit))
+ The damage reduction will increase with talent level and light damage will increase with your Spellpower.]]):
+ format(range, damDesc(self, DamageType.LIGHT, damageonmeleehit))
end,
}
+-- Escorts can't give this one so it should have the most significant spellpower scaling
+-- Ideally at high spellpower this would almost always be the best chant to use, but we can't guarantee that while still differentiating the chants in interesting ways
+-- People that don't want to micromanage/math out when the other chants are better will like this and it should still outperform Fortitude most of the time
newTalent{
name = "Chant of Resistance",
type = {"celestial/chants",3},
@@ -123,7 +135,7 @@ newTalent{
tactical = { BUFF = 2 },
no_energy = true,
range = 10,
- getResists = function(self, t) return self:combatTalentSpellDamage(t, 5, 20) end,
+ getResists = function(self, t) return math.min(35, self:combatTalentSpellDamage(t, 5, 30)) end,
getDamageOnMeleeHit = function(self, t) return self:combatTalentSpellDamage(t, 5, 25) end,
activate = function(self, t)
cancelChants(self)
@@ -131,12 +143,7 @@ newTalent{
game:playSoundNear(self, "talents/spell_generic2")
local ret = {
onhit = self:addTemporaryValue("on_melee_hit", {[DamageType.LIGHT]=t.getDamageOnMeleeHit(self, t)}),
- res = self:addTemporaryValue("resists", {
- [DamageType.FIRE] = power,
- [DamageType.LIGHTNING] = power,
- [DamageType.ACID] = power,
- [DamageType.COLD] = power,
- }),
+ res = self:addTemporaryValue("resists", {all = power}),
particle = self:addParticles(Particles.new("golden_shield", 1))
}
return ret
@@ -150,7 +157,7 @@ newTalent{
info = function(self, t)
local resists = t.getResists(self, t)
local damage = t.getDamageOnMeleeHit(self, t)
- return ([[You chant the glory of the Sun, granting you %d%% fire, lightning, acid and cold damage resistance.
+ return ([[You chant the glory of the Sun, granting you %d%% resistance to all damage.
In addition, this talent surrounds you with a shield of light, dealing %0.2f light damage to anything that attacks you.
You may only have one Chant active at once.
The effects will increase with your Spellpower.]]):
@@ -158,6 +165,8 @@ newTalent{
end,
}
+-- Extremely niche in the name of theme
+-- A defensive chant is realistically always a better choice than an offensive one but we can mitigate this by giving abnormally high value at low talent investment
newTalent{
name = "Chant of Light",
type = {"celestial/chants", 4},
@@ -170,7 +179,7 @@ newTalent{
dont_provide_pool = true,
tactical = { BUFF = 2 },
range = 10,
- getLightDamageIncrease = function(self, t) return self:combatTalentSpellDamage(t, 10, 50) end,
+ getLightDamageIncrease = function(self, t) return self:combatTalentSpellDamage(t, 20, 50) end,
getDamageOnMeleeHit = function(self, t) return self:combatTalentSpellDamage(t, 5, 25) end,
getLite = function(self, t) return math.floor(self:combatTalentScale(t, 2, 6, "log")) end,
activate = function(self, t)
diff --git a/game/modules/tome/data/talents/celestial/combat.lua b/game/modules/tome/data/talents/celestial/combat.lua
index 8b3331d7ad02b93eadd9f6e6c9ab4d832759c876..19765dadfd582a29c640ff6dcdb7cd7754cb5b38 100644
--- a/game/modules/tome/data/talents/celestial/combat.lua
+++ b/game/modules/tome/data/talents/celestial/combat.lua
@@ -17,6 +17,8 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
+-- This concept plays well but vs. low damage levels spam bumping can make stupidly large shields
+-- Leaving as is for now but will likely change somehow
newTalent{
name = "Weapon of Light",
type = {"celestial/combat", 1},
@@ -27,63 +29,49 @@ newTalent{
sustain_positive = 10,
tactical = { BUFF = 2 },
range = 10,
- getDamage = function(self, t) return 7 + self:combatSpellpower(0.092) * self:combatTalentScale(t, 1, 5) end,
+ getDamage = function(self, t) return 7 + self:combatSpellpower(0.092) * self:combatTalentScale(t, 1, 7) end,
+ getShieldFlat = function(self, t)
+ return t.getDamage(self, t) / 2
+ end,
activate = function(self, t)
game:playSoundNear(self, "talents/spell_generic2")
local ret = {
+ dam = self:addTemporaryValue("melee_project", {[DamageType.LIGHT]=t.getDamage(self, t)}),
}
return ret
end,
deactivate = function(self, t, p)
+ self:removeTemporaryValue("melee_project", p.dam)
return true
end,
- info = function(self, t)
- local damage = t.getDamage(self, t)
- return ([[Infuse your weapon with the power of the Sun, doing %0.2f light damage at the cost of 3 positive energy for each blow dealt.
- If you do not have enough positive energy, the sustain will have no effect.
- The damage dealt will increase with your Spellpower.]]):
- format(damDesc(self, DamageType.LIGHT, damage))
- end,
-}
+ callbackOnMeleeAttack = function(self, t, target, hitted, crit, weapon, damtype, mult, dam)
+ if hitted and self:hasEffect(self.EFF_DAMAGE_SHIELD) and (self:reactionToward(target) < 0) then
+ -- Shields can't usually merge, so change the parameters manually
+ local shield = self:hasEffect(self.EFF_DAMAGE_SHIELD)
+ local shield_power = t.getShieldFlat(self, t)
-newTalent{
- name = "Martyrdom",
- type = {"celestial/combat", 2},
- require = divi_req2,
- points = 5,
- random_ego = "attack",
- cooldown = 22,
- positive = 25,
- tactical = { DISABLE = 2 },
- range = 6,
- reflectable = true,
- requires_target = true,
- getReturnDamage = function(self, t) return self:combatLimit(self:getTalentLevel(t)^.5, 100, 15, 1, 40, 2.24) end, -- Limit <100%
- action = function(self, t)
- local tg = {type="bolt", range=self:getTalentRange(t), talent=t}
- local x, y = self:getTarget(tg)
- if not x or not y then return nil end
- local _ _, x, y = self:canProject(tg, x, y)
- game:playSoundNear(self, "talents/spell_generic")
- local target = game.level.map(x, y, Map.ACTOR)
- if target then
- target:setEffect(self.EFF_MARTYRDOM, 10, {src = self, power=t.getReturnDamage(self, t), apply_power=self:combatSpellpower()})
- else
- return
+ shield.power = shield.power + shield_power
+ self.damage_shield_absorb = self.damage_shield_absorb + shield_power
+ self.damage_shield_absorb_max = self.damage_shield_absorb_max + shield_power
+ shield.dur = math.max(2, shield.dur)
end
- return true
+
end,
info = function(self, t)
- local returndamage = t.getReturnDamage(self, t)
- return ([[Designate a target as a martyr for 10 turns. When the martyr deals damage, it also damages itself for %d%% of the damage dealt.]]):
- format(returndamage)
+ local damage = t.getDamage(self, t)
+ local shieldflat = t.getShieldFlat(self, t)
+ return ([[Infuse your weapon with the power of the Sun, adding %0.2f light damage on each melee hit.
+ Additionally, if you have a temporary damage shield active, melee attacks will increase its power by %d.
+ The damage dealt and shield bonus will increase with your Spellpower.]]):
+ format(damDesc(self, DamageType.LIGHT, damage), shieldflat)
end,
}
+-- Boring scaling, TL4 effect?
newTalent{
name = "Wave of Power",
- type = {"celestial/combat",3},
- require = divi_req3,
+ type = {"celestial/combat",2},
+ require = divi_req2,
points = 5,
random_ego = "attack",
cooldown = 6,
@@ -91,9 +79,9 @@ newTalent{
tactical = { ATTACK = 2 },
requires_target = true,
range = function(self, t) return 2 + math.max(0, self:combatStatScale("str", 0.8, 8)) end,
- getDamage = function(self, t) return self:combatTalentWeaponDamage(t, 1.1, 1.9) end,
+ getDamage = function(self, t) return self:combatTalentWeaponDamage(t, 0.9, 2.5) end,
action = function(self, t)
- local tg = {type="bolt", range=self:getTalentRange(t), talent=t}
+ local tg = {type="hit", range=self:getTalentRange(t), talent=t}
local x, y = self:getTarget(tg)
if not x or not y then return nil end
local _ _, x, y = self:canProject(tg, x, y)
@@ -113,31 +101,87 @@ newTalent{
end,
}
+-- Interesting interactions with shield timing, lots of synergy and antisynergy in general
newTalent{
- name = "Crusade",
- type = {"celestial/combat", 4},
- require = divi_req4,
- random_ego = "attack",
+ name = "Weapon of Wrath",
+ type = {"celestial/combat", 3},
+ mode = "sustained",
+ require = divi_req3,
points = 5,
cooldown = 10,
- positive = 10,
- tactical = { ATTACK = {LIGHT = 2} },
- range = 1,
- requires_target = true,
- getDamage = function(self, t) return self:combatTalentWeaponDamage(t, 0.8, 1.6) end,
- action = function(self, t)
- local tg = {type="hit", range=self:getTalentRange(t)}
- local x, y, target = self:getTarget(tg)
- if not x or not y or not target then return nil end
- if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
- self:attackTarget(target, DamageType.LIGHT, t.getDamage(self, t), true)
- self:attackTarget(target, DamageType.LIGHT, t.getDamage(self, t), true)
+ sustain_positive = 10,
+ tactical = { BUFF = 2 },
+ range = 10,
+ getMartyrDamage = function(self, t) return self:combatTalentScale(t, 5, 25) end,
+ getLifeDamage = function(self, t) return self:combatTalentScale(t, 0.1, 0.8) end,
+ activate = function(self, t)
+ game:playSoundNear(self, "talents/spell_generic2")
+ -- Is this any better than having the callback call getLifeDamage? I figure its better to calculate it once
+ local ret = {
+ martyr = self:addTemporaryValue("weapon_of_wrath_martyr", t.getMartyrDamage(self, t)),
+ damage = self:addTemporaryValue("weapon_of_wrath_life", t.getLifeDamage(self, t)),
+ }
+ return ret
+ end,
+ deactivate = function(self, t, p)
+ self:removeTemporaryValue("weapon_of_wrath_martyr", p.martyr)
+ self:removeTemporaryValue("weapon_of_wrath_life", p.damage)
return true
end,
+ callbackOnMeleeAttack = function(self, t, target, hitted, crit, weapon, damtype, mult, dam)
+ if hitted and self:attr("weapon_of_wrath_martyr") and not self.turn_procs.weapon_of_wrath and not target.dead then
+ target:setEffect(target.EFF_MARTYRDOM, 4, {power = self:attr("weapon_of_wrath_martyr")})
+
+ local damage = self:attr("weapon_of_wrath_life") * (self.max_life - math.max(0, self.life)) -- avoid problems with die_at
+ if damage == 0 then return end
+ damage = math.min(300, damage) -- No need to try to scale this in a clever way, NPC HP is too variant
+
+ local tg = {type="hit", range=10, selffire=true, talent=t}
+ self:project(tg, target.x, target.y, DamageType.FIRE, damage)
+
+ self.turn_procs.weapon_of_wrath = true
+ end
+ end,
info = function(self, t)
- local damage = t.getDamage(self, t)
- return ([[Concentrate the power of the Sun into two blows; each blow does %d%% of your weapon damage as light damage.]]):
- format(100 * damage)
+ local martyr = t.getMartyrDamage(self, t)
+ local damagepct = t.getLifeDamage(self, t)
+ local damage = damagepct * (self.max_life - math.max(0, self.life))
+ return ([[Your weapon attacks burn with righteous fury dealing %d%% of your lost HP (Current: %d) fire damage up to 300 damage and causing your target to take %d%% of the damage they deal.]]):
+ format(damagepct*100, damage, martyr)
+ end,
+}
+
+-- Core class defense to be compared with Bone Shield, Aegis, Indiscernable Anatomy, etc
+-- !H/Shield could conceivably reactivate this in the same fight with Crusade spam if it triggers with Suncloak up, 2H never will without running
+newTalent{
+ name = "Second Life",
+ type = {"celestial/combat", 4},
+ require = divi_req4, no_sustain_autoreset = true,
+ points = 5,
+ mode = "sustained",
+ sustain_positive = 30,
+ cooldown = 30,
+ tactical = { DEFEND = 2 },
+ getLife = function(self, t) return self.max_life * self:combatTalentLimit(t, 1.5, 0.09, 0.4) end, -- Limit < 150% max life (to survive a large string of hits between turns)
+ activate = function(self, t)
+ game:playSoundNear(self, "talents/heal")
+ local ret = {}
+ if core.shader.active(4) then
+ ret.particle = self:addParticles(Particles.new("shader_ring_rotating", 1, {toback=true, a=0.6, rotation=0, radius=2, img="flamesgeneric"}, {type="sunaura", time_factor=6000}))
+ else
+ ret.particle = self:addParticles(Particles.new("golden_shield", 1))
+ end
+ return ret
+ end,
+ deactivate = function(self, t, p)
+ self:removeParticles(p.particle)
+ return true
+ end,
+ info = function(self, t)
+ return ([[Any attack that would drop you below 1 hit point instead triggers Second Life, deactivating the talent, setting your hit points to 1, then healing you for %d.]]):
+ format(t.getLife(self, t))
end,
}
+
+
diff --git a/game/modules/tome/data/talents/celestial/crusader.lua b/game/modules/tome/data/talents/celestial/crusader.lua
index b67d5612fd890ff93d15f05aef3d96d33800abb3..5cc1c8f42adbd94d1653c044f92ea87db7d0da85 100644
--- a/game/modules/tome/data/talents/celestial/crusader.lua
+++ b/game/modules/tome/data/talents/celestial/crusader.lua
@@ -17,6 +17,11 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
+-- NOTE: 2H may seem to have more defense than 1H/Shield at a glance but this isn't true
+-- Mechanically, 2H gets bigger numbers on its defenses because they're all active, they don't do anything when you get hit at range 10 before you've taken an action unlike Retribution/Shield of Light
+-- Thematically, 2H feels less defensive for the same reason--when you get hit it hurts, but you're encouraged to be up in their face fighting
+
+-- Part of 2H core defense to be compared with Shield of Light, Retribution, etc
newTalent{
name = "Absorption Strike",
type = {"celestial/crusader", 1},
@@ -27,7 +32,8 @@ newTalent{
tactical = { ATTACK = 2, DISABLE = 1 },
range = 1,
requires_target = true,
- getWeakness = function(self, t) return self:combatTalentScale(t, 20, 45, 0.75) end,
+ getWeakness = function(self, t) return self:combatTalentScale(t, 5, 20, 0.75) end,
+ getNumb = function(self, t) return math.min(30, self:combatTalentScale(t, 1, 15, 0.75)) end,
getDamage = function(self, t) return self:combatTalentWeaponDamage(t, 1.1, 2.3) end,
on_pre_use = function(self, t, silent) if not self:hasTwoHandedWeapon() then if not silent then game.logPlayer(self, "You require a two handed weapon to use this talent.") end return false end return true end,
action = function(self, t)
@@ -37,10 +43,12 @@ newTalent{
if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
local hit = self:attackTarget(target, nil, t.getDamage(self, t), true)
if hit then
+
self:project({type="ball", radius=2, selffire=false}, self.x, self.y, function(px, py)
local a = game.level.map(px, py, Map.ACTOR)
if a then
- a:setEffect(a.EFF_ABSORPTION_STRIKE, 5, {apply_power=self:combatSpellpower(), power=t.getWeakness(self, t)})
+ -- No power check, this is essentially a defensive talent in debuff form. Instead of taking less damage passively 2H has to stay active, but we still want the consistency of a sustain/passive
+ a:setEffect(a.EFF_ABSORPTION_STRIKE, 5, {power=t.getWeakness(self, t), numb = t.getNumb(self, t)})
end
end)
end
@@ -49,11 +57,12 @@ newTalent{
info = function(self, t)
local damage = t.getDamage(self, t)
return ([[You strike your foe with your two handed weapon, dealing %d%% weapon damage.
- If the attack hits all foes in radius 2 will have their light resistance reduced by %d%% for 5 turns.]]):
- format(100 * damage, t.getWeakness(self, t))
+ If the attack hits all foes in radius 2 will have their light resistance reduced by %d%% and their damage reduced by %d%% for 5 turns.]]):
+ format(100 * damage, t.getWeakness(self, t), t.getNumb(self, t))
end,
}
+-- Part of 2H core defense to be compared with Shield of Light, Retribution, etc
newTalent{
name = "Mark of Light",
type = {"celestial/crusader", 2},
@@ -65,7 +74,7 @@ newTalent{
tactical = { ATTACK=0.5, DISABLE=2, HEAL=2 },
range = 1,
requires_target = true,
- getPower = function(self, t) return self:combatTalentScale(t, 30, 70) end,
+ getPower = function(self, t) return self:combatTalentScale(t, 10, 50) end,
getDamage = function(self, t) return self:combatTalentWeaponDamage(t, 0.2, 0.7) end,
on_pre_use = function(self, t, silent) if not self:hasTwoHandedWeapon() then if not silent then game.logPlayer(self, "You require a two handed weapon to use this talent.") end return false end return true end,
action = function(self, t)
@@ -96,8 +105,9 @@ newTalent{
getArmor = function(self, t) return self:combatTalentScale(t, 5, 30) end,
getDamage = function(self, t) return self:combatTalentSpellDamage(t, 10, 120) end,
getCrit = function(self, t) return self:combatTalentScale(t, 3, 10, 0.75) end,
- getPower = function(self, t) return self:combatTalentScale(t, 5, 20) end,
+ getPower = function(self, t) return self:combatTalentScale(t, 5, 15) end,
callbackOnCrit = function(self, t, kind, dam, chance, target)
+ if not self:hasTwoHandedWeapon() then return end
if kind ~= "physical" or not target then return end
if self.turn_procs.righteous_strength then return end
self.turn_procs.righteous_strength = true
@@ -116,13 +126,15 @@ newTalent{
end,
}
+-- Low damage, 2H Assault has plenty of AoE damage strikes, this one is fundamentally defensive or strong only if Light is scaled up
+-- Part of 2H core defense to be compared with Shield of Light, Retribution, etc
newTalent{
name = "Flash of the Blade",
type = {"celestial/crusader", 4},
require = divi_req4,
random_ego = "attack",
points = 5,
- cooldown = 10,
+ cooldown = 9,
positive = 15,
tactical = { ATTACKAREA = {LIGHT = 2} },
range = 0,
@@ -132,8 +144,8 @@ newTalent{
return {type="ball", range=self:getTalentRange(t), selffire=false, radius=self:getTalentRadius(t)}
end,
on_pre_use = function(self, t, silent) if not self:hasTwoHandedWeapon() then if not silent then game.logPlayer(self, "You require a two handed weapon to use this talent.") end return false end return true end,
- get1Damage = function(self, t) return self:combatTalentWeaponDamage(t, 0.8, 1.6) end,
- get2Damage = function(self, t) return self:combatTalentWeaponDamage(t, 0.5, 1.2) end,
+ get1Damage = function(self, t) return self:combatTalentWeaponDamage(t, 0.5, 1.3) end,
+ get2Damage = function(self, t) return self:combatTalentWeaponDamage(t, 0.3, 1.5) end,
action = function(self, t)
local tg1 = self:getTalentTarget(t) tg1.radius = 1
local tg2 = self:getTalentTarget(t)
@@ -143,16 +155,18 @@ newTalent{
self:attackTarget(target, nil, t.get1Damage(self, t), true)
end
end)
+
self:project(tg2, self.x, self.y, function(px, py, tg, self)
local target = game.level.map(px, py, Map.ACTOR)
if target and target ~= self then
self:attackTarget(target, DamageType.LIGHT, t.get2Damage(self, t), true)
- if self:getTalentLevel(t) >= 4 then
- target:setEffect(target.EFF_DAZED, 3, {apply_power=self:combatSpellpower()})
- end
end
end)
+ if self:getTalentLevel(t) >= 4 then
+ self:setEffect(self.EFF_FLASH_SHIELD, 1, {})
+ end
+
self:addParticles(Particles.new("meleestorm", 2, {radius=2, img="spinningwinds_yellow"}))
self:addParticles(Particles.new("meleestorm", 1, {img="spinningwinds_yellow"}))
return true
@@ -161,7 +175,7 @@ newTalent{
return ([[Infuse your two handed weapon with light while spinning around.
All creatures in radius one take %d%% weapon damage.
In addition while spinning your weapon shines so much it deals %d%% light weapon damage to all foes in radius 2.
- At level 4 creatures may also be dazed by the light.]]):
+ At level 4 your mystical, manly display of spinning around creates a manly shield that blocks all damage for 1 turn.]]):
format(t.get1Damage(self, t) * 100, t.get2Damage(self, t) * 100)
end,
}
diff --git a/game/modules/tome/data/talents/celestial/guardian.lua b/game/modules/tome/data/talents/celestial/guardian.lua
index cc83d9702d84fd9460168b6a95089b7085d38513..d3d93874332986fc1b16dc81155b92e4e0730613 100644
--- a/game/modules/tome/data/talents/celestial/guardian.lua
+++ b/game/modules/tome/data/talents/celestial/guardian.lua
@@ -17,6 +17,10 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
+-- Core offensive scaler for 1H/S as we have no Shield Mastery
+-- Core defense roughly to be compared with Absorption Strike, but in truth 1H/S gets a lot of its defense from cooldown management+Suncloak/etc
+-- Its important that this can crit but its also spamming the combat log, unsure of solution
+-- Flag if its a crit once for each turn then calculate damage manually?
newTalent{
name = "Shield of Light",
type = {"celestial/guardian", 1},
@@ -27,7 +31,8 @@ newTalent{
sustain_positive = 10,
tactical = { BUFF = 2 },
range = 10,
- getHeal = function(self, t) return self:combatTalentSpellDamage(t, 5, 25) end,
+ getHeal = function(self, t) return self:combatTalentSpellDamage(t, 5, 18) end,
+ getShieldDamage = function(self, t) return self:combatTalentWeaponDamage(t, 0.1, 0.8, self:getTalentLevel(self.T_SHIELD_EXPERTISE)) end,
activate = function(self, t)
local shield = self:hasShield()
if not shield then
@@ -43,26 +48,35 @@ newTalent{
deactivate = function(self, t, p)
return true
end,
+ callbackOnMeleeAttack = function(self, t, target, hitted, crit, weapon, damtype, mult, dam)
+ if hitted and not target.dead and weapon and not self.turn_procs.shield_of_light then
+ self:attackTargetWith(target, weapon.special_combat, DamageType.LIGHT, t.getShieldDamage(self, t))
+ self.turn_procs.shield_of_light = true
+ end
+ end,
info = function(self, t)
local heal = t.getHeal(self, t)
return ([[Infuse your shield with light, healing you for %0.2f each time you take damage at the expense of up to 2 positive energy.
If you do not have any positive energy, the effect will not trigger.
+ Additionally, once per turn successful melee attacks will trigger a bonus attack with your shield dealing %d%% light damage.
The healing done will increase with your Spellpower.]]):
- format(heal)
+ format(heal, t.getShieldDamage(self, t)*100)
end,
}
+-- Shield of Light means 1H/Shield builds actually care about positive energy, so we can give this a meaningful cost and power
+-- Spamming Crusade+whatever is always more energy efficient than this
newTalent{
name = "Brandish",
type = {"celestial/guardian", 2},
require = divi_req_high2,
points = 5,
cooldown = 8,
- positive = 15,
+ positive = 25,
tactical = { ATTACK = {LIGHT = 2} },
requires_target = true,
- getWeaponDamage = function(self, t) return self:combatTalentWeaponDamage(t, 1, 1.5) end,
- getShieldDamage = function(self, t) return self:combatTalentWeaponDamage(t, 1, 1.5, self:getTalentLevel(self.T_SHIELD_EXPERTISE)) end,
+ getWeaponDamage = function(self, t) return self:combatTalentWeaponDamage(t, 1, 3) end,
+ getShieldDamage = function(self, t) return self:combatTalentWeaponDamage(t, 1, 2, self:getTalentLevel(self.T_SHIELD_EXPERTISE)) end,
getLightDamage = function(self, t) return self:combatTalentSpellDamage(t, 20, 200) end,
radius = function(self, t) return math.floor(self:combatTalentScale(t, 2.5, 4.5)) end,
action = function(self, t)
@@ -87,7 +101,7 @@ newTalent{
local tg = {type="ball", range=1, selffire=true, radius=self:getTalentRadius(t), talent=t}
self:project(tg, x, y, DamageType.LITE, 1)
tg.selffire = false
- local grids = self:project(tg, x, y, DamageType.LIGHT, t.getLightDamage(self, t))
+ local grids = self:project(tg, x, y, DamageType.LIGHT, self:spellCrit(t.getLightDamage(self, t)))
game.level.map:particleEmitter(x, y, tg.radius, "sunburst", {radius=tg.radius, grids=grids, tx=x, ty=y, max_alpha=80})
game:playSoundNear(self, "talents/flame")
end
@@ -136,41 +150,70 @@ newTalent{
self.retribution_strike = nil
return true
end,
+ callbackOnRest = function(self, t)
+ -- Resting requires no enemies in view so we can safely clear all stored damage
+ self.retribution_absorb = 0
+ self.retribution_strike = 0
+ end,
info = function(self, t)
local damage = t.getDamage(self, t)
+ local absorb_string = ""
+ if self.retribution_absorb and self.retribution_strike then
+ absorb_string = ([[#RED#Absorb Remaining: %d]]):format(self.retribution_absorb)
+ end
+
return ([[Retribution negates half of all damage you take while it is active. Once Retribution has negated %0.2f damage, your shield will explode in a burst of light, inflicting damage equal to the amount negated in a radius of %d and deactivating the talent.
- The amount absorbed will increase with your Spellpower.]]):
- format(damage, self:getTalentRange(t))
+ The amount absorbed will increase with your Spellpower.
+ %s]]):
+ format(damage, self:getTalentRange(t), absorb_string)
end,
}
+-- Moderate damage but very short CD
+-- Spamming this on cooldown keeps positive energy up and gives a lot of cooldown management
newTalent{
- name = "Second Life",
+ name = "Crusade",
type = {"celestial/guardian", 4},
- require = divi_req_high4, no_sustain_autoreset = true,
+ require = divi_req_high4,
+ random_ego = "attack",
points = 5,
- mode = "sustained",
- sustain_positive = 60,
- cooldown = 50,
- tactical = { DEFEND = 2 },
- getLife = function(self, t) return self.max_life * self:combatTalentLimit(t, 1.5, 0.09, 0.25) end, -- Limit < 150% max life (to survive a large string of hits between turns)
- activate = function(self, t)
- game:playSoundNear(self, "talents/heal")
- local ret = {}
- if core.shader.active(4) then
- ret.particle = self:addParticles(Particles.new("shader_ring_rotating", 1, {toback=true, a=0.6, rotation=0, radius=2, img="flamesgeneric"}, {type="sunaura", time_factor=6000}))
- else
- ret.particle = self:addParticles(Particles.new("golden_shield", 1))
+ cooldown = 5,
+ positive = -20,
+ tactical = { ATTACK = {LIGHT = 2} },
+ range = 1,
+ requires_target = true,
+ getWeaponDamage = function(self, t) return self:combatTalentWeaponDamage(t, 0.3, 1.2) end,
+ getShieldDamage = function(self, t) return self:combatTalentWeaponDamage(t, 0.3, 1.2, self:getTalentLevel(self.T_SHIELD_EXPERTISE)) end,
+ getCooldownReduction = function(self, t) return math.ceil(self:combatTalentScale(t, 1, 3)) end,
+ getDebuff = function(self, t) return 1 end,
+ action = function(self, t)
+ local shield = self:hasShield()
+ if not shield then
+ game.logPlayer(self, "You cannot use Crusade without a shield!")
+ return nil
end
- return ret
- end,
- deactivate = function(self, t, p)
- self:removeParticles(p.particle)
+ local tg = {type="hit", range=self:getTalentRange(t)}
+ local x, y, target = self:getTarget(tg)
+ if not x or not y or not target then return nil end
+ if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
+
+ local hit = self:attackTarget(target, DamageType.LIGHT, t.getWeaponDamage(self, t), true)
+ if hit then self:talentCooldownFilter(nil, 1, t.getCooldownReduction(self, t), true) end
+
+ local hit2 = self:attackTargetWith(target, shield.special_combat, DamageType.LIGHT, t.getShieldDamage(self, t))
+ if hit2 then self:removeEffectsFilter({status = "detrimental"}, t.getDebuff(self, t)) end
+
return true
end,
info = function(self, t)
- return ([[Any attack that would drop you below 1 hit point instead triggers Second Life, deactivating the talent and setting your hit points to %d.]]):
- format(t.getLife(self, t))
+ local weapon = t.getWeaponDamage(self, t)*100
+ local shield = t.getShieldDamage(self, t)*100
+ local cooldown = t.getCooldownReduction(self, t)
+ local cleanse = t.getDebuff(self, t)
+ return ([[You demonstrate your dedication to the light with a measured attack striking once with your weapon for %d%% damage and once with your shield for %d%% damage.
+ If the first strike connects %d random talent cooldowns are reduced by 1.
+ If the second strike connects you are cleansed of %d debuffs.]]):
+ format(weapon, shield, cooldown, cleanse)
end,
}
diff --git a/game/modules/tome/data/talents/celestial/light.lua b/game/modules/tome/data/talents/celestial/light.lua
index 7cd8501b0eb1dcf2f6f31185e469a841e7a61bd3..e37714927b2d8d51d412f4ca873e5a39ce2df5ff 100644
--- a/game/modules/tome/data/talents/celestial/light.lua
+++ b/game/modules/tome/data/talents/celestial/light.lua
@@ -53,23 +53,23 @@ newTalent{
require = spells_req2,
random_ego = "defensive",
points = 5,
- cooldown = 10,
+ cooldown = 15,
positive = -20,
tactical = { HEAL = 3 },
range = 0,
- radius = 3,
+ radius = 2,
target = function(self, t)
return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t)}
end,
- getHeal = function(self, t) return self:combatTalentSpellDamage(t, 4, 40) end,
- getDuration = function(self, t) return math.floor(self:combatTalentScale(t, 3, 7)) end,
+ getHeal = function(self, t) return self:combatTalentSpellDamage(t, 4, 80) end,
+ getDuration = function(self, t) return math.floor(self:combatTalentScale(t, 4, 7)) end,
action = function(self, t)
local tg = self:getTalentTarget(t)
self:project(tg, self.x, self.y, DamageType.LITE, 1)
-- Add a lasting map effect
game.level.map:addEffect(self,
self.x, self.y, t.getDuration(self, t),
- DamageType.HEALING_POWER, t.getHeal(self, t),
+ DamageType.HEALING_POWER, self:spellCrit(t.getHeal(self, t)),
self:getTalentRadius(t),
5, nil,
{type="healing_vapour"},
@@ -85,7 +85,7 @@ newTalent{
return ([[A magical zone of Sunlight appears around you, healing and shielding all within radius %d for %0.2f per turn and increasing healing effects on everyone within by %d%%. The effect lasts for %d turns.
It also lights up the affected zone.
The amount healed will increase with the Magic stat]]):
- format(radius, heal, heal, duration)
+ format(radius, heal, heal / 2, duration)
end,
}
@@ -98,9 +98,9 @@ newTalent{
positive = -20,
cooldown = 15,
tactical = { DEFEND = 2 },
- getAbsorb = function(self, t) return self:combatTalentSpellDamage(t, 30, 470) end,
+ getAbsorb = function(self, t) return self:combatTalentSpellDamage(t, 30, 370) end,
action = function(self, t)
- self:setEffect(self.EFF_DAMAGE_SHIELD, 10, {color={0xe1/255, 0xcb/255, 0x3f/255}, power=t.getAbsorb(self, t)})
+ self:setEffect(self.EFF_DAMAGE_SHIELD, 10, {color={0xe1/255, 0xcb/255, 0x3f/255}, power=self:spellCrit(t.getAbsorb(self, t))})
game:playSoundNear(self, "talents/heal")
return true
end,
diff --git a/game/modules/tome/data/talents/celestial/radiance.lua b/game/modules/tome/data/talents/celestial/radiance.lua
index 8e3937330a2ae4206b565980bd12bca5879ad080..c4507d6a88399ab4d2d5b9ca44e1be46317ddee5 100644
--- a/game/modules/tome/data/talents/celestial/radiance.lua
+++ b/game/modules/tome/data/talents/celestial/radiance.lua
@@ -18,7 +18,11 @@
-- darkgod@te4.org
function radianceRadius(self)
- return self:getTalentRadius(self:getTalentFromId(self.T_RADIANCE))
+ if self:hasEffect(self.EFF_RADIANCE_DIM) then
+ return 1
+ else
+ return self:getTalentRadius(self:getTalentFromId(self.T_RADIANCE))
+ end
end
newTalent{
@@ -59,15 +63,11 @@ newTalent{
local ss = self:isTalentActive(self.T_SEARING_SIGHT)
if ss then
local dist = core.fov.distance(self.x, self.y, target.x, target.y) - 1
- local coeff = math.scale(radius - dist, 1, radius, 0.1, 1)
- local realdam = DamageType:get(DamageType.LIGHT).projector(self, target.x, target.y, DamageType.LIGHT, ss.dam * coeff)
+ local coeff = math.max(0.1, 1 - (0.1*dist)) -- 10% less damage per distance
+ DamageType:get(DamageType.LIGHT).projector(self, target.x, target.y, DamageType.LIGHT, ss.dam * coeff)
if ss.daze and rng.percent(ss.daze) and target:canBe("stun") then
target:setEffect(target.EFF_DAZED, 3, {apply_power=self:combatSpellpower()})
end
-
- if realdam and realdam > 0 and self:hasEffect(self.EFF_LIGHT_BURST) then
- self:setEffect(self.EFF_LIGHT_BURST_SPEED, 4, {})
- end
end
end
end end end
@@ -81,6 +81,8 @@ newTalent{
end,
}
+-- This doesn't work well in practice.. Its powerful but it leads to cheesy gameplay, spams combat logs, maybe even lags
+-- It can stay like this for now but may be worth making better
newTalent{
name = "Searing Sight",
type = {"celestial/radiance",3},
@@ -90,8 +92,8 @@ newTalent{
cooldown = 15,
range = function(self) return radianceRadius(self) end,
tactical = { ATTACKAREA = {LIGHT=1} },
- sustain_positive = 40,
- getDamage = function(self, t) return self:combatTalentSpellDamage(t, 1, 90) end,
+ sustain_positive = 10,
+ getDamage = function(self, t) return self:combatTalentSpellDamage(t, 1, 50) end,
getDaze = function(self, t) return self:combatTalentLimit(t, 35, 5, 20) end,
activate = function(self, t)
local daze = nil
@@ -115,28 +117,54 @@ newTalent{
require = divi_req4,
points = 5,
cooldown = 25,
- positive = 15,
- tactical = { DISABLE = {blind=1} },
+ positive = 20,
+ tactical = { ATTACKAREA = {LIGHT = 2} },
+ radius = function(self) return radianceRadius(self) end,
range = function(self) return radianceRadius(self) end,
- requires_target = true,
- getDur = function(self, t) return self:combatTalentLimit(t, 9, 2, 6) end,
- getMax = function(self, t) return math.floor(self:combatTalentScale(t, 2, 8)) end,
+ getMoveDamage = function(self, t) return self:combatTalentSpellDamage(t, 1, 40) end,
+ getExplosionDamage = function(self, t) return self:combatTalentSpellDamage(t, 20, 150) end,
action = function(self, t)
- local radius = radianceRadius(self)
- local grids = core.fov.circle_grids(self.x, self.y, radius, true)
- for x, yy in pairs(grids) do for y, _ in pairs(grids[x]) do local target = game.level.map(x, y, Map.ACTOR) if target and self ~= target then
- if target:canBe("blind") then
- target:setEffect(target.EFF_BLINDED, 4, {apply_power=self:combatSpellpower()})
- end
- end end end
- self:setEffect(self.EFF_LIGHT_BURST, t.getDur(self, t), {max=t.getMax(self, t)})
+ local tg = {type="ball", range=self:getTalentRange(t), radius = self:getTalentRadius(t), selffire = false, talent=t}
+
+ local movedam = self:spellCrit(t.getMoveDamage(self, t))
+ local dam = self:spellCrit(t.getExplosionDamage(self, t))
+
+ self:project(tg, self.x, self.y, function(tx, ty)
+ local target = game.level.map(tx, ty, engine.Map.ACTOR)
+ if not target then return end
+
+ local proj = require("mod.class.Projectile"):makeHoming(
+ self,
+ {particle="bolt_light", trail="lighttrail"},
+ {speed=1, name="Judgement", dam=dam, movedam=movedam},
+ target,
+ self:getTalentRange(t),
+ function(self, src)
+ local DT = require("engine.DamageType")
+ DT:get(DT.JUDGEMENT).projector(src, self.x, self.y, DT.JUDGEMENT, self.def.movedam)
+ end,
+ function(self, src, target)
+ local DT = require("engine.DamageType")
+ local grids = src:project({type="ball", radius=1, x=self.x, y=self.y}, self.x, self.y, DT.JUDGEMENT, self.def.dam)
+
+
+ game.level.map:particleEmitter(self.x, self.y, 1, "sunburst", {radius=1, grids=grids, tx=self.x, ty=self.y})
+
+ game:playSoundNear(self, "talents/lightning")
+ end
+ )
+ game.zone:addEntity(game.level, proj, "projectile", self.x, self.y)
+ end)
+
+ -- EFF_RADIANCE_DIM does nothing by itself its just used by radianceRadius
+ self:setEffect(self.EFF_RADIANCE_DIM, 8, {})
+
return true
end,
info = function(self, t)
- return ([[Concentrate your Radiance in a blinding flash of light. All foes caught inside will be blinded for 3 turns.
- In addition for %d turns each time your Searing Sight damages a foe you gain a movement bonus of 10%%, stacking up to %d times.]]):
- format(t.getDur(self, t), t.getMax(self, t))
+ return ([[Fire a glowing orb of light at each enemy within your Radiance. Each orb will slowly follow its target until it connects dealing %d light damage to anything else it contacts along the way. When the target is reached the orb will explode dealing %d light damage and healing you for 50%% of the damage dealt. This powerful ability will dim your Radiance reducing its radius to 1 for 5 turns.]]):
+ format(t.getMoveDamage(self, t), t.getExplosionDamage(self, t))
end,
}
diff --git a/game/modules/tome/data/talents/celestial/sun.lua b/game/modules/tome/data/talents/celestial/sun.lua
index ec9584b5a9458d831d42a68df9b3b2b1cc9e9cf1..7ab7d02c3656bfdc2d8afc5aae1fa9a33deff1d9 100644
--- a/game/modules/tome/data/talents/celestial/sun.lua
+++ b/game/modules/tome/data/talents/celestial/sun.lua
@@ -17,13 +17,14 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
+-- Baseline blind because the class has a lot of trouble with CC early game and rushing TL4 isn't reasonable
newTalent{
name = "Sun Beam",
type = {"celestial/sun", 1},
require = divi_req1,
random_ego = "attack",
points = 5,
- cooldown = 6,
+ cooldown = 9,
positive = -16,
range = 7,
tactical = { ATTACK = {LIGHT = 2} },
@@ -34,18 +35,21 @@ newTalent{
getDamage = function(self, t)
local mult = 1
if self:attr("amplify_sun_beam") then mult = 1 + self:attr("amplify_sun_beam") / 100 end
- return self:combatTalentSpellDamage(t, 6, 220) * mult
+ return self:combatTalentSpellDamage(t, 20, 240) * mult
end,
getDuration = function(self, t) return math.floor(self:combatTalentScale(t, 2, 4)) end,
action = function(self, t)
- local tg = {type="bolt", range=self:getTalentRange(t), talent=t}
+ local tg = {type="hit", range=self:getTalentRange(t), talent=t}
local x, y = self:getTarget(tg)
if not x or not y then return nil end
self:project(tg, x, y, DamageType.LIGHT, self:spellCrit(t.getDamage(self, t)), {type="light"})
if self:getTalentLevel(t) >= 4 then
local _ _, x, y = self:canProject(tg, x, y)
- self:project({type="ball", x=x, y=y, radius=1, selffire=false}, x, y, DamageType.BLIND, t.getDuration(self, t), {type="light"})
+ self:project({type="ball", x=x, y=y, radius=2, selffire=false}, x, y, DamageType.BLIND, t.getDuration(self, t), {type="light"})
+ else
+ local _ _, x, y = self:canProject(tg, x, y)
+ self:project({type="hit", x=x, y=y, radius=0, selffire=false}, x, y, DamageType.BLIND, t.getDuration(self, t), {type="light"})
end
-- Delay removal of the effect so its still there when no_energy checks
@@ -58,39 +62,43 @@ newTalent{
end,
info = function(self, t)
local damage = t.getDamage(self, t)
- return ([[Calls the a beam of light from the Sun, doing %0.2f damage to the target.
- At level 4 the beam will be so intense it blinds all foes in radius 1 for %d turns.
+ return ([[Calls the a beam of light from the Sun, doing %0.2f damage to the target and blinding them.
+ At level 4 the beam will be so intense it blinds all foes in radius 2 for %d turns.
The damage dealt will increase with your Spellpower.]]):
format(damDesc(self, DamageType.LIGHT, damage), t.getDuration(self, t))
end,
}
+-- Core class defense to be compared with Bone Shield, Aegis, Indiscernable Anatomy, etc
+-- Moderate offensive scaler
+-- The CD reduction effects more abilities on the class than it doesn't
newTalent{
name = "Suncloak",
type = {"celestial/sun", 2},
require = divi_req2,
points = 5,
- cooldown = 15,
+ cooldown = 20, -- CD reduction works on this
positive = -15,
tactical = { BUFF = 2 },
direct_hit = true,
requires_target = true,
range = 10,
- getResists = function(self, t) return 10 + self:combatTalentSpellDamage(t, 4, 150) / 10 end,
- getDuration = function(self, t) return 20 + self:combatTalentSpellDamage(t, 4, 400) / 10 end,
+ getCap = function(self, t) return math.max(50, 100 - self:getTalentLevelRaw(t) * 10) end,
+ getHaste = function(self, t) return math.min(1, self:combatTalentSpellDamage(t, 0.2, 0.8)) end,
action = function(self, t)
- self:setEffect(self.EFF_SUNCLOAK, 5, {reduce=t.getDuration(self, t), resists=t.getResists(self, t)})
+ self:setEffect(self.EFF_SUNCLOAK, 6, {cap=t.getCap(self, t), haste=t.getHaste(self, t)})
game:playSoundNear(self, "talents/flame")
return true
end,
info = function(self, t)
- return ([[You wrap yourself in a cloak of sunlight for 5 turns.
- While the cloak is active all new detrimental temporary effects have their duration reduced by %d%% and all your resistances are increased by %d%%.
+ return ([[You wrap yourself in a cloak of sunlight that empowers your magic and protects you for 6 turns.
+ While the cloak is active your spell casting speed is increased by %d%%, your spell cooldowns are reduced by %d%%, and you cannot take more than %d%% of your maximum life from a single blow.
The effects will increase with your Spellpower.]]):
- format(t.getDuration(self, t), t.getResists(self, t))
+ format(t.getHaste(self, t)*100, t.getHaste(self, t)*100, t.getCap(self, t))
end,
}
+-- Can someone put a really obvious visual on this?
newTalent{
name = "Sun's Vengeance", short_name = "SUN_VENGEANCE",
type = {"celestial/sun",3},
diff --git a/game/modules/tome/data/talents/gifts/storm-drake.lua b/game/modules/tome/data/talents/gifts/storm-drake.lua
index 48c1e8d257e3c285324d0a11a28e386f0335cffc..5940fe40937e28933b1e4a81c515224cc205459b 100644
--- a/game/modules/tome/data/talents/gifts/storm-drake.lua
+++ b/game/modules/tome/data/talents/gifts/storm-drake.lua
@@ -29,6 +29,7 @@ newTalent{
range = 10,
tactical = { CLOSEIN = 2, ESCAPE = 2 },
requires_target = true,
+ no_energy = true,
getSpeed = function(self, t) return self:combatTalentScale(t, 470, 750, 0.75) end,
getDuration = function(self, t) return math.ceil(self:combatTalentScale(t, 1.1, 2.6)) end,
on_learn = function(self, t) self.resists[DamageType.LIGHTNING] = (self.resists[DamageType.LIGHTNING] or 0) + 1 end,
diff --git a/game/modules/tome/data/talents/misc/npcs.lua b/game/modules/tome/data/talents/misc/npcs.lua
index 370521a0fa935f97ebacacc6eb5bfe3168412f89..41ea8c596cb041a41ad0c8c530349ced9fa3f244 100644
--- a/game/modules/tome/data/talents/misc/npcs.lua
+++ b/game/modules/tome/data/talents/misc/npcs.lua
@@ -2245,4 +2245,84 @@ newTalent{
return ([[Each time one of your foes bites the dust, you feel a surge of power, increasing your strength by 2 up to a maximum of %d for %d turns.]]):
format(math.floor(self:getTalentLevel(t) * 6), t.getDuration(self, t))
end,
+}
+
+newTalent{
+ name = "Martyrdom",
+ type = {"spell/other", 1},
+ points = 5,
+ random_ego = "attack",
+ cooldown = 22,
+ positive = 25,
+ tactical = { DISABLE = 2 },
+ range = 6,
+ reflectable = true,
+ requires_target = true,
+ getReturnDamage = function(self, t) return self:combatLimit(self:getTalentLevel(t)^.5, 100, 15, 1, 40, 2.24) end, -- Limit <100%
+ action = function(self, t)
+ local tg = {type="bolt", range=self:getTalentRange(t), talent=t}
+ local x, y = self:getTarget(tg)
+ if not x or not y then return nil end
+ local _ _, x, y = self:canProject(tg, x, y)
+ game:playSoundNear(self, "talents/spell_generic")
+ local target = game.level.map(x, y, Map.ACTOR)
+ if target then
+ target:setEffect(self.EFF_MARTYRDOM, 10, {src = self, power=t.getReturnDamage(self, t), apply_power=self:combatSpellpower()})
+ else
+ return
+ end
+ return true
+ end,
+ info = function(self, t)
+ local returndamage = t.getReturnDamage(self, t)
+ return ([[Designate a target as a martyr for 10 turns. When the martyr deals damage, it also damages itself for %d%% of the damage dealt.]]):
+ format(returndamage)
+ end,
+}
+
+newTalent{
+ name = "Overpower",
+ type = {"technique/other", 1},
+ points = 5,
+ random_ego = "attack",
+ cooldown = 8,
+ stamina = 22,
+ requires_target = true,
+ tactical = { ATTACK = 2, ESCAPE = { knockback = 1 }, DISABLE = { knockback = 1 } },
+ on_pre_use = function(self, t, silent) if not self:hasShield() then if not silent then game.logPlayer(self, "You require a weapon and a shield to use this talent.") end return false end return true end,
+ action = function(self, t)
+ local shield = self:hasShield()
+ if not shield then
+ game.logPlayer(self, "You cannot use Overpower without a shield!")
+ return nil
+ end
+
+ local tg = {type="hit", range=self:getTalentRange(t)}
+ local x, y, target = self:getTarget(tg)
+ if not x or not y or not target then return nil end
+ if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
+
+ -- First attack with weapon
+ self:attackTarget(target, nil, self:combatTalentWeaponDamage(t, 0.8, 1.3), true)
+ -- Second attack with shield
+ self:attackTargetWith(target, shield.special_combat, nil, self:combatTalentWeaponDamage(t, 0.8, 1.3, self:getTalentLevel(self.T_SHIELD_EXPERTISE)))
+ -- Third attack with shield
+ local speed, hit = self:attackTargetWith(target, shield.special_combat, nil, self:combatTalentWeaponDamage(t, 0.8, 1.3, self:getTalentLevel(self.T_SHIELD_EXPERTISE)))
+
+ -- Try to stun !
+ if hit then
+ if target:checkHit(self:combatAttack(shield.special_combat), target:combatPhysicalResist(), 0, 95, 5 - self:getTalentLevel(t) / 2) and target:canBe("knockback") then
+ target:knockback(self.x, self.y, 4)
+ else
+ game.logSeen(target, "%s resists the knockback!", target.name:capitalize())
+ end
+ end
+
+ return true
+ end,
+ info = function(self, t)
+ return ([[Hits the target with your weapon doing %d%% damage and two shield strikes doing %d%% damage, trying to overpower your target.
+ If the last attack hits, the target is knocked back. The chance for knockback increases with your Accuracy.]])
+ :format(100 * self:combatTalentWeaponDamage(t, 0.8, 1.3), 100 * self:combatTalentWeaponDamage(t, 0.8, 1.3, self:getTalentLevel(self.T_SHIELD_EXPERTISE)))
+ end,
}
\ No newline at end of file
diff --git a/game/modules/tome/data/talents/techniques/2h-assault.lua b/game/modules/tome/data/talents/techniques/2h-assault.lua
index ad3aa62edf02495e204b6f60cd5bf7e1baf61d64..a9a8bdc3874198c97d975b5ce81033a14af28889 100644
--- a/game/modules/tome/data/talents/techniques/2h-assault.lua
+++ b/game/modules/tome/data/talents/techniques/2h-assault.lua
@@ -152,6 +152,7 @@ newTalent{
end,
}
+-- FIX SCALING
newTalent{
name = "Execution",
type = {"technique/2hweapon-assault", 4},
@@ -173,10 +174,10 @@ newTalent{
if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
local perc = 1 - (target.life / target.max_life)
- local power = t.getPower()
-
+ local power = t.getPower(self, t)
+ game.logPlayer(self, "perc " .. perc .. " power " .. power)
self.turn_procs.auto_phys_crit = true
- local speed, hit = self:attackTargetWith(target, weapon.combat, nil, power * perc * 100)
+ local speed, hit = self:attackTargetWith(target, weapon.combat, nil, power * perc)
self.turn_procs.auto_phys_crit = nil
return true
end,
diff --git a/game/modules/tome/data/talents/techniques/weaponshield.lua b/game/modules/tome/data/talents/techniques/weaponshield.lua
index 57198ec94c2c061b5ca9d2df383754dc1f130f51..e265579231b30080f49912c5d7904cff214b1e4f 100644
--- a/game/modules/tome/data/talents/techniques/weaponshield.lua
+++ b/game/modules/tome/data/talents/techniques/weaponshield.lua
@@ -90,20 +90,21 @@ newTalent{
}
newTalent{
- name = "Overpower",
+ name = "Shield Slam",
type = {"technique/shield-offense", 3},
require = techs_req3,
points = 5,
random_ego = "attack",
- cooldown = 8,
- stamina = 22,
+ cooldown = 10,
+ stamina = 15,
requires_target = true,
- tactical = { ATTACK = 2, ESCAPE = { knockback = 1 }, DISABLE = { knockback = 1 } },
+ getShieldDamage = function(self, t) return self:combatTalentWeaponDamage(t, 0.1, 0.8, self:getTalentLevel(self.T_SHIELD_EXPERTISE)) end,
+ tactical = { ATTACK = 2}, -- is there a way to make this consider the free Block?
on_pre_use = function(self, t, silent) if not self:hasShield() then if not silent then game.logPlayer(self, "You require a weapon and a shield to use this talent.") end return false end return true end,
action = function(self, t)
local shield = self:hasShield()
if not shield then
- game.logPlayer(self, "You cannot use Overpower without a shield!")
+ game.logPlayer(self, "You cannot use Shield Slam without a shield!")
return nil
end
@@ -112,28 +113,19 @@ newTalent{
if not x or not y or not target then return nil end
if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
- -- First attack with weapon
- self:attackTarget(target, nil, self:combatTalentWeaponDamage(t, 0.8, 1.3), true)
- -- Second attack with shield
- self:attackTargetWith(target, shield.special_combat, nil, self:combatTalentWeaponDamage(t, 0.8, 1.3, self:getTalentLevel(self.T_SHIELD_EXPERTISE)))
- -- Third attack with shield
- local speed, hit = self:attackTargetWith(target, shield.special_combat, nil, self:combatTalentWeaponDamage(t, 0.8, 1.3, self:getTalentLevel(self.T_SHIELD_EXPERTISE)))
-
- -- Try to stun !
- if hit then
- if target:checkHit(self:combatAttack(shield.special_combat), target:combatPhysicalResist(), 0, 95, 5 - self:getTalentLevel(t) / 2) and target:canBe("knockback") then
- target:knockback(self.x, self.y, 4)
- else
- game.logSeen(target, "%s resists the knockback!", target.name:capitalize())
- end
- end
+ local damage = t.getShieldDamage(self, t)
+ self:forceUseTalent(self.T_BLOCK, {ignore_energy=true, ignore_cd = true, silent = true})
+
+ self:attackTargetWith(target, shield.special_combat, nil, damage)
+ self:attackTargetWith(target, shield.special_combat, nil, damage)
+ self:attackTargetWith(target, shield.special_combat, nil, damage)
return true
end,
info = function(self, t)
- return ([[Hits the target with your weapon doing %d%% damage and two shield strikes doing %d%% damage, trying to overpower your target.
- If the last attack hits, the target is knocked back. The chance for knockback increases with your Accuracy.]])
- :format(100 * self:combatTalentWeaponDamage(t, 0.8, 1.3), 100 * self:combatTalentWeaponDamage(t, 0.8, 1.3, self:getTalentLevel(self.T_SHIELD_EXPERTISE)))
+ local damage = t.getShieldDamage(self, t)*100
+ return ([[Hit your target with your shield 3 times for %d%% damage then quickly return to a blocking position. The bonus block will not check or trigger Block cooldown.]])
+ :format(damage)
end,
}
diff --git a/game/modules/tome/data/talents/uber/const.lua b/game/modules/tome/data/talents/uber/const.lua
index 0589a718464b33607ef9a71a2c6398d3269eff77..24835422ed5af12f21dabf01b10a7298a2236705 100644
--- a/game/modules/tome/data/talents/uber/const.lua
+++ b/game/modules/tome/data/talents/uber/const.lua
@@ -20,7 +20,7 @@
uberTalent{
name = "Draconic Body",
mode = "passive",
- cooldown = 40,
+ cooldown = 20,
require = { special={desc="Be close to the draconic world", fct=function(self) return game.state.birth.ignore_prodigies_special_reqs or (self:attr("drake_touched") and self:attr("drake_touched") >= 2) end} },
trigger = function(self, t, value)
if self.life - value < self.max_life * 0.3 and not self:isTalentCoolingDown(t) then
diff --git a/game/modules/tome/data/timed_effects/magical.lua b/game/modules/tome/data/timed_effects/magical.lua
index 8241a0677284878aa87d4c0d6e2851615f8955a9..f1a9c6386049024f9b602648f479b7e9c648faaa 100644
--- a/game/modules/tome/data/timed_effects/magical.lua
+++ b/game/modules/tome/data/timed_effects/magical.lua
@@ -568,6 +568,22 @@ newEffect{
end,
}
+-- This only exists to mark a timer for Radiance being consumed
+newEffect{
+ name = "RADIANCE_DIM", image = "talents/curse_of_vulnerability.png",
+ desc = "Radiance Lost",
+ long_desc = function(self, eff) return ("You have expended the power of your Radiance temporarily reducing its radius to 1."):format() end,
+ type = "other",
+ subtype = { radiance=true },
+ parameters = { },
+ on_gain = function(self, err) return "#Target#'s aura dims.", "+Dim" end,
+ on_lose = function(self, err) return "#Target# shines with renewed light.", "-Dim" end,
+ activate = function(self, eff)
+ end,
+ deactivate = function(self, eff)
+ end,
+}
+
newEffect{
name = "CURSE_VULNERABILITY", image = "talents/curse_of_vulnerability.png",
desc = "Curse of Vulnerability",
@@ -2474,16 +2490,17 @@ newEffect{
newEffect{
name = "SUNCLOAK", image = "talents/suncloak.png",
desc = "Suncloak",
- long_desc = function(self, eff) return ("The target is filled with the Sun's fury, next Sun Beam will be instant cast."):format() end,
+ long_desc = function(self, eff) return ("The target is protected by the sun, increasing their spell casting speed by 30%%, reducing spell cooldowns by 30%%, and preventing damage over %d%% of your maximum life from a single hit."):format(eff.cap) end,
type = "magical",
subtype = { sun=true, },
status = "beneficial",
- parameters = {},
- on_gain = function(self, err) return "#Target# is filled with the Sun's fury!", "+Sun's Vengeance" end,
- on_lose = function(self, err) return "#Target#'s solar fury subsides.", "-Sun's Vengeance" end,
+ parameters = {cap = 1, haste = 0.1},
+ on_gain = function(self, err) return "#Target# is energized and protected by the Sun!", "+Suncloak" end,
+ on_lose = function(self, err) return "#Target#'s solar fury subsides.", "-Suncloak" end,
activate = function(self, eff)
- self:effectTemporaryValue(eff, "resists", {all=eff.resists})
- self:effectTemporaryValue(eff, "reduce_detrimental_status_effects_time", eff.reduce)
+ self:effectTemporaryValue(eff, "flat_damage_cap", {all=eff.cap})
+ self:effectTemporaryValue(eff, "combat_spellspeed", eff.haste)
+ self:effectTemporaryValue(eff, "spell_cooldown_reduction", eff.haste)
eff.particle = self:addParticles(Particles.new("suncloak", 1))
end,
deactivate = function(self, eff)
@@ -2491,21 +2508,6 @@ newEffect{
end,
}
-newEffect{
- name = "ABSORPTION_STRIKE", image = "talents/absorption_strike.png",
- desc = "Absorption Strike",
- long_desc = function(self, eff) return ("The target's light has been drained, reducing light resistance by %d%%."):format(eff.power) end,
- type = "magical",
- subtype = { sun=true, },
- status = "detrimental",
- parameters = { power = 10 },
- on_gain = function(self, err) return "#Target# is drained from light!", "+Absorption Strike" end,
- on_lose = function(self, err) return "#Target#'s light is back.", "-Absorption Strike" end,
- activate = function(self, eff)
- self:effectTemporaryValue(eff, "resists", {[DamageType.LIGHT]=-eff.power})
- end,
-}
-
newEffect{
name = "MARK_OF_LIGHT", image = "talents/mark_of_light.png",
desc = "Mark of Light",
diff --git a/game/modules/tome/data/timed_effects/other.lua b/game/modules/tome/data/timed_effects/other.lua
index d425d2f79ea6aaa8f59ad52fc61584c3c469016b..36a0db6bf0bb2652381d68210ec15d4b1b95cb9c 100644
--- a/game/modules/tome/data/timed_effects/other.lua
+++ b/game/modules/tome/data/timed_effects/other.lua
@@ -25,6 +25,40 @@ local Map = require "engine.Map"
local Level = require "engine.Level"
local Combat = require "mod.class.interface.Combat"
+newEffect{
+ name = "FLASH_SHIELD", image = "talents/flash_of_the_blade.png",
+ desc = "Protected by the Sun",
+ long_desc = function(self, eff) return "The Sun has granted a brief immunity to all damage." end,
+ type = "other",
+ subtype = { },
+ status = "beneficial",
+ on_gain = function(self, err) return "#Target# whirls around and a radiant shield surrounds them!", "+Divine Shield" end,
+ parameters = {},
+ activate = function(self, eff)
+ self:effectTemporaryValue(eff, "cancel_damage_chance", 100)
+ end,
+ deactivate = function(self, eff)
+
+ end,
+}
+
+-- type other because this is a core defensive mechanic in debuff form, it should not interact with saves
+newEffect{
+ name = "ABSORPTION_STRIKE", image = "talents/absorption_strike.png",
+ desc = "Absorption Strike",
+ long_desc = function(self, eff) return ("The target's light has been drained, reducing light resistance by %d%% and damage by %d%%."):format(eff.power, eff.numb) end,
+ type = "other",
+ subtype = { sun=true, },
+ status = "detrimental",
+ parameters = { power = 10, numb = 1 },
+ on_gain = function(self, err) return "#Target# is drained from light!", "+Absorption Strike" end,
+ on_lose = function(self, err) return "#Target#'s light is back.", "-Absorption Strike" end,
+ activate = function(self, eff)
+ self:effectTemporaryValue(eff, "resists", {[DamageType.LIGHT]=-eff.power})
+ self:effectTemporaryValue(eff, "numbed", eff.numb)
+ end,
+}
+
-- Design: Temporary immobility in exchange for a large stat buff.
newEffect{
name = "TREE_OF_LIFE", image = "shockbolt/object/artifact/tree_of_life.png",
diff --git a/game/modules/tome/data/timed_effects/physical.lua b/game/modules/tome/data/timed_effects/physical.lua
index 2d464a3b04aaeaf5e4364d15a46569b983effd7f..ce596db746d586137879dfd0b75e5b600796792a 100644
--- a/game/modules/tome/data/timed_effects/physical.lua
+++ b/game/modules/tome/data/timed_effects/physical.lua
@@ -347,7 +347,7 @@ newEffect{
newEffect{
name = "STUNNED", image = "effects/stunned.png",
desc = "Stunned",
- long_desc = function(self, eff) return ("The target is stunned, reducing damage by 70%%, putting random talents on cooldown and reducing movement speed by 50%%. While stunned talents do not cooldown."):format() end,
+ long_desc = function(self, eff) return ("The target is stunned, reducing damage by 60%%, putting 3 random talents on cooldown and reducing movement speed by 50%%. While stunned talents do not cooldown."):format() end,
type = "physical",
subtype = { stun=true },
status = "detrimental",
@@ -364,7 +364,7 @@ newEffect{
local t = self:getTalentFromId(tid)
if t and not self.talents_cd[tid] and t.mode == "activated" and not t.innate and util.getval(t.no_energy, self, t) ~= true then tids[#tids+1] = t end
end
- for i = 1, 4 do
+ for i = 1, 3 do
local t = rng.tableRemove(tids)
if not t then break end
self.talents_cd[t.id] = 1 -- Just set cooldown to 1 since cooldown does not decrease while stunned