Update mapper and related files.

test.fnl

@@ -12,8 +12,7 @@
 (var cell-size (+ hall-width wall-width))
 
 ; Initialize the cell table
-(var cells [])
-(print (length cells))
+(var cells {})
 (for [c 1 (* cell-num cell-num)]
 	(var cell [])
 	(for [i 1 cell-size]
@@ -22,11 +21,13 @@
 					(if (and (< i (+ hall-width 1)) (< j (+ hall-width 1)))
 							(tset cell cell-index 0)
 							(tset cell cell-index 1))))
-	(print (length cell))
 	(table.insert cells cell))
 
-(fn map-row [i] (+ 1 (// (- i 1) cell-num)))
-(fn map-index [i] (+ (- (* i cell-size) 1) (* cell-size cell-num (- (map-row i) 1))))
+(fn cell-row [i] (+ 1 (// (- i 1) cell-num)))
+(fn map-index [i] 
+	(var cell-col (if (= 0 (% i cell-num)) cell-num (% i cell-num)))
+	(+ (* cell-size cell-size cell-num (- (cell-row i) 1))
+		 (- (* cell-col cell-size) (- cell-size 1))))
 (fn generate_cell_map [cells]
 	(var cell_map [])
 	(for [c 1 (length cells)]
@@ -38,12 +39,17 @@
 				(tset cell_map new-map-index (. cells c new-cell-index)))))
 	cell_map)
 
-(print (length cells))
+(fn print_cell_map [cells]
+	(var output "")
+	(for [i 1 (length cells)]
+		(set output (.. output " " (. cells i)))
+		(if (= 0 (% i (* cell-num cell-size))) (set output (.. output "\n"))))
+	(print output))
 
-(print (length (generate_cell_map cells)))
+(print_cell_map (generate_cell_map cells))
 
-(var output "")
-(var ctp (. cells 51))
-(for [i 1 (length ctp)]
-	(set output (.. output " " (. ctp i))))
-(print output)
+; (var output "")
+; (var ctp (. cells 51))
+; (for [i 1 (length ctp)]
+; 	(set output (.. output " " (. ctp i))))
+; (print output)