Add more information to Room Positions

src/Dodge/Room/Room.hs

@@ -40,9 +40,9 @@ roomC :: RandomGen g => Float -> Float -> State g Room
 roomC w h = do
     wallf <- takeOne [ crystalLine , windowLine ]
     ntanks <- takeOne [0,0,0,0,0,1,1,1,1,2,3,4]
-    thetank <- randomTank <&> plSpot .~ (rprBool $ \rp _ ->
+    thetank <- randomTank <&> plSpot .~ rprBool (\rp _ ->
         _rpPlacementUse rp == 0
-        && RoomPosOffPath `S.member` _rpType rp
+        && rpIsOffPath rp
         && (xV2 (_rpPos rp) > w / 2 + 5 || xV2 (_rpPos rp) < w / 2 - 5  ))
     maybeaddgird <- takeOne [return, addRandomGirderFrom West 0, addRandomGirderFrom North 0]
     maybeaddgird =<< shuffleLinks (roomRectAutoLinks w h
@@ -196,14 +196,14 @@ weaponBetweenPillars = do
     (w,wn) <- takeOne [(240,2),(340,3)]
     (h,hn) <- takeOne [(240,2),(340,3)]
     let wpPos = rprBool $ \rp r -> and 
-            [ RoomPosOnPath `S.member` _rpType rp
+            [ rpIsOnPath rp
             , _rpPlacementUse rp == 0
             , _rpLinkStatus rp == NotLink
             , any ((<100) . dist (_rpPos rp)) (usedRoomInLinkPoss r)
             ]
     ncrits <- state $ randomR (1,3)
     critPlacementSpots <- replicateM ncrits $ randDirPS $ rprBool $ \rp r -> 
-        RoomPosOnPath `S.member` _rpType rp
+        rpIsOnPath rp
         && _rpPlacementUse rp == 0
         && all ((>100) . dist (_rpPos rp)) (usedRoomLinkPoss r)
     fmap pure $ roomPillars 30 w h wn hn 
@@ -242,7 +242,7 @@ deadEndRoom = defaultRoom
 weaponRoom :: RandomGen g => Int -> State g (MetaTree Room String)
 weaponRoom i = join $ takeOne 
     [ weaponEmptyRoom       >>= rToOnward "weaponEmptyRoom"
-    , weaponUnderCrits i
+    , weaponUnderCrits i  -- this int is used for PickOnePlacement
     , weaponBehindPillar    >>= rToOnward "weaponBehindPillar"
     , weaponBetweenPillars  >>= rToOnward "weaponBetweenPillars"
     , weaponLongCorridor    >>= rToOnward "weaponLongCorridor"
@@ -300,7 +300,7 @@ pistolerRoom :: RandomGen g => State g Room
 pistolerRoom = do
     (w,wn) <- takeOne [(200,3),(255,4)]
     roomPillars 10 w 200 wn 3 <&> rmPmnts .++~ replicate 3 
-        (spNoID (rprBool $ \rp _ -> _rpPlacementUse rp == 0 && RoomPosOnPath `S.member` _rpType rp) 
+        (spNoID (rprBool $ \rp _ -> _rpPlacementUse rp == 0 && rpIsOnPath rp) 
         (PutCrit pistolCrit))
 
 shootingRange :: RandomGen g => State g (MetaTree Room String)
@@ -328,7 +328,7 @@ spawnerRoom = do
     x <- state $ randomR (250,300)
     y <- state $ randomR (300,400)
     roomWithSpawner <- roomC x y <&> rmPmnts .:~ spNoID 
-        (rprBool $ \rp _ -> _rpPlacementUse rp == 0 && RoomPosOnPath `S.member` _rpType rp
+        (rprBool $ \rp _ -> _rpPlacementUse rp == 0 && rpIsOnPath rp
                         && xV2 (_rpPos rp) < x/2 && yV2 (_rpPos rp) < y/2 ) 
         (PutCrit spawnerCrit)
     aRoom <- airlock