aadit/tetris-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Swap return -> pure because its better

Browse source
This commit is contained in:
Sam Tay 2017-06-17 20:42:56 -04:00
parent 80e71eb859
commit ef6ed845c2
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Tetris.hs
View file

@ -140,7 +140,7 @@ coords b = b ^. origin : b ^. extra
bagFourTetriminoEach :: Seq.Seq Tetrimino -> IO (Tetrimino, Seq.Seq Tetrimino) bagFourTetriminoEach :: Seq.Seq Tetrimino -> IO (Tetrimino, Seq.Seq Tetrimino)
bagFourTetriminoEach = go . Seq.viewl bagFourTetriminoEach = go . Seq.viewl
where where
go (t :< ts) = return (t, ts) go (t :< ts) = pure (t, ts)
go EmptyL = freshList >>= bagFourTetriminoEach go EmptyL = freshList >>= bagFourTetriminoEach
freshList = shuffle $ Seq.cycleTaking 28 $ Seq.fromList [(I)..] freshList = shuffle $ Seq.cycleTaking 28 $ Seq.fromList [(I)..]
@ -149,7 +149,7 @@ initGame :: Int -> IO Game
initGame lvl = do initGame lvl = do
(s1, bag1) <- bagFourTetriminoEach mempty (s1, bag1) <- bagFourTetriminoEach mempty
(s2, bag2) <- bagFourTetriminoEach bag1 (s2, bag2) <- bagFourTetriminoEach bag1
return $ pure $
Game { _level = lvl Game { _level = lvl
, _block = initBlock s1 , _block = initBlock s1
, _nextShape = s2 , _nextShape = s2
@ -164,7 +164,7 @@ isGameOver g = blockStopped g && g ^. block ^. origin == startOrigin
timeStep :: Game -> IO Game timeStep :: Game -> IO Game
timeStep = timeStep =
bool bool
<$> (return . gravitate) -- if not stopped <$> (pure . gravitate) -- if not stopped
<*> nextBlock . updateScore . clearFullRows . freezeBlock -- if stopped <*> nextBlock . updateScore . clearFullRows . freezeBlock -- if stopped
<*> blockStopped -- predicate <*> blockStopped -- predicate
@ -250,7 +250,7 @@ freezeBlock g = g & board %~ (M.union blkMap)
nextBlock :: Game -> IO Game nextBlock :: Game -> IO Game
nextBlock g = do nextBlock g = do
(t, ts) <- bagFourTetriminoEach (g ^. nextShapeBag) (t, ts) <- bagFourTetriminoEach (g ^. nextShapeBag)
return $ pure $
g & block .~ initBlock (g ^. nextShape) g & block .~ initBlock (g ^. nextShape)
& nextShape .~ t & nextShape .~ t
& nextShapeBag .~ ts & nextShapeBag .~ ts