Reinstate genworld concept

src/Dodge/Placement/PlaceSpot.hs

@@ -28,7 +28,7 @@ import Data.Bifunctor
 
 -- when placing a placement, we update the world and the room and assign an id
 -- to the placement
-placeSpot :: (World,Room) -> Placement -> ( (World,Room), [Placement] )
+placeSpot :: (GenWorld,Room) -> Placement -> ( (GenWorld,Room), [Placement] )
 placeSpot (w,rm) plmnt = case plmnt of
     Placement{_plSpot = PSRoomRand i f} -> placeSpotRoomRand rm i f plmnt w
     Placement{_plSpot = PSPos extract eff fallback} -> placeSpotUsingLink w rm plmnt extract eff fallback
@@ -39,31 +39,31 @@ placeSpot (w,rm) plmnt = case plmnt of
   where
     shift = _rmShift rm
 
-placePickOne :: Int -> Placement -> Room -> World -> World
+placePickOne :: Int -> Placement -> Room -> GenWorld -> GenWorld
 placePickOne i pl rm w = w & genPlacements %~ IM.insertWith (++) i [(pl, fromJust (_rmMID rm))]
 
-placeRandomPlacement :: State StdGen Placement -> World -> Room -> ((World,Room),[Placement])
-placeRandomPlacement rplmnt w rm = placeSpot (w & randGen .~ g,rm) plmnt'
+placeRandomPlacement :: State StdGen Placement -> GenWorld -> Room -> ((GenWorld,Room),[Placement])
+placeRandomPlacement rplmnt w rm = placeSpot (w & gwWorld . randGen .~ g,rm) plmnt'
   where
-    (plmnt', g) = runState rplmnt (_randGen w)
+    (plmnt', g) = runState rplmnt (_randGen (_gwWorld w))
 
-placePlainPSSpot :: World -> Room -> Placement -> DPoint2 -> ((World,Room),[Placement])
+placePlainPSSpot :: GenWorld -> Room -> Placement -> DPoint2 -> ((GenWorld,Room),[Placement])
 placePlainPSSpot w rm plmnt shift = 
     let (i,w') = placeSpotID (shiftPSBy shift (_plSpot plmnt)) (_plType plmnt) w
         newplmnt = plmnt & plMID ?~ i
-    in maybe ((w',rm),[newplmnt]) (recrPlace newplmnt w') (_plIDCont plmnt w' newplmnt)
+    in maybe ((w',rm),[newplmnt]) (recrPlace newplmnt w') (_plIDCont plmnt (_gwWorld w') newplmnt)
   where
     recrPlace newplmnt w' pl = let (wr,newplmnts) = placeSpot (w',rm) pl
                     in (wr,newplmnt:newplmnts)
 
 -- this should be tidied up
-placeSpotUsingLink :: World 
+placeSpotUsingLink :: GenWorld 
     -> Room 
     -> Placement 
     -> (RoomPos -> Room -> Maybe (PlacementSpot,RoomPos))
     -> (RoomPos -> Room -> Room)
     -> Maybe Placement
-    -> ((World, Room), [Placement])
+    -> ((GenWorld, Room), [Placement])
 placeSpotUsingLink w rm plmnt extract eff fallback = case searchedPoss (_rmPos rm) of
     Just (ps,rmposs) -> placeSpot (w, eff (head rmposs) $ rm & rmPos .~ rmposs) (plmnt & plSpot .~ ps)
     Nothing -> case fallback of
@@ -76,14 +76,18 @@ placeSpotUsingLink w rm plmnt extract eff fallback = case searchedPoss (_rmPos r
         Just (ps,rmpos) -> Just ( ps,rmpos:poss)
 
 placeSpotRoomRand :: Room -> Int -> (DPoint2 -> PlacementSpot) 
-    -> Placement -> World -> ((World,Room),[Placement])
+    -> Placement -> GenWorld -> ((GenWorld,Room),[Placement])
 placeSpotRoomRand rm i f plmnt w =
-    let (ps,g) = runState (_rmRandPSs rm !! i) $_randGen w
-    in placeSpot (w & randGen .~ g,rm) (plmnt & plSpot .~ f ps)
+    let (ps,g) = runState (_rmRandPSs rm !! i) $_randGen (_gwWorld w)
+    in placeSpot (w & gwWorld . randGen .~ g,rm) (plmnt & plSpot .~ f ps)
+
+placeSpotID :: PlacementSpot -> PSType -> GenWorld -> (Int, GenWorld)
+placeSpotID ps pt gw = let (i,w) = placeSpotID' ps pt (_gwWorld gw)
+    in (i,gw & gwWorld .~ w)
 
 -- the Int here is some id that is assigned when the placement is placed
-placeSpotID :: PlacementSpot -> PSType -> World -> (Int, World)
-placeSpotID ps pt w = case pt of
+placeSpotID' :: PlacementSpot -> PSType -> World -> (Int, World)
+placeSpotID' ps pt w = case pt of
     PutTrigger  cnd         -> plNewID   triggers cnd w
     PutMod      mdi         -> plNewUpID modifications mdID mdi w
     PutProp     prp         -> plNewUpID props prID (mvProp p rot prp) w
@@ -109,7 +113,7 @@ placeSpotID ps pt w = case pt of
     PutID i                 -> (i, w)
     PutWorldUpdate f        -> (0, w & f ps)
     PutUsingGenParams f     ->  let (w',pt') = f w
-                                in placeSpotID ps pt' w'
+                                in placeSpotID' ps pt' w'
   where 
     p@(V2 px py) = _psPos ps
     p' = V3 px py 0
@@ -120,7 +124,7 @@ shiftDec :: Point2 -> Float -> Picture -> Picture
 shiftDec p r pic = uncurryV translate p $ rotate r pic
 
 evaluateRandPS :: State StdGen PSType -> PlacementSpot -> World -> (Int,World)
-evaluateRandPS rgen ps w = placeSpotID ps evaluatedType (set randGen g w)
+evaluateRandPS rgen ps w = placeSpotID' ps evaluatedType (set randGen g w)
   where 
     (evaluatedType, g) = runState rgen (_randGen w)