aboutsummaryrefslogtreecommitdiff
path: root/src/Game
diff options
context:
space:
mode:
authorJuan J. Martinez <jjm@usebox.net>2023-03-21 21:02:45 +0000
committerJuan J. Martinez <jjm@usebox.net>2023-03-21 21:02:45 +0000
commit1c8a22d24b14d258a9103f7b83d627359eae0da8 (patch)
tree92b3d18cf689ddc0bf90028e7139354d82c2da48 /src/Game
parent897bfe0f72ddc80a020a421cbe987b54716e571e (diff)
downloadspace-plat-hs-1c8a22d24b14d258a9103f7b83d627359eae0da8.tar.gz
space-plat-hs-1c8a22d24b14d258a9103f7b83d627359eae0da8.zip
Player transition into the stage
Diffstat (limited to 'src/Game')
-rw-r--r--src/Game/Entities.hs6
-rw-r--r--src/Game/Entities/Entry.hs31
-rw-r--r--src/Game/Entities/Types.hs8
-rw-r--r--src/Game/State.hs6
4 files changed, 46 insertions, 5 deletions
diff --git a/src/Game/Entities.hs b/src/Game/Entities.hs
index 8a939f4..b43ab0e 100644
--- a/src/Game/Entities.hs
+++ b/src/Game/Entities.hs
@@ -19,6 +19,7 @@ import qualified Game.Controller as C
import Game.Entities.Common
import Game.Entities.Const
import Game.Entities.Effect
+import Game.Entities.Entry
import Game.Entities.Exit
import Game.Entities.Pickup
import Game.Entities.Player
@@ -37,8 +38,10 @@ mkEntities sprites m controls = do
_ -> error "No player entity in map"
playerRef <- newIORef player
entities <- traverse (toEntity playerRef) $ sort $ filter (not . M.isPlayer) (M.objects m)
+ -- the effect of the player "warping" into the level
+ entryEffect <- mkEntry sprites player.x player.y
-- the entities list has always player first
- pure $ Entities sprites playerRef (player : entities)
+ pure $ Entities sprites playerRef (player : (entryEffect : entities))
where
toEntity :: IORef Entity -> M.Object -> IO Entity
toEntity playerRef (M.SlimeEntity x y) = mkSlime sprites x y (collision playerRef 16) (M.isBlocked m)
@@ -105,6 +108,7 @@ updateAll es state = do
-- the player is not in the action, changing the type disables collision detection
((head ents) {typ = TypeEffect} : tail ents)
t
+ ActionEntryDone -> processActions s {GS.levelCompleted = GS.ExitOff} ents t
ActionExitDone -> processActions s {GS.levelCompleted = GS.ExitDone} ents t
processActions s ents [] = pure (s, ents)
diff --git a/src/Game/Entities/Entry.hs b/src/Game/Entities/Entry.hs
new file mode 100644
index 0000000..5c17146
--- /dev/null
+++ b/src/Game/Entities/Entry.hs
@@ -0,0 +1,31 @@
+module Game.Entities.Entry (mkEntry) where
+
+import Game.Entities.Common
+import Game.Entities.Const
+import Game.Entities.Types
+import qualified Game.Sprites as S
+
+mkEntry :: S.SpriteSheet -> Int -> Int -> IO Entity
+mkEntry sprites x y = do
+ s <- S.get sprites "exit"
+ pure
+ Entity
+ { typ = TypePickup,
+ x = x,
+ y = y,
+ delay = frameDelay,
+ frame = 0,
+ jumping = False,
+ gravity = gravityOff,
+ dir = Dying,
+ sprite = s,
+ update = pure . updateEntry,
+ destroy = False,
+ actions = []
+ }
+
+updateEntry :: Entity -> Entity
+updateEntry e
+ | e.delay > 0 = e {delay = e.delay - 1}
+ | e.frame + 1 < frameLimit e = e {delay = frameDelay, frame = e.frame + 1}
+ | otherwise = e {destroy = True, actions = [ActionEntryDone]}
diff --git a/src/Game/Entities/Types.hs b/src/Game/Entities/Types.hs
index 4ece6c5..e8b29b0 100644
--- a/src/Game/Entities/Types.hs
+++ b/src/Game/Entities/Types.hs
@@ -29,7 +29,13 @@ data Entities = Entities
-- | The effect name must match the sprite name in the spritesheet.
type EffectName = String
-data Action = ActionAddEffect Int Int EffectName | ActionAddBattery Int Int | ActionHitPlayer | ActionExitStarted | ActionExitDone
+data Action
+ = ActionAddEffect Int Int EffectName
+ | ActionAddBattery Int Int
+ | ActionHitPlayer
+ | ActionExitStarted
+ | ActionEntryDone
+ | ActionExitDone
data Entity = Entity
{ typ :: Type,
diff --git a/src/Game/State.hs b/src/Game/State.hs
index 4f46c01..083e6d4 100644
--- a/src/Game/State.hs
+++ b/src/Game/State.hs
@@ -6,7 +6,7 @@ import qualified Game.Map as M
maxLives :: Int
maxLives = 4
-data ExitState = ExitOff | ExitStarted | ExitDone deriving (Eq)
+data ExitState = ExitOff | ExitEntry | ExitStarted | ExitDone deriving (Eq)
data State = State
{ batteries :: Int,
@@ -33,7 +33,7 @@ initialState m =
exit = False,
-- doesn't matter where
lastBattery = (0, 0),
- levelCompleted = ExitOff,
+ levelCompleted = ExitEntry,
currentLevel = 0
}
@@ -47,5 +47,5 @@ levelState s m =
exit = False,
-- doesn't matter where
lastBattery = (0, 0),
- levelCompleted = ExitOff
+ levelCompleted = ExitEntry
}