From dd8547f62121658b752b5a241bf5d0c1648112ce Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Fri, 18 Jun 2010 18:23:22 +0000
Subject: [PATCH] fixed shadow similacrum
git-svn-id: http://svn.net-core.org/repos/t-engine4@814 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Game.lua | 6 +++---
game/modules/tome/class/Player.lua | 2 +-
game/modules/tome/data/talents/divine/twilight.lua | 11 +++++++++++
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index 6cba45ebba..842f28aadc 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -529,7 +529,7 @@ function _M:setupCommands()
self.key:addCommands{
[{"_d","ctrl"}] = function()
if config.settings.tome.cheat then
- self:changeLevel(1, "infinite-dungeon")
+ self:changeLevel(1, "wilderness-arda-fareast")
end
end,
}
@@ -796,11 +796,11 @@ function _M:setupMouse()
end
-- Move
- if button == "left" and not xrel and not yrel and not moving_around then
+ if button == "left" and not core.key.modState("shift") and not moving_around then
if self.key == self.normal_key then self.player:mouseMove(tmx, tmy) end
-- Move map around
- elseif button == "left" and xrel and yrel then
+ elseif button == "left" and xrel and yrel and core.key.modState("shift") then
derivx = derivx + xrel
derivy = derivy + yrel
game.level.map.changed = true
diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua
index 7e5a704180..74ecd01fe7 100644
--- a/game/modules/tome/class/Player.lua
+++ b/game/modules/tome/class/Player.lua
@@ -504,7 +504,7 @@ end
-- if no monsters in sight it will try to make an A* path, if it fails it will do a direct path
-- if there are monsters in sight it will move one stop in the direct path direction
function _M:mouseMove(tmx, tmy)
- if config.settings.tome.cheat and game.key.status[game.key._LSHIFT] and game.key.status[game.key._LCTRL] then
+ if config.settings.tome.cheat and core.key.modState("ctrl") then
game.log("[CHEAT] teleport to %dx%d", tmx, tmy)
self:move(tmx, tmy, true)
else
diff --git a/game/modules/tome/data/talents/divine/twilight.lua b/game/modules/tome/data/talents/divine/twilight.lua
index ceda62ca0e..c074b0d021 100644
--- a/game/modules/tome/data/talents/divine/twilight.lua
+++ b/game/modules/tome/data/talents/divine/twilight.lua
@@ -161,6 +161,17 @@ newTalent{
return
end
+ if target.rank >= 4 or -- No boss
+ target.on_die or -- No special die handler
+ target.on_acquire_target or -- No special vision handled
+ target.seen_by or -- No special vision handled
+ target.can_talk or -- No talking things
+ target:reactionToward(self) >= 0 -- No friends
+ then
+ game.logPlayer(self, "%s resists!", target.name:capitalize())
+ return true
+ end
+
local m = target:clone{
no_drops = true,
faction = self.faction,
--
GitLab