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

fix dream malleus

fix party members in stome cases staying "dead"
parent 51e3f019
No related branches found
No related tags found
No related merge requests found
......@@ -2759,7 +2759,7 @@ function _M:emptyDrops()
end
function _M:die(src, death_note)
if self.dead then self:disappear(src) self:deleteFromMap(game.level.map) return true end
if self.dead then self:disappear(src) self:deleteFromMap(game.level.map) if game.level:hasEntity(self) then game.level:removeEntity(self, true) end return true end
-- Self resurrect, mouhaha!
if self:attr("self_resurrect") and not self.no_resurrect then
......
......@@ -352,7 +352,7 @@ function _M:onTakeHit(value, src, death_note)
end
function _M:die(src, death_note)
if self.dead then self:disappear(src) self:deleteFromMap(game.level.map) return true end
if self.dead then self:disappear(src) self:deleteFromMap(game.level.map) if game.level:hasEntity(self) then game.level:removeEntity(self, true) end return true end
if src and Faction:get(self.faction) and Faction:get(self.faction).hostile_on_attack then
Faction:setFactionReaction(self.faction, src.faction, Faction:factionReaction(self.faction, src.faction) - self.rank, true)
......
......@@ -24,7 +24,7 @@ local DamageType = require "engine.DamageType"
module(..., package.seeall, class.make)
function _M:onPartyDeath(src, death_note)
if self.dead then return true end
if self.dead then if game.level:hasEntity(self) then game.level:removeEntity(self, true) end return true end
-- Remove from the party if needed
if self.remove_from_party_on_death then
......
......@@ -7091,7 +7091,7 @@ newEntity{ base = "BASE_GREATMAUL", define_as = "DREAM_MALLEUS",
combat = {
dam = 56,
apr = 5,
dammod = {str=1.1, wil=1.2},
dammod = {str=0.7, wil=0.7},
melee_project={[DamageType.MIND] = 10}
},
wielder = {
......
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