Improvements to rooms and view distances

src/Dodge/Room/Room.hs

@@ -303,15 +303,12 @@ weaponBehindPillar  = do
 
 weaponBetweenPillars :: RandomGen g => State g (SubCompTree Room)
 weaponBetweenPillars = do
-    wpPos <- takeOne [V2 x y | x <- [20,120,220], y <- [20,120,220]]
-    critPlacementSpots <- replicateM 2 $ randDirPS $ unusedSpotAwayFromInLink 100
-    let plmnts = 
-            sPS wpPos 0 (RandPS randFirstWeapon) :
-            map (`sps` randC1) critPlacementSpots
-        theRoom = roomPillars & rmPmnts %~ (++ plmnts)
-    (fmap singleUseAll . randomiseOutLinks) =<< filterLinks f theRoom
-  where 
-    f (_,a) = a == 0
+    let wpPos = unusedSpotNearInLink 100
+    ncrits <- state $ randomR (1,3)
+    critPlacementSpots <- replicateM ncrits $ randDirPS $ unusedSpotAwayFromInLink 100
+    let theRoom = roomPillars & rmPmnts .++~
+            sps wpPos (RandPS randFirstWeapon) : map (`sps` randC1) critPlacementSpots
+    return $ singleUseAll theRoom
 
 weaponLongCorridor :: RandomGen g => State g (SubCompTree Room)
 weaponLongCorridor = do
@@ -356,24 +353,6 @@ roomCCrits :: RandomGen g => State g Room
 roomCCrits = roomC 200 200
     <&> rmPmnts %~ (replicate 20 (spNoID (PSRoomRand 0 (uncurry PS)) randC1) ++ )
 
-longRoom :: RandomGen g => State g Room
-longRoom = do
-    h <- state $ randomR (1500,1500)
-    let w = 75
-    let cond x = (sndV2 . fst) x < h - 40
-    let wlsNSEWs wln wls listew = [sps0 $ PutWall (rectNSWE wln wls wallw walle) defaultCrystalWall
-            | (wallw,walle) <- listew ]
-    let ws = wlsNSEWs (h-35) (h-135) [(-10,10) , (15,35) , (40,60) , (65,85)]
-    let wsDefense = wlsNSEWs 95 70 [(0,25) , (50,75) ]
-    brlOffsets <- replicateM 5 $ randInRect (w-20) 900
-    let brls = [ sPS (p +.+ V2 10 200) 0 $ PutCrit explosiveBarrel | p <- brlOffsets ]
-    let rm = roomRect w (h+70) 1 1 & rmPolys .++~ [rectNSWE h (h-165) (-45) (w+45)]
-            & rmFloor .~ InheritFloor
-    return $ restrictInLinks cond $ rm & rmPmnts .~ ws ++ brls ++ wsDefense ++
-        [sPS (V2 crx (h-25)) 0 $ PutCrit longCrit
-                | crx <- [12.5,37.5,62.5] ] ++
-        [sPS (V2 25 lampy ) 0 putLamp | lampy <- [20,h-10] ]
-
 doubleCorridorBarrels :: RandomGen g => State g Room
 doubleCorridorBarrels = do
     h <- state $ randomR (200,300)