Commit c1f9f575282f86edcb457779dd27b8c4129b8043
1 parent
3fe01207
It is now safe to digest a cursed shadow
Showing
3 changed files
with
6 additions
and
4 deletions
... | ... | @@ -2223,7 +2223,7 @@ do return end |
2223 | 2223 | |
2224 | 2224 | if config.settings.tome.rest_before_explore then |
2225 | 2225 | local ok = false |
2226 | - self.player:restInit(nil, nil, nil, function() ok = self.player.resting.rested_fully end, function() if ok then self:onTickEnd(ae) self.tick_loopback = true end end) | |
2226 | + self.player:restInit(nil, nil, nil, function() ok = self.player.resting and self.player.resting.rested_fully end, function() if ok then self:onTickEnd(ae) self.tick_loopback = true end end) | |
2227 | 2227 | else |
2228 | 2228 | ae() |
2229 | 2229 | end | ... | ... |
... | ... | @@ -139,8 +139,8 @@ newEntity{ base = "BASE_NPC_XORN", |
139 | 139 | if not m.dead then |
140 | 140 | nb_alive = nb_alive + 1 |
141 | 141 | game.logSeen(self, "#AQUAMARINE#%s absorbs the energy of the destroyed fragment!", self:getName()) |
142 | - m.max_life = m.max_life + m.add_max_life | |
143 | - m:heal(m.add_max_life) | |
142 | + m.max_life = m.max_life + (m.add_max_life or 0) | |
143 | + m:heal(m.add_max_life or 0) | |
144 | 144 | m.inc_damage.all = (m.inc_damage.all or 0) + 20 |
145 | 145 | end |
146 | 146 | end | ... | ... |
... | ... | @@ -44,7 +44,9 @@ newTalent{ |
44 | 44 | is_teleport = true, |
45 | 45 | action = function(self, t) |
46 | 46 | local x, y, range |
47 | - if self.ai_state.shadow_wall then | |
47 | + if self.player then | |
48 | + x, y, range = self.x, self.y, 10 | |
49 | + elseif self.ai_state.shadow_wall then | |
48 | 50 | x, y, range = self.ai_state.shadow_wall_target.x, self.ai_state.shadow_wall_target.y, 1 |
49 | 51 | elseif self.ai_target.x and self.ai_target.y then |
50 | 52 | x, y, range = self.ai_target.x, self.ai_target.y, 1 | ... | ... |
-
Please register or login to post a comment