From e403e4c672c678a82acc881e95e072a42fe69ab5 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Wed, 29 Sep 2010 12:51:01 +0000
Subject: [PATCH] Talent descriptions will now display the damage done after
the percentile damage bonuses
git-svn-id: http://svn.net-core.org/repos/t-engine4@1329 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/data/talents.lua | 16 ++++++++++++++++
.../tome/data/talents/corruptions/bone.lua | 6 +++---
.../tome/data/talents/corruptions/curses.lua | 2 +-
.../tome/data/talents/corruptions/hexes.lua | 2 +-
.../tome/data/talents/corruptions/plague.lua | 6 +++---
.../data/talents/corruptions/reaving-combat.lua | 2 +-
.../tome/data/talents/corruptions/sanguisuge.lua | 4 ++--
.../tome/data/talents/corruptions/scourge.lua | 4 ++--
.../tome/data/talents/cunning/shadow-magic.lua | 4 ++--
game/modules/tome/data/talents/cursed/gloom.lua | 2 +-
game/modules/tome/data/talents/divine/chants.lua | 8 ++++----
game/modules/tome/data/talents/divine/combat.lua | 2 +-
game/modules/tome/data/talents/divine/glyphs.lua | 2 +-
game/modules/tome/data/talents/divine/hymns.lua | 8 ++++----
.../tome/data/talents/divine/star-fury.lua | 12 ++++++------
game/modules/tome/data/talents/divine/sun.lua | 8 ++++----
.../tome/data/talents/gifts/cold-drake.lua | 4 ++--
.../tome/data/talents/gifts/fire-drake.lua | 4 ++--
.../tome/data/talents/gifts/sand-drake.lua | 2 +-
game/modules/tome/data/talents/gifts/slime.lua | 4 ++--
.../tome/data/talents/gifts/summon-distance.lua | 12 ++++++++----
game/modules/tome/data/talents/spells/air.lua | 8 ++++----
game/modules/tome/data/talents/spells/arcane.lua | 2 +-
game/modules/tome/data/talents/spells/earth.lua | 2 +-
.../tome/data/talents/spells/enhancement.lua | 4 ++--
.../tome/data/talents/spells/explosives.lua | 2 ++
.../tome/data/talents/spells/fire-alchemy.lua | 8 ++++----
game/modules/tome/data/talents/spells/fire.lua | 8 ++++----
game/modules/tome/data/talents/spells/ice.lua | 6 +++---
.../tome/data/talents/spells/phantasm.lua | 2 +-
game/modules/tome/data/talents/spells/storm.lua | 8 ++++----
game/modules/tome/data/talents/spells/water.lua | 8 ++++----
.../tome/data/talents/spells/wildfire.lua | 4 ++--
.../tome/data/talents/techniques/warcries.lua | 2 +-
game/modules/tome/data/talents/undeads/ghoul.lua | 2 +-
.../tome/data/talents/undeads/skeleton.lua | 2 +-
36 files changed, 102 insertions(+), 80 deletions(-)
diff --git a/game/modules/tome/data/talents.lua b/game/modules/tome/data/talents.lua
index e33fec5597..0e291dbf93 100644
--- a/game/modules/tome/data/talents.lua
+++ b/game/modules/tome/data/talents.lua
@@ -38,6 +38,22 @@ newTalent = function(t)
return oldNewTalent(t)
end
+damDesc = function(self, type, dam)
+ -- Difficulty settings
+ if game.difficulty == game.DIFFICULTY_NIGHTMARE then
+ if self:resolveSource().player then dam = dam * 0.7 end
+ elseif game.difficulty == game.DIFFICULTY_INSANE then
+ if self:resolveSource().player then dam = dam * 0.5 end
+ end
+
+ -- Increases damage
+ if self.inc_damage then
+ local inc = (self.inc_damage.all or 0) + (self.inc_damage[type] or 0)
+ dam = dam + (dam * inc / 100)
+ end
+ return dam
+end
+
load("/data/talents/misc/misc.lua")
load("/data/talents/techniques/techniques.lua")
load("/data/talents/cunning/cunning.lua")
diff --git a/game/modules/tome/data/talents/corruptions/bone.lua b/game/modules/tome/data/talents/corruptions/bone.lua
index 3994dd7594..195b2684c9 100644
--- a/game/modules/tome/data/talents/corruptions/bone.lua
+++ b/game/modules/tome/data/talents/corruptions/bone.lua
@@ -39,7 +39,7 @@ newTalent{
end,
info = function(self, t)
return ([[Conjures up spear of bones doing %0.2f physical damage to all targets in line.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 20, 200))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.PHYSICAL, self:combatTalentSpellDamage(t, 20, 200)))
end,
}
@@ -82,7 +82,7 @@ newTalent{
return ([[Grab a target and teleport it to your side, pinning it there with a bone rising from the ground for %d turns.
The bone will also deal %0.2f physical damage.
The damage will increase with your Magic stat.]]):
- format(math.floor(3 + self:getTalentLevel(t)), self:combatTalentSpellDamage(t, 5, 140))
+ format(math.floor(3 + self:getTalentLevel(t)), damDesc(self, DamageType.PHYSICAL, self:combatTalentSpellDamage(t, 5, 140)))
end,
}
@@ -103,7 +103,7 @@ newTalent{
end,
info = function(self, t)
return ([[Fire bone spears in all directions, hitting all your foes for %0.2f physical damage.
- The damage will increase with your Magic stat.]]):format(self:combatTalentSpellDamage(t, 8, 180))
+ The damage will increase with your Magic stat.]]):format(damDesc(self, DamageType.PHYSICAL, self:combatTalentSpellDamage(t, 8, 180)))
end,
}
diff --git a/game/modules/tome/data/talents/corruptions/curses.lua b/game/modules/tome/data/talents/corruptions/curses.lua
index 9c235ab7c9..1cbe75c2bf 100644
--- a/game/modules/tome/data/talents/corruptions/curses.lua
+++ b/game/modules/tome/data/talents/corruptions/curses.lua
@@ -103,7 +103,7 @@ newTalent{
end,
info = function(self, t)
return ([[Curses your target, stopping any natural healing and dealing %0.2f darkness damage each turn.
- The resistances will decrease with Magic stat.]]):format(self:combatTalentSpellDamage(t, 10, 70))
+ The resistances will decrease with Magic stat.]]):format(damDesc(self, DamageType.BLIGHT, self:combatTalentSpellDamage(t, 10, 70)))
end,
}
diff --git a/game/modules/tome/data/talents/corruptions/hexes.lua b/game/modules/tome/data/talents/corruptions/hexes.lua
index 4348ef4209..a8b8c2e9d2 100644
--- a/game/modules/tome/data/talents/corruptions/hexes.lua
+++ b/game/modules/tome/data/talents/corruptions/hexes.lua
@@ -73,7 +73,7 @@ newTalent{
end,
info = function(self, t)
return ([[Hexes your target. Each time it uses a resource (stamina, mana, vim, ...) it takes %0.2f fire damage.
- The damage will increase with Magic stat.]]):format(self:combatTalentSpellDamage(t, 4, 90))
+ The damage will increase with Magic stat.]]):format(damDesc(self, DamageType.FIRE, self:combatTalentSpellDamage(t, 4, 90)))
end,
}
diff --git a/game/modules/tome/data/talents/corruptions/plague.lua b/game/modules/tome/data/talents/corruptions/plague.lua
index d33db34134..182983f29a 100644
--- a/game/modules/tome/data/talents/corruptions/plague.lua
+++ b/game/modules/tome/data/talents/corruptions/plague.lua
@@ -53,7 +53,7 @@ newTalent{
info = function(self, t)
return ([[Fires a bolt of pure filth, diseasing your target with a random disease doing %0.2f blight damage per turns for 6 turns and reducing one of its physical stats (strength, constitution, dexterity) by %d.
The effect will increase with your Magic stat.]]):
- format(self:combatTalentSpellDamage(t, 5, 45), self:combatTalentSpellDamage(t, 5, 25))
+ format(damDesc(self, DamageType.BLIGHT, self:combatTalentSpellDamage(t, 5, 45)), self:combatTalentSpellDamage(t, 5, 25))
end,
}
@@ -112,7 +112,7 @@ newTalent{
return ([[Make your target's diseases burst, doing %0.2f blight damage for each disease it is infected with.
This will also spread the diseases to any nearby foes in a radius of 1.
The damage will increase with your Magic stat.]]):
- format(self:combatTalentSpellDamage(t, 15, 85))
+ format(damDesc(self, DamageType.BLIGHT, self:combatTalentSpellDamage(t, 15, 85)))
end,
}
@@ -221,6 +221,6 @@ newTalent{
info = function(self, t)
return ([[Infects the target with a very contagious disease doing %0.2f damage per turn for 6 turns.
If any blight damage from non-diseases hits the target, the epidemic will activate and spread diseases to nearby targets.]]):
- format(self:combatTalentSpellDamage(t, 15, 50))
+ format(damDesc(self, DamageType.BLIGHT, self:combatTalentSpellDamage(t, 15, 50)))
end,
}
diff --git a/game/modules/tome/data/talents/corruptions/reaving-combat.lua b/game/modules/tome/data/talents/corruptions/reaving-combat.lua
index 2d395d29d4..78e3472b52 100644
--- a/game/modules/tome/data/talents/corruptions/reaving-combat.lua
+++ b/game/modules/tome/data/talents/corruptions/reaving-combat.lua
@@ -86,6 +86,6 @@ newTalent{
return ([[Your blood turns into an acidic mixture. When you get hit the attacker is splashed with acid.
This deals %0.2f acid damage each turn for 5 turns and reduces the attacker attack by %d.
At level 3 it will also reduce armour by %d.]]):
- format(self:combatTalentSpellDamage(t, 5, 30), self:combatTalentSpellDamage(t, 15, 35), self:combatTalentSpellDamage(t, 15, 40))
+ format(damDesc(self, DamageType.ACID, self:combatTalentSpellDamage(t, 5, 30)), self:combatTalentSpellDamage(t, 15, 35), self:combatTalentSpellDamage(t, 15, 40))
end,
}
diff --git a/game/modules/tome/data/talents/corruptions/sanguisuge.lua b/game/modules/tome/data/talents/corruptions/sanguisuge.lua
index e4115db15b..9f35337604 100644
--- a/game/modules/tome/data/talents/corruptions/sanguisuge.lua
+++ b/game/modules/tome/data/talents/corruptions/sanguisuge.lua
@@ -76,9 +76,9 @@ newTalent{
return true
end,
info = function(self, t)
- return ([[Fires a bolt of blight, doing %0.2f damage and replenishing 20%% of it as vim energy.
+ return ([[Fires a bolt of blight, doing %0.2f blight damage and replenishing 20%% of it as vim energy.
The effect will increase with your Magic stat.]]):
- format(self:combatTalentSpellDamage(t, 15, 200))
+ format(damDesc(self, DamageType.BLIGHT, self:combatTalentSpellDamage(t, 15, 200)))
end,
}
diff --git a/game/modules/tome/data/talents/corruptions/scourge.lua b/game/modules/tome/data/talents/corruptions/scourge.lua
index 25cd827f16..6a530134b6 100644
--- a/game/modules/tome/data/talents/corruptions/scourge.lua
+++ b/game/modules/tome/data/talents/corruptions/scourge.lua
@@ -88,7 +88,7 @@ newTalent{
info = function(self, t)
return ([[Concentrate on the corruption you bring, enhancing each of your melee strikes with %0.2f blight damage.
The damage will increase with your Magic stat.]]):
- format(self:combatTalentSpellDamage(t, 15, 40))
+ format(damDesc(self, DamageType.BLIGHT, self:combatTalentSpellDamage(t, 15, 40)))
end,
}
@@ -127,7 +127,7 @@ newTalent{
info = function(self, t)
return ([[Strike with each of your weapons, doing %d%% acid weapon damage. If at least one of the strikes hits an acid splash is generated doing %0.2f acid damage.
The splash damage will increase with your Magic stat.]]):
- format(100 * self:combatTalentWeaponDamage(t, 0.8, 1.6), self:combatTalentSpellDamage(t, 10, 130))
+ format(100 * self:combatTalentWeaponDamage(t, 0.8, 1.6), damDesc(self, DamageType.ACID, self:combatTalentSpellDamage(t, 10, 130)))
end,
}
diff --git a/game/modules/tome/data/talents/cunning/shadow-magic.lua b/game/modules/tome/data/talents/cunning/shadow-magic.lua
index d914eb83c6..4399403831 100644
--- a/game/modules/tome/data/talents/cunning/shadow-magic.lua
+++ b/game/modules/tome/data/talents/cunning/shadow-magic.lua
@@ -32,8 +32,8 @@ newTalent{
return true
end,
info = function(self, t)
- return ([[Channel raw magical energy into your melee attacks, each doing %d damage and costing %.2f mana.]]):
- format(3 + self:getTalentLevel(t) * 2, 1 + self:getTalentLevelRaw(t) / 1.5)
+ return ([[Channel raw magical energy into your melee attacks, each doing %d darkness damage and costing %.2f mana.]]):
+ format(damDesc(self, DamageType.DARKNESS, 3 + self:getTalentLevel(t) * 2), 1 + self:getTalentLevelRaw(t) / 1.5)
end,
}
diff --git a/game/modules/tome/data/talents/cursed/gloom.lua b/game/modules/tome/data/talents/cursed/gloom.lua
index 2a71403717..d93eb276fc 100644
--- a/game/modules/tome/data/talents/cursed/gloom.lua
+++ b/game/modules/tome/data/talents/cursed/gloom.lua
@@ -215,7 +215,7 @@ newTalent{
require = cursed_wil_req3,
points = 5,
info = function(self, t)
- local baseDamage = 30 + self:getWil() * 0.4 * self:getTalentLevel(t)
+ local baseDamage = damDesc(self, DamageType.BLIGHT, 30 + self:getWil() * 0.4 * self:getTalentLevel(t))
local attackStrength = 0.3 + self:getTalentLevel(t) * 0.12
local effectiveness = getWillFailureEffectiveness(self, 30, 95, attackStrength)
return ([[Your rage builds within you for 20 turns, then unleashes itself for %d to %d hate-based blight damage on the first one to enter your gloom. (%d effectiveness)]]):format(baseDamage * .5, baseDamage * 1.5, effectiveness)
diff --git a/game/modules/tome/data/talents/divine/chants.lua b/game/modules/tome/data/talents/divine/chants.lua
index d1a4901b83..a0b71bdbc4 100644
--- a/game/modules/tome/data/talents/divine/chants.lua
+++ b/game/modules/tome/data/talents/divine/chants.lua
@@ -65,7 +65,7 @@ newTalent{
return ([[Chant the glory of the sun, granting you %d physical and spell save.
In addition it surrounds you with a shield of light, damaging anything that attacks you for %0.2f light damage.
You may only have one Chant active at once.
- The resistance and damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 5, 70), self:combatTalentSpellDamage(t, 5, 25))
+ The resistance and damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 5, 70), damDesc(self, DamageType.LIGHT, self:combatTalentSpellDamage(t, 5, 25)))
end,
}
@@ -103,7 +103,7 @@ newTalent{
return ([[Chant the glory of the sun, granting you %d%% physical damage resistance.
In addition it surrounds you with a shield of light, damaging anything that attacks you for %0.2f light damage.
You may only have one Chant active at once.
- The resistance and damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 5, 35), self:combatTalentSpellDamage(t, 5, 25))
+ The resistance and damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 5, 35), damDesc(self, DamageType.LIGHT, self:combatTalentSpellDamage(t, 5, 25)))
end,
}
@@ -146,7 +146,7 @@ newTalent{
return ([[Chant the glory of the sun, granting you %d%% elemental resistances.
In addition it surrounds you with a shield of light, damaging anything that attacks you for %0.2f light damage.
You may only have one Chant active at once.
- The resistance and damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 5, 35), self:combatTalentSpellDamage(t, 5, 25))
+ The resistance and damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 5, 35), damDesc(self, DamageType.LIGHT, self:combatTalentSpellDamage(t, 5, 25)))
end,
}
@@ -184,6 +184,6 @@ newTalent{
return ([[Chant the glory of the sun, granting you %d%% more light damage.
In addition it surrounds you with a shield of light, damaging anything that attacks you for %0.2f light damage.
You may only have one Chant active at once.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 10, 50), self:combatTalentSpellDamage(t, 5, 25))
+ The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 10, 50), damDesc(self, DamageType.LIGHT, self:combatTalentSpellDamage(t, 5, 25)))
end,
}
diff --git a/game/modules/tome/data/talents/divine/combat.lua b/game/modules/tome/data/talents/divine/combat.lua
index 0df35f0f14..caedb82923 100644
--- a/game/modules/tome/data/talents/divine/combat.lua
+++ b/game/modules/tome/data/talents/divine/combat.lua
@@ -41,7 +41,7 @@ newTalent{
info = function(self, t)
return ([[Infuse your weapon of the power of the Sun, doing %0.2f light damage with each hit.
Each hit will drain 3 positive energy. The spell ends when energy reaches 0.
- The damage will increase with the Magic stat]]):format(7 + self:combatSpellpower(0.092) * self:getTalentLevel(t))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.LIGHT, 7 + self:combatSpellpower(0.092) * self:getTalentLevel(t)))
end,
}
diff --git a/game/modules/tome/data/talents/divine/glyphs.lua b/game/modules/tome/data/talents/divine/glyphs.lua
index 7eefabab7b..c63a3a5b6b 100644
--- a/game/modules/tome/data/talents/divine/glyphs.lua
+++ b/game/modules/tome/data/talents/divine/glyphs.lua
@@ -134,7 +134,7 @@ newTalent{
info = function(self, t)
return ([[You bind light in a glyph on the floor. The first target passing by will be hit by a blast of light doing %0.2f damage.
The glyph lasts for %d turns.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 20, 150), 2 + self:getTalentLevel(t))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.LIGHT, self:combatTalentSpellDamage(t, 20, 150)), 2 + self:getTalentLevel(t))
end,
}
diff --git a/game/modules/tome/data/talents/divine/hymns.lua b/game/modules/tome/data/talents/divine/hymns.lua
index 265f09b8b2..ee7076f6ce 100644
--- a/game/modules/tome/data/talents/divine/hymns.lua
+++ b/game/modules/tome/data/talents/divine/hymns.lua
@@ -63,7 +63,7 @@ newTalent{
return ([[Chant the glory of the moon, granting you %d%% more darkness damage.
In addition it surrounds you with a shield of shadows, damaging anything that attacks you for %0.2f darkness damage.
You may only have one Hymn active at once.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 10, 50), self:combatTalentSpellDamage(t, 5, 25))
+ The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 10, 50), damDesc(self, DamageType.DARKNESS, self:combatTalentSpellDamage(t, 5, 25)))
end,
}
@@ -100,7 +100,7 @@ newTalent{
return ([[Chant the glory of the moon, granting you infravision up to %d grids.
In addition it surrounds you with a shield of darkness, damaging anything that attacks you for %0.2f darkness damage.
You may only have one Hymn active at once.
- The resistance and damage will increase with the Magic stat]]):format(math.floor(5 + self:getTalentLevel(t)), self:combatTalentSpellDamage(t, 5, 25))
+ The resistance and damage will increase with the Magic stat]]):format(math.floor(5 + self:getTalentLevel(t)), damDesc(self, DamageType.DARKNESS, self:combatTalentSpellDamage(t, 5, 25)))
end,
}
@@ -141,7 +141,7 @@ newTalent{
return ([[Chant the glory of the moon, granting you %d%% stun, blindness and confusion resistances.
In addition it surrounds you with a shield of darkness, damaging anything that attacks you for %0.2f light damage.
You may only have one Hymn active at once.
- The damage will increase with the Magic stat]]):format(100 * (0.2 + self:getTalentLevel(t) / 10), self:combatTalentSpellDamage(t, 5, 25))
+ The damage will increase with the Magic stat]]):format(100 * (0.2 + self:getTalentLevel(t) / 10), damDesc(self, DamageType.DARKNESS, self:combatTalentSpellDamage(t, 5, 25)))
end,
}
@@ -204,6 +204,6 @@ newTalent{
return ([[Conjures a shroud of dancing shadows with a radius of 5 that follows you as long as this spell is active.
Each turn a random shadow beam will hit up to %d of your foes for 1 to %0.2f damage.
This powerful spell will continuously drain negative energy while active.
- The damage will increase with the Magic stat]]):format(self:getTalentLevel(t), self:combatTalentSpellDamage(t, 7, 80))
+ The damage will increase with the Magic stat]]):format(self:getTalentLevel(t), damDesc(self, DamageType.DARKNESS, self:combatTalentSpellDamage(t, 7, 80)))
end,
}
diff --git a/game/modules/tome/data/talents/divine/star-fury.lua b/game/modules/tome/data/talents/divine/star-fury.lua
index dcd1e48bad..50da7ba93c 100644
--- a/game/modules/tome/data/talents/divine/star-fury.lua
+++ b/game/modules/tome/data/talents/divine/star-fury.lua
@@ -44,7 +44,7 @@ newTalent{
end,
info = function(self, t)
return ([[Calls the power of the Moon into a beam of shadows doing %0.2f damage.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 14, 230))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.DARKNESS, self:combatTalentSpellDamage(t, 14, 230)))
end,
}
@@ -90,8 +90,8 @@ newTalent{
return ([[Invokes a blast of shadows dealing %0.2f darkness damage and leaving a field that does %0.2f darkness damage per turn for %d turns.
The damage will increase with the Magic stat]]):
format(
- self:combatTalentSpellDamage(t, 5, 120),
- self:combatTalentSpellDamage(t, 4, 50),
+ damDesc(self, DamageType.DARKNESS, self:combatTalentSpellDamage(t, 5, 120)),
+ damDesc(self, DamageType.DARKNESS, self:combatTalentSpellDamage(t, 4, 50)),
self:getTalentLevel(t) + 2
)
end,
@@ -125,8 +125,8 @@ newTalent{
It also regenerates both your negative and positive energies.
The damage will increase with the Magic stat]]):
format(
- self:combatTalentSpellDamage(t, 10, 100),
- self:combatTalentSpellDamage(t, 10, 100),
+ damDesc(self, DamageType.LIGHT, self:combatTalentSpellDamage(t, 10, 100)),
+ damDesc(self, DamageType.DARKNESS, self:combatTalentSpellDamage(t, 10, 100)),
self:getTalentRange(t)
)
end,
@@ -159,6 +159,6 @@ newTalent{
end,
info = function(self, t)
return ([[A star falls onto the target, stunning all and doing %0.2f darkness damage.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 28, 170))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.DARKNESS, self:combatTalentSpellDamage(t, 28, 170)))
end,
}
diff --git a/game/modules/tome/data/talents/divine/sun.lua b/game/modules/tome/data/talents/divine/sun.lua
index 48b4af69e2..5509a34fb9 100644
--- a/game/modules/tome/data/talents/divine/sun.lua
+++ b/game/modules/tome/data/talents/divine/sun.lua
@@ -54,7 +54,7 @@ newTalent{
end,
info = function(self, t)
return ([[Calls the power of the Sun into a searing lance doing %0.2f damage and leaving a spot on the ground for 4 turns doing %0.2f damage.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 6, 160), self:combatTalentSpellDamage(t, 6, 80))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.LIGHT, self:combatTalentSpellDamage(t, 6, 160)), self:combatTalentSpellDamage(t, 6, 80))
end,
}
@@ -88,7 +88,7 @@ newTalent{
At level 3 it will start dealing %0.2f light damage.
The damage will increase with the Magic stat]]):
format(
- self:combatTalentSpellDamage(t, 4, 80)
+ damDesc(self, DamageType.LIGHT, self:combatTalentSpellDamage(t, 4, 80))
)
end,
}
@@ -121,7 +121,7 @@ newTalent{
info = function(self, t)
return ([[Fire a beam of Sun flames at your foes, burning all those in line for %0.2f fire damage.
The damage will increase with the Magic stat]]):
- format(self:combatTalentSpellDamage(t, 10, 200))
+ format(damDesc(self, DamageType.FIRE, self:combatTalentSpellDamage(t, 10, 200)))
end,
}
@@ -149,6 +149,6 @@ newTalent{
end,
info = function(self, t)
return ([[Conjures a furious burst of Sunlight, dealing %0.2f light damage to all those around you in a radius of 4.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 10, 160))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.LIGHT, self:combatTalentSpellDamage(t, 10, 160)))
end,
}
diff --git a/game/modules/tome/data/talents/gifts/cold-drake.lua b/game/modules/tome/data/talents/gifts/cold-drake.lua
index b98ded6ac0..f99efcfdd0 100644
--- a/game/modules/tome/data/talents/gifts/cold-drake.lua
+++ b/game/modules/tome/data/talents/gifts/cold-drake.lua
@@ -69,7 +69,7 @@ newTalent{
return true
end,
info = function(self, t)
- return ([[Your skin forms icy scales, damaging all that hit you for %d cold damage and increasing your armor by %d.]]):format(5 * self:getTalentLevel(t), 4 * self:getTalentLevel(t))
+ return ([[Your skin forms icy scales, damaging all that hit you for %d cold damage and increasing your armor by %d.]]):format(damDesc(self, DamageType.C, 5 * self:getTalentLevel(t)), 4 * self:getTalentLevel(t))
end,
}
@@ -147,6 +147,6 @@ newTalent{
end,
info = function(self, t)
return ([[You breathe ice in a frontal cone. Any target caught in the area will take %0.2f cold damage and can be frozen for a few turns.
- The damage will increase with the Strength stat]]):format(30 + self:getStr(50) * self:getTalentLevel(t), 2+self:getTalentLevelRaw(t))
+ The damage will increase with the Strength stat]]):format(damDesc(self, DamageType.COLD, 30 + self:getStr(50) * self:getTalentLevel(t)), 2+self:getTalentLevelRaw(t))
end,
}
diff --git a/game/modules/tome/data/talents/gifts/fire-drake.lua b/game/modules/tome/data/talents/gifts/fire-drake.lua
index f65ec2299d..52e4090ac3 100644
--- a/game/modules/tome/data/talents/gifts/fire-drake.lua
+++ b/game/modules/tome/data/talents/gifts/fire-drake.lua
@@ -103,7 +103,7 @@ newTalent{
end,
info = function(self, t)
return ([[Spit a cloud of flames doing %0.2f fire damage in a radius of 2 each turn for %d turns.
- The damage will increase with the Willpower stat]]):format(10 + self:getWil() * 0.2 * self:getTalentLevel(t), 2 + self:getTalentLevelRaw(t))
+ The damage will increase with the Willpower stat]]):format(damDesc(self, DamageType.FIRE, 10 + self:getWil() * 0.2 * self:getTalentLevel(t)), 2 + self:getTalentLevelRaw(t))
end,
}
@@ -132,6 +132,6 @@ newTalent{
end,
info = function(self, t)
return ([[You breathe fire in a frontal cone. Any target caught in the area will take %0.2f fire damage over 3 turns.
- The damage will increase with the Strength stat]]):format(30 + self:getStr(65) * self:getTalentLevel(t))
+ The damage will increase with the Strength stat]]):format(damDesc(self, DamageType.FIRE, 30 + self:getStr(65) * self:getTalentLevel(t)))
end,
}
diff --git a/game/modules/tome/data/talents/gifts/sand-drake.lua b/game/modules/tome/data/talents/gifts/sand-drake.lua
index 385456adff..6677d77304 100644
--- a/game/modules/tome/data/talents/gifts/sand-drake.lua
+++ b/game/modules/tome/data/talents/gifts/sand-drake.lua
@@ -122,6 +122,6 @@ newTalent{
end,
info = function(self, t)
return ([[You breathe sand in a frontal cone. Any target caught in the area will take %0.2f physical damage and be blinded for %d turns.
- The damage will increase with the Strength stat]]):format(10 + self:getStr() * 0.3 * self:getTalentLevel(t), 2+self:getTalentLevelRaw(t))
+ The damage will increase with the Strength stat]]):format(damDesc(self, DamageType.PHYSICAL, 10 + self:getStr() * 0.3 * self:getTalentLevel(t)), 2+self:getTalentLevelRaw(t))
end,
}
diff --git a/game/modules/tome/data/talents/gifts/slime.lua b/game/modules/tome/data/talents/gifts/slime.lua
index faa7995399..29fae78e21 100644
--- a/game/modules/tome/data/talents/gifts/slime.lua
+++ b/game/modules/tome/data/talents/gifts/slime.lua
@@ -72,7 +72,7 @@ newTalent{
return true
end,
info = function(self, t)
- return ([[Your skin drips with acid, damaging all that hit you for %d acid damage.]]):format(10 + 5 * self:getTalentLevel(t))
+ return ([[Your skin drips with acid, damaging all that hit you for %d acid damage.]]):format(damDesc(self, DamageType.ACID, 10 + 5 * self:getTalentLevel(t)))
end,
}
@@ -100,7 +100,7 @@ newTalent{
end,
info = function(self, t)
return ([[Spit slime at your target doing %0.2f nature damage and slowing it down for 3 turns.
- The damage will increase with the Dexterity stat]]):format(20 + (self:getDex() * self:getTalentLevel(t)) * 0.3)
+ The damage will increase with the Dexterity stat]]):format(damDesc(self, DamageType.NATURE, 20 + (self:getDex() * self:getTalentLevel(t)) * 0.3))
end,
}
diff --git a/game/modules/tome/data/talents/gifts/summon-distance.lua b/game/modules/tome/data/talents/gifts/summon-distance.lua
index 3c015f79a9..b504917d5b 100644
--- a/game/modules/tome/data/talents/gifts/summon-distance.lua
+++ b/game/modules/tome/data/talents/gifts/summon-distance.lua
@@ -35,7 +35,7 @@ newTalent{ short_name = "FIRE_IMP_BOLT",
end,
info = function(self, t)
return ([[Conjures up a bolt of fire doing %0.2f fire damage.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 8, 120))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.FIRE, self:combatTalentSpellDamage(t, 8, 120)))
end,
}
@@ -62,7 +62,7 @@ newTalent{
end,
info = function(self, t)
return ([[Breathe acid on your foes, doing %d damage.
- The damage will increase with the Willpower stat]]):format(30 + self:getWil(50) * self:getTalentLevel(t))
+ The damage will increase with the Willpower stat]]):format(damDesc(self, DamageType.ACID, 30 + self:getWil(50) * self:getTalentLevel(t)))
end,
}
@@ -90,7 +90,11 @@ newTalent{
end,
info = function(self, t)
return ([[Breathe lightning on your foes, doing %d to %d damage.
- The damage will increase with the Willpower stat]]):format((30 + self:getWil(70) * self:getTalentLevel(t)) / 3, 30 + self:getWil(70) * self:getTalentLevel(t))
+ The damage will increase with the Willpower stat]]):
+ format(
+ damDesc(self, DamageType.LIGHTNING, (30 + self:getWil(70) * self:getTalentLevel(t)) / 3),
+ damDesc(self, DamageType.LIGHTNING, 30 + self:getWil(70) * self:getTalentLevel(t))
+ )
end,
}
@@ -117,7 +121,7 @@ newTalent{
end,
info = function(self, t)
return ([[Breathe poison on your foes, doing %d damage over a few turns.
- The damage will increase with the Willpower stat]]):format(10 + self:getWil(70) * self:getTalentLevel(t))
+ The damage will increase with the Willpower stat]]):format(damDesc(self, DamageType.NATURE, 10 + self:getWil(70) * self:getTalentLevel(t)))
end,
}
diff --git a/game/modules/tome/data/talents/spells/air.lua b/game/modules/tome/data/talents/spells/air.lua
index 9e71fb8425..3c89b88bb9 100644
--- a/game/modules/tome/data/talents/spells/air.lua
+++ b/game/modules/tome/data/talents/spells/air.lua
@@ -45,7 +45,7 @@ newTalent{
end,
info = function(self, t)
return ([[Conjures up mana into a powerful beam of lightning doing %0.2f to %0.2f damage
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 20, 290) / 3, self:combatTalentSpellDamage(t, 20, 290))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.LIGHTNING, self:combatTalentSpellDamage(t, 20, 290) / 3), damDesc(self, DamageType.LIGHTNING, self:combatTalentSpellDamage(t, 20, 290)))
end,
}
@@ -123,8 +123,8 @@ newTalent{
It can hit up to %d targets and will never hit the same one twice; nor will it hit the caster.
The damage will increase with the Magic stat]]):
format(
- self:combatTalentSpellDamage(t, 10, 200) / 3,
- self:combatTalentSpellDamage(t, 10, 200),
+ damDesc(self, DamageType.LIGHTNING, self:combatTalentSpellDamage(t, 10, 200) / 3),
+ damDesc(self, DamageType.LIGHTNING, self:combatTalentSpellDamage(t, 10, 200)),
3 + self:getTalentLevelRaw(t)
)
end,
@@ -224,6 +224,6 @@ newTalent{
return ([[Conjures a furious, raging lightning storm with a radius of 5 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.
This powerful spell will continuously drain mana while active.
- The damage will increase with the Magic stat]]):format(self:getTalentLevel(t), self:combatTalentSpellDamage(t, 15, 80))
+ The damage will increase with the Magic stat]]):format(self:getTalentLevel(t), damDesc(self, DamageType.LIGHTNING, self:combatTalentSpellDamage(t, 15, 80)))
end,
}
diff --git a/game/modules/tome/data/talents/spells/arcane.lua b/game/modules/tome/data/talents/spells/arcane.lua
index 773b19d8b6..6ca9b6cb54 100644
--- a/game/modules/tome/data/talents/spells/arcane.lua
+++ b/game/modules/tome/data/talents/spells/arcane.lua
@@ -77,7 +77,7 @@ newTalent{
info = function(self, t)
return ([[Conjures up mana into a powerful bolt doing %0.2f arcane damage.
At level 3 it becomes a beam.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 20, 230))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.ARCANE, self:combatTalentSpellDamage(t, 20, 230)))
end,
}
diff --git a/game/modules/tome/data/talents/spells/earth.lua b/game/modules/tome/data/talents/spells/earth.lua
index 5d2c04e2fc..b981de1a26 100644
--- a/game/modules/tome/data/talents/spells/earth.lua
+++ b/game/modules/tome/data/talents/spells/earth.lua
@@ -99,7 +99,7 @@ newTalent{
end,
info = function(self, t)
return ([[Conjures up a fist of stone doing %0.2f physical damage and knocking the target back.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 8, 170))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.PHYSICAL, self:combatTalentSpellDamage(t, 8, 170)))
end,
}
diff --git a/game/modules/tome/data/talents/spells/enhancement.lua b/game/modules/tome/data/talents/spells/enhancement.lua
index e8fcd05a44..55eca07afb 100644
--- a/game/modules/tome/data/talents/spells/enhancement.lua
+++ b/game/modules/tome/data/talents/spells/enhancement.lua
@@ -42,7 +42,7 @@ newTalent{
end,
info = function(self, t)
return ([[Engulfs your hands (and weapons) in a sheath of fire, dealing %d fire damage per melee attack and increasing all fire damage by %d%%.]]):
- format(self:combatTalentSpellDamage(t, 5, 20), self:combatTalentSpellDamage(t, 5, 14))
+ format(damDesc(self, DamageType.FIRE, self:combatTalentSpellDamage(t, 5, 20)), self:combatTalentSpellDamage(t, 5, 14))
end,
}
@@ -90,7 +90,7 @@ newTalent{
end,
info = function(self, t)
return ([[Engulfs your hands (and weapons) in a sheath of ice, dealing %d ice damage per melee attack and increasing all cold damage by %d%%.]]):
- format(self:combatTalentSpellDamage(t, 3, 15), self:combatTalentSpellDamage(t, 5, 14))
+ format(damDesc(self, DamageType.COLD, self:combatTalentSpellDamage(t, 3, 15)), self:combatTalentSpellDamage(t, 5, 14))
end,
}
diff --git a/game/modules/tome/data/talents/spells/explosives.lua b/game/modules/tome/data/talents/spells/explosives.lua
index 85c323b9f8..c6ec7d12e2 100644
--- a/game/modules/tome/data/talents/spells/explosives.lua
+++ b/game/modules/tome/data/talents/spells/explosives.lua
@@ -109,6 +109,7 @@ newTalent{
local ammo = self:hasAlchemistWeapon()
local dam, damtype = 1, DamageType.FIRE
if ammo then dam, damtype = t.computeDamage(self, t, ammo) end
+ dam = damDesc(self, damtype, dam)
return ([[Imbue an alchemist gem with an explosive charge of mana and throw it.
The gem will explode for %0.2f %s damage.
Each kind of gem will also provide a specific effect.
@@ -228,6 +229,7 @@ newTalent{
local ammo = self:hasAlchemistWeapon()
local dam, damtype = 1
if ammo then dam = t.computeDamage(self, t, ammo) end
+ dam = damDesc(self, DamageType.PHYSICAL, dam)
return ([[Crush together two alchemist gems, making them extremely unstable.
You then throw them to a target area, where they explode on impact dealing %0.2f physical damage and knocking back any creatures in the blast radius.
Each kind of gem will also provide a specific effect.
diff --git a/game/modules/tome/data/talents/spells/fire-alchemy.lua b/game/modules/tome/data/talents/spells/fire-alchemy.lua
index e83969fa82..1c873f619c 100644
--- a/game/modules/tome/data/talents/spells/fire-alchemy.lua
+++ b/game/modules/tome/data/talents/spells/fire-alchemy.lua
@@ -40,7 +40,7 @@ newTalent{
end,
info = function(self, t)
return ([[Turn part of your target into fire, burning the rest for %0.2f fire damage over 5 turns.
- The damage will increase with Magic stat.]]):format(self:combatTalentSpellDamage(t, 25, 220))
+ The damage will increase with Magic stat.]]):format(damDesc(self, DamageType.FIRE, self:combatTalentSpellDamage(t, 25, 220)))
end,
}
@@ -122,7 +122,7 @@ newTalent{
end,
info = function(self, t)
return ([[A furious fire storm rages around the caster doing %0.2f fire damage in a radius of 3 each turn for %d turns.
- The damage and duration will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 5, 90), 5 + self:combatSpellpower(0.05) + self:getTalentLevel(t))
+ The damage and duration will increase with the Magic stat]]):format(damDesc(self, DamageType.FIRE, self:combatTalentSpellDamage(t, 5, 90)), 5 + self:combatSpellpower(0.05) + self:getTalentLevel(t))
end,
}
@@ -192,8 +192,8 @@ newTalent{
The damage will increase with Magic stat.]]):
format(
self:combatTalentSpellDamage(t, 5, 45),
- self:combatTalentSpellDamage(t, 5, 25),
- self:combatTalentSpellDamage(t, 15, 70)
+ damDesc(self, DamageType.FIRE, self:combatTalentSpellDamage(t, 5, 25)),
+ damDesc(self, DamageType.FIRE, self:combatTalentSpellDamage(t, 15, 70))
)
end,
}
diff --git a/game/modules/tome/data/talents/spells/fire.lua b/game/modules/tome/data/talents/spells/fire.lua
index 5bb68603a6..7a4f42c63f 100644
--- a/game/modules/tome/data/talents/spells/fire.lua
+++ b/game/modules/tome/data/talents/spells/fire.lua
@@ -42,7 +42,7 @@ newTalent{
end,
info = function(self, t)
return ([[Conjures up a bolt of fire, setting the target ablaze and doing %0.2f fire damage over 3 turns.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 25, 290))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.FIRE, self:combatTalentSpellDamage(t, 25, 290)))
end,
}
@@ -69,7 +69,7 @@ newTalent{
end,
info = function(self, t)
return ([[Conjures up a cone of flame. Any target caught in the area will take %0.2f fire damage and be stunned for %d turns.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 10, 120), self:getTalentLevelRaw(t) + 2)
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.FIRE, self:combatTalentSpellDamage(t, 10, 120)), self:getTalentLevelRaw(t) + 2)
end,
}
@@ -100,7 +100,7 @@ newTalent{
end,
info = function(self, t)
return ([[Conjures up a bolt of fire moving toward the target that explodes into a flash of fire doing %0.2f fire damage in a radius of %d.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 28, 280), 1 + self:getTalentLevelRaw(t))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.FIRE, self:combatTalentSpellDamage(t, 28, 280)), 1 + self:getTalentLevelRaw(t))
end,
}
@@ -141,6 +141,6 @@ newTalent{
end,
info = function(self, t)
return ([[Raging flames burn foes and allies alike doing %0.2f fire damage in a radius of 5 each turn for %d turns.
- The damage and duration will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 15, 80), 5 + self:getTalentLevel(t))
+ The damage and duration will increase with the Magic stat]]):format(damDesc(self, DamageType.FIRE, self:combatTalentSpellDamage(t, 15, 80)), 5 + self:getTalentLevel(t))
end,
}
diff --git a/game/modules/tome/data/talents/spells/ice.lua b/game/modules/tome/data/talents/spells/ice.lua
index 0c6ce320b4..06c4acc72a 100644
--- a/game/modules/tome/data/talents/spells/ice.lua
+++ b/game/modules/tome/data/talents/spells/ice.lua
@@ -48,7 +48,7 @@ newTalent{
info = function(self, t)
return ([[Invoke ice shards at the targets in the selected area. Each shard travels slowly and does %0.2f ice damage on impact.
This spell will never hit the caster.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 25, 200))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.COLD, self:combatTalentSpellDamage(t, 25, 200)))
end,
}
@@ -73,7 +73,7 @@ newTalent{
info = function(self, t)
return ([[Blast a wave of cold all around you, doing %0.2f cold damage and freezing creatures to the ground for %d turns.
Affected creatures can still act but not move.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 10, 180), 4)
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.COLD, self:combatTalentSpellDamage(t, 10, 180)), 4)
end,
}
@@ -125,7 +125,7 @@ newTalent{
* Normal rank will get +50%% critical chance
* Elites will get +10%% critical chance
At most it will affect %d foes.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 10, 180), math.ceil(self:getTalentLevel(t) + 2))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.COLD, self:combatTalentSpellDamage(t, 10, 180)), math.ceil(self:getTalentLevel(t) + 2))
end,
}
diff --git a/game/modules/tome/data/talents/spells/phantasm.lua b/game/modules/tome/data/talents/spells/phantasm.lua
index 0a51898e80..abf5749813 100644
--- a/game/modules/tome/data/talents/spells/phantasm.lua
+++ b/game/modules/tome/data/talents/spells/phantasm.lua
@@ -98,7 +98,7 @@ newTalent{
end,
info = function(self, t)
return ([[The caster is surrounded by a phantasmal shield. If hit in melee, the shield will deal %d arcane damage to the attacker.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 10, 50))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.ARCANE, self:combatTalentSpellDamage(t, 10, 50)))
end,
}
diff --git a/game/modules/tome/data/talents/spells/storm.lua b/game/modules/tome/data/talents/spells/storm.lua
index 493fe1bdcc..358e6e6ac2 100644
--- a/game/modules/tome/data/talents/spells/storm.lua
+++ b/game/modules/tome/data/talents/spells/storm.lua
@@ -35,7 +35,7 @@ newTalent{
end,
info = function(self, t)
return ([[Conjures up a bolt of fire, setting the target ablaze and doing %0.2f fire damage over 3 turns.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 25, 290))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.LIGHTNING, self:combatTalentSpellDamage(t, 25, 290)))
end,
}
@@ -57,7 +57,7 @@ newTalent{
end,
info = function(self, t)
return ([[Conjures up a bolt of fire, setting the target ablaze and doing %0.2f fire damage over 3 turns.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 25, 290))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.LIGHTNING, self:combatTalentSpellDamage(t, 25, 290)))
end,
}
@@ -79,7 +79,7 @@ newTalent{
end,
info = function(self, t)
return ([[Conjures up a bolt of fire, setting the target ablaze and doing %0.2f fire damage over 3 turns.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 25, 290))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.LIGHTNING, self:combatTalentSpellDamage(t, 25, 290)))
end,
}
@@ -101,6 +101,6 @@ newTalent{
end,
info = function(self, t)
return ([[Conjures up a bolt of fire, setting the target ablaze and doing %0.2f fire damage over 3 turns.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 25, 290))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.LIGHTNING, self:combatTalentSpellDamage(t, 25, 290)))
end,
}
diff --git a/game/modules/tome/data/talents/spells/water.lua b/game/modules/tome/data/talents/spells/water.lua
index 92a080e1d4..b2a5cacc81 100644
--- a/game/modules/tome/data/talents/spells/water.lua
+++ b/game/modules/tome/data/talents/spells/water.lua
@@ -53,7 +53,7 @@ newTalent{
end,
info = function(self, t)
return ([[Corrosive fumes rise from the ground doing %0.2f acid damage in a radius of 3 each turn for %d turns.
- The damage and duration will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 4, 50), self:getTalentLevel(t) + 2)
+ The damage and duration will increase with the Magic stat]]):format(damDesc(self, DamageType.ACID, self:combatTalentSpellDamage(t, 4, 50)), self:getTalentLevel(t) + 2)
end,
}
@@ -83,7 +83,7 @@ newTalent{
end,
info = function(self, t)
return ([[Condenses ambient water on a target, freezing it for a short while and damaging it for %0.2f.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 12, 160))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.COLD, self:combatTalentSpellDamage(t, 12, 160)))
end,
}
@@ -120,7 +120,7 @@ newTalent{
end,
info = function(self, t)
return ([[A wall of water rushes out from the caster doing %0.2f cold damage and knocking back targets each turn for %d turns.
- The damage and duration will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 5, 90), 5 + self:combatSpellpower(0.01) * self:getTalentLevel(t))
+ The damage and duration will increase with the Magic stat]]):format(damDesc(self, DamageType.COLD, self:combatTalentSpellDamage(t, 5, 90)), 5 + self:combatSpellpower(0.01) * self:getTalentLevel(t))
end,
}
@@ -159,6 +159,6 @@ newTalent{
info = function(self, t)
return ([[A furious ice storm rages around the caster doing %0.2f cold damage in a radius of 3 each turn for %d turns.
It has 25%% chance to freeze damaged targets.
- The damage and duration will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 5, 90), 5 + self:combatSpellpower(0.05) + self:getTalentLevel(t))
+ The damage and duration will increase with the Magic stat]]):format(damDesc(self, DamageType.COLD, self:combatTalentSpellDamage(t, 5, 90)), 5 + self:combatSpellpower(0.05) + self:getTalentLevel(t))
end,
}
diff --git a/game/modules/tome/data/talents/spells/wildfire.lua b/game/modules/tome/data/talents/spells/wildfire.lua
index eb9b1ab003..f2b8305fcc 100644
--- a/game/modules/tome/data/talents/spells/wildfire.lua
+++ b/game/modules/tome/data/talents/spells/wildfire.lua
@@ -39,7 +39,7 @@ newTalent{
end,
info = function(self, t)
return ([[A wave of fire emanates from you, knocking back anything caught inside and setting them ablaze and doing %0.2f fire damage over 3 turns.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 28, 180))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.FIRE, self:combatTalentSpellDamage(t, 28, 180)))
end,
}
@@ -72,7 +72,7 @@ newTalent{
info = function(self, t)
return ([[Surround yourself in flames, setting all those in your line of sight ablaze and doing %0.2f fire damage over 8 turns.
At most it will affect %d foes.
- The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 10, 240), math.ceil(self:getTalentLevel(t) + 2))
+ The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.FIRE, self:combatTalentSpellDamage(t, 10, 240)), math.ceil(self:getTalentLevel(t) + 2))
end,
}
diff --git a/game/modules/tome/data/talents/techniques/warcries.lua b/game/modules/tome/data/talents/techniques/warcries.lua
index 3c94b0b277..a74d0998a1 100644
--- a/game/modules/tome/data/talents/techniques/warcries.lua
+++ b/game/modules/tome/data/talents/techniques/warcries.lua
@@ -37,7 +37,7 @@ newTalent{
end,
info = function(self, t)
return ([[A powerful shout, doing %0.2f physical damage in a radius %d cone in front of you.
- The damage increases with Strength.]]):format((50 + self:getTalentLevel(t) * self:getStr()) / 2.3, 3 + self:getTalentLevelRaw(t))
+ The damage increases with Strength.]]):format(damDesc(self, DamageType.PHYSICAL, (50 + self:getTalentLevel(t) * self:getStr()) / 2.3), 3 + self:getTalentLevelRaw(t))
end,
}
diff --git a/game/modules/tome/data/talents/undeads/ghoul.lua b/game/modules/tome/data/talents/undeads/ghoul.lua
index 2cb7a2de0b..9cfb2116e1 100644
--- a/game/modules/tome/data/talents/undeads/ghoul.lua
+++ b/game/modules/tome/data/talents/undeads/ghoul.lua
@@ -142,6 +142,6 @@ newTalent{
end,
info = function(self, t)
return ([[Vomit on the ground around you, healing any undead in the area and damaging others.
- Lasts %d turns and deals %d blight damage.]]):format(self:getTalentLevel(t) / 2 + 4, (2 + self:getCon(8)) * self:getTalentLevel(t))
+ Lasts %d turns and deals %d blight damage.]]):format(self:getTalentLevel(t) / 2 + 4, damDesc(self, DamageType.BLIGHT, (2 + self:getCon(8)) * self:getTalentLevel(t)))
end,
}
diff --git a/game/modules/tome/data/talents/undeads/skeleton.lua b/game/modules/tome/data/talents/undeads/skeleton.lua
index 6c98898d2f..a38e1803c3 100644
--- a/game/modules/tome/data/talents/undeads/skeleton.lua
+++ b/game/modules/tome/data/talents/undeads/skeleton.lua
@@ -73,7 +73,7 @@ newTalent{
end,
info = function(self, t)
return ([[Lay down some sharpened bones to make a simple trap that will cause anyone stepping on it to bleed for %d damage.]]):
- format((10 + self:getStr(20)) * self:getTalentLevel(t))
+ format(damDesc(self, DamageType.PHYSICAL, (10 + self:getStr(20)) * self:getTalentLevel(t)))
end,
}
--
GitLab