Initial work on respawn points

nullenvk · May 29, 2022 · 537c1b3 · 537c1b3
1 parent e6d12ed
commit 537c1b3
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/res/main.map b/res/main.map
@@ -4,7 +4,7 @@
 BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
 B0000000000000000000000000000000
 B0000000000000000000000000000000
-B0000000000000000000000000000000
+B00000000000000000R0000000000000
 B000000BBB000BBBBBBBBBBBBBB0BBBB
 B000000BBB000BBBBBBBBBBBB000000B
 B000000BBB000BBBBBBBBBBBB000000B
@@ -27,7 +27,7 @@ BBBBBBBBBBBBBB00000BBBBBBBBBBBBB
 BBBBBBBBBBBBBB00000BBBBBBBBBBBBB
 
 BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-0000000000000000000000000000000B
+000000000000000000R000000000000B
 0000000000000000000000000000000B
 0000000000000000000000000000000B
 B000000BBB000BBBBBBBBBBBBBB0BBBB

diff --git a/res/tileR.png b/res/tileR.png
diff --git a/src/ent_player.lua b/src/ent_player.lua
@@ -173,6 +173,7 @@ local function isTileBlocking(tile)
         ['0'] = false,
         ['B'] = true,
         ['K'] = false,
+        ['R'] = false,
     }
 
     if tile == nil then return true end
@@ -303,6 +304,7 @@ function Player:reactToCol(tilemap, dPos, tFinal, isVert, tilePos)
     local TILE_HANDLERS = {
         ['B'] = self.reactToColSlide,
         ['K'] = self.reactToColKill,
+        ['R'] = self.reactToColIgnore, -- SET RESPAWN 
     }
 
     local NIL_HANDLER = self.reactToColTransition

diff --git a/src/ent_tiles.lua b/src/ent_tiles.lua
@@ -1,7 +1,7 @@
 require('src.ent_sprite')
 
 --local TILETYPE_NUM = 2
-local TILETYPES = {"B", "K"}
+local TILETYPES = {"B", "K", "R"}
 
 Tiles = GameObj:new({dat = nil, colDat = nil, textures = nil})
 
@@ -68,6 +68,24 @@ function Tiles:setColorByScreen()
     love.graphics.setColor(SCR_COLORS[i])
 end
 
+function Tiles:setTileColor(t)
+    local UNCOLORED_TILES = {"R"}
+
+    local uncolored = false
+    for _,v in pairs(UNCOLORED_TILES) do
+        if v == t then 
+            uncolored = true
+            break
+        end
+    end
+
+    if uncolored then
+        love.graphics.setColor(1,1,1,1)
+    else
+        self:setColorByScreen()
+    end
+end
+
 function Tiles:drawTile(tx, ty)
     local tile_w = 800 / TILESCREEN_W
     local tile_h = 600 / TILESCREEN_H
@@ -81,7 +99,6 @@ function Tiles:drawTile(tx, ty)
         return tile == self.dat[tx + ox][ty + oy]
     end
 
-    love.graphics.rectangle("fill", (tx-1)*tile_w, (ty-1)*tile_h, tile_w, tile_h)
     if self.textures[tile] == nil then return end
 
     local qnum = 1
@@ -92,12 +109,12 @@ function Tiles:drawTile(tx, ty)
 
     local tex = Tiles.textures[tile]
     local x, y = (tx-1) * tile_w, (ty-1) * tile_h
+
+    self:setTileColor(tile)
     love.graphics.draw(tex.texture, tex.quads[qnum], x, y)
 end
 
 function Tiles:draw()
-    self:setColorByScreen()
-
     for x=1,TILESCREEN_W do
         for y=1,TILESCREEN_H do
             if self.dat[x][y] ~= "0" then self:drawTile(x, y) end