Add looping sound, add sound to terminals

src/Dodge/Room/LongDoor.hs

@@ -49,8 +49,8 @@ twinSlowDoorRoom w h x = defaultRoom
         [ pContID (PS (V2 0 (h-5)) pi) ( PutButton $ makeButton col id)
             $ \btid -> jsps0J (PutSlideDr False col (cond' btid) 1 (V2 x 1) (V2 x h) wlSpeed)
             $ ps0 (PutSlideDr False col (cond' btid) 1 (V2 (-x) 1) (V2 (-x) h) wlSpeed)
-            $ \did -> jps0 (PutLS (lsColPos (V3 0.75 0 0) (V3 0 (h-1) lampHeight)))
-            $ \lsid -> jsps0 $ PutProp $ addColorChange lsid did $ lampCoverWhen (drmoving did) (V2 0 (h-1)) lampHeight
+            $ \did -> jps0' (PutLS (lsColPos (V3 0.75 0 0) (V3 0 (h-1) lampHeight)))
+            $ \lspl -> jsps0 $ PutProp $ addColorChange (fromJust $ _plMID lspl) did $ lampCoverWhen (drmoving did) (V2 0 (h-1)) lampHeight
         ]
     , _rmBound  = ps
     , _rmName   = "twinSlowDoorRoom"
@@ -92,15 +92,12 @@ addSouthPillars x h r = do
 
 addButtonSlowDoor :: RandomGen g => Float -> Float -> Room -> State g Room
 addButtonSlowDoor x h rm = do
-    (butPos,butRot) <- takeOne 
-       [( V2 (x/2-50) 5,0::Float)
-       ,( V2 (x/2+50) 5,0::Float)
-       ]
-    thePlacement <- takeOne [butDoor butPos butRot ]
     shuffleLinks $ setOutLinksPD aboveH $ setInLinksPD belowH $ rm 
-        & rmPmnts .:~ thePlacement
+        & rmPmnts .++~ [butDoor , theterminal]
         & rmBound .:~ openDoorBound
   where
+    theterminal = putTerminal (const NoTerminalParams) 
+        & plSpot .~ rprBoolShift (\rp _ -> RoomPosLab 0 `S.member` _rpType rp) (shiftInBy 20)
     openDoorBound = rectNSEW (h + 5) (h - 5) (-x/2) (3*x/2)
     belowH y = (sndV2 . fst) y < h - 40
     aboveH y = (sndV2 . fst) y > h + 40
@@ -108,8 +105,9 @@ addButtonSlowDoor x h rm = do
                 (V3 15 xoff 89) (aShape (V2 15 0) (V3 15 xoff 90)) . const . const
     -- TODO make the height of this light source and of other mounted lights
     -- be taken from a single consistent source
-    butDoor _ _ = putLitButOnPos col butPosCond
-        $  \btid -> Just $ putDoubleDoorThen False col (cond' btid) 30 (V2 0 h) (V2 x h) 2
+    butDoor = putLitButOnPos col (psposAddLabel (RoomPosLab 0) $ rprBool $ isUnusedLnkType InLink)
+        $  \btplmnt -> Just $ putDoubleDoorThen False col (cond' $ fromJust $ _plMID btplmnt) 
+                            30 (V2 0 h) (V2 x h) 2
         $ \dr1 dr2 -> amountedlight dr1 50
         $ amountedlight dr1 (-50)
         $ amountedlight dr2   50
@@ -117,7 +115,7 @@ addButtonSlowDoor x h rm = do
          Nothing
     getdoorpos drid w = let Just (a,b) = w ^? doors . ix drid . drPos
         in (b, argV (a-.-b))
-    butPosCond = useRoomPosCond $ \rp _ -> isUnusedLnk' rp && yV2 (_rpPos rp) < 0.5 * h 
+    --butPosCond = useRoomPosCond $ \rp _ -> isUnusedLnk' rp && yV2 (_rpPos rp) < 0.5 * h 
     --butPosCond _ = True -- y < h
     col = dim $ light red
     cond' btid w = w ^? buttons . ix btid . btState /= Just BtOff

src/Dodge/Room/SensorDoor.hs

@@ -14,6 +14,7 @@ import Dodge.Room.Link
 import Dodge.Room.Foreground
 --import Dodge.Room.RoadBlock
 import Dodge.Placement.Instance
+import Dodge.SoundLogic
 --import Dodge.Default.Room
 --import Dodge.Item.Weapon.BulletGuns
 --import Dodge.Item.Weapon.Utility
@@ -60,7 +61,7 @@ sensAboveDoor sensetype wth ps = extTrigLitPos
         | otherwise = w
 
 sensInsideDoor :: DamageType -> Int -> Room -> Room
-sensInsideDoor senseType outplid rm = rm 
+sensInsideDoor senseType outplid rm = rm
     & rmName .++~ take 4 (show senseType)
     & rmPmnts .++~ 
         [ psPt atFstLnkOut 
@@ -90,6 +91,11 @@ sensInsideDoor senseType outplid rm = rm
                 ]
         in TerminalParams
             {_termDisplayedLines = [] --zip (replicate 7 horline) (repeat white)
-            ,_termFutureLines = zip (repeat 0) $ zip themessage $ repeat white
+            ,_termFutureLines = TerminalLineEffect 0 termsound
+                : map totermline themessage
             ,_termMaxLines = 7
             }
+    totermline s = TerminalLineDisplay 0 s white
+    termsound subinv w' = soundStart TerminalSound tpos computerBeepingS Nothing w'
+      where
+        tpos = fromMaybe 0 $ w' ^? buttons . ix (_termID subinv) . btPos

src/Dodge/Room/Tanks.hs

@@ -41,8 +41,8 @@ tanksRoom crs its = do
     girderPosOrder <- shuffle [1 .. nwestlnks - 2]
     let plmnts = 
             --ok, this has become complicated
-            foldr1 setFallback [ twoRoomPoss (const . isUnusedLinkType (FromSouth i)) 
-                (const . isUnusedLinkType (FromSouth i)) $ \ps1 ps2 ->
+            foldr1 setFallback [ twoRoomPoss (isUnusedLnkType (FromSouth i)) 
+                (isUnusedLnkType (FromSouth i)) $ \ps1 ps2 ->
                 sps0 $ PutShape $ girderV 96 20 10 (_psPos ps1) (_psPos ps2) 
                 | i <- girderPosOrder]
             : map (\it -> sps0 (PutFlIt it) & plSpot .~ anyUnusedSpot) its