From 2b4614c95102e127d538f38a9ba751f46f99b418 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Fri, 28 Dec 2012 23:34:54 +0000
Subject: [PATCH] Fixed valley of the moon quest
git-svn-id: http://svn.net-core.org/repos/t-engine4@6277 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/NPC.lua | 4 ++--
game/modules/tome/class/generator/actor/ValleyMoon.lua | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/game/modules/tome/class/NPC.lua b/game/modules/tome/class/NPC.lua
index 254f949540..d05ef9d823 100644
--- a/game/modules/tome/class/NPC.lua
+++ b/game/modules/tome/class/NPC.lua
@@ -185,9 +185,9 @@ function _M:seen_by(who)
end
if who.ai_state and who.ai_state.target_last_seen then
-- Don't believe allies if they saw the target far, far away
- if core.fov.distance(self.x, self.y, who.ai_state.target_last_seen.x, who.ai_state.target_last_seen.y) > self.sight then return end
+ if who.ai_state.target_last_seen.x and who.ai_state.target_last_seen.y and core.fov.distance(self.x, self.y, who.ai_state.target_last_seen.x, who.ai_state.target_last_seen.y) > self.sight then return end
-- Don't believe allies if they saw the target over 10 turns ago
- if (game.turn - who.ai_state.target_last_seen.turn) / (game.energy_to_act / game.energy_per_tick) > 10 then return end
+ if (game.turn - (who.ai_state.target_last_seen.turn or game.turn)) / (game.energy_to_act / game.energy_per_tick) > 10 then return end
end
-- And only trust the ally if they can actually see the target
if not who:canSee(who.ai_target.actor) then return end
diff --git a/game/modules/tome/class/generator/actor/ValleyMoon.lua b/game/modules/tome/class/generator/actor/ValleyMoon.lua
index 74370c9b93..7c2f9ecb61 100644
--- a/game/modules/tome/class/generator/actor/ValleyMoon.lua
+++ b/game/modules/tome/class/generator/actor/ValleyMoon.lua
@@ -84,6 +84,10 @@ function _M:generateOne()
else
m:setTarget(game.player)
end
+ if not m.unique then
+ m.ai_state = m.ai_state or {}
+ m.ai_state.ai_move = "move_dmap"
+ end
self.zone:addEntity(self.level, m, "actor", x, y)
end
end
--
GitLab