Allow for more complex placement positioning

src/Dodge/Room/Room.hs

@@ -53,8 +53,8 @@ roomPadCut ps p = defaultRoom
     , _rmPath  = [(V2 0 0,p)]
     }
 roomPillars :: Room
-roomPillars = --over rmLinks init $ -- it is unclear to me the purpose of this: perhaps to get the in link in the center?
-    set rmPmnts plmnts $ roomRect 240 240 2 2
+roomPillars = roomRect 240 240 2 2
+    & rmPmnts .~ plmnts
   where 
     plmnts = spanLightI (V2 120 24) (V2 120 216) 
         : mntLS vShape (V2 12 12) (V3 25 25 70)
@@ -106,8 +106,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) | cond y = Just (PS (V2 x y) a , PosPl (V2 x y) a)
-        con1 _ _ = Nothing
+        con1 cond (UnusedLink (V2 x y) a) _ | cond y = Just (PS (V2 x y) a , UsedSpot (V2 x y) a)
+        con1 _ _ _ = Nothing
         plmnts = 
             [ mntLightLnkCond $ con1 (< 0.5 * hgt)
             , mntLightLnkCond $ con1 (> 0.5 * hgt)
@@ -134,8 +134,8 @@ glassSwitchBack = do
 
 glassSwitchBackCrits :: RandomGen g => State g Room
 glassSwitchBackCrits = glassSwitchBack 
-    <&> rmPmnts %~ ([spNoID (PSRoomRand 0) (PutCrit miniGunCrit)
-                , spNoID (PSRoomRand 1) randC1
+    <&> rmPmnts %~ ([spNoID (PSRoomRand 0 (uncurry PS)) (PutCrit miniGunCrit)
+                , spNoID (PSRoomRand 1 (uncurry PS)) randC1
                 ] ++)
 
 miniTree2 :: RandomGen g => State g (SubCompTree Room)
@@ -182,7 +182,7 @@ rot90Around cen p = cen +.+ vNormal (p -.- cen)
 -- inside an inner tree
 roomMiniIntro :: RandomGen g => State g (SubCompTree Room)
 roomMiniIntro = do
-    midroom <- join $ takeOne [miniTree2,glassLesson]
+    midroom <- join $ takeOne [miniTree2] --,glassLesson]
     return $ chainUses [return $ UseAll door, midroom,return $ UseAll corridor]
 
 roomCenterPillar :: RandomGen g => State g Room
@@ -328,7 +328,7 @@ weaponLongCorridor :: RandomGen g => State g (SubCompTree Room)
 weaponLongCorridor = do
     root <- takeOne [tEast, tWest]
     connectingRoom <- takeOne 
-        [tEast & rmPmnts .~ [spanLightI (V2 (-40) 40) (V2 (-40) 80)]
+        [tEast  & rmPmnts .~ [spanLightI (V2 (-30) 40) (V2 (-30) 80)]
         ]
     i1 <- state $ randomR (2,5)
     i2 <- state $ randomR (2,5)
@@ -356,16 +356,16 @@ deadEndRoom = defaultRoom
 {- A random Either tree with a weapon and melee monster challenge.  -}
 weaponRoom :: RandomGen g => State g (SubCompTree Room)
 weaponRoom = join $ takeOne 
-    [ weaponEmptyRoom
-    , weaponUnderCrits
-    , weaponBehindPillar
-    , weaponBetweenPillars
-    , weaponLongCorridor
+    [-- weaponEmptyRoom
+    --, weaponUnderCrits
+    --, weaponBehindPillar
+     weaponBetweenPillars
+    --, weaponLongCorridor
     ]
 
 roomCCrits :: RandomGen g => State g Room
 roomCCrits = roomC 200 200
-    <&> rmPmnts %~ (replicate 20 (spNoID (PSRoomRand 0) randC1) ++ )
+    <&> rmPmnts %~ (replicate 20 (spNoID (PSRoomRand 0 (uncurry PS)) randC1) ++ )
 
 longRoom :: RandomGen g => State g Room
 longRoom = do
@@ -432,13 +432,13 @@ shootersRoom' = do
 shootersRoom1 :: RandomGen g => State g Room
 shootersRoom1 = shootersRoom' <&> rmPmnts %~ 
     ( (
-    RandomPlacement $ takeOne $ map (\i -> spNoID (PSRoomRand i) (PutCrit autoCrit))
+    RandomPlacement $ takeOne $ map (\i -> spNoID (PSRoomRand i (uncurry PS)) (PutCrit autoCrit))
                     [0,1,2]
     ) :)
 
 shootersRoom :: RandomGen g => State g Room
 shootersRoom = shootersRoom' <&> rmPmnts %~
-    ( map (\i -> spNoID (PSRoomRand i) (PutCrit autoCrit))
+    ( map (\i -> spNoID (PSRoomRand i (uncurry PS)) (PutCrit autoCrit))
                     [0,1,2]
     ++ )
 
@@ -477,9 +477,9 @@ pillarGrid = do
 pistolerRoom :: RandomGen g => State g Room
 pistolerRoom = pillarGrid
     <&> rmPmnts %~ (
-        [spNoID (PSRoomRand 0) (PutCrit pistolCrit)
-        ,spNoID (PSRoomRand 0) (PutCrit pistolCrit)
-        ,spNoID (PSRoomRand 0) (PutCrit pistolCrit)
+        [spNoID (PSRoomRand 0 (uncurry PS)) (PutCrit pistolCrit)
+        ,spNoID (PSRoomRand 0 (uncurry PS)) (PutCrit pistolCrit)
+        ,spNoID (PSRoomRand 0 (uncurry PS)) (PutCrit pistolCrit)
         ]
             ++)
 
@@ -506,6 +506,6 @@ spawnerRoom = do
     x <- state $ randomR (250,300)
     y <- state $ randomR (300,400)
     roomWithSpawner <- roomC x y <&> 
-        rmPmnts %~ (spNoID (PSRoomRand 0) (PutCrit spawnerCrit) :)
+        rmPmnts %~ (spNoID (PSRoomRand 0 (uncurry PS)) (PutCrit spawnerCrit) :)
     aRoom <- airlock
     return $ treeFromTrunk [PassDown aRoom,PassDown corridor] $ singleUseAll roomWithSpawner