From fa0b65b34f07ac0c0c6a1337c85ecca6ef166257 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Thu, 11 Feb 2010 08:37:34 +0000
Subject: [PATCH] various fixes
git-svn-id: http://svn.net-core.org/repos/t-engine4@333 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/data/talents/misc/misc.lua | 2 +-
game/modules/tome/data/talents/misc/npcs.lua | 2 +-
.../tome/data/talents/techniques/combat-techniques.lua | 2 +-
.../tome/data/talents/techniques/weaponshield.lua | 10 +++++-----
game/modules/tome/data/zones/maze/npcs.lua | 1 +
5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/game/modules/tome/data/talents/misc/misc.lua b/game/modules/tome/data/talents/misc/misc.lua
index 89aa794c47..3e118861ec 100644
--- a/game/modules/tome/data/talents/misc/misc.lua
+++ b/game/modules/tome/data/talents/misc/misc.lua
@@ -124,7 +124,7 @@ newTalent{
return true
end,
info = function(self)
- return ([[Call legendary resilience of the Dwarven race to increase your armor(+%d), spell(+%d) and physical(+%d) resistances for 8 turns.
+ return ([[Call upon the legendary resilience of the Dwarven race to increase your armor(+%d), spell(+%d) and physical(+%d) resistances for 8 turns.
The bonus will increase with the Constitution stat]]):format(5 + self:getCon() / 5, 10 + self:getCon() / 5, 10 + self:getCon() / 5)
end,
}
diff --git a/game/modules/tome/data/talents/misc/npcs.lua b/game/modules/tome/data/talents/misc/npcs.lua
index cf451fb402..c25e95e9d0 100644
--- a/game/modules/tome/data/talents/misc/npcs.lua
+++ b/game/modules/tome/data/talents/misc/npcs.lua
@@ -138,7 +138,7 @@ newTalent{
local x, y, target = self:getTarget(tg)
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 hit = self:attackTarget(target, 0.5 + self:getTalentLevel(t) / 10, true)
+ local hit = self:attackTarget(target, nil, 0.5 + self:getTalentLevel(t) / 10, true)
-- Try to stun !
if hit then
diff --git a/game/modules/tome/data/talents/techniques/combat-techniques.lua b/game/modules/tome/data/talents/techniques/combat-techniques.lua
index bf6a017e62..7193b5a1ba 100644
--- a/game/modules/tome/data/talents/techniques/combat-techniques.lua
+++ b/game/modules/tome/data/talents/techniques/combat-techniques.lua
@@ -2,7 +2,7 @@
-- Active techniques
----------------------------------------------------
newTalent{
- name = "Precise Striking",
+ name = "Precise Strikes",
type = {"technique/combat-techniques-active", 1},
mode = "sustained",
points = 5,
diff --git a/game/modules/tome/data/talents/techniques/weaponshield.lua b/game/modules/tome/data/talents/techniques/weaponshield.lua
index 63f6c58ec7..ef1e13e204 100644
--- a/game/modules/tome/data/talents/techniques/weaponshield.lua
+++ b/game/modules/tome/data/talents/techniques/weaponshield.lua
@@ -127,7 +127,7 @@ newTalent{
return true
end,
info = function(self, t)
- return ([[Hits the target with shield doing %d%% damage. If it hits you follow up with 2 weapon strikes which are automatic crits.]]):
+ return ([[Hits the target with shield doing %d%% damage. If it hits, you follow up with two weapon strikes which are automatic crits.]]):
format(100 * (1 + (self:getTalentLevel(t) + self:getTalentLevel(self.T_SHIELD_EXPERTISE) / 2) / 10))
end,
}
@@ -175,8 +175,8 @@ newTalent{
return true
end,
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(
+ return ([[Enter 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 immune to stuns and knockbacks.]]):format(
5 + self:getDex(4) * self:getTalentLevel(t) + self:getTalentLevel(self.T_SHIELD_EXPERTISE),
5 + self:getCun(4) * self:getTalentLevel(t) + self:getTalentLevel(self.T_SHIELD_EXPERTISE)
)
@@ -212,7 +212,7 @@ newTalent{
return true
end,
info = function(self, t)
- return ([[Let all your foes pile up on your shield then put all your strengh in one mighty thrust and repel them all away.]])
+ return ([[Let all your foes pile up on your shield then put all your strength in one mighty thrust and repel them all away.]])
end,
}
@@ -251,7 +251,7 @@ newTalent{
end
return {
- max_life = self:addTemporaryValue("max_life", 10 * self:getTalentLevel(t)),
+ max_life = self:addTemporaryValue("max_life", (10 + self:getCon() * 0.25) * self:getTalentLevel(t)),
def = self:addTemporaryValue("combat_def", 5 + self:getDex(4) * self:getTalentLevel(t)),
nomove = self:addTemporaryValue("never_move", 1),
}
diff --git a/game/modules/tome/data/zones/maze/npcs.lua b/game/modules/tome/data/zones/maze/npcs.lua
index b128251089..272c9e008f 100644
--- a/game/modules/tome/data/zones/maze/npcs.lua
+++ b/game/modules/tome/data/zones/maze/npcs.lua
@@ -29,6 +29,7 @@ newEntity{ define_as = "MINOTAUR_MAZE",
drops = resolvers.drops{chance=100, nb=5, {ego_chance=100} },
talents = resolvers.talents{
+ [Talents.T_HEAVY_ARMOUR_TRAINING]=1,
[Talents.T_STAMINA_POOL]=1,
[Talents.T_WARSHOUT]=1,
[Talents.T_STUNNING_BLOW]=1,
--
GitLab