inertia and refactor

This commit is contained in:
assada 2024-06-03 00:31:15 +03:00
parent 3ca6427583
commit 4f6d0a6c24
Signed by: assada
GPG Key ID: D4860A938E541F06
9 changed files with 94 additions and 54 deletions

View File

@ -3,5 +3,6 @@
## TODO: ## TODO:
- [ ] Menu audio - [ ] Menu audio
- [ ] Tags, zOffset from constants - [x] Tags, zOffset from constants
- [ ] Add global game state (?) - [ ] Add global game state (?)
- [x] Add inertia to the player

View File

@ -19,7 +19,9 @@ ZIndex = {
props = 3, props = 3,
fx = 6, fx = 6,
ui = 10, ui = 10,
alert = 12 alert = 12,
ground = 100,
flash = 101
} }
CollideGroups = { CollideGroups = {
player = 1, player = 1,

View File

@ -45,6 +45,8 @@ end
function scene:start() function scene:start()
scene.super.start(self) scene.super.start(self)
playdate.ui.crankIndicator:draw() -- not sure why this is not working
self.optionsMenu:addMenuItem("Main Menu", function() Noble.transition(Menu) end) self.optionsMenu:addMenuItem("Main Menu", function() Noble.transition(Menu) end)
Noble.showFPS = true Noble.showFPS = true
end end
@ -52,22 +54,22 @@ end
function scene:spawnBaleba() function scene:spawnBaleba()
local balebaCount = #scene.balebas local balebaCount = #scene.balebas
if balebaCount >= 6 then if balebaCount >= 6 then
scene.balebaSpawner:remove()
return return
end end
scene.balebas[balebaCount + 1] = Baleba(math.random(410, 900), math.random(10, 210), scene.player, true) --scene.balebas[balebaCount + 1] = Baleba(math.random(410, 900), math.random(10, 210), scene.player, true)
return scene.balebas[balebaCount + 1]
end end
function scene:enter() function scene:enter()
scene.super.enter(self) scene.super.enter(self)
scene.player = Player(150, 100) scene.player = Player(150, 100)
scene.ground = Ground(0, 225, scene.player) scene.ground = Ground(0, 225, scene.player)
scene.balebaSpawner.timerEndedCallback = function() scene.balebaSpawner.timerEndedCallback = function()
--scene.balebas[k] = scene:spawnBaleba() scene:spawnBaleba()
end end
for i = 1, 3 do for i = 1, 3 do
@ -107,7 +109,11 @@ function scene:update()
playdate.timer.performAfterDelay(4000, function() playdate.timer.performAfterDelay(4000, function()
scene.resultShowed = true scene.resultShowed = true
c = notify("Nice", function() local message = "You failed!"
if scene.player.targetDone then
message = "You did it!"
end
c = notify(message, function()
Noble.transition(Menu) Noble.transition(Menu)
c:remove() c:remove()
end) end)

View File

@ -15,10 +15,15 @@ function Baleba:init(x, y, player, loop)
self.animation:setState("run") self.animation:setState("run")
-- Collision properties -- Collision properties
self:setZIndex(11) self:setZIndex(ZIndex.enemy)
self:setCollideRect(3, 25, 40, 15) self:setCollideRect(3, 25, 40, 15)
self:setTag(154) self:setTag(154)
self:setSize(64, 64) self:setSize(64, 64)
self:setGroups(CollideGroups.enemy)
self:setCollidesWithGroups(
{
CollideGroups.player
})
-- Sprite properties -- Sprite properties
self.standrate = randomFloat(0.3, 2) self.standrate = randomFloat(0.3, 2)

View File

@ -12,7 +12,7 @@ function BigBoom:init()
self:playAnimation() self:playAnimation()
self:setCenter(0, 0) self:setCenter(0, 0)
self:setSize(playdate.display.getSize()) self:setSize(playdate.display.getSize())
self:setZIndex(120) self:setZIndex(ZIndex.flash)
self:moveTo(0, 0) self:moveTo(0, 0)

View File

@ -12,7 +12,7 @@ function Danger:init(x, y, dangerousObject)
self.animation:setState("run") self.animation:setState("run")
-- Collision properties -- Collision properties
self:setZIndex(11) self:setZIndex(ZIndex.alert)
self:setTag(7) self:setTag(7)
self:setSize(64, 64) self:setSize(64, 64)

View File

@ -5,9 +5,14 @@ function Ground:init(x, y, player)
Ground.super.init(self, "assets/sprites/groundFin") Ground.super.init(self, "assets/sprites/groundFin")
-- Collision properties -- Collision properties
self:setZIndex(100) self:setZIndex(ZIndex.ground)
self:setTag(3) self:setTag(3)
self:setGroups(CollideGroups.wall)
self:setCollideRect(0, 28, 800, 10) self:setCollideRect(0, 28, 800, 10)
self:setCollidesWithGroups(
{
CollideGroups.player
})
self:setSize(800, 32) self:setSize(800, 32)
-- Main properties -- Main properties

View File

@ -5,7 +5,7 @@ function Player:init(x, y)
Player.super.init(self, "assets/sprites/player", true) Player.super.init(self, "assets/sprites/player", true)
-- Animation properties -- Animation properties
self.animation:addState("run", 1, 7) self.animation:addState("run", 8, 14)
self.animation.run.frameDuration = 2 self.animation.run.frameDuration = 2
self.animation:addState("up", 1, 7) self.animation:addState("up", 1, 7)
self.animation.up.frameDuration = 6 self.animation.up.frameDuration = 6
@ -22,17 +22,27 @@ function Player:init(x, y)
-- Collision properties -- Collision properties
self:setSize(64, 64) self:setSize(64, 64)
self:moveTo(x, y) self:moveTo(x, y)
self:setZIndex(10) self:setZIndex(ZIndex.player)
self:setCollideRect(3, 19, 63, 33) self:setGroups(CollideGroups.player)
self:setCollidesWithGroups(
{
CollideGroups.enemy,
CollideGroups.wall
})
self:setCollideRect(3, 19, 60, 33)
self:setTag(1) self:setTag(1)
-- Physics properties -- Physics properties
self.fallSpeed = 0.05
self.xVelocity = 0 self.xVelocity = 0
self.yVelocity = 0 self.yVelocity = self.fallSpeed
self.maxXSpeed = 2 self.maxXSpeed = 2
self.maxYSpeed = 5 self.maxYSpeed = 5
self.fallSpeed = 0.05 self.acceleration = 0.05
self.maxFallSpeed = 0.4 self.friction = 0.95
self.yInertia = 0
self.maxFallSpeed = 0.7
self.frictionAccel = 0.3
-- Player State -- Player State
self.touchingGround = false self.touchingGround = false
@ -41,8 +51,9 @@ function Player:init(x, y)
Player.dead = false Player.dead = false
Player.bat = 10000 Player.bat = 10000
Player.dischargeRate = 1 Player.dischargeRate = 1
self.cantDown = false
Player.moveRight = false Player.moveRight = false
self.lastDirection = nil
self.targetDone = false
end end
function Player:handleInput() function Player:handleInput()
@ -52,54 +63,53 @@ function Player:handleInput()
local crankChange, acceleratedChange = playdate.getCrankChange() local crankChange, acceleratedChange = playdate.getCrankChange()
if playdate.buttonJustReleased(playdate.kButtonLeft) or playdate.buttonJustReleased(playdate.kButtonRight) then -- X velocity
self.cantDown = false if not playdate.buttonIsPressed(playdate.kButtonLeft) and not playdate.buttonIsPressed(playdate.kButtonRight) then
end self.xVelocity = self.xVelocity * self.friction
if playdate.buttonIsPressed(playdate.kButtonLeft) then
self:changeToRunState("left")
self:setRotation(10)
self.cantDown = true
Player.moveRight = false Player.moveRight = false
elseif playdate.buttonIsPressed(playdate.kButtonRight) then
self:changeToRunState("right")
self:setRotation(10)
self.cantDown = true
Player.moveRight = true
end end
local isChangingDirection = false
if playdate.buttonIsPressed(playdate.kButtonLeft) then
if self.lastDirection == "right" then
isChangingDirection = true
end
self:changeToRunState("left")
self.lastDirection = "left"
self.xVelocity = self.xVelocity - self.acceleration
elseif playdate.buttonIsPressed(playdate.kButtonRight) then
if self.lastDirection == "left" then
isChangingDirection = true
end
self:changeToRunState("right")
Player.moveRight = true
self.lastDirection = "right"
self.xVelocity = self.xVelocity + self.acceleration
end
if isChangingDirection then
self.xVelocity = self.xVelocity * self.frictionAccel
end
-- Y velocity
if crankChange ~= 0 then if crankChange ~= 0 then
local force = 0.01
if crankChange > 0 then if crankChange > 0 then
self.animation:setState("up") self.animation:setState("up")
else else
self.animation:setState("down") self.animation:setState("down")
force = 0.05
end end
self.yVelocity = self.yVelocity - acceleratedChange * force self.yInertia = self.yInertia - (acceleratedChange * 0.007)
elseif self.cantDown == false then
self.cantDown = false
self:changeToDownState()
else else
self.yVelocity = self.fallSpeed self.yInertia = self.yInertia * self.friction
end
end
function Player:changeToDownState()
Player.moveRight = false
self.yVelocity = self.fallSpeed
self.xVelocity = 0
self.animation:setState("down") self.animation:setState("down")
self:setRotation(0) end
end end
function Player:changeToRunState(direction) function Player:changeToRunState(direction)
if direction == "left" then if direction == "left" then
self.xVelocity = -self.maxXSpeed
self.animation.direction = Noble.Animation.DIRECTION_LEFT self.animation.direction = Noble.Animation.DIRECTION_LEFT
self.animation:setState("run") self.animation:setState("run")
elseif direction == "right" then elseif direction == "right" then
self.xVelocity = self.maxXSpeed
self.animation.direction = Noble.Animation.DIRECTION_RIGHT self.animation.direction = Noble.Animation.DIRECTION_RIGHT
self.animation:setState("run") self.animation:setState("run")
end end
@ -129,12 +139,13 @@ function Player:handleMovementAndCollisions()
end end
local xVel = self.xVelocity local xVel = self.xVelocity
local yVel = self.yVelocity + self.yInertia + self.fallSpeed
if (self.x < 20 and xVel < 0) or (self.x > 380 and xVel > 0) then -- Screen bounds if (self.x < 20 and xVel < 0) or (self.x > 380 and xVel > 0) then -- Screen bounds
xVel = 0 xVel = 0
end end
local _, _, collisions, length = self:checkCollisions(self.x + xVel, self.y + self.yVelocity) local _, _, collisions, length = self:checkCollisions(self.x + xVel, self.y + yVel)
self.touchingGround = false self.touchingGround = false
self.touchingCeiling = false self.touchingCeiling = false
@ -161,12 +172,13 @@ function Player:handleMovementAndCollisions()
self:boom() self:boom()
return return
elseif collisionTag == 154 then -- Baleba elseif collisionTag == 154 then -- Baleba
-- self:boom(collisionObject) self:boom(collisionObject)
return return
elseif collisionTag == 2 then -- Tank elseif collisionTag == 2 then -- Tank
self:boom() self:boom()
BigBoom() BigBoom()
self.targetDone = true
local particleC = ParticlePoly(collisionObject.x, collisionObject.y) local particleC = ParticlePoly(collisionObject.x, collisionObject.y)
particleC:setThickness(5) particleC:setThickness(5)
particleC:setAngular(-15, 15) particleC:setAngular(-15, 15)
@ -180,7 +192,8 @@ function Player:handleMovementAndCollisions()
return return
end end
end end
self:moveTo(self.x + xVel, self.y + self.yVelocity)
self:moveTo(self.x + xVel, self.y + yVel)
end end
function Player:handleDischarge(state) function Player:handleDischarge(state)
@ -190,7 +203,7 @@ function Player:handleDischarge(state)
if Player.bat <= 0 then if Player.bat <= 0 then
Player.bat = 0 Player.bat = 0
self.fallSpeed = 2 self.fallSpeed = 2
self:changeToDownState() self.animation:setState("down")
return return
end end
@ -198,6 +211,10 @@ function Player:handleDischarge(state)
self.fallSpeed = self.maxFallSpeed self.fallSpeed = self.maxFallSpeed
end end
if Player.bat < 3000 then
self.frictionAccel = 0.4
end
if state == "run" then if state == "run" then
Player.dischargeRate = 5 Player.dischargeRate = 5
elseif state == "up" then elseif state == "up" then
@ -216,7 +233,6 @@ end
function Player:update() function Player:update()
self:handleMovementAndCollisions() self:handleMovementAndCollisions()
if Player.dead then if Player.dead then
print("Player is dead")
return return
end end

View File

@ -16,9 +16,14 @@ function Tank:init(x, y, player, ground)
Graphics.popContext() Graphics.popContext()
-- Collision properties -- Collision properties
self:setZIndex(99) self:setZIndex(ZIndex.enemy)
self:setTag(2) self:setTag(2)
self:setCollideRect(4, 56, 147, 65) self:setCollideRect(4, 56, 147, 65)
self:setGroups(CollideGroups.enemy)
self:setCollidesWithGroups(
{
CollideGroups.player
})
-- Main properties -- Main properties
Tank.moveSpeed = 2 Tank.moveSpeed = 2