tome / Tales of MajEyal · Commits

Commit 4c8a9a07895f07a808c6e30b8d89bd2df14a0339

Authored by dg
1 parent 8a1fd015

Runic/Infusion saturation do not prevent entering the worldmap anymore 


git-svn-id: http://svn.net-core.org/repos/t-engine4@3886 51575b47-30f0-44d4-a5cc-537603b46e54
Inline Side-by-side
Showing 2 changed files with 4 additions and 1 deletions
@@ -1147,7 +1147,7 @@ function _M:setupCommands() @@ -1147,7 +1147,7 @@ function _M:setupCommands()
1147 local stop = {} 1147 local stop = {}
1148 for eff_id, p in pairs(self.player.tmp) do 1148 for eff_id, p in pairs(self.player.tmp) do
1149 local e = self.player.tempeffect_def[eff_id] 1149 local e = self.player.tempeffect_def[eff_id]
1150 - if e.status == "detrimental" then stop[#stop+1] = e.desc end 1150 + if e.status == "detrimental" and not e.no_stop_enter_worlmap then stop[#stop+1] = e.desc end
1151 end 1151 end
1152 1152
1153 if e.change_zone and #stop > 0 and e.change_zone:find("^wilderness") then 1153 if e.change_zone and #stop > 0 and e.change_zone:find("^wilderness") then
@@ -30,6 +30,7 @@ newEffect{ @@ -30,6 +30,7 @@ newEffect{
30 long_desc = function(self, eff) return ("The more you use infusions, the longer they will take to recharge (+%d cooldowns)."):format(eff.power) end, 30 long_desc = function(self, eff) return ("The more you use infusions, the longer they will take to recharge (+%d cooldowns)."):format(eff.power) end,
31 type = "infusion", 31 type = "infusion",
32 status = "detrimental", 32 status = "detrimental",
  33 + no_stop_enter_worlmap = true,
33 parameters = { power=1 }, 34 parameters = { power=1 },
34 on_merge = function(self, old_eff, new_eff) 35 on_merge = function(self, old_eff, new_eff)
35 old_eff.dur = new_eff.dur 36 old_eff.dur = new_eff.dur
@@ -44,6 +45,7 @@ newEffect{ @@ -44,6 +45,7 @@ newEffect{
44 long_desc = function(self, eff) return ("The more you use runes, the longer they will take to recharge (+%d cooldowns)."):format(eff.power) end, 45 long_desc = function(self, eff) return ("The more you use runes, the longer they will take to recharge (+%d cooldowns)."):format(eff.power) end,
45 type = "rune", 46 type = "rune",
46 status = "detrimental", 47 status = "detrimental",
  48 + no_stop_enter_worlmap = true,
47 parameters = { power=1 }, 49 parameters = { power=1 },
48 on_merge = function(self, old_eff, new_eff) 50 on_merge = function(self, old_eff, new_eff)
49 old_eff.dur = new_eff.dur 51 old_eff.dur = new_eff.dur
@@ -58,6 +60,7 @@ newEffect{ @@ -58,6 +60,7 @@ newEffect{
58 long_desc = function(self, eff) return ("The more you use taints, the longer they will take to recharge (+%d cooldowns)."):format(eff.power) end, 60 long_desc = function(self, eff) return ("The more you use taints, the longer they will take to recharge (+%d cooldowns)."):format(eff.power) end,
59 type = "taint", 61 type = "taint",
60 status = "detrimental", 62 status = "detrimental",
  63 + no_stop_enter_worlmap = true,
61 parameters = { power=1 }, 64 parameters = { power=1 },
62 on_merge = function(self, old_eff, new_eff) 65 on_merge = function(self, old_eff, new_eff)
63 old_eff.dur = new_eff.dur 66 old_eff.dur = new_eff.dur