From 7f42dea6faddc33f396242b7a26915e36199760d Mon Sep 17 00:00:00 2001 From: lustlion Date: Thu, 10 Feb 2022 15:53:50 +0100 Subject: [PATCH] player respawn, spikes & hazard objects --- assets/tileset/library.png | Bin 4151 -> 4077 bytes data/levels/level1.lua | 25 ++++++++++++++----------- data/scripts/entities/player.lua | 17 +++++++++++++++++ data/scripts/game.lua | 4 +++- data/scripts/in_out.lua | 23 +++++++++++++++++------ data/scripts/level.lua | 12 ++++++++++++ data/scripts/objects.lua | 17 +++++++++++++++-- data/tileset/library.lua | 10 ++++------ main.lua | 2 +- 9 files changed, 83 insertions(+), 27 deletions(-) diff --git a/assets/tileset/library.png b/assets/tileset/library.png index 9fcf3c5587345df6ec091abf9bdcd59cdd77b30a..4f84e85aafc49ed4e78c5ead53504b3279e1f2c4 100644 GIT binary patch delta 4066 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

m@3H2zTqluIFsjvI3M% zt=6fu4+goLE(`6SA#5!JBY#tjv1#VD^C{P8I<(-3T?-f^Q)xxXtq%$7|J1L^RrB2Q z4l=uY!43f74qSWk<{hYvO#>rSKpkchdE!+zj=d-5PMluR--noYkP*-Q?t&d4qAEQ! z07Ux}i0f|kuy(_>I-hS?vkO$|^G8|mh?ayIn@(oNDOUU3c#!Wyh<^`u0H6{*INx5B z>c`6M09ESYtCn9&J3#4FYzL@%K0qDp09DBkc7O<%k2)Ryj4(DG>)ma82Lnh}ZcrTP zXylKC;WNO*oY3PdJF@5P)UN2allJ=BByi%diQB}_-w^h_oa9aF{-dlp9#ziM?RpEY zsFxHEI^$NnvqaLc#(&)A$SxuB-B|)2UQeyepeB9&w#)EtuFV(MG;QSVX$-W zOXsbk$_u#*B!*6k3(2}cjNvnON5kIH_em~DP=g|6Wla$N>wo%Qp=ubc}S0m7@Jp%qlb&aW8C*!ordodDq0hrr#m;V)Ex2&ewt^lp?3HUYrsS@7z)I!OHe+l=quE}Eq@=03@;wAJ59 zoC9~?PX!BhfIeZ}ix;r#sK;lsyIol_)P0D3WO*Q`ac1(Ad$$^mZs!pI-OY_CuupOp z!443Sr0WGeBX;c+ zUo?Im&fQ%Mn8hwLd9Klc0Fa{w?bUz&iS@q^G=|1of&3@qBsNaLx(pQBDG?oFN8sGd{%?AiHmbeSltv|fWwbwg7H{0?Ys0WG~wB@}v zi)&5%UgE2SRUrapF#r_n!|Qv(`nl<9@q-a8Py-T6@YXWqwv)MRErZrCleP-k*i3iv zN2Wq02vkmD2$S1#`YE4`op3rOjK%fe0IVnE4LIld9HeDd;#MYf3 ze=#*`aF`27v@Ve8o{)F0(rbLc{RQv$jI%IVCLp1zx2^Y?<+WQdbNA~527Xmg9aNG; r)Fzi{lP+A-HA4jmgccxFfJXCw5LPgbnYJCG00000NkvXXu0mjf^)M*B diff --git a/data/levels/level1.lua b/data/levels/level1.lua index b769aa7..b62c11a 100644 --- a/data/levels/level1.lua +++ b/data/levels/level1.lua @@ -1,18 +1,21 @@ return { name = "test", tileset = tileset.library, + properties = { + darkness = false + }, tiles = { - { 1, 14, 14, 14, 14, 14, 14, 1, 14, 14, 14, 14, 14, 14, 14, 1}, - { 1, 4, 0, 0, 0, 0, 2, 14, 4, 0, 0, 0, 0, 0, 2, 1}, - { 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1}, - { 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1}, - { 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1}, - { 1, 4, 0, 0, 0, 0, 2, 13, 4, 0, 0, 0, 0, 0, 2, 1}, - { 1, 13, 13, 13, 13, 13, 13, 1, 4, 0, 0, 0, 0, 0, 2, 1}, - { 1, 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 2, 1}, - { 1, 1, 1, 1, 1, 1, 1, 1, 13, 13, 13, 13, 13, 13, 13, 1}, - { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, + { 1, 14, 14, 14, 14, 14, 14, 1, 14, 14, 14, 14, 14, 14, 14, 1}, + { 1, 4, 0, 0, 0, 0, 2, 14, 4, 0, 0, 0, 0, 0, 2, 1}, + { 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1}, + { 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1}, + { 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1}, + { 1, 4, 0, 0, 0, 0, 2, 13, 4, 0, 0, 0, 0, 0, 2, 1}, + { 1, 13, 13, 13, 13, 13, 13, 1, 4, 0, 0, 0, 0, 0, 2, 1}, + { 1, 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 2, 1}, + { 1, 1, 1, 1, 1, 1, 1, 1, 13, 13, 13, 13, 13, 13, 13, 1}, + { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1} }, objects = {} -} \ No newline at end of file +} diff --git a/data/scripts/entities/player.lua b/data/scripts/entities/player.lua index 14f76fd..e6985e0 100644 --- a/data/scripts/entities/player.lua +++ b/data/scripts/entities/player.lua @@ -45,6 +45,14 @@ o.canFall = true o.canFriction = true o.maskType = animation.moth_mask + o.anchorRespawn = { + x = o.pos.x, + y = o.pos.y + } + o.anchorRope = { + x = nil, + y = nil + } -- sprite o.target_offset = {x = 0, y = 0} @@ -166,6 +174,15 @@ function Player:DoPhysics() self.vel.y = 0 end end + + if self:isCollidingAt(self.pos.x, self.pos.y, LoadedObjects.Hazards) then + self:Respawn() + end +end + +function Player:Respawn() + self.pos.x = self.anchorRespawn.x + self.pos.y = self.anchorRespawn.y end function Player:HandleAnimation() diff --git a/data/scripts/game.lua b/data/scripts/game.lua index 96d71b4..6c5e4ca 100644 --- a/data/scripts/game.lua +++ b/data/scripts/game.lua @@ -53,7 +53,9 @@ function GameDraw() GameworldDrawPrepare() GameworldDrawBackground() GameworldDrawForeground() - GameworldDrawLighting() + if LevelData.properties.darkness then + GameworldDrawLighting() + end GameworldDrawParticles() GameworldDrawEntities() GameworldDrawEnd() diff --git a/data/scripts/in_out.lua b/data/scripts/in_out.lua index 031ca07..a0338e4 100644 --- a/data/scripts/in_out.lua +++ b/data/scripts/in_out.lua @@ -3,19 +3,28 @@ function ExportLevel(levelname, filename) filename = filename or "output.lua" filename = "Mothback/export/"..filename exportFile = io.open(filename, "w+") + if exportFile then - exportFile:write("return {") logPrint("Exporting level \"".. levelname .. "\"...") - exportFile:write("\n name = \"" .. levelname .. "\",") + exportFile:write("return {") + logPrint("- level name") + exportFile:write("\n name = \"" .. levelname .. "\",") + + logPrint("- tileset") for k, v in pairs(tileset) do if v == LevelData.tileset then exportFile:write("\n tileset = tileset." .. k .. ",") - logPrint("- tileset") end end - exportFile:write("\n tiles = {") + + logPrint("- properties") + exportFile:write("\n properties = {") + exportFile:write("\n darkness = true") + exportFile:write("\n },") + logPrint("- tiles") + exportFile:write("\n tiles = {") local rows = #LevelTiles for i = 1, #LevelTiles do exportFile:write("\n { ") @@ -33,10 +42,12 @@ function ExportLevel(levelname, filename) end logPrint(" - All rows 100%") exportFile:write("\n },") - exportFile:write("\n objects = {}") + logPrint("- objects") - exportFile:write("\n}") + exportFile:write("\n objects = {}") + logPrint("Exporting complete.") + exportFile:write("\n}") exportFile:close() end end diff --git a/data/scripts/level.lua b/data/scripts/level.lua index d23a146..022f2e9 100644 --- a/data/scripts/level.lua +++ b/data/scripts/level.lua @@ -338,6 +338,7 @@ function TileCreateObjects() LoadedObjects.Collisions = {} LoadedObjects.Platforms = {} LoadedObjects.Ladders = {} + LoadedObjects.Hazards = {} TileOptimizeObjects() @@ -625,6 +626,17 @@ function TileCreateObjects() ) table.insert(LoadedObjects.Platforms,plat) + elseif type == "bottom_hazard" then + + + local hazard = Collision:New( + base_x, + base_y + tileProperties.height * 12/16 * tileProperties.scale, + base_x + tileProperties.width * tileProperties.scale, + base_y + tileProperties.height * tileProperties.scale + ) + table.insert(LoadedObjects.Hazards,hazard) + end end end diff --git a/data/scripts/objects.lua b/data/scripts/objects.lua index e032316..0e5cf88 100644 --- a/data/scripts/objects.lua +++ b/data/scripts/objects.lua @@ -3,7 +3,8 @@ LoadedObjects = { Collisions = {}, Platforms = {}, - Ladders = {} + Ladders = {}, + Hazards = {} } -- level functions @@ -20,6 +21,10 @@ function LoadedObjects.DrawCollisions() for _, ladder in pairs(LoadedObjects.Ladders) do ladder:Draw(2) end + + for _, hazard in pairs(LoadedObjects.Hazards) do + hazard:Draw(1) + end end -- returns true if theres a collision at that point @@ -58,7 +63,8 @@ function SetCollisionFlags() local Check = { LoadedObjects.Collisions, LoadedObjects.Ladders, - LoadedObjects.Platforms + LoadedObjects.Platforms, + LoadedObjects.Hazards } for _, type in pairs(Check) do for _, object in pairs(type) do @@ -72,4 +78,11 @@ function SetCollisionFlags() platform.disable = true end end + for _, platform in pairs(LoadedObjects.Hazards) do + if main_Player.isOnGround then + platform.disable = true + else + platform.disable = false + end + end end diff --git a/data/tileset/library.lua b/data/tileset/library.lua index 0e37188..8e8cd14 100644 --- a/data/tileset/library.lua +++ b/data/tileset/library.lua @@ -82,15 +82,13 @@ properties[50] = { } properties[61] = { - overlay = {1}, - type = "emtpy", - depth = "background" + type = "bottom_hazard", + depth = "foreground" } properties[62] = { - overlay = {1}, - type = "emtpy", - depth = "background" + type = "top_hazard", + depth = "foreground" } return properties diff --git a/main.lua b/main.lua index 7450558..0d60ecc 100644 --- a/main.lua +++ b/main.lua @@ -63,7 +63,7 @@ function love.load() Fairy:New(200,88) --CursedBook:New(180,68) - love.audio.play(music.placeholder) + --love.audio.play(music.placeholder) end function love.update(dt)