Skip to content
Snippets Groups Projects
Commit a19f8e99 authored by dg's avatar dg
Browse files

fix

git-svn-id: http://svn.net-core.org/repos/t-engine4@3137 51575b47-30f0-44d4-a5cc-537603b46e54
parent 1199bd5c
No related branches found
No related tags found
No related merge requests found
......@@ -65,8 +65,8 @@ function _M:takeHit(value, src)
if self.onTakeHit then value = self:onTakeHit(value, src) end
self.life = self.life - value
self.changed = true
if src.on_kill and src:on_kill(self) then return false, value end
if self.life <= 0 then
if src.on_kill and src:on_kill(self) then return false, value end
game.logSeen(self, "#{bold}#%s killed %s!#{normal}#", src.name:capitalize(), self.name)
return self:die(src), value
end
......
......@@ -99,7 +99,7 @@ generate = function(self, player, x, y)
end
a.on_kill = function(self, who)
local p = game.party:findMember{main=true}
if who == p then
if who == p then util.show_backtrace()
p:setQuestStatus("paradoxology", engine.Quest.COMPLETED, "now-died")
game.logSeen(self, "#LIGHT_BLUE#Your future self kills you! The timestreams are broken by the paradox!")
game.logSeen(self, "#LIGHT_BLUE#All those events never happened. Except they did, somewhen.")
......
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