Fixed bomb not getting destroyed on lava

MadByteDE · Jun 1, 2020 · dd07258 · dd07258
1 parent aa5e285
commit dd07258
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/source/assets.lua b/source/assets.lua
@@ -130,6 +130,7 @@ local tiles   = {
     dim         = {w=8, h=5},
     trans       = {r=0, sx=1, sy=1, ox=0, oy=3},
     deadly      = true,
+    solid       = true,
     collide     = true, },
   { name        = "exit",
     type        = "entity",

diff --git a/source/objects/bomb.lua b/source/objects/bomb.lua
@@ -15,7 +15,7 @@ function Bomb:init(level, dx, dy, parent)
   self.bounciness = .6
   local bx = parent.pos.x+parent.dim.w/2-self.dim.w/2-.5
   local by = parent.pos.y+parent.dim.h/2-self.dim.h/2-2
-  Actor.init(self, level, bx, by, {collide=true})
+  Actor.init(self, level, bx, by, {collide=true, canDie=true})
   local dx = dx-parent.pos.x+parent.dim.w/2
   local dy = dy-parent.pos.y+parent.dim.h/2
   local angle = math.sqrt(dx*dx+dy*dy)
@@ -33,6 +33,11 @@ function Bomb:init(level, dx, dy, parent)
 end
 
 
+function Bomb:onCollision(other)
+  if other.name == "lava" then self:destroy() end
+end
+
+
 function Bomb:onDead()
   Assets.playSound("boom")
   Screen:shake()