diff --git a/game/modules/tome/class/interface/Combat.lua b/game/modules/tome/class/interface/Combat.lua
index 438f1f415d971871299b4ca8ce90c8ffa19be67e..62c7e86fea9298f1153e52d5f1affacf59bfb88d 100644
--- a/game/modules/tome/class/interface/Combat.lua
+++ b/game/modules/tome/class/interface/Combat.lua
@@ -155,7 +155,7 @@ end
--- Gets the defense
function _M:combatDefense()
- return self.combat_def + self:getDex() - 10
+ return self.combat_def + (self:getDex() - 10) * 0.35
end
--- Gets the armor
diff --git a/game/modules/tome/data/talents/misc/npcs.lua b/game/modules/tome/data/talents/misc/npcs.lua
index 31cd52b75fd67a687e61e304c920088440a244f7..0f06dcb9ca75d2c17e982747441bf27208051f50 100644
--- a/game/modules/tome/data/talents/misc/npcs.lua
+++ b/game/modules/tome/data/talents/misc/npcs.lua
@@ -48,7 +48,9 @@ newTalent{
action = function(self, t)
local x, y, target = self:getTarget()
if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
+ self.combat_apr = self.combat_apr + 1000
self:attackTarget(target, DamageType.POISON, 2 + self:getTalentLevel(t), true)
+ self.combat_apr = self.combat_apr - 1000
return true
end,
info = function(self)
@@ -67,7 +69,9 @@ newTalent{
action = function(self, t)
local x, y, target = self:getTarget()
if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
+ self.combat_apr = self.combat_apr + 1000
self:attackTarget(target, DamageType.ACID, 1 + self:getTalentLevel(t) / 3, true)
+ self.combat_apr = self.combat_apr - 1000
return true
end,
info = function(self)
@@ -88,7 +92,9 @@ newTalent{
local x, y, target = self:getTarget(t)
if not x or not y or not target then return nil end
if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
+ self.combat_apr = self.combat_apr + 1000
self:attackTarget(target, DamageType.BLIND, 0.8 + self:getTalentLevel(t) / 10, true)
+ self.combat_apr = self.combat_apr - 1000
return true
end,
info = function(self)
@@ -107,7 +113,9 @@ newTalent{
action = function(self, t)
local x, y, target = self:getTarget()
if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
+ self.combat_apr = self.combat_apr + 1000
self:attackTarget(target, DamageType.POISON, 2 + self:getTalentLevel(t), true)
+ self.combat_apr = self.combat_apr - 1000
return true
end,
info = function(self)
diff --git a/game/modules/tome/data/talents/misc/random.lua b/game/modules/tome/data/talents/misc/random.lua
index cdf1db7994c5f797597c6ebd1c4eb116f0be39bc..e58bcf7b1f464f024720194a782ee476f3a99ded 100644
--- a/game/modules/tome/data/talents/misc/random.lua
+++ b/game/modules/tome/data/talents/misc/random.lua
@@ -17,7 +17,9 @@ newTalent{
local x, y, target = self:getTarget(t)
if not x or not y or not target then return nil end
if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
+ self.combat_apr = self.combat_apr + 1000
self:attackTarget(target, DamageType.POISON, 1.5 + self:getTalentLevel(t) / 5, true)
+ self.combat_apr = self.combat_apr - 1000
return true
end,
info = function(self)
diff --git a/game/modules/tome/data/talents/physical/2hweapon.lua b/game/modules/tome/data/talents/physical/2hweapon.lua
index f6f92bccc8fa90862cefa1402fe4bbf32bbfb99f..236d8537f2a35e6b4d4259fd24e8f5fb24a491a1 100644
--- a/game/modules/tome/data/talents/physical/2hweapon.lua
+++ b/game/modules/tome/data/talents/physical/2hweapon.lua
@@ -16,7 +16,7 @@ newTalent{
local x, y, target = self:getTarget(t)
if not x or not y or not target then return nil end
if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
- local speed, hit = self:attackTargetWith(target, weapon.combat, nil, 2)
+ local speed, hit = self:attackTargetWith(target, weapon.combat, nil, 1.5 + self:getTalentLevel(t) / 10)
-- Try to stun !
if hit then
@@ -29,8 +29,8 @@ newTalent{
return true
end,
- info = function(self)
- return ([[Hits the target with your weapon, if the atatck hits, the target is stunned.]])
+ info = function(self, t)
+ return ([[Hits the target with your weapon doing %d%% damage, if the atatck hits, the target is stunned.]]):format(100 * (1.5 + self:getTalentLevel(t) / 10))
end,
}
@@ -59,7 +59,7 @@ newTalent{
end
self.combat_physcrit = self.combat_physcrit + 100
- local speed, hit = self:attackTargetWith(target, weapon.combat, nil, 2 + self:getTalentLevel(t) / 10)
+ local speed, hit = self:attackTargetWith(target, weapon.combat, nil, 2 + self:getTalentLevel(t) / 5)
if self:getTalentLevel(t) >= 4 then
self.combat_dam = self.combat_dam - inc
@@ -80,9 +80,9 @@ newTalent{
return true
end,
- info = function(self)
- return ([[Tries to perform a killing blow, granting automatic critical hit. If the target ends up with low enough life it might be instantly killed.
- At level 4 it drains all remaining stamina and uses it to increase the blow damage.]])
+ info = function(self, t)
+ return ([[Tries to perform a killing blow doing %d%% weapon damage, granting automatic critical hit. If the target ends up with low enough life it might be instantly killed.
+ At level 4 it drains all remaining stamina and uses it to increase the blow damage.]]):format(100 * (2 + self:getTalentLevel(t) / 5))
end,
}
@@ -110,8 +110,8 @@ newTalent{
return true
end,
- info = function(self)
- return ([[Spin around, extending your weapon and damaging all targets aruond.]])
+ info = function(self, t)
+ return ([[Spin around, extending your weapon and damaging all targets around for %d%% weapon damage.]]):format(100 * (1.4 + self:getTalentLevel(t) / 8))
end,
}
@@ -133,8 +133,8 @@ newTalent{
return {
atk = self:addTemporaryValue("combat_dam", 5 + self:getStr(4) * self:getTalentLevel(t)),
dam = self:addTemporaryValue("combat_atk", 5 + self:getDex(4) * self:getTalentLevel(t)),
- def = self:addTemporaryValue("combat_def", -5),
- armor = self:addTemporaryValue("combat_armor", -5),
+ def = self:addTemporaryValue("combat_def", -15),
+ armor = self:addTemporaryValue("combat_armor", -15),
}
end,
deactivate = function(self, t, p)
@@ -144,7 +144,7 @@ newTalent{
self:removeTemporaryValue("combat_dam", p.dam)
return true
end,
- info = function(self)
- return ([[Enters a protective battle stance, increasing attack and damage at the cost of defense and armor.]])
+ info = function(self, t)
+ return ([[Enters a protective battle stance, increasing attack by %d and damage by %d at the cost of 15 defense and 15 armor.]]):format(5 + self:getDex(4) * self:getTalentLevel(t), 5 + self:getStr(4) * self:getTalentLevel(t))
end,
}
diff --git a/game/modules/tome/data/talents/physical/combat-training.lua b/game/modules/tome/data/talents/physical/combat-training.lua
index bd0d7227fc1af82f1eb1c5262ec20b5063064cbd..792eced89a4b3bafb8d02621cc8ccaf7b83b7067 100644
--- a/game/modules/tome/data/talents/physical/combat-training.lua
+++ b/game/modules/tome/data/talents/physical/combat-training.lua
@@ -3,7 +3,7 @@ newTalent{
type = {"physical/combat-training", 1},
mode = "passive",
require = { stat = { str=18 }, },
- info = function(self)
+ info = function(self, t)
return [[Teaches the usage of heavy mail armours.]]
end,
}
@@ -13,7 +13,7 @@ newTalent{
type = {"physical/combat-training", 2},
mode = "passive",
require = { stat = { str=22 }, talent = { Talents.T_HEAVY_ARMOUR_TRAINING }, },
- info = function(self)
+ info = function(self, t)
return [[Teaches the usage of massive plate armours.]]
end,
}
@@ -30,7 +30,7 @@ newTalent{
on_unlearn = function(self, t)
self.max_life = self.max_life - 40
end,
- info = function(self)
+ info = function(self, t)
return [[Increases your maximun life by 40 per talent level]]
end,
}
diff --git a/game/modules/tome/data/talents/physical/dualweapon.lua b/game/modules/tome/data/talents/physical/dualweapon.lua
index 0fd3d77394947251baf1cedcb349b56dad7fea1a..f812a531c6ff6632f607d03c9da6d083c21ce793 100644
--- a/game/modules/tome/data/talents/physical/dualweapon.lua
+++ b/game/modules/tome/data/talents/physical/dualweapon.lua
@@ -4,8 +4,8 @@ newTalent{
mode = "passive",
points = 5,
require = { stat = { dex=14 } },
- info = function(self)
- return ([[Reduces the damage penality of the off-hand weapon]])
+ info = function(self, t)
+ return ([[Reduces the damage penality of the off-hand weapon to %d%%]]):format(100 / (2 - self:getTalentLevel(t) / 6))
end,
}
@@ -34,8 +34,8 @@ newTalent{
return true
end,
- info = function(self)
- return ([[Lashes out a flurry of blows, hiting your target three times with each weapons.]])
+ info = function(self, t)
+ return ([[Lashes out a flurry of blows, hiting your target three times with each weapons for %d%% damage.]]):format(100 * (1.8 + self:getTalentLevel(t) / 10))
end,
}
@@ -64,8 +64,8 @@ newTalent{
return true
end,
- info = function(self)
- return ([[Spin around, damaging all targets around with both weapons.]])
+ info = function(self, t)
+ return ([[Spin around, damaging all targets around with both weapons for %d%%.]]):format(100 * (1.4 + self:getTalentLevel(t) / 10))
end,
}
@@ -95,8 +95,8 @@ newTalent{
self:removeTemporaryValue("stamina_regen", p.stamina_regen)
return true
end,
- info = function(self)
- return ([[Greatly increases attack speed, but drains stamina quickly.]])
+ info = function(self, t)
+ return ([[Increases attack speed by %0.2f, but drains stamina quickly.]]):format(-0.1 - self:getTalentLevel(t) / 10)
end,
}
@@ -127,7 +127,7 @@ newTalent{
self:removeTemporaryValue("stamina_regen", p.stamina_regen)
return true
end,
- info = function(self)
+ info = function(self, t)
return ([[Greatly increases attack speed, but drains stamina quickly.]])
end,
}
diff --git a/game/modules/tome/data/talents/physical/weapon-training.lua b/game/modules/tome/data/talents/physical/weapon-training.lua
index 978c0c8bbb749f248e4f181d140dd1ec1f086c45..6dddf9f79c1f9906eaff39cdbba088929af01387 100644
--- a/game/modules/tome/data/talents/physical/weapon-training.lua
+++ b/game/modules/tome/data/talents/physical/weapon-training.lua
@@ -4,17 +4,17 @@ newTalent{
points = 10,
require = { level=function(level) return (level - 1) * 2 end },
mode = "passive",
- info = function(self)
+ info = function(self, t)
return [[Increases chances to hit with melee weapons.]]
end,
}
newTalent{
name = "Sword Mastery",
type = {"physical/weapon-training", 1},
- points = 12,
- require = { stat = { str=function(level) return 10 + level * 3 end }, },
+ points = 10,
+ require = { stat = { str=function(level) return 12 + level * 3 end }, },
mode = "passive",
- info = function(self)
+ info = function(self, t)
return [[Increases damage with swords.]]
end,
}
@@ -22,10 +22,10 @@ newTalent{
newTalent{
name = "Axe Mastery",
type = {"physical/weapon-training", 1},
- points = 12,
- require = { stat = { str=function(level) return 10 + level * 3 end }, },
+ points = 10,
+ require = { stat = { str=function(level) return 12 + level * 3 end }, },
mode = "passive",
- info = function(self)
+ info = function(self, t)
return [[Increases damage with axes.]]
end,
}
@@ -33,10 +33,10 @@ newTalent{
newTalent{
name = "Mace Mastery",
type = {"physical/weapon-training", 1},
- points = 14,
- require = { stat = { str=function(level) return 10 + level * 3 end }, },
+ points = 10,
+ require = { stat = { str=function(level) return 14 + level * 3 end }, },
mode = "passive",
- info = function(self)
+ info = function(self, t)
return [[Increases damage with maces.]]
end,
}
@@ -47,7 +47,7 @@ newTalent{
points = 10,
require = { stat = { dex=function(level) return 10 + level * 3 end }, },
mode = "passive",
- info = function(self)
+ info = function(self, t)
return [[Increases damage with knifes.]]
end,
}
diff --git a/game/modules/tome/data/talents/physical/weaponshield.lua b/game/modules/tome/data/talents/physical/weaponshield.lua
index 29f92c387d5dbd92bee6664b7d125fedc904653a..8cdb6efe95141aae534eaf75023ab097ffba1eca 100644
--- a/game/modules/tome/data/talents/physical/weaponshield.lua
+++ b/game/modules/tome/data/talents/physical/weaponshield.lua
@@ -29,9 +29,9 @@ newTalent{
return true
end,
- info = function(self)
- return ([[Hits the target with a shield strike, stunning it.
- The damage multiplier increases with your strength.]])
+ info = function(self, t)
+ return ([[Hits the target with a shield strike, stunning it and doing %d%% shield damage.
+ The damage multiplier increases with your strength.]]):format(100 * (2 + self:getTalentLevel(t) / 5))
end,
}
@@ -72,9 +72,9 @@ newTalent{
return true
end,
- info = function(self)
- return ([[Hits the target with your weapon and two shield strikes, trying to overpower your target.
- If the last attack hits, the target is knocked back.]])
+ info = function(self, t)
+ return ([[Hits the target with your weapon and two shield strikes doing %d%% damage, trying to overpower your target.
+ If the last attack hits, the target is knocked back.]]):format(100 * (1.8 + self:getTalentLevel(t) / 10))
end,
}
@@ -106,7 +106,7 @@ newTalent{
return true
end,
- info = function(self)
+ info = function(self, t)
return ([[Let all your foes pile up on your shield then put all your strengh in one mighty thurst and repel them all away.]])
end,
}
@@ -132,8 +132,8 @@ newTalent{
knock = self:addTemporaryValue("knockback_immune", 1)
end
return {
- atk = self:addTemporaryValue("combat_dam", -5),
- dam = self:addTemporaryValue("combat_atk", -5),
+ atk = self:addTemporaryValue("combat_dam", -10),
+ dam = self:addTemporaryValue("combat_atk", -10),
def = self:addTemporaryValue("combat_def", 5 + self:getDex(4) * self:getTalentLevel(t)),
armor = self:addTemporaryValue("combat_armor", 5 + self:getCun(4) * self:getTalentLevel(t)),
stun = stun,
@@ -149,8 +149,8 @@ newTalent{
if p.knock then self:removeTemporaryValue("knockback_immune", p.knock) end
return true
end,
- info = function(self)
- return ([[Enters a protective battle stance, incraesing defense and armor at the cost of attack and damage.
- At level 5 it also makes you immnue to stuns and knockbacks.]])
+ info = function(self, t)
+ return ([[Enters a protective battle stance, increasing defense by %d and armor by %d at the cost of 10 attack and 10 damage.
+ At level 5 it also makes you immnue to stuns and knockbacks.]]):format(5 + self:getDex(4) * self:getTalentLevel(t), 5 + self:getCun(4) * 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 c9c90139961e92ed61db73fefbe3fe8c91dafbac..cf0421f4ab699d2e1623034eee7b55fbad92e98b 100644
--- a/game/modules/tome/data/talents/spells/air.lua
+++ b/game/modules/tome/data/talents/spells/air.lua
@@ -1,3 +1,27 @@
+newTalent{
+ name = "Lightning",
+ type = {"spell/air", 1},
+ points = 5,
+ mana = 10,
+ cooldown = 3,
+ tactical = {
+ ATTACK = 10,
+ },
+ range = 20,
+ action = function(self, t)
+ local tg = {type="beam", range=self:getTalentRange(t)}
+ local x, y = self:getTarget(tg)
+ if not x or not y then return nil end
+ self:project(tg, x, y, DamageType.LIGHTNING, rng.avg(1, self:spellCrit(20 + self:combatSpellpower(0.8) * self:getTalentLevel(t)), 3))
+ return true
+ end,
+ require = { stat = { mag=10 }, },
+ info = function(self, t)
+ return ([[Conjures up mana into a powerful beam of lightning doing 1 to %0.2f damage
+ The damage will increase with the Magic stat]]):format(20 + self:combatSpellpower(0.8) * self:getTalentLevel(t))
+ end,
+}
+
newTalent{
name = "Noxious Cloud",
type = {"spell/air",1},
diff --git a/game/modules/tome/data/talents/spells/arcane.lua b/game/modules/tome/data/talents/spells/arcane.lua
index b533fdaf239bcbf0b6e0eeeffa9e578d565b7242..c313532e2572abbe13ab6e43c1e15a73816811d4 100644
--- a/game/modules/tome/data/talents/spells/arcane.lua
+++ b/game/modules/tome/data/talents/spells/arcane.lua
@@ -13,14 +13,14 @@ newTalent{
if self:getTalentLevel(t) >= 3 then tg.type = "beam" end
local x, y = self:getTarget(tg)
if not x or not y then return nil end
- self:project(tg, x, y, DamageType.ARCANE, self:spellCrit(10 + self:combatSpellpower(0.5) * self:getTalentLevel(t)))
+ self:project(tg, x, y, DamageType.ARCANE, self:spellCrit(20 + self:combatSpellpower(0.5) * self:getTalentLevel(t)))
return true
end,
require = { stat = { mag=10 }, },
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(10 + self:combatSpellpower(0.5) * self:getTalentLevel(t))
+ The damage will increase with the Magic stat]]):format(20 + self:combatSpellpower(0.5) * self:getTalentLevel(t))
end,
}
diff --git a/game/modules/tome/data/talents/spells/earth.lua b/game/modules/tome/data/talents/spells/earth.lua
index c198b954406de59ee36b31cb901ba754a4745573..313033a6d790ca51b5b197443238fec4b77d2752 100644
--- a/game/modules/tome/data/talents/spells/earth.lua
+++ b/game/modules/tome/data/talents/spells/earth.lua
@@ -9,7 +9,7 @@ newTalent{
DEFEND = 10,
},
activate = function(self, t)
- local power = 1 + self:combatSpellpower(0.3) * self:getTalentLevel(t)
+ local power = 1 + self:combatSpellpower(0.03) * self:getTalentLevel(t)
return {
armor = self:addTemporaryValue("combat_armor", power),
}
@@ -21,7 +21,7 @@ newTalent{
require = { stat = { mag=14 }, },
info = function(self, t)
return ([[The caster skin grows as hard as stone, granting %d bonus to armor.
- The bonus to armor will increase with the Magic stat]]):format(1 + self:combatSpellpower(0.3) * self:getTalentLevel(t))
+ The bonus to armor will increase with the Magic stat]]):format(1 + self:combatSpellpower(0.03) * self:getTalentLevel(t))
end,
}
diff --git a/game/modules/tome/data/talents/spells/fire.lua b/game/modules/tome/data/talents/spells/fire.lua
index d97844066c1c9ff77250da3e62063dcbc6598b54..021914f86e87dc32ebd58c46bda68106c6f6cb53 100644
--- a/game/modules/tome/data/talents/spells/fire.lua
+++ b/game/modules/tome/data/talents/spells/fire.lua
@@ -12,13 +12,13 @@ newTalent{
local tg = {type="bolt", range=self:getTalentRange(t)}
local x, y = self:getTarget(tg)
if not x or not y then return nil end
- self:project(tg, x, y, DamageType.ACID, self:spellCrit(15 + self:combatSpellpower(0.8) * self:getTalentLevel(t)))
+ self:project(tg, x, y, DamageType.FIREBURN, self:spellCrit(25 + self:combatSpellpower(0.8) * self:getTalentLevel(t)))
return true
end,
require = { stat = { mag=10 }, },
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(15 + self:combatSpellpower(0.8) * self:getTalentLevel(t))
+ The damage will increase with the Magic stat]]):format(25 + self:combatSpellpower(0.8) * self:getTalentLevel(t))
end,
}
diff --git a/game/modules/tome/data/talents/spells/nature.lua b/game/modules/tome/data/talents/spells/nature.lua
index d4b5cafa96a0a4a463f6ef0cf1b27d3fba69181c..f26b95ff40639177a37d742f42e9d6f8db2204f1 100644
--- a/game/modules/tome/data/talents/spells/nature.lua
+++ b/game/modules/tome/data/talents/spells/nature.lua
@@ -8,13 +8,13 @@ newTalent{
HEAL = 10,
},
action = function(self, t)
- self:setEffect(self.EFF_REGENERATION, 10, {power=5 + self:combatSpellpower(0.7) * self:getTalentLevel(t)})
+ self:setEffect(self.EFF_REGENERATION, 10, {power=5 + self:combatSpellpower(0.07) * self:getTalentLevel(t)})
return true
end,
require = { stat = { mag=10 }, },
info = function(self, t)
return ([[Call upon the forces of nature to regenerate your body for %d life every turns for 10 turns.
- The life healed will increase with the Magic stat]]):format(5 + self:combatSpellpower(0.7) * self:getTalentLevel(t))
+ The life healed will increase with the Magic stat]]):format(5 + self:combatSpellpower(0.07) * self:getTalentLevel(t))
end,
}
diff --git a/game/modules/tome/data/talents/spells/water.lua b/game/modules/tome/data/talents/spells/water.lua
index 8f811ac2bd1ebcd38f0c63af9d5a32d27d6deb7b..7432755d6da177b11237571edbf46075d079ae39 100644
--- a/game/modules/tome/data/talents/spells/water.lua
+++ b/game/modules/tome/data/talents/spells/water.lua
@@ -27,14 +27,14 @@ newTalent{
local tg = {type="hit", range=self:getTalentRange(t)}
local x, y = self:getTarget(tg)
if not x or not y then return nil end
- self:project(tg, x, y, DamageType.COLD, self:spellCrit(7 + self:combatSpellpower(0.25) * self:getTalentLevel(t)))
+ self:project(tg, x, y, DamageType.COLD, self:spellCrit(12 + self:combatSpellpower(0.25) * self:getTalentLevel(t)))
self:project(tg, x, y, DamageType.FREEZE, 2 + math.floor(self:getTalentLevel(t) / 3))
return true
end,
require = { stat = { mag=14 }, },
info = function(self, t)
- return ([[Condenses ambiant water on a target, freezing it for a short while.
- The damage will increase with the Magic stat]]):format(7 + self:combatSpellpower(0.25) * self:getTalentLevel(t))
+ return ([[Condenses ambiant 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(12 + self:combatSpellpower(0.25) * self:getTalentLevel(t))
end,
}