-puzzle = [[Wall, Wall, Wall, Wall, Wall, Wall],
- [Wall, Free, Free, Free, Free, Wall],
- [Wall, Agent,Free, Box, Free, Wall],
- [Wall, Free, Free, Free, Target, Wall],
- [Wall, Wall, Wall, Wall, Wall, Wall]]
-
-size :: (Int, Int)
-size = (4,5)
-
-checkX :: Int -> Int
-checkX x = if (x > length (hd puzzle)) (-1) x
-
-checkY :: Int -> Int
-checkY y = if (y > length puzzle) (-1) y
-
-genCoord :: Int Int -> [String]
-genCoord x y = [" next(x" +++ toString x +++ "_" +++ toString y +++ ") := case\n",
+puzzle = Sokoban [[Wall, Wall, Wall, Wall, Wall, Wall],
+ [Wall, Free, Free, Free, Free, Wall],
+ [Wall, Agent,Free, Box, Free, Wall],
+ [Wall, Free, Free, Free, Target, Wall],
+ [Wall, Wall, Wall, Wall, Wall, Wall]]
+
+checkX :: [[SokobanTile]] Int -> Int
+checkX p x = let (Sokoban p) = puzzle in if (x > (length p - 1)) (-1) x
+
+checkY :: [[SokobanTile]] Int Int -> Int
+checkY p x y = let (Sokoban p) = puzzle in if (y > (length (p !! x) - 1)) (-1) y
+
+genField :: [[SokobanTile]] Int Int -> String
+genField p x y = " init(x" +++ toString x +++ "_" +++ toString y +++ ") := " +++ fromTile ((p !! x) !! y) +++ ";\n"
+
+genVars :: Int Int -> String
+genVars x y = " x" +++ toString x +++ "_" +++ toString y +++ " : {Wall, Free, Box, BoxOnTarget, Target, Agent, AgentOnTarget};\n"
+
+genCoord :: [[SokobanTile]] Int Int -> [String]
+genCoord p x y = [" next(x" +++ toString x +++ "_" +++ toString y +++ ") := case\n",