Move GenWorld fields into World

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'