Cleanup terminal display

src/Dodge/LevelGen/LevelStructure.hs

@@ -19,16 +19,16 @@ import Control.Monad.State
 import System.Random
 
 worldToGenWorld :: IM.IntMap Room -> World -> World
-worldToGenWorld rms w = w & genParams .~ gparams
-        & genRooms .~ rms
---    , _gPlacements = IM.empty
---    , _gRooms = rms
-  where 
-    gparams = evalState generateGenParams (_randGen w)
+worldToGenWorld rms w = w 
+    & genParams .~ evalState generateGenParams (_randGen w)
+    & genRooms .~ rms
 
 generateGenParams :: RandomGen g => State g GenParams
 generateGenParams = do
-    cols <- shuffle [Red .. Orange]
-    shps <- shuffle [PlusDecoration ..]
-    return . GenParams . M.fromList . zip [Flaming,Lasering,Electrical]
+    cols <- shuffle [RED .. ORANGE]
+    shps <- shuffle [PLUS ..]
+    return 
+        . GenParams 
+        . M.fromList 
+        . zip [FLAMING,LASERING,ELECTRICAL]
         $ zip cols shps