Move GenWorld fields into World

src/Dodge/Room/Branch.hs

@@ -4,7 +4,8 @@ Collections of rooms that branch into multiple paths.
 module Dodge.Room.Branch
     where
 --import Geometry
-import Dodge.LevelGen.Data
+--import Dodge.LevelGen.Data
+import Dodge.Data
 import Dodge.Room.Door
 import Dodge.Room.Link
 import Dodge.Room.Procedural

src/Dodge/Room/CheckConsistency.hs

@@ -1,6 +1,7 @@
 module Dodge.Room.CheckConsistency
   where
-import Dodge.LevelGen.Data
+--import Dodge.LevelGen.Data
+import Dodge.Data
 import Dodge.Graph
 import Dodge.RoomLink
 

src/Dodge/Room/Corridor.hs

@@ -1,7 +1,8 @@
 {-# LANGUAGE TupleSections #-}
 module Dodge.Room.Corridor where
 import Data.Tile
-import Dodge.LevelGen.Data
+--import Dodge.LevelGen.Data
+import Dodge.Data
 import Dodge.RoomLink
 --import Dodge.Room.Foreground
 import Dodge.Default.Room

src/Dodge/Room/Door.hs

@@ -10,7 +10,7 @@ import Color
 
 import Data.Maybe
 import qualified Data.IntMap.Strict as IM
-import Dodge.LevelGen.Data
+--import Dodge.LevelGen.Data
 import Control.Lens
 
 door :: Room

src/Dodge/Room/GlassLesson.hs

@@ -3,6 +3,7 @@ module Dodge.Room.GlassLesson where
 import Dodge.RoomLink
 import Dodge.Creature
 import Dodge.LevelGen.Data
+import Dodge.Data
 import Dodge.RandomHelp
 import Dodge.Default.Wall
 import Dodge.Tree

src/Dodge/Room/Link.hs

@@ -19,7 +19,8 @@ module Dodge.Room.Link
 import Dodge.ShiftPoint
 --import Dodge.Placement.PlaceSpot
 import Dodge.Placement.Shift
-import Dodge.LevelGen.Data
+--import Dodge.LevelGen.Data
+import Dodge.Data
 import Dodge.RandomHelp
 import Geometry
 import Data.Tile

src/Dodge/Room/LongRoom.hs

@@ -5,6 +5,7 @@ import Dodge.Tree
 --import Dodge.Default.Room
 import Dodge.Default.Wall
 import Dodge.LevelGen.Data
+import Dodge.Data
 import Dodge.Placement.Instance
 import Dodge.Room.Link
 import Dodge.Room.Door

src/Dodge/Room/Modify/Girder.hs

@@ -6,6 +6,7 @@ module Dodge.Room.Modify.Girder
     ) where
 --import Dodge.Data
 import Dodge.LevelGen.Data
+import Dodge.Data
 import Dodge.RandomHelp
 --import Dodge.Room.Procedural
 import Dodge.Room.Foreground

src/Dodge/Room/Ngon.hs

@@ -3,7 +3,8 @@ import Data.Tile
 import Dodge.PlacementSpot
 import Dodge.RoomLink
 import Dodge.Default.Room
-import Dodge.LevelGen.Data
+--import Dodge.LevelGen.Data
+import Dodge.Data
 import Dodge.Placement.Instance
 --import Dodge.LevelGen.Data
 import Geometry

src/Dodge/Room/Path.hs

@@ -6,7 +6,8 @@ module Dodge.Room.Path
     , createPathGrid
     )
     where
-import Dodge.LevelGen.Data
+--import Dodge.LevelGen.Data
+import Dodge.Data
 import Dodge.LevelGen.StaticWalls
 import Dodge.RoomLink
 import Geometry

src/Dodge/Room/Warning.hs

@@ -1,7 +1,7 @@
 --{-# LANGUAGE TupleSections #-}
 module Dodge.Room.Warning where
 import Dodge.Terminal
-import Dodge.LevelGen.Data
+--import Dodge.LevelGen.Data
 import Dodge.PlacementSpot
 import Dodge.Placement.Instance.Terminal
 import Dodge.Data