Make Placement into a product type

src/Dodge/Room/Tutorial.hs

@@ -55,26 +55,29 @@ tutAnoTree =
 
 tutDrop :: State LayoutVars (MetaTree Room String)
 tutDrop = do
-    x <- shuffleLinks $ roomNgon 6 100
+    x <- shuffleLinks =<< roomNgon 6 100
     y <- decontamRoom
-    return $ tToBTree "TutDrop" $ treePost [x,y,cleatOnward $ roomRectAutoLinks 40 100]
+    rm <- roomRectAutoLinks 40 100
+    return $ tToBTree "TutDrop" $ treePost [x,y,cleatOnward rm]
 
 tutRooms :: State LayoutVars (MetaTree Room String)
 tutRooms = do
     i <- nextLayoutInt
     j <- nextLayoutInt
-    x <- shuffleLinks $ analyserByDoor (RequireEquipment (AMMOMAG DRUMMAG)) i 
-         $ addDoorAtNthLinkToggleTerminal 1 (makeTermPara s) j
-            $ roomNgon 6 100
+    x <- shuffleLinks =<< analyserByDoor (RequireEquipment (AMMOMAG DRUMMAG)) i 
+         <$> addDoorAtNthLinkToggleTerminal 1 (makeTermPara s) j
+            <$> roomNgon 6 100
     bcor <- blockedCorridor
+    r1 <-(r burstRifle)
+    r2 <-(r (drumMag & itConsumables ?~ 100))
     return $ tToBTree "DoorTest" $ Node x 
-        [treeFromPost [triggerDoorRoom i] (r burstRifle)
-        ,treeFromPost [triggerDoorRoom j] (r (drumMag & itConsumables ?~ 100))
+        [treeFromPost [triggerDoorRoom i] r1
+        ,treeFromPost [triggerDoorRoom j] r2
         ,bcor
         ]
   where
     s = "INTERACTION TEST: USE KEYBOARD OR SCROLL TO ENTER COMMANDS."
-    r x = roomRectAutoLinks 100 100 & rmPmnts .:~ sps (PS 50 0) (PutFlIt x)
+    r x = roomRectAutoLinks 100 100 <&> rmPmnts .:~ sps (PS 50 0) (PutFlIt x)
 
 tutRezBox :: RandomGen g => State g Room
 tutRezBox = do