Work on lasRun rooms

src/Dodge/Room/LasTurret.hs

@@ -241,6 +241,7 @@ lasCenRunClose' = do
 lasCenRunCloseLongCor :: (RandomGen g) => State g (MetaTree Room String)
 lasCenRunCloseLongCor = do
     (alinks,blinks) <- shufflePair (rlinks,llinks)
+    rdir <- takeOne [negate,id]
     a <- takeOne [5*pi/16]
     let h = 800
     laspos <- takeOne [V2 (h/2) 80]
@@ -249,8 +250,8 @@ lasCenRunCloseLongCor = do
         (roomRectAutoLights h 160
             <&> rmPmnts
             <>~ [ putLasTurret 0.02 & plSpot .~ PS laspos a
-               , awall (V2 (h /4) 80) (rotateV (pi/16) <$> rectWH 180 10) 
+               , awall (V2 (h /4) 80) (rotateV (rdir pi/16) <$> rectWH 180 10) 
-               , awall (V2 (3*h/4) 80) (rotateV (pi/16) <$> rectWH 180 10)
+               , awall (V2 (3*h/4) 80) (rotateV (rdir pi/16) <$> rectWH 180 10)
                 , ls
                ]
             <&> rmLinks %~ setInLinks alinks
@@ -271,17 +272,26 @@ lasCenRunCloseLongCor = do
 lasCenRunClose1 :: (RandomGen g) => State g (MetaTree Room String)
 lasCenRunClose1 = do
     --(alinks,blinks) <- shufflePair (bllinks,brlinks)
-    (alinks,blinks) <- shufflePair (bllinks,tmllink)
+    --(alinks,blinks) <- shufflePair (bllinks,tmllink)
+    lnks <- shuffle [bllinks,brlinks,tmllink,tmrlink]
+    let alinks = lnks !! 0
+        blinks = lnks !! 1
     outwall <- takeOne [awall (V2 185 25) (rectWH 10 50) 
                , awall (V2 200 50) (rectWH 50 10) ]
+    let z = 35
     r <- roomRectAutoLights 250 200
+            <&> rmPolys .~ [[V2 0 0, V2 250 0
+                , V2 250 (200-z)
+                , V2 (250 - z) 200
+                , V2 z 200
+                , V2 0 (200-z)
+                ]]
             <&> rmPmnts
             <>~ [ putLasTurret 0.02 & plSpot .~ PS (V2 125 100) 0
                , awall (V2 65 25) (rectWH 10 50) 
                 , outwall
-               , awall (V2 95 150) (rectWH 10 10) 
+               , awall (V2 95 150) (rectWH 10 20) 
-               --, awall (V2 105 150) (rectWH 20 10) 
+               , awall (V2 155 150) (rectWH 10 20) 
-               , awall (V2 155 150) (rectWH 10 10) 
                 , sps0 $ putConvexChasm $ rectNSWE 200 110 105 145
 --               , awall (V2 150 215) (rectWH 60 10)
                ]

src/Dodge/Room/Tutorial.hs

@@ -55,7 +55,7 @@ tutAnoTree = do
 --        , return . tToBTree "door" $ treePost [corridor, cleatOnward door]
         , corDoor
 --        , tToBTree "cor" . return <$> shuffleLinks (cleatOnward corridor)
-        , lasCenRunClose1
+        , lasCenRunClose
 --        , passthroughLockKeyLists lockRoomKeyItems itemRooms
         , tToBTree "door" . return <$> return (cleatOnward door)
         , tToBTree "cor" . return <$> shuffleLinks (cleatOnward corridor)