From 013e1487e3994f5ceca402cdc64dd6a7c33bef7b Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Tue, 21 Jun 2011 21:24:38 +0000
Subject: [PATCH] fix
git-svn-id: http://svn.net-core.org/repos/t-engine4@3696 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/interface/Combat.lua | 4 ++--
game/modules/tome/data/maps/vaults/test.lua | 7 -------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/game/modules/tome/class/interface/Combat.lua b/game/modules/tome/class/interface/Combat.lua
index e2cc5943af..95234a11ba 100644
--- a/game/modules/tome/class/interface/Combat.lua
+++ b/game/modules/tome/class/interface/Combat.lua
@@ -37,11 +37,11 @@ function _M:bumpInto(target)
elseif reaction >= 0 then
-- Talk ?
if self.player and target.can_talk then
- local chat = Chat.new(target.can_talk, target, self)
+ local chat = Chat.new(target.can_talk, target, self, {npc=target, player=self})
chat:invoke()
if target.can_talk_only_once then target.can_talk = nil end
elseif target.player and self.can_talk then
- local chat = Chat.new(self.can_talk, self, target)
+ local chat = Chat.new(self.can_talk, self, target, {npc=self, player=target})
chat:invoke()
if target.can_talk_only_once then target.can_talk = nil end
elseif self.move_others and not target.cant_be_moved then
diff --git a/game/modules/tome/data/maps/vaults/test.lua b/game/modules/tome/data/maps/vaults/test.lua
index 3c8dc84a3e..5e48b2ea7d 100644
--- a/game/modules/tome/data/maps/vaults/test.lua
+++ b/game/modules/tome/data/maps/vaults/test.lua
@@ -19,8 +19,6 @@
-- This is simply and example of how to use levers, not a real ingame vault
-setStatusAll{no_teleport=true}
-
defineTile('.', "FLOOR")
defineTile('=', "FLOOR", nil, nil, nil, {foobar=true})
defineTile('&', "GENERIC_LEVER", nil, nil, nil, {lever=1, lever_kind="foo", lever_radius=10, lever_block="foobar"})
@@ -32,11 +30,6 @@ defineTile('"', "FLOOR", nil, nil, nil, {lever_action_value=0, lever_action_only
end
end})
-rotates = {"default", "90", "180", "270", "flipx", "flipy"}
-
-startx = 5
-starty = 0
-
return {
[[...........]],
[[...+.......]],
--
GitLab