game-projects/sonic-radiance
1
0
Fork 0
Code Issues 33 Pull requests Projects 3 Releases Wiki Activity

chore: simplify gizmo collision check

Browse source
This commit is contained in:
Kazhnuz 2021-03-21 16:32:29 +01:00
parent bceda94970
commit 91c7a03dc2
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
sonic-radiance.love/scenes/overworld/actors/player.lua
View file

@ -68,27 +68,29 @@ function Player:updateCurrentCharset()
end end
function Player:collisionResponse(col) function Player:collisionResponse(col)
if (not col.other.owner.isDestroyed) then local hitbox = col.other
if (col.other.type == "gizmo") then local other = col.other.owner
if (col.other.owner.needButton) then if (not other.isDestroyed) then
if (hitbox.type == "gizmo") then
if (other.needButton) then
if (self.keys["A"].isPressed) then if (self.keys["A"].isPressed) then
col.other.owner:doAction() other:doAction()
self.haveCollided = true self.haveCollided = true
self.lastCollision = col.other.owner.creationID self.lastCollision = other.creationID
end end
else else
if (self.lastCollision ~= col.other.owner.creationID) then if (self.lastCollision ~= other.creationID) then
col.other.owner:doAction() other:doAction()
end end
self.haveCollided = true self.haveCollided = true
self.lastCollision = col.other.owner.creationID self.lastCollision = other.creationID
end end
end end
if (col.other.type == "btnInput" and col.other.owner.needButton) then if (hitbox.type == "btnInput" and other.needButton) then
if (self.keys["A"].isPressed and (self:faceRightDirection(col.other.owner))) then if (self.keys["A"].isPressed and (self:faceRightDirection(other))) then
col.other.owner:doAction() other:doAction()
self.haveCollided = true self.haveCollided = true
self.lastCollision = col.other.owner.creationID self.lastCollision = other.creationID
end end
end end
end end