From 45a103da2133b645fac9617cc97c11901d3e258f Mon Sep 17 00:00:00 2001 From: "Juan J. Martinez" Date: Fri, 10 Mar 2023 23:53:40 +0000 Subject: Change stage --- src/Game/Entities/Exit.hs | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'src/Game/Entities/Exit.hs') diff --git a/src/Game/Entities/Exit.hs b/src/Game/Entities/Exit.hs index 075e1f4..12f160d 100644 --- a/src/Game/Entities/Exit.hs +++ b/src/Game/Entities/Exit.hs @@ -19,13 +19,21 @@ mkExit sprites x y playerCollision = do gravity = gravityOff, dir = DirRight, sprite = s, - update = pure . updateExit playerCollision, + update = updateExit playerCollision, destroy = False, actions = [] } -updateExit :: Collision -> Entity -> Entity -updateExit _ e - | e.delay > 0 = e {delay = e.delay - 1} - | e.frame + 1 < frameLimit e = e {delay = frameDelay, frame = e.frame + 1} - | otherwise = e {delay = frameDelay, frame = 7} +updateExit :: Collision -> Entity -> IO Entity +updateExit touchedPlayer e = do + touched <- if e.frame < fullyOpen then pure False else touchedPlayer e + pure $ if touched then e {destroy = True, actions = [ActionExitLevel]} else update + where + fullyOpen :: Int + fullyOpen = 7 + + update :: Entity + update + | e.delay > 0 = e {delay = e.delay - 1} + | e.frame + 1 < frameLimit e = e {delay = frameDelay, frame = e.frame + 1} + | otherwise = e {delay = frameDelay, frame = fullyOpen} -- cgit v1.2.3