From 5664d06c2234e8b41776a5a7d5793dc1beb4c6e7 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Thu, 11 Nov 2010 21:11:56 +0000
Subject: [PATCH] Fix lost merchant quest: can not push around things
git-svn-id: http://svn.net-core.org/repos/t-engine4@1866 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/data/general/encounters/maj-eyal.lua | 6 ++++--
game/modules/tome/data/general/traps/alarm.lua | 4 ++--
game/modules/tome/data/maps/quests/lost-merchant.lua | 2 ++
game/modules/tome/data/talents/gifts/storm-drake.lua | 1 +
game/modules/tome/data/talents/techniques/2hweapon.lua | 5 +++--
5 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/game/modules/tome/data/general/encounters/maj-eyal.lua b/game/modules/tome/data/general/encounters/maj-eyal.lua
index 4fe7f1b9a7..fe12345717 100644
--- a/game/modules/tome/data/general/encounters/maj-eyal.lua
+++ b/game/modules/tome/data/general/encounters/maj-eyal.lua
@@ -92,8 +92,10 @@ newEntity{
},
post_process = function(level)
for uid, e in pairs(level.entities) do
- if e.faction ~= "allied-kingdoms" then e.faction="assassin-lair" end
- if not e.can_talk then e.can_talk = "assassin-lord-thieves" end
+ if e.faction ~= "allied-kingdoms" then
+ e.faction="assassin-lair"
+ e.cant_be_moved = true
+ end
end
end,
}, },
diff --git a/game/modules/tome/data/general/traps/alarm.lua b/game/modules/tome/data/general/traps/alarm.lua
index 96aae123e9..6c2bdcb844 100644
--- a/game/modules/tome/data/general/traps/alarm.lua
+++ b/game/modules/tome/data/general/traps/alarm.lua
@@ -33,12 +33,12 @@ newEntity{ base = "TRAP_ALARM",
for i = x - 20, x + 20 do for j = y - 20, y + 20 do if game.level.map:isBound(i, j) then
local actor = game.level.map(i, j, game.level.map.ACTOR)
if actor and not actor.player then
- if who:reactionToward(actor) >= 0 then
+ if who:reactionToward(actor) > 0 then
local tx, ty, a = who:getTarget()
if a then
actor:setTarget(a)
end
- else
+ elseif who:reactionToward(actor) < 0 then
actor:setTarget(who)
end
end
diff --git a/game/modules/tome/data/maps/quests/lost-merchant.lua b/game/modules/tome/data/maps/quests/lost-merchant.lua
index 367ba5525e..454c36c4e3 100644
--- a/game/modules/tome/data/maps/quests/lost-merchant.lua
+++ b/game/modules/tome/data/maps/quests/lost-merchant.lua
@@ -29,6 +29,7 @@ defineTile('P', "FLOOR", nil, mod.class.NPC.new{
display = "p", color=colors.VIOLET,
name = "Assassin Lord",
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
+ cant_be_moved = true,
resolvers.drops{chance=20, nb=1, {} },
resolvers.equip{
@@ -76,6 +77,7 @@ defineTile('@', "FLOOR", nil, mod.class.NPC.new{
faction = "allied-kingdoms",
can_talk = "lost-merchant",
is_merchant = true,
+ cant_be_moved = true,
})
startx = 2
diff --git a/game/modules/tome/data/talents/gifts/storm-drake.lua b/game/modules/tome/data/talents/gifts/storm-drake.lua
index 06cb07c6fe..0b3942cb87 100644
--- a/game/modules/tome/data/talents/gifts/storm-drake.lua
+++ b/game/modules/tome/data/talents/gifts/storm-drake.lua
@@ -37,6 +37,7 @@ newTalent{
end,
info = function(self, t)
return ([[You transform into pure lightning, moving %d%% faster for %d turns.
+ Also provides 30%% physical damage resistance and 100%% lightning resistance.
Any actions other than moving will stop this effect.]]):format(400 + self:getTalentLevel(t) * 70, math.ceil(6 + self:getTalentLevel(t) * 1.2))
end,
}
diff --git a/game/modules/tome/data/talents/techniques/2hweapon.lua b/game/modules/tome/data/talents/techniques/2hweapon.lua
index b5ca4da7c7..83cc69ebbc 100644
--- a/game/modules/tome/data/talents/techniques/2hweapon.lua
+++ b/game/modules/tome/data/talents/techniques/2hweapon.lua
@@ -83,10 +83,11 @@ newTalent{
return true
end,
info = function(self, t)
- return ([[Enters an aggressive battle stance, increasing attack by %d and damage by %d at the cost of %d defense and %d armor.
+ return ([[Enters an aggressive battle stance, increasing attack by %d and damage by %d at the cost of -10 defense and -10 armor.
While berserking you are naerly unstoppable, granting %d%% stun and pinning resistance.]]):
format(
- 5 + self:getDex(7) * self:getTalentLevel(t), 5 + self:getStr(7) * self:getTalentLevel(t), -5 - 2 * (self:getTalentLevelRaw(t)-1), -5 - 2 * (self:getTalentLevelRaw(t)-1),
+ 5 + self:getDex(7) * self:getTalentLevel(t),
+ 5 + self:getStr(7) * self:getTalentLevel(t),
0.1 * self:getTalentLevel(t)
)
end,
--
GitLab