From 900d7526033b2c8716e6d6dbe084ed821197ab40 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Mon, 13 Feb 2012 16:00:40 +0000
Subject: [PATCH] Learning lore stops running Necrotic minions are worht 0 exp
Recall/Angolwen Teleport only works when the main player is alive
git-svn-id: http://svn.net-core.org/repos/t-engine4@4855 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/engine/ui/ActorFrame.lua | 2 +-
game/modules/tome/class/interface/PlayerLore.lua | 5 +++++
game/modules/tome/data/talents/spells/spells.lua | 1 +
game/modules/tome/data/timed_effects/magical.lua | 6 +++---
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/game/engines/default/engine/ui/ActorFrame.lua b/game/engines/default/engine/ui/ActorFrame.lua
index 1df4bdc95f..dfc0bfc04e 100644
--- a/game/engines/default/engine/ui/ActorFrame.lua
+++ b/game/engines/default/engine/ui/ActorFrame.lua
@@ -27,7 +27,7 @@ function _M:init(t)
self.actor = assert(t.actor, "no actorframe actor")
self.w = assert(t.w, "no actorframe w")
self.h = assert(t.h, "no actorframe h")
- self.tiles = t.tiles or Tiles.new(w, h, nil, nil, true, nil)
+ self.tiles = t.tiles or Tiles.new(self.w, self.h, nil, nil, true, nil)
Base.init(self, t)
end
diff --git a/game/modules/tome/class/interface/PlayerLore.lua b/game/modules/tome/class/interface/PlayerLore.lua
index 6ce1101a11..5026f66521 100644
--- a/game/modules/tome/class/interface/PlayerLore.lua
+++ b/game/modules/tome/class/interface/PlayerLore.lua
@@ -90,4 +90,9 @@ function _M:learnLore(lore, nopopup, silent)
if learnt and not self.additional_lore[lore] and self.registerLoreFound then self:registerLoreFound(lore) end
print("[LORE] learnt", lore)
if learnt then if l.on_learn then l.on_learn(self) end end
+
+ if self.runStop then
+ self:runStop("learnt lore")
+ self:restStop("learnt lore")
+ end
end
diff --git a/game/modules/tome/data/talents/spells/spells.lua b/game/modules/tome/data/talents/spells/spells.lua
index 18bd64fa6d..d9cde8fba8 100644
--- a/game/modules/tome/data/talents/spells/spells.lua
+++ b/game/modules/tome/data/talents/spells/spells.lua
@@ -123,6 +123,7 @@ function necroSetupSummon(self, m, x, y, level, no_control)
m.summoner = self
m.summoner_gain_exp = true
m.necrotic_minion = true
+ m.exp_worth = 0
m.life_regen = 0
m.unused_stats = 0
m.unused_talents = 0
diff --git a/game/modules/tome/data/timed_effects/magical.lua b/game/modules/tome/data/timed_effects/magical.lua
index 61fe7f805b..84f4ad6c39 100644
--- a/game/modules/tome/data/timed_effects/magical.lua
+++ b/game/modules/tome/data/timed_effects/magical.lua
@@ -727,7 +727,7 @@ newEffect{
deactivate = function(self, eff)
if (eff.allow_override or (self:canBe("worldport") and not self:attr("never_move"))) and eff.dur <= 0 then
game:onTickEnd(function()
- if eff.leveid == game.zone.short_name.."-"..game.level.level then
+ if eff.leveid == game.zone.short_name.."-"..game.level.level and game.player.can_change_zone then
game.logPlayer(self, "You are yanked out of this place!")
game:changeLevel(1, eff.where or game.player.last_wilderness)
end
@@ -764,7 +764,7 @@ newEffect{
if self:canBe("worldport") and not self:attr("never_move") then
game:onTickEnd(function()
- if eff.leveid == game.zone.short_name.."-"..game.level.level then
+ if eff.leveid == game.zone.short_name.."-"..game.level.level and game.player.can_change_zone then
game.logPlayer(self, "You are yanked out of this place!")
game:changeLevel(1, "town-angolwen")
end
@@ -1391,7 +1391,7 @@ newEffect{
old_eff.physid = self:addTemporaryValue("combat_physresist", old_eff.cur_physical)
old_eff.spellid = self:addTemporaryValue("combat_spellresist", old_eff.cur_spell)
old_eff.mentalid = self:addTemporaryValue("combat_mentalresist", old_eff.cur_mental)
-
+
old_eff.dur = new_eff.dur
return old_eff
end,
--
GitLab