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

Merge pull request #17 from hapytex/improvement/redundant-lense

Browse source 
Group sequences of .^
This commit is contained in:
Sam Tay 2021-03-17 21:39:35 -04:00 • committed by GitHub
commit 8d8ca986a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Tetris.hs
View file

@ -178,7 +178,7 @@ initGame lvl = do
} }
isGameOver :: Game -> Bool isGameOver :: Game -> Bool
isGameOver g = blockStopped g && g ^. block ^. origin == startOrigin isGameOver g = blockStopped g && g ^. (block . origin) == startOrigin
-- | The main game execution, this is executed at each discrete time step -- | The main game execution, this is executed at each discrete time step
timeStep :: MonadIO m => TetrisT m () timeStep :: MonadIO m => TetrisT m ()

6
src/UI/Game.hs
View file

@ -134,7 +134,7 @@ handleTick ui =
-- | Restart game at the same level -- | Restart game at the same level
restart :: UI -> EventM Name (Next UI) restart :: UI -> EventM Name (Next UI)
restart ui = do restart ui = do
let lvl = ui ^. game ^. level let lvl = ui ^. (game . level)
g <- liftIO $ initGame lvl g <- liftIO $ initGame lvl
continue $ ui & game .~ g continue $ ui & game .~ g
& locked .~ False & locked .~ False
@ -161,8 +161,8 @@ drawGrid ui =
foldr (<+>) emptyWidget foldr (<+>) emptyWidget
. M.filterWithKey (\(V2 _ y) _ -> r == y) . M.filterWithKey (\(V2 _ y) _ -> r == y)
$ mconcat $ mconcat
[ drawBlockCell NormalBlock <$> ui ^. game ^. board [ drawBlockCell NormalBlock <$> ui ^. (game . board)
, blockMap NormalBlock (ui ^. game ^. block) , blockMap NormalBlock (ui ^. (game . block))
, case ui ^. preview of , case ui ^. preview of
Nothing -> M.empty Nothing -> M.empty
Just s -> blockMap (HardDropBlock s) (evalTetris hardDroppedBlock (ui ^. game)) Just s -> blockMap (HardDropBlock s) (evalTetris hardDroppedBlock (ui ^. game))