Attach terminal to analyser (these should rather be combined)

2022-03-21 19:20:58 +00:00
parent 51cc04799d
commit 9c46027711
11 changed files with 92 additions and 47 deletions
@@ -254,11 +254,10 @@ weaponBetweenPillars = do
            , any ((<100) . dist (_rpPos rp)) (usedRoomInLinkPoss r)
            ]
    ncrits <- state $ randomR (1,3)
-    critPlacementSpots <- replicateM ncrits $ randDirPS $ rprBool $ \rp r -> and 
-            [ RoomPosOnPath `S.member` _rpType rp
-            , _rpPlacementUse rp == 0
-            , all ((>100) . dist (_rpPos rp)) (usedRoomLinkPoss r)
-            ]
+    critPlacementSpots <- replicateM ncrits $ randDirPS $ rprBool $ \rp r -> 
+            RoomPosOnPath `S.member` _rpType rp
+            && _rpPlacementUse rp == 0
+            && all ((>100) . dist (_rpPos rp)) (usedRoomLinkPoss r)
    theRoom <- roomPillars 30 w h wn hn <&> rmPmnts .++~
            sps wpPos (RandPS randFirstWeapon) : map (`sps` randC1) critPlacementSpots
    return $ singleUseAll theRoom