Move towards scrapping separate GenWorld, merging into World

src/Dodge/LevelGen/LevelStructure.hs

@@ -9,6 +9,7 @@ import Dodge.LevelGen.Data
 import Dodge.Data
 import Dodge.RandomHelp
 import Color
+import LensHelp
 
 --import Data.Tree
 import qualified Data.IntMap.Strict as IM
@@ -19,11 +20,12 @@ import System.Random
 
 worldToGenWorld :: IM.IntMap Room -> World -> GenWorld
 worldToGenWorld rms w = GenWorld 
-    { _gWorld = w
+    { _gWorld = w & genParams .~ gparams
     , _gPlacements = IM.empty
     , _gRooms = rms
-    , _gParams = evalState generateGenParams (_randGen w)
     }
+  where 
+    gparams = evalState generateGenParams (_randGen w)
 
 generateGenParams :: RandomGen g => State g GenParams
 generateGenParams = do