Allow for more complex placement positioning

src/Dodge/Placement/PlaceSpot.hs

@@ -33,7 +33,7 @@ import Data.Bifunctor
 -- to the placement
 placeSpot :: (World,Room) -> Placement -> ( (World,Room), [Placement] )
 placeSpot (w,rm) plmnt = case plmnt of
-    Placement{_plSpot = PSRoomRand i} -> placeSpotRoomRand rm i plmnt w
+    Placement{_plSpot = PSRoomRand i f} -> placeSpotRoomRand rm i f plmnt w
     Placement{_plSpot = PSPos extract eff fallback} -> placeSpotUsingLink w rm plmnt extract eff fallback
     Placement{} ->
         let (i,w') = placeSpotID (shiftPSBy shift (_plSpot plmnt)) (_plType plmnt) w
@@ -52,7 +52,7 @@ placeSpot (w,rm) plmnt = case plmnt of
 
 -- this should be tidied up
 placeSpotUsingLink :: World -> Room -> Placement 
-    -> (RoomPos -> Maybe (PlacementSpot,RoomPos))
+    -> (RoomPos -> Room -> Maybe (PlacementSpot,RoomPos))
     -> (RoomPos -> Room -> Room)
     -> Maybe Placement
     -> ((World, Room), [Placement])
@@ -63,14 +63,15 @@ placeSpotUsingLink w rm plmnt extract eff fallback = case searchedPoss (_rmPos r
         Just plmnt' -> placeSpot (w,rm) plmnt'
   where
     searchedPoss [] = Nothing
-    searchedPoss (pos:poss) = case extract pos of
+    searchedPoss (pos:poss) = case extract pos rm of
         Nothing -> second (pos:) <$> searchedPoss poss
         Just (ps,rmpos) -> Just ( ps,rmpos:poss)
 
-placeSpotRoomRand :: Room -> Int -> Placement -> World -> ((World,Room),[Placement])
-placeSpotRoomRand rm i plmnt w =
+placeSpotRoomRand :: Room -> Int -> ((Point2,Float) -> PlacementSpot) 
+    -> Placement -> World -> ((World,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 .~ uncurry PS ps)
+    in placeSpot (w & randGen .~ g,rm) (plmnt & plSpot .~ f ps)
 
 shiftPlacement :: (Point2,Float) -> Placement -> Placement
 shiftPlacement shift plmnt = case plmnt of