Move GenWorld fields into World

src/Dodge/Placement/Instance/Analyser.hs

@@ -3,7 +3,7 @@ module Dodge.Placement.Instance.Analyser
     , testYouHave
     , testYourHealth
     ) where
-import Dodge.LevelGen.Data
+--import Dodge.LevelGen.Data
 --import Dodge.PlacementSpot
 import Dodge.Data
 import Dodge.Base.You

src/Dodge/Placement/Instance/Creature.hs

@@ -1,5 +1,6 @@
 module Dodge.Placement.Instance.Creature where
-import Dodge.LevelGen.Data
+--import Dodge.LevelGen.Data
+import Dodge.Data
 import Dodge.RandomHelp
 import Dodge.Creature.ArmourChase
 import Dodge.Creature.ChaseCrit

src/Dodge/Placement/PlaceSpot.hs

@@ -5,7 +5,7 @@
 module Dodge.Placement.PlaceSpot
     ( placeSpot
     ) where
-import Dodge.LevelGen.LevelStructure
+--import Dodge.LevelGen.LevelStructure
 import Dodge.Placement.Shift
 import Dodge.Data
 import Dodge.Path
@@ -45,7 +45,7 @@ placeSpot (w,rm) plmnt = case plmnt of
     shift = _rmShift rm
 
 placePickOne :: Int -> Placement -> Room -> GenWorld -> GenWorld
-placePickOne i pl rm w = w & gPlacements %~ IM.insertWith (++) i [(pl, fromJust (_rmMID rm))]
+placePickOne i pl rm w = w & gWorld . genPlacements %~ IM.insertWith (++) i [(pl, fromJust (_rmMID rm))]
 
 placeRandomPlacement :: State StdGen Placement -> GenWorld -> Room -> ((GenWorld,Room),[Placement])
 placeRandomPlacement rplmnt w rm = placeSpot (w & gWorld . randGen .~ g,rm) plmnt'

src/Dodge/Placement/PlaceSpot/Block.hs

@@ -6,7 +6,7 @@ module Dodge.Placement.PlaceSpot.Block
     where
 import Dodge.Data
 import Dodge.Path
-import Dodge.LevelGen.LevelStructure
+--import Dodge.LevelGen.LevelStructure
 import Dodge.Base
 import Dodge.Zone
 import Geometry

src/Dodge/Placement/PlaceSpot/TriggerDoor.hs

@@ -11,7 +11,7 @@ import Picture
 import Geometry
 import qualified IntMapHelp as IM
 import Dodge.SoundLogic
-import Dodge.LevelGen.LevelStructure
+--import Dodge.LevelGen.LevelStructure
 
 import Data.List
 import Control.Lens

src/Dodge/Placement/Shift.hs

@@ -3,7 +3,8 @@ module Dodge.Placement.Shift
     , shiftPSBy
     , shiftRelativeToPS
     ) where
-import Dodge.LevelGen.Data
+--import Dodge.LevelGen.Data
+import Dodge.Data
 import Dodge.ShiftPoint
 import LensHelp