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

Rename blockCoords -> coords

Browse source
This commit is contained in:
Sam Tay 2017-06-17 02:54:40 -04:00
parent 39bad552af
commit 8e1c949a69
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Tetris.hs
View file

@ -125,8 +125,8 @@ rotate' b@(Block s o@(xo,yo) cs)
counterclockwise (xo, yo) (x, y) = (xo + yo - y, x + yo - xo) counterclockwise (xo, yo) (x, y) = (xo + yo - y, x + yo - xo)
-- | Get coordinates of entire block -- | Get coordinates of entire block
blockCoords :: Block -> [Coord] coords :: Block -> [Coord]
blockCoords b = b ^. origin : b ^. extra coords b = b ^. origin : b ^. extra
-- Higher level functions on game and board -- Higher level functions on game and board
@ -217,13 +217,13 @@ blockStopped g = isStopped (g ^. board) (g ^. block)
-- | Check if a block on a board is stopped from further gravitation -- | Check if a block on a board is stopped from further gravitation
isStopped :: Board -> Block -> Bool isStopped :: Board -> Block -> Bool
isStopped b = any (`M.member` b) . map (translate Down) . blockCoords isStopped b = any (`M.member` b) . map (translate Down) . coords
-- | Freeze current block -- | Freeze current block
freezeBlock :: Game -> Game freezeBlock :: Game -> Game
freezeBlock g = g & board %~ (M.union blkMap) freezeBlock g = g & board %~ (M.union blkMap)
where blk = g ^. block where blk = g ^. block
blkMap = M.fromList $ zip (blk ^. to blockCoords) (repeat $ blk ^. shape) blkMap = M.fromList $ zip (blk ^. to coords) (repeat $ blk ^. shape)
-- | Replace block with next block -- | Replace block with next block
nextBlock :: Game -> IO Game nextBlock :: Game -> IO Game
@ -257,7 +257,7 @@ gravitate = shift Down
-- | Checks if block's potential new location is valid -- | Checks if block's potential new location is valid
isValidBlockPosition :: Block -> Board -> Bool isValidBlockPosition :: Block -> Board -> Bool
isValidBlockPosition blk brd = all validCoord $ blk ^. to blockCoords isValidBlockPosition blk brd = all validCoord $ blk ^. to coords
where validCoord = (&&) <$> isFree brd <*> isInBounds where validCoord = (&&) <$> isFree brd <*> isInBounds
-- | Shuffle a sequence (random permutation) -- | Shuffle a sequence (random permutation)