From 220668d8d69158581389cc78c06bc78d353f30a8 Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Tue, 5 Nov 2024 21:04:27 +0100 Subject: [PATCH] chore: make all action exemple more similar --- .../gameplay/moveplayer3D/actors/player.lua | 17 +++++++++++------ .../scenes/gameplay/plateform/actors/player.lua | 11 ++++++----- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/examples/scenes/gameplay/moveplayer3D/actors/player.lua b/examples/scenes/gameplay/moveplayer3D/actors/player.lua index 27107fc..aeb5350 100644 --- a/examples/scenes/gameplay/moveplayer3D/actors/player.lua +++ b/examples/scenes/gameplay/moveplayer3D/actors/player.lua @@ -21,26 +21,31 @@ function Player:onInit() end function Player:update(dt) - if love.keyboard.isDown("up") then + if love.keyboard.isDown("up") and (not self.isPunching) then self.speed.y = -120 end - if love.keyboard.isDown("down") then + if love.keyboard.isDown("down") and (not self.isPunching) then self.speed.y = 120 end - if love.keyboard.isDown("left") then + if love.keyboard.isDown("left") and (not self.isPunching) then self.speed.x = -120 end - if love.keyboard.isDown("right") then + if love.keyboard.isDown("right") and (not self.isPunching) then self.speed.x = 120 end if love.keyboard.isDown("a") and (self.onGround) then self.speed.z = 280 + assets:playSFX("gameplay.jump") + end + + if love.keyboard.isDown("z") then + self.isPunching = true + else + self.isPunching = false end self:setAnimation() - - print(self.position.z, self.onGround, self.gravity.z) end function Player:setAnimation() diff --git a/examples/scenes/gameplay/plateform/actors/player.lua b/examples/scenes/gameplay/plateform/actors/player.lua index 97c4229..7424b72 100644 --- a/examples/scenes/gameplay/plateform/actors/player.lua +++ b/examples/scenes/gameplay/plateform/actors/player.lua @@ -27,10 +27,6 @@ function Player:onInit() end function Player:update(dt) - if love.keyboard.isDown("up") and (self.onGround) then - self.speed.y = -280 - assets:playSFX("gameplay.jump") - end if love.keyboard.isDown("down") then self.mainHitbox:modify({x = 0, y = 8}, {w = 16, h = 16}) else @@ -43,7 +39,12 @@ function Player:update(dt) self.speed.x = 120 end - if love.keyboard.isDown("a") then + if love.keyboard.isDown("a") and (self.onGround) then + self.speed.y = -280 + assets:playSFX("gameplay.jump") + end + + if love.keyboard.isDown("z") then self.isPunching = true else self.isPunching = false