diff --git a/source/assets/sprites/bg1.png b/source/assets/sprites/bg1.png new file mode 100644 index 0000000..a875fa7 Binary files /dev/null and b/source/assets/sprites/bg1.png differ diff --git a/source/assets/sprites/old1player-table-64-64.png b/source/assets/sprites/old1player-table-64-64.png new file mode 100644 index 0000000..3062160 Binary files /dev/null and b/source/assets/sprites/old1player-table-64-64.png differ diff --git a/source/assets/sprites/player-table-64-64.png b/source/assets/sprites/player-table-64-64.png index 3062160..a5dbf7f 100644 Binary files a/source/assets/sprites/player-table-64-64.png and b/source/assets/sprites/player-table-64-64.png differ diff --git a/source/scenes/Game.lua b/source/scenes/Game.lua index d4d4ced..0708385 100644 --- a/source/scenes/Game.lua +++ b/source/scenes/Game.lua @@ -19,8 +19,8 @@ end function scene:drawBackground() local speed = 0.1 - if Ground.player ~= nil and Ground.player.isMovingRight() == true then - speed = 0.2 + if scene.ground ~= nil then + speed = scene.ground.moveSpeed * 0.4 end if scene.distance > 0 then @@ -34,7 +34,7 @@ function scene:drawBackground() end function scene:setValues() - self.bg = Graphics.image.new("assets/sprites/bgTest") + self.bg = Graphics.image.new("assets/sprites/bg1") scene.bgX = 0 scene.telemLostSound = playdate.sound.fileplayer.new("assets/audio/telemko") scene.telemLostSoundPlayed = false @@ -54,7 +54,7 @@ function scene:setValues() scene.tank = nil - scene.distance = 900 + scene.distance = 200 end function scene:init() @@ -115,11 +115,15 @@ function scene:update() end if scene.distance > 0 then - scene.distance = scene.distance - 1 + scene.distance = scene.distance - scene.ground.moveSpeed end - if scene.distance < 850 and scene.tank == nil then - scene.tank = Tank(500, 190, scene.player, scene.ground) + if scene.distance < 0 then -- SHIT + scene.distance = 0 + end + + if scene.distance < 150 and scene.tank == nil then + scene.tank = Tank(480, 190, scene.ground) scene:addSprite(scene.tank) -- Raw sprite end @@ -131,7 +135,7 @@ function scene:update() local t = scene.player.getBat() / 10000 local lerpBat = playdate.math.lerp(12.0, 16.8, t) Noble.Text.draw(round(lerpBat) .. "v", 10, 210, Noble.Text.ALIGN_LEFT, false, font) - Noble.Text.draw(scene.distance .. "m", 200, 40, Noble.Text.ALIGN_CENTER, false, font) + Noble.Text.draw(math.round(scene.distance) .. "m", 200, 20, Noble.Text.ALIGN_CENTER, false, font) end if scene.player.isDead() and not scene.telemLostSoundPlayed then diff --git a/source/scripts/tankSprite.lua b/source/scripts/tankSprite.lua index aa55aaa..8f82d02 100644 --- a/source/scripts/tankSprite.lua +++ b/source/scripts/tankSprite.lua @@ -2,7 +2,7 @@ Tank = {} class("Tank").extends(Graphics.sprite) -function Tank:init(x, y, player, ground) +function Tank:init(x, y, ground) self.tankImage = Graphics.image.new("assets/sprites/tank") self.tankImageD = Graphics.image.new("assets/sprites/tankD") Tank.super.init(self) @@ -26,8 +26,6 @@ function Tank:init(x, y, player, ground) }) -- Main properties - Tank.moveSpeed = 2 - Tank.player = player Tank.ground = ground self:fadein() @@ -49,12 +47,5 @@ function Tank:update() return end - -- Speedup when player is moving right - if Tank.player.isMovingRight() == false then - Tank.moveSpeed = 0.2 - else - Tank.moveSpeed = 1 - end - - self:moveTo(self.x - Tank.moveSpeed, self.y) + self:moveTo(self.x - Tank.ground.moveSpeed, self.y) end