Refactor, try to limit dependencies

src/Dodge/LevelGen/LevelStructure.hs

@@ -1,34 +1,30 @@
---{-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE StrictData #-}
-module Dodge.LevelGen.LevelStructure 
-    ( module Dodge.LevelGen.Data
-    , worldToGenWorld
-    ) where
-import Dodge.LevelGen.Data
---import Dodge.Tree.Compose.Data
-import Dodge.Data
-import RandomHelp
-import Color
-import LensHelp
+module Dodge.LevelGen.LevelStructure (
+    module Dodge.LevelGen.Data,
+    worldToGenWorld,
+) where
 
---import Data.Tree
-import qualified IntMapHelp as IM
+import Color
 import qualified Data.Map.Strict as M
---import Control.Lens
+import Dodge.Data.GenWorld
+import Dodge.LevelGen.Data
+import qualified IntMapHelp as IM
+import LensHelp
+import RandomHelp
 
 worldToGenWorld :: IM.IntMap Room -> World -> GenWorld
-worldToGenWorld rms w = GenWorld 
-    { _gwWorld = w & cWorld . genParams .~ evalState generateGenParams (_randGen w)
-    , _genRooms = rms
-    , _genPlacements = mempty
-    }
+worldToGenWorld rms w =
+    GenWorld
+        { _gwWorld = w & cWorld . genParams .~ evalState generateGenParams (_randGen w)
+        , _genRooms = rms
+        , _genPlacements = mempty
+        }
 
 generateGenParams :: RandomGen g => State g GenParams
 generateGenParams = do
     cols <- shuffle [RED .. ORANGE]
     shps <- shuffle [PLUS ..]
-    return 
-        . GenParams 
-        . M.fromList 
-        . zip [FLAMING,LASERING,ELECTRICAL]
+    return
+        . GenParams
+        . M.fromList
+        . zip [FLAMING, LASERING, ELECTRICAL]
         $ zip cols shps