Thread a more complex structure through the placement process

src/Dodge/Placement/PlaceSpot.hs

@@ -30,7 +30,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
@@ -43,18 +43,18 @@ placeSpot (w,rm) plmnt = case plmnt of
                         in (wr,newplmnt:newplmnts)
             -- (placeSpot (w',rm)) (_plIDCont plmnt i)
     PlacementUsingPos p subpl -> placeSpot (w,rm) (subpl (shiftPoint3By shift p))
-    RandomPlacement rplmnt -> placeSpot (w & randGen .~ g,rm) plmnt'
+    RandomPlacement rplmnt -> placeSpot (w & gWorld . randGen .~ g,rm) plmnt'
       where
-        (plmnt', g) = runState rplmnt (_randGen w)
+        (plmnt', g) = runState rplmnt (_randGen $ _gWorld w)
   where
     shift = _rmShift rm
 
 -- this should be tidied up
-placeSpotUsingLink :: World -> Room -> Placement 
+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
@@ -67,15 +67,15 @@ placeSpotUsingLink w rm plmnt extract eff fallback = case searchedPoss (_rmPos r
         Just (ps,rmpos) -> Just ( ps,rmpos:poss)
 
 placeSpotRoomRand :: Room -> Int -> ((Point2,Float) -> 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 (_gWorld w)
+    in placeSpot (w & gWorld . randGen .~ g,rm) (plmnt & plSpot .~ f ps)
 
 
 
 -- the Int here is some id that is assigned when the placement is placed
-placeSpotID :: PlacementSpot -> PSType -> World -> (Int, World)
+placeSpotID :: PlacementSpot -> PSType -> GenWorld -> (Int, GenWorld)
 placeSpotID ps pt w = case pt of
     PutTrigger cond -> placeNewInto triggers cond w
     PutMod     modi -> plNewUpID modifications mdID modi w
@@ -94,23 +94,23 @@ placeSpotID ps pt w = case pt of
     PutBlock{} -> error "messed up block placement somehow"
     PutLineBlock wl bm wdth dpth a b -> placeLineBlock wl bm wdth dpth (doShift a) (doShift b) w
     PutWall { _pwPoly = ps', _pwWall = wl } -> (0,placeWallPoly (map doShift ps') wl w)
-    PutForeground sh -> (0,w & foregroundShape %~ ((uncurryV translateSHf p . rotateSH rot) sh <>))
+    PutForeground sh -> (0,w & gWorld . foregroundShape %~ ((uncurryV translateSHf p . rotateSH rot) sh <>))
     PutNothing -> (0,w)
     PutID i -> (i, w)
-    PutWorldUpdate f -> (0,f ps w)
+    PutWorldUpdate f -> (0,w & gWorld %~ f ps)
   where 
     p@(V2 px py) = _psPos ps
     p' = V3 px py 0
     rot = _psRot ps
     doShift = shiftPointBy (p,rot)
 
-evaluateRandPS :: State StdGen PSType -> PlacementSpot -> World -> (Int,World)
-evaluateRandPS rgen ps w = placeSpotID ps evaluatedType (set randGen g w)
+evaluateRandPS :: State StdGen PSType -> PlacementSpot -> GenWorld -> (Int,GenWorld)
+evaluateRandPS rgen ps w = placeSpotID ps evaluatedType (set (gWorld . randGen) g w)
   where 
-    (evaluatedType, g) = runState rgen (_randGen w)
+    (evaluatedType, g) = runState rgen (_randGen $ _gWorld w)
 
-placeWallPoly :: [Point2] -> Wall -> World -> World
-placeWallPoly ps wl = rmCrossPaths . over walls (addWalls ps wl)
+placeWallPoly :: [Point2] -> Wall -> GenWorld -> GenWorld
+placeWallPoly ps wl = gWorld %~ (rmCrossPaths . over walls (addWalls ps wl))
   where
     rmCrossPaths w = foldr (uncurry removePathsCrossing) w $ loopPairs ps
 
@@ -130,21 +130,21 @@ addPane wl l wls = IM.insert wlid (wl { _wlLine = l, _wlID = wlid }) wls
 -- new index as well
 placeNewInto :: ALens' World (IM.IntMap a)
     -> a
-    -> World
-    -> (Int,World)
-placeNewInto l x w = (i,w & l #%~ IM.insert i x)
+    -> GenWorld
+    -> (Int,GenWorld)
+placeNewInto l x w = (i,w & gWorld . l #%~ IM.insert i x)
   where
-    i = IM.newKey $ w ^# l
+    i = IM.newKey $ (_gWorld w) ^# l
 
 -- | place an new object into an intmap and update its id
 plNewUpID :: ALens' World (IM.IntMap a)
     -> ALens' a Int
     -> a
-    -> World
-    -> (Int,World)
-plNewUpID l li x w = (i,w & l #%~ IM.insert i (x & li #~ i))
+    -> GenWorld
+    -> (Int,GenWorld)
+plNewUpID l li x w = (i,w & gWorld . l #%~ IM.insert i (x & li #~ i))
   where
-    i = IM.newKey $ w ^# l
+    i = IM.newKey $ (_gWorld w) ^# l
 
 mvProp :: Point2 -> Float -> Prop -> Prop
 mvProp p a = (pjRot +~ a) . (pjPos %~ ( (p +.+) . rotateV a ))
@@ -162,14 +162,15 @@ mvPP p rot pp = pp {_ppPos = p,_ppRot = rot}
 mvCr :: Point2 -> Float -> Creature -> Creature
 mvCr p rot cr = cr {_crPos = p,_crOldPos = p,_crDir = rot}
 
-placeMachine :: Color -> [Point2] -> Machine -> Point2 -> Float -> World -> (Int,World)
+placeMachine :: Color -> [Point2] -> Machine -> Point2 -> Float -> GenWorld -> (Int,GenWorld)
 placeMachine color wallpoly mc p rot w = (mcid
-    , w & machines  %~ addMc
-        & walls     %~ placeMachineWalls color wallpoly mcid wlid
+    , w & gWorld . machines  %~ addMc
+        & gWorld . walls     %~ placeMachineWalls color wallpoly mcid wlid
     )
   where 
-    mcid = IM.newKey $ _machines w
-    wlid = IM.newKey $ _walls w
+    w' = _gWorld w
+    mcid = IM.newKey $ _machines w'
+    wlid = IM.newKey $ _walls w'
     wlids = IS.fromList [wlid .. wlid + length wallpoly - 1]
     addMc mcs = IM.insert mcid (mc {_mcPos = p,_mcDir = rot,_mcID = mcid, _mcWallIDs = wlids}) mcs