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

Fix clearing rows

Browse source
This commit is contained in:
Sam Tay 2017-06-17 16:59:31 -04:00
parent ec72607827
commit 82ca49321c
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Tetris.hs
View file

@ -169,12 +169,12 @@ clearFullRows :: Game -> Game
clearFullRows g = g & board %~ clearBoard
& rowClears %~ (|> rowCount)
where
clearBoard = M.mapKeys shiftCoordAbove . M.filterWithKey isInFullRow
isInFullRow (_,y) _ = y `elem` fullRowIndices
rowCount = length fullRowIndices
fullRowIndices = filter isFullRow [1..boardHeight]
isFullRow r = boardWidth == (length . M.filterWithKey (inRow r) $ g ^. board)
inRow r (_, y) _ = r == y
clearBoard = M.mapKeys shiftCoordAbove . M.filterWithKey notInFullRow
notInFullRow (_,y) _ = y `notElem` fullRowIndices
rowCount = length fullRowIndices
fullRowIndices = filter isFullRow [1..boardHeight]
isFullRow r = boardWidth == (length . M.filterWithKey (inRow r) $ g ^. board)
inRow r (_, y) _ = r == y
shiftCoordAbove (x,y) =
let offset = length . filter (< y) $ fullRowIndices
in (x, y - offset)