Skip to content
Snippets Groups Projects
Commit 819a3d5b authored by DarkGod's avatar DarkGod
Browse files

removed reload casting on explore & rest

parent 3bad5307
No related branches found
No related tags found
No related merge requests found
......@@ -354,7 +354,7 @@ function _M:die(src, death_note)
if rod then
-- If the player can move to the space the NPC died on, drop in the normal way
-- Else make absolutely sure they get the Rod of Recall by moving it to their inventory directly
if not game.player:canMove(self.x, self.y) then
if not game.player:canMove(self.x, self.y, true) then
game.zone:addEntity(game.level, rod, "object")
game:getPlayer(true):addObject(game:getPlayer(true):getInven("INVEN"), rod)
rod:identify(true)
......
......@@ -924,7 +924,7 @@ function _M:restCheck()
for act, def in pairs(game.party.members) do if game.level:hasEntity(act) and not act.dead then
if act.life < act.max_life and act.life_regen > 0 and not act:attr("no_life_regen") then return true end
end end
if ammo and ammo.combat.shots_left < ammo.combat.capacity and ((self:hasEffect(self.EFF_RELOADING)) or (ammo.combat.ammo_every and ammo.combat.ammo_every > 0)) then return true end
if ammo and ammo.combat.shots_left < ammo.combat.capacity then return true end
if self:fireTalentCheck("callbackOnRest") then return true end
else
......@@ -1067,11 +1067,6 @@ function _M:runMoved()
if self.running and self.running.explore then
game.level.map:particleEmitter(self.x, self.y, 1, "dust_trail")
end
-- Autoreload on Auto-explore
local ammo = self:hasAmmo()
if self.running and self.running.explore and ammo and ammo.combat.shots_left < ammo.combat.capacity and not self:hasEffect(self.EFF_RELOADING) and self:knowTalent(self.T_RELOAD) then
self:forceUseTalent(self.T_RELOAD, {ignore_energy=true})
end
end
--- Called after stopping running
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment