Fixed git fuckup

cellinfo.lua

@@ -1,11 +1,25 @@
 local celltypes = require('celltypes')
 
-local cellinfos = {
-    [celltypes.sand] = { letter = ".", color = {0.8, 0.8, 0.3}, solid=false },
-    [celltypes.dirt] = { letter = ',', color = {0.6, 0.4, 0.4}, solid=false },
+local cellinfo = {
+    [celltypes.dirt] = { letter = ".", color = {0.8, 0.8, 0.3}, solid=false },
     [celltypes.forest] = { letter = '¥', color = {0.5, 0.8, 0}, solid=false },
     [celltypes.mountain] = { letter = 'M', color = {0.4, 0.4, 0.4}, solid=true },
-    [celltypes.water] = { letter = 'O', color = {0.5, 0.6, 0.8}, solid=true }
+    [celltypes.water] = { letter = '~', color = {0.5, 0.6, 0.8}, solid=true },
+
+
+    [celltypes.mud] = { letter = ',', color = {0.5, 0.6, 0.8}, solid=false },
+    [celltypes.grass] = { letter = ':', color = {0.2, 0.6, 0.3}, solid=false },
+    [celltypes.rock] = { letter = '-', color = {0.3, 0.3, 0.3}, solid=false },
+    [celltypes.sand] = { letter = '_', color = {0.5, 0.6, 0.8}, solid=true },
+
+    [celltypes.grove] = { letter = '♣', color = {0.5, 0.6, 0.8}, solid=true },
+    [celltypes.pine] = { letter = '¥', color = {0.5, 0.6, 0.8}, solid=true },
+    [celltypes.swamp] = { letter = ';', color = {0.5, 0.6, 0.8}, solid=true },
+
+    [celltypes.peak] = { letter = '△', color = {0.5, 0.6, 0.8}, solid=true },
+    [celltypes.icepeak] = { letter = '^', color = {0.5, 0.6, 0.8}, solid=true },
+
+    [celltypes.deepwater] = { letter = 'u', color = {0.5, 0.6, 0.8}, solid=true },
 }
-
-return cellinfos
+  
+return cellinfo

celltypes.lua

@@ -1,9 +1,33 @@
 local celltypes = {
-  sand=0,
   dirt=1,
-  forest=2,
-  mountain=3,
-  water=4
+  forest=3,
+  mountain=7,
+  water=15,
+
+
+  mud=2,
+  grass=4,
+  rock=8,
+  sand=16,
+
+  grove=6,
+  pine=10,
+  swamp=18,
+
+  peak=14,
+  icepeak=22,
+
+  deepwater=30
 }
 
+function celltypes:isPrimary(celltype)
+  if (celltype == self.dirt or
+      celltype == self.mountain or
+      celltype == self.forest or
+      celltype == self.water) then
+    return true
+  end
+  return false
+end
+
 return celltypes