From aed5650f473a26042fbe98689ac52639fdef2489 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Wed, 29 Sep 2010 21:51:47 +0000
Subject: [PATCH] fix
git-svn-id: http://svn.net-core.org/repos/t-engine4@1335 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/engine/interface/ObjectActivable.lua | 8 ++++----
game/engines/default/engine/interface/PlayerHotkeys.lua | 2 +-
game/modules/tome/class/Player.lua | 4 ++--
game/modules/tome/data/general/objects/egos/amulets.lua | 1 +
game/modules/tome/data/general/objects/egos/belt.lua | 1 +
game/modules/tome/data/general/objects/egos/boots.lua | 1 +
.../modules/tome/data/general/objects/world-artifacts.lua | 2 ++
.../tome/data/talents/techniques/combat-techniques.lua | 4 ++--
8 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/game/engines/default/engine/interface/ObjectActivable.lua b/game/engines/default/engine/interface/ObjectActivable.lua
index 7edacbbf22..c10cc46130 100644
--- a/game/engines/default/engine/interface/ObjectActivable.lua
+++ b/game/engines/default/engine/interface/ObjectActivable.lua
@@ -59,9 +59,10 @@ end
function _M:useObject(who, ...)
if self.use_power then
if self.power >= self.use_power.power then
- local ret, no_power = self.use_power.use(self, who, ...)
+ local rets = { self.use_power.use(self, who, ...) }
+ local no_power = rets[3]
if not no_power then self.power = self.power - self.use_power.power end
- return ret
+ return unpack(rets)
else
if self.power_regen and self.power_regen ~= 0 then
game.logPlayer(who, "%s is still recharging.", self:getName{no_count=true})
@@ -70,8 +71,7 @@ function _M:useObject(who, ...)
end
end
elseif self.use_simple then
- local ret = self.use_simple.use(self, who, ...)
- return ret
+ return self.use_simple.use(self, who, ...)
elseif self.use_talent then
if not self.use_talent.power or self.power >= self.use_talent.power then
self.power = self.power - self.use_talent.power
diff --git a/game/engines/default/engine/interface/PlayerHotkeys.lua b/game/engines/default/engine/interface/PlayerHotkeys.lua
index 9e997cc7a5..6712f3fe73 100644
--- a/game/engines/default/engine/interface/PlayerHotkeys.lua
+++ b/game/engines/default/engine/interface/PlayerHotkeys.lua
@@ -36,7 +36,7 @@ function _M:activateHotkey(id)
if self.hotkey[id] then
self["hotkey"..self.hotkey[id][1]:capitalize()](self, self.hotkey[id][2])
else
- Dialog:simplePopup("Hotkey not defined", "You may define a hotkey by pressing 'm' and following the inscructions there.")
+ Dialog:simplePopup("Hotkey not defined", "You may define a hotkey by pressing 'm' and following the instructions there.")
end
end
diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua
index 5fc8da1607..cd035909ea 100644
--- a/game/modules/tome/class/Player.lua
+++ b/game/modules/tome/class/Player.lua
@@ -609,8 +609,8 @@ function _M:playerUseItem(object, item, inven)
local use_fct = function(o, inven, item)
local co = coroutine.create(function()
self.changed = true
- local ret, no_id = o:use(self, nil, inven, item)
- if not no_id then
+ local ret, id = o:use(self, nil, inven, item)
+ if id then
o:identify(true)
end
if ret and ret == "destroy" then
diff --git a/game/modules/tome/data/general/objects/egos/amulets.lua b/game/modules/tome/data/general/objects/egos/amulets.lua
index 0f5b9a1089..f65bb85533 100644
--- a/game/modules/tome/data/general/objects/egos/amulets.lua
+++ b/game/modules/tome/data/general/objects/egos/amulets.lua
@@ -139,5 +139,6 @@ newEntity{
who:teleportRandom(who.x, who.y, 200)
game.level.map:particleEmitter(who.x, who.y, 1, "teleport")
game.logSeen(who, "%s uses %s!", who.name:capitalize(), self:getName{no_count=true})
+ return nil, true
end}
}
diff --git a/game/modules/tome/data/general/objects/egos/belt.lua b/game/modules/tome/data/general/objects/egos/belt.lua
index ceb2212cb2..5941fa134b 100644
--- a/game/modules/tome/data/general/objects/egos/belt.lua
+++ b/game/modules/tome/data/general/objects/egos/belt.lua
@@ -44,6 +44,7 @@ newEntity{
local power = 100 + who:getMag(120)
who:setEffect(who.EFF_DAMAGE_SHIELD, 10, {power=power})
game.logSeen(who, "%s uses %s!", who.name:capitalize(), self:getName{no_count=true})
+ return nil, true
end}
}
diff --git a/game/modules/tome/data/general/objects/egos/boots.lua b/game/modules/tome/data/general/objects/egos/boots.lua
index 8a195aa0b9..38b3616438 100644
--- a/game/modules/tome/data/general/objects/egos/boots.lua
+++ b/game/modules/tome/data/general/objects/egos/boots.lua
@@ -31,6 +31,7 @@ newEntity{
who:teleportRandom(who.x, who.y, 10 + who:getMag(5))
game.level.map:particleEmitter(who.x, who.y, 1, "teleport")
game.logSeen(who, "%s uses %s!", who.name:capitalize(), self:getName{no_count=true})
+ return nil, true
end}
}
diff --git a/game/modules/tome/data/general/objects/world-artifacts.lua b/game/modules/tome/data/general/objects/world-artifacts.lua
index ef34956f85..12e96291f6 100644
--- a/game/modules/tome/data/general/objects/world-artifacts.lua
+++ b/game/modules/tome/data/general/objects/world-artifacts.lua
@@ -191,6 +191,7 @@ newEntity{
use = function(self, who)
who:heal(150 + who:getMag())
game.logSeen(who, "%s quaffs an %s!", who.name:capitalize(), self:getName())
+ return nil, true
end
},
}
@@ -212,6 +213,7 @@ newEntity{
use = function(self, who)
who:incMana(150 + who:getMag())
game.logSeen(who, "%s quaffs an %s!", who.name:capitalize(), self:getName())
+ return nil, true
end
},
}
diff --git a/game/modules/tome/data/talents/techniques/combat-techniques.lua b/game/modules/tome/data/talents/techniques/combat-techniques.lua
index 9f1b105b72..0f838eae3f 100644
--- a/game/modules/tome/data/talents/techniques/combat-techniques.lua
+++ b/game/modules/tome/data/talents/techniques/combat-techniques.lua
@@ -30,7 +30,7 @@ newTalent{
sustain_stamina = 30,
activate = function(self, t)
return {
- speed = self:addTemporaryValue("combat_physspeed", self:combatSpeed() - 1 / (1 + self:getTalentLevel(t) * 0.08)),
+ speed = self:addTemporaryValue("combat_physspeed", self:combatSpeed() - 1 / (1 + 0.08 * 1.3)),
atk = self:addTemporaryValue("combat_atk", 4 + (self:getTalentLevel(t) * self:getDex()) / 15),
crit = self:addTemporaryValue("combat_physcrit", 4 + (self:getTalentLevel(t) * self:getDex()) / 25),
}
@@ -43,7 +43,7 @@ newTalent{
end,
info = function(self, t)
return ([[You focus your strikes, reducing your attack speed by %d%% and increasing your attack by %d and critical chance by %d%%.]]):
- format((self:getTalentLevel(t) * 8), 4 + (self:getTalentLevel(t) * self:getDex()) / 15, 4 + (self:getTalentLevel(t) * self:getDex()) / 25)
+ format((1.3 * 8), 4 + (self:getTalentLevel(t) * self:getDex()) / 15, 4 + (self:getTalentLevel(t) * self:getDex()) / 25)
end,
}
--
GitLab