From c539d89ab6feaf006b85a0d0a7fc90b487341b12 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Fri, 29 Oct 2010 23:28:59 +0000
Subject: [PATCH] fix
git-svn-id: http://svn.net-core.org/repos/t-engine4@1702 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/ai/escort.lua | 1 +
game/modules/tome/class/Object.lua | 2 ++
game/modules/tome/data/chats/escort-quest.lua | 4 ++--
game/modules/tome/data/talents/techniques/bloodthirst.lua | 1 +
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/game/modules/tome/ai/escort.lua b/game/modules/tome/ai/escort.lua
index 41002d6888..b690b6fe1d 100644
--- a/game/modules/tome/ai/escort.lua
+++ b/game/modules/tome/ai/escort.lua
@@ -46,6 +46,7 @@ newAI("move_escort", function(self)
local tx, ty = self.escort_target.x, self.escort_target.y
local a = Astar.new(game.level.map, self)
local path = self.escort_path
+ if path and path[1] and math.floor(core.fov.distance(self.x, self.y, path[1].x, path[1].y)) > 1 then self.escort_path = nil path = nil end
if not path or #path == 0 then path = a:calc(self.x, self.y, tx, ty) end
if not path then
return self:runAI("move_simple")
diff --git a/game/modules/tome/class/Object.lua b/game/modules/tome/class/Object.lua
index 7c2674b0dd..8e1b0165a2 100644
--- a/game/modules/tome/class/Object.lua
+++ b/game/modules/tome/class/Object.lua
@@ -381,6 +381,8 @@ function _M:getTextualDesc()
if w.healing_factor then desc:add(("Increases all healing by %d%%"):format(w.healing_factor * 100), true) end
+ if w.belt_slots then desc:add(("Allows to put %d small objects in the belt."):format(w.belt_slots), true) end
+
end
if self.wielder then
diff --git a/game/modules/tome/data/chats/escort-quest.lua b/game/modules/tome/data/chats/escort-quest.lua
index f3235d161f..f1e3537e9d 100644
--- a/game/modules/tome/data/chats/escort-quest.lua
+++ b/game/modules/tome/data/chats/escort-quest.lua
@@ -40,8 +40,8 @@ local reward_types = {
["spell/divination"] = 0.7,
},
talents = {
- [Talents.T_SENSE] = 1,
- [Talents.T_IDENTIFY] = 1,
+ [Talents.T_ARCANE_EYE] = 1,
+ [Talents.T_PREMONITION] = 1,
[Talents.T_VISION] = 1,
},
stats = {
diff --git a/game/modules/tome/data/talents/techniques/bloodthirst.lua b/game/modules/tome/data/talents/techniques/bloodthirst.lua
index 1d5841b984..28bfdb155b 100644
--- a/game/modules/tome/data/talents/techniques/bloodthirst.lua
+++ b/game/modules/tome/data/talents/techniques/bloodthirst.lua
@@ -43,6 +43,7 @@ newTalent{
if dam < target.max_life * (20 + (30 - self:getTalentLevelRaw(t) * 5)) / 100 then return end
local weapon = target:getInven("MAINHAND")
+ if type(weapon) == "boolean" then weapon = nil end
if weapon then weapon = weapon[1] and weapon[1].combat end
if not weapon or type(weapon) ~= "table" then weapon = nil end
weapon = weapon or target.combat
--
GitLab