Commit before changing logging of placement spots

src/Dodge/Room/Tutorial.hs

@@ -41,14 +41,10 @@ import qualified Data.IntMap.Strict as IM
 
 tutAnoTree :: State LayoutVars MTRS
 tutAnoTree = do
-    (is,wbp) <- setTreeInts =<< weaponBehindPillar
     foldMTRS
         [ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox
         , corDoor
-        , tutRooms is
-        , corDoor
-        , tToBTree "critroom" <$> return wbp
-        , corDoor
+        , tutHub
         , tutDrop
         , return $ tToBTree "cor" $ return $ cleatOnward corridor
         ----        , AnTree $ pickupTut
@@ -106,22 +102,24 @@ tutDrop = do
         , makeTermLine "-------------------------------------------"
         ]
 
-tutRooms :: [Int] -> State LayoutVars (MetaTree Room String)
-tutRooms is = do
+tutHub :: State LayoutVars (MetaTree Room String)
+tutHub = do
+    (is,wbp) <- setTreeInts =<< critsRoom 2
     i <- nextLayoutInt
     j <- nextLayoutInt
     k <- nextLayoutInt
     let a gw = analyserByNthLinkWithPrompt 
-            3 (makeTermPara $ show is <> show (getRoomsFromInts is gw)
-                <>(getCrsFromRooms' is gw)) 
+            3 --(makeTermPara $ show is <> show (getRoomsFromInts is gw)
+              --  <> getCrsFromRooms' is gw)
+                []
                 (RequireDeadCreatures $ getCrsFromRooms is gw) k
     x <-
         shuffleLinks 
-            . analyserByDoorWithPrompt sensorTut (RequireEquipment (AMMOMAG DRUMMAG)) i
+            . analyserByDoorWithPrompt [] (RequireEquipment (AMMOMAG DRUMMAG)) i
             . (rmInPmnt .:~ (0,a))
-            =<< addDoorAtNthLinkToggleTerminal 1 ss j
-            <$> roomNgon 6 100
-    bcor <- blockedCorridor
+            . addDoorAtNthLinkToggleTerminal 1 ss j
+            =<< roomNgon 6 100
+    bcor <- treeAttachDeep (return door) <$> blockedCorridor
     r1 <- r burstRifle <&> rmPmnts .:~ t
     r2 <- r (drumMag & itConsumables ?~ 500)
     return $
@@ -130,8 +128,9 @@ tutRooms is = do
                 x
                 [ treeFromPost [triggerDoorRoom i] r1
                 , treeFromPost [triggerDoorRoom j] r2
-                , bcor
-                , treeFromPost [triggerDoorRoom k & rmInPmnt . ix 0 . _1 .~ 1] r2
+                , (rmClusterStatus . csLinks . at OnwardCluster .~ Nothing) 
+                    <$> treeAttachDeep wbp bcor
+                , treeFromPost [] (cleatOnward $ triggerDoorRoom k & rmInPmnt . ix 0 . _1 .~ 1)
                 ]
   where
     ss =
@@ -192,7 +191,7 @@ getCrsFromRooms' is gw = fmap h $ show $ foldMap f (IM.restrictKeys (gw ^. genRo
 getCrsFromRooms :: [Int] -> GenWorld -> [Int]
 getCrsFromRooms is gw = foldMap f (IM.restrictKeys (gw ^. genRooms) js)
   where
-    js = foldMap IS.singleton $ IM.restrictKeys (gw ^. genInts) (IS.fromList is)
+    js = getRoomsFromInts is gw
     f rm = foldMap g $ rm ^. rmPmnts
     g x = case x ^. plType of
         PutCrit _ -> [x ^?! plMID . _Just]
@@ -206,7 +205,7 @@ sensorTut =
         , makeTermLine "               | / - \\"
         , makeTermLine "--------------------------------------------"
         ]
-        <> tlSetStatus (TerminalPressTo "CONTINUE")
+--        <> tlSetStatus (TerminalPressTo "CONTINUE")
 
 tutRezBox :: RandomGen g => State g Room
 tutRezBox = do