Unify RoomPos constructors

src/Dodge/Room/LongDoor.hs

@@ -132,9 +132,7 @@ addButtonSlowDoor x h rm = do
         $ Nothing
     getdoorpos drid w = let Just (a,b) = w ^? doors . ix drid . drPos
         in (b, argV (a-.-b))
-    butPosCond (UnusedLink (V2 x' y') a' _ rpls) _ | y' < 0.5 * h 
-                = Just (PS (V2 x' y') a' , UsedSpot (V2 x' y') a' (S.singleton RoomPosExLink) rpls)
-    butPosCond _ _ = Nothing
+    butPosCond = useRoomPosCond $ \rp -> isUnusedLnk rp && yV2 (_rpPos rp) < 0.5 * h 
     --butPosCond _ = True -- y < h
     col = dim $ light red
     cond' btid w = w ^? buttons . ix btid . btState /= Just BtOff

src/Dodge/Room/Procedural.hs

@@ -53,8 +53,8 @@ roomRect x y xn yn = defaultRoom
     { _rmPolys = [rectNSWE  y 0 0 x ]
     , _rmLinks = lnks
     , _rmPath  = concatMap doublePair pth
-    , _rmPos   = map (\pd -> UnusedSpot pd 0 (S.singleton RoomPosOnPath) NotLink) posps
-        ++ map (\pd -> UnusedSpot pd 0 (S.singleton RoomPosOffPath) NotLink) interposps
+    , _rmPos   = map (roomposat RoomPosOnPath) posps
+        ++ map (roomposat RoomPosOffPath) interposps
     , _rmPmnts    = []
     , _rmBound = [rectNSWE (y+5) (-5) (-5) (x+5)]
     , _rmFloor = Tiled [Tile 
@@ -66,6 +66,7 @@ roomRect x y xn yn = defaultRoom
     , _rmRandPSs = [psRandRanges (10,x-10) (10,y-10) (0,2*pi)]
     }
   where 
+    roomposat onoffpath p = RoomPos p 0 (S.singleton onoffpath) NotLink 0
     yd = (y - 40) / fromIntegral yn
     xd = (x - 40) / fromIntegral xn
     somelnks poffset ps a = zip (map (+.+ poffset) ps) (repeat a)
@@ -147,8 +148,8 @@ quarterRoomTri w = do
             , sPS (V2 (w-15) (w-25)) pi PutNothing 
             ]
         , _rmPos = 
-            [ UnusedSpot (V2 (w-20) (w-20)) pi S.empty NotLink
-            , UnusedSpot (V2 (w-15) (w-25)) pi S.empty NotLink
+            [ RoomPos (V2 (w-20) (w-20)) pi S.empty NotLink 0
+            , RoomPos (V2 (w-15) (w-25)) pi S.empty NotLink 0
             ]
         , _rmBound  = [[V2 0 0,V2 w w,V2 (-w) w]]
         }
@@ -188,8 +189,9 @@ quarterRoomSquare w = do
             , sPS (V2 20 (2*w-40)) pi PutNothing
             , sPS (V2 25 (2*w-45)) pi PutNothing
             ]
-        , _rmPos = [UnusedSpot (V2 20 (2*w-40)) pi S.empty NotLink
-                , UnusedSpot (V2 25 (2*w-45)) pi S.empty NotLink
+        , _rmPos = 
+                [ RoomPos (V2 20 (2*w-40)) pi S.empty NotLink 0
+                , RoomPos (V2 25 (2*w-45)) pi S.empty NotLink 0
                 ]
         , _rmBound = [map toV2 [(w,w),(0,2*w),(-w,w)]]
         }

src/Dodge/Room/Room.hs

@@ -24,7 +24,7 @@ import Tile
 import MonadHelp
 import LensHelp
 
-import qualified Data.Set as S
+--import qualified Data.Set as S
 import Control.Monad.State
 --import Control.Monad.Loops
 import System.Random
@@ -83,13 +83,8 @@ glassSwitchBack = do
     hgt <- state $ randomR (400,600)
     wllen <- state $ randomR (60,wth/2-40)
     let hf = hgt/5
-        con1 cond (UnusedLink (V2 x y) a _ rpls) _ 
-            | cond y = Just (PS (V2 x y) a , UsedSpot (V2 x y) a (S.singleton RoomPosExLink) rpls)
-        con1 _ _ _ = Nothing
         plmnts = 
-            [ mntLightLnkCond $ con1 (< 0.5 * hgt)
-            , mntLightLnkCond $ con1 (> 0.5 * hgt)
-            ,windowLine (V2 (wth-60   )    hf ) (V2 wllen  hf   )
+            [ windowLine (V2 (wth-60   )    hf ) (V2 wllen  hf   )
             ,windowLine (V2 (wth-wllen) (2*hf)) (V2 60    (2*hf))
             ,windowLine (V2 (wth-60   ) (3*hf)) (V2 wllen (3*hf))
             ,windowLine (V2 (wth-wllen) (4*hf)) (V2 60    (4*hf))