Respawn functionality

nullenvk · Jun 22, 2022 · 3bfe388 · 3bfe388
1 parent 1cf01dc
commit 3bfe388
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/res/main.map b/res/main.map
@@ -4,7 +4,7 @@
 BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
 B0000000000000000000000000000000
 B0000000000000000000000000000000
-B00000000000000000R0000000000000
+B00000000000000000R00000K0000000
 B000000BBB000BBBBBBBBBBBBBB0BBBB
 B000000BBB000BBBBBBBBBBBB000000B
 B000000BBB000BBBBBBBBBBBB000000B

diff --git a/src/ent_player.lua b/src/ent_player.lua
@@ -266,7 +266,21 @@ function Player:reactToColKill(dPos, tFinal, isVert, tile)
 end
 
 function Player:reactToColSetRespawn(dPos, tFinal, isVert, tile)
+    local pw, ph = self.spriteSizeW, self.spriteSizeH
+    local tw, th = 800 / TILESCREEN_W, 600 / TILESCREEN_H
+
+    local topBlocked = not self:isTileEmpty(tile.x, tile.y, {x = 0, y = -1})
+
+    local rDest = {x = (tile.x - 1) * tw, y = tile.y * th - ph, 
+                    sx = self.tmPos.x, sy = self.tmPos.y, 
+                    gravFlip = true, reset = true}
+
+    if topBlocked then
+        rDest.gravFlip = false
+        rDest.y = rDest.y + th
+    end
 
+    self.respawnDest = rDest
 
     self:reactToColIgnore(dPos, tFinal, isVert, tile)
 end

diff --git a/src/state_game.lua b/src/state_game.lua
@@ -57,9 +57,12 @@ end
 
 function State_Game:testTeleport()
     local tdest = self.player.teleportDest
+    local rdest = self.player.respawnDest
+
     if tdest ~= nil then
         if tdest.reset then 
             self.player = Player:new()
+            self.player.respawnDest = rdest -- Make respawn points persist between deaths
             self.player.gravFlip = tdest.gravFlip or false
         end