From 39bad552afe6cd43b509449a749a507b95f4c9c2 Mon Sep 17 00:00:00 2001 From: Sam Tay Date: Sat, 17 Jun 2017 02:54:15 -0400 Subject: [PATCH] More portable block definitions --- src/Tetris.hs | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/Tetris.hs b/src/Tetris.hs index 7715517..89d2652 100644 --- a/src/Tetris.hs +++ b/src/Tetris.hs @@ -79,13 +79,19 @@ instance Translatable Block where -- Low level functions on blocks and coordinates initBlock :: Tetrimino -> Block -initBlock I = Block I startOrigin [(-2,0), (-1,0), (1,0)] -initBlock O = Block O startOrigin [(-1,0), (-1,-1), (0,-1)] -initBlock S = Block S startOrigin [(-1,-1), (0,-1), (1,0)] -initBlock Z = Block Z startOrigin [(-1,0), (0,-1), (1,-1)] -initBlock L = Block L startOrigin [(-1,-1), (-1,0), (1,0)] -initBlock J = Block J startOrigin [(-1,0), (1,0), (1,-1)] -initBlock T = Block T startOrigin [(-1,0), (0,-1), (1,0)] +initBlock t = Block t startOrigin $ offset startOrigin $ relCells t + +offset :: Coord -> [Coord] -> [Coord] +offset (xo,yo) = fmap (\(x,y) -> (xo + x, yo + x)) + +relCells :: Tetrimino -> [Coord] +relCells I = [(-2,0), (-1,0), (1,0)] +relCells O = [(-1,0), (-1,-1), (0,-1)] +relCells S = [(-1,-1), (0,-1), (1,0)] +relCells Z = [(-1,0), (0,-1), (1,-1)] +relCells L = [(-1,-1), (-1,0), (1,0)] +relCells J = [(-1,0), (1,0), (1,-1)] +relCells T = [(-1,0), (0,-1), (1,0)] -- | Visible, active board size boardWidth, boardHeight :: Int