Work on airlocks

src/Dodge/Room/Tutorial.hs

@@ -1,5 +1,9 @@
 module Dodge.Room.Tutorial (tutAnoTree) where
 
+import Dodge.Room.Corridor
+import Dodge.Room.Airlock
+import Dodge.Room.RoadBlock
+import Dodge.Room.Room
 import Dodge.Item.Held.Cane
 import Dodge.Item.Ammo
 import Dodge.Annotation.Data
@@ -22,7 +26,6 @@ import Dodge.Room.Ngon
 --import Dodge.Room.Link
 import Dodge.Room.Procedural
 import Dodge.Room.RezBox
-import Dodge.Room.Room
 import Dodge.Room.Warning
 --import Dodge.Room.RoadBlock
 import Dodge.RoomLink
@@ -40,25 +43,21 @@ import TreeHelp
 tutAnoTree :: Annotation
 tutAnoTree =
     OnwardList $
-        [ AnTree $ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox
+        [ AnTree $ return $ tToBTree "teststart" $ return $ cleatOnward corridor
+        , AnTree $ tutDrop
+        , AnTree $ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox
         , AnTree corDoor
         , AnTree $ tutRooms
-        , AnTree $ pickupTut
-        , AnTree $ weaponTut
+        , AnTree $ tutDrop
+--        , AnTree $ pickupTut
+--        , AnTree $ weaponTut
         ]
 
-weaponTut :: State LayoutVars (MetaTree Room String)
-weaponTut = do
+tutDrop :: State LayoutVars (MetaTree Room String)
+tutDrop = do
     x <- shuffleLinks $ roomNgon 6 100
-        & rmPmnts .:~ sps (PS 0 0) (PutFlIt $ burstRifle)
-    return $ tToBTree "WeaponTestTest" $ treePost $ [x]
-
-pickupTut :: State LayoutVars (MetaTree Room String)
-pickupTut = do
-    i <- nextLayoutInt
-    x <- shuffleLinks $ analyserByDoor (RequireEquipment (AMMOMAG DRUMMAG)) i $ roomNgon 6 100
-        & rmPmnts .:~ sps (PS 0 0) (PutFlIt $ drumMag & itConsumables ?~ 100)
-    return $ tToBTree "PickupTest" $ treePost $ [x, cleatOnward $ triggerDoorRoom i]
+    y <- decontamRoom
+    return $ tToBTree "TutDrop" $ treePost [x,y,roomRectAutoLinks 40 100]
 
 tutRooms :: State LayoutVars (MetaTree Room String)
 tutRooms = do
@@ -67,12 +66,15 @@ tutRooms = do
     x <- shuffleLinks $ analyserByDoor (RequireEquipment (AMMOMAG DRUMMAG)) i 
          $ addDoorAtNthLinkToggleTerminal 1 (makeTermPara s) j
             $ roomNgon 6 100
+    bcor <- blockedCorridor
     return $ tToBTree "DoorTest" $ Node x 
-        [Node (cleatOnward $ triggerDoorRoom i) []
-        ,Node ( triggerDoorRoom j) []
+        [treeFromPost [triggerDoorRoom i] (r burstRifle)
+        ,treeFromPost [triggerDoorRoom j] (r (drumMag & itConsumables ?~ 100))
+        ,bcor
         ]
   where
-    s = "INTERACTION TEST 1: USE KEYBOARD OR SCROLL TO ENTER COMMANDS."
+    s = "INTERACTION TEST: USE KEYBOARD OR SCROLL TO ENTER COMMANDS."
+    r x = roomRectAutoLinks 100 100 & rmPmnts .:~ sps (PS 50 0) (PutFlIt x)
 
 tutRezBox :: RandomGen g => State g Room
 tutRezBox = do
@@ -91,4 +93,4 @@ tutRezBox = do
     s = tutorialMessage1
 
 tutorialMessage1 :: String
-tutorialMessage1 = "SYNTHESIS SUCCESSFUL. MOVEMENT TEST 1 INITIATED [WASD]. INTERACTION TEST 1 IN QUEUE [SPACE]."
+tutorialMessage1 = "SYNTHESIS SUCCESSFUL. MOBILITY TEST INITIATED [WASD]. INTERACTION TEST IN QUEUE [SPACE]."