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

Merge pull request #12 from hapytex/improvement/redundant-brackets

Browse source 
Remove redundant brackets.
This commit is contained in:
Sam Tay 2021-03-16 09:36:58 -04:00 • committed by GitHub
commit e4660c1e8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Tetris.hs
View file

@ -143,8 +143,8 @@ rotateRaw b@(Block s o@(V2 xo yo) cs)
s == I && V2 xo (yo + 1) `elem` cs = rotateWith clockwise s == I && V2 xo (yo + 1) `elem` cs = rotateWith clockwise
| otherwise = rotateWith counterclockwise | otherwise = rotateWith counterclockwise
where where
clockwise = (+ o) . (cwperp) . (subtract o) clockwise = (+ o) . cwperp . subtract o
counterclockwise = (+ o) . LV.perp . (subtract o) counterclockwise = (+ o) . LV.perp . subtract o
rotateWith dir = b & extra %~ fmap dir rotateWith dir = b & extra %~ fmap dir
cwperp (V2 x y) = V2 y (-x) cwperp (V2 x y) = V2 y (-x)
@ -160,7 +160,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 (t :<| ts) = pure (t, ts) bagFourTetriminoEach (t :<| ts) = pure (t, ts)
bagFourTetriminoEach Empty = bagFourTetriminoEach Empty =
bagFourTetriminoEach <=< shuffle . Seq.fromList . take 28 $ cycle [(I) ..] bagFourTetriminoEach <=< shuffle . Seq.fromList . take 28 $ cycle [I ..]
-- | Initialize a game with a given level -- | Initialize a game with a given level
initGame :: Int -> IO Game initGame :: Int -> IO Game
@ -260,8 +260,8 @@ blockStopped g = isStopped (g ^. board) (g ^. block)
isStopped :: Board -> Block -> Bool isStopped :: Board -> Block -> Bool
isStopped brd = any stopped . coords isStopped brd = any stopped . coords
where where
stopped = (||) <$> atBottom <*> (`M.member` brd) . (translate Down) stopped = (||) <$> atBottom <*> (`M.member` brd) . translate Down
atBottom = (== 1) . (view _y) atBottom = (== 1) . view _y
hardDrop :: Tetris () hardDrop :: Tetris ()
hardDrop = hardDroppedBlock >>= assign block hardDrop = hardDroppedBlock >>= assign block
@ -277,8 +277,8 @@ hardDroppedBlock = do
, xo == x , xo == x
, yo < y , yo < y
] ]
minY = minimum $ (view _y) <$> blockCoords minY = minimum $ view _y <$> blockCoords
dist = minimum $ (subtract 1) <$> (minY : diffs) dist = minimum $ subtract 1 <$> (minY : diffs)
translateBy dist Down <$> use block translateBy dist Down <$> use block
-- | Freeze current block -- | Freeze current block
@ -326,7 +326,7 @@ shuffle xs
| null xs = mempty | null xs = mempty
| otherwise = do | otherwise = do
randomPosition <- getStdRandom (randomR (0, length xs - 1)) randomPosition <- getStdRandom (randomR (0, length xs - 1))
let (left, (y :<| ys)) = Seq.splitAt randomPosition xs let (left, y :<| ys) = Seq.splitAt randomPosition xs
fmap (y <|) (shuffle $ left >< ys) fmap (y <|) (shuffle $ left >< ys)
v2 :: (a, a) -> V2 a v2 :: (a, a) -> V2 a

6
src/UI/Game.hs
View file

@ -163,7 +163,7 @@ drawGrid ui =
$ 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))
, emptyCellMap , emptyCellMap
@ -174,7 +174,7 @@ drawGrid ui =
emptyCellMap :: Map Coord (Widget Name) emptyCellMap :: Map Coord (Widget Name)
emptyCellMap = M.fromList emptyCellMap = M.fromList
[ ((V2 x y), emptyGridCellW) | x <- [1 .. boardWidth], y <- [1 .. boardHeight] ] [ (V2 x y, emptyGridCellW) | x <- [1 .. boardWidth], y <- [1 .. boardHeight] ]
emptyGridCellW :: Widget Name emptyGridCellW :: Widget Name
emptyGridCellW = withAttr emptyAttr cw emptyGridCellW = withAttr emptyAttr cw
@ -275,7 +275,7 @@ drawKeyInfo action keys =
drawGameOver :: Game -> Widget Name drawGameOver :: Game -> Widget Name
drawGameOver g = drawGameOver g =
if (isGameOver g) if isGameOver g
then padLeftRight 4 $ withAttr gameOverAttr $ str "GAME OVER" then padLeftRight 4 $ withAttr gameOverAttr $ str "GAME OVER"
else emptyWidget else emptyWidget