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

Rename "frozen" -> "locked", better semantics

Browse source
This commit is contained in:
Sam Tay 2018-12-27 10:43:20 -05:00
parent ad1fcf9192
commit ccbd9d8e36
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/UI/Game.hs
View file

@ -28,7 +28,7 @@ import Tetris
data UI = UI data UI = UI
{ _game :: Game -- ^ tetris game { _game :: Game -- ^ tetris game
, _preview :: Maybe String -- ^ hard drop preview cell , _preview :: Maybe String -- ^ hard drop preview cell
, _frozen :: Bool -- ^ freeze after hard drop before time step , _locked :: Bool -- ^ lock after hard drop before time step
} }
makeLenses ''UI makeLenses ''UI
@ -80,18 +80,18 @@ handleEvent ui (VtyEvent (V.EvKey (V.KChar 'j') [])) = exec (shift Down) ui
handleEvent ui (VtyEvent (V.EvKey V.KUp [])) = exec rotate ui handleEvent ui (VtyEvent (V.EvKey V.KUp [])) = exec rotate ui
handleEvent ui (VtyEvent (V.EvKey (V.KChar 'k') [])) = exec rotate ui handleEvent ui (VtyEvent (V.EvKey (V.KChar 'k') [])) = exec rotate ui
handleEvent ui (VtyEvent (V.EvKey (V.KChar ' ') [])) = continue $ ui & game %~ execTetris hardDrop handleEvent ui (VtyEvent (V.EvKey (V.KChar ' ') [])) = continue $ ui & game %~ execTetris hardDrop
& frozen .~ True & locked .~ True
handleEvent ui (VtyEvent (V.EvKey (V.KChar 'r') [])) = restart ui handleEvent ui (VtyEvent (V.EvKey (V.KChar 'r') [])) = restart ui
handleEvent ui (VtyEvent (V.EvKey (V.KChar 'q') [])) = halt ui handleEvent ui (VtyEvent (V.EvKey (V.KChar 'q') [])) = halt ui
handleEvent ui (VtyEvent (V.EvKey V.KEsc [])) = halt ui handleEvent ui (VtyEvent (V.EvKey V.KEsc [])) = halt ui
handleEvent ui _ = continue ui handleEvent ui _ = continue ui
-- | This common execution function is used for all game input except hard -- | This common execution function is used for all game input except hard
-- drop. If frozen (from hard drop) do nothing, else execute the state -- drop. If locked (from hard drop) do nothing, else execute the state
-- computation and unfreeze. -- computation and unlock.
exec :: Tetris () -> UI -> EventM Name (Next UI) exec :: Tetris () -> UI -> EventM Name (Next UI)
exec op ui = continue exec op ui = continue
$ if ui ^. frozen || ui ^. game . to isGameOver $ if ui ^. locked || ui ^. game . to isGameOver
then ui then ui
else ui & game %~ execTetris op else ui & game %~ execTetris op
@ -103,7 +103,7 @@ handleTick ui =
else do else do
next <- execStateT timeStep $ ui ^. game next <- execStateT timeStep $ ui ^. game
continue $ ui & game .~ next continue $ ui & game .~ next
& frozen .~ False & locked .~ False
-- | Restart game at the same level -- | Restart game at the same level
restart :: UI -> EventM Name (Next UI) restart :: UI -> EventM Name (Next UI)
@ -111,7 +111,7 @@ 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
& frozen .~ False & locked .~ False
-- Drawing -- Drawing