Cleanup

src/Dodge/Room/Room.hs

@@ -13,7 +13,7 @@ import Dodge.Data
 import Dodge.PlacementSpot
 import Dodge.RoomLink
 import Dodge.Default.Room
-import Dodge.Item.Weapon.BulletGuns
+import Dodge.Item.Weapon
 import Dodge.Creature
 import Dodge.Room.Pillar
 import Dodge.Room.Girder
@@ -118,17 +118,20 @@ roomMiniIntro = do
     rToOnward "roomMiniIntro" midroom
 
 roomCenterPillar :: RandomGen g => State g Room
-roomCenterPillar = shuffleLinks . restrictInLinks ((\p -> dist p (V2 120 0) < 10) . fst) 
-    $ set rmPmnts plmnts 
-    $ set rmName "roomCenterPillar"
-    $ roomRect 240 240 2 2
+roomCenterPillar = do
+    addHighGirder' =<< (shuffleLinks . restrictInLinks ((\p -> dist p (V2 120 0) < 10) . fst) 
+        $ cleatSide
+        $ set rmPmnts plmnts 
+        $ set rmName "roomCenterPillar"
+        $ roomRect 240 240 2 2
+        )
   where 
     plmnts = 
         [ blockLine (V2 115 115) (V2 115 125)
         , blockLine (V2 125 115) (V2 125 125)
-        , mntLightLnkCond useUnusedLnk
-        , mntLightLnkCond useUnusedLnk
+--        , mntLightLnkCond useUnusedLnk
         , mntLightLnkCond (resetPLUse $ rprBool $ \rp _ -> isInLnk rp)       
+        , mntLightLnkCond (resetPLUse $ rprBool $ \rp _ -> isOutLnk rp)       
         ]
 
 {- Probabilites of the type of the first floor weapon.  -}
@@ -137,6 +140,8 @@ randFirstWeapon = takeOne $ map PutFlIt $
     replicate 10 pistol
     ++ replicate 5 (bangStick 4)
     ++ replicate 5 (bangCaneX 3)
+    ++ replicate 5 bangCone
+    ++ [lasGun]
 
 weaponEmptyRoom :: RandomGen g => State g (Tree Room)
 weaponEmptyRoom = do
@@ -151,7 +156,7 @@ weaponEmptyRoom = do
         f (V2 x y,a) = (a == pi && x > 25 && x < w - 25) || (a /= 0 && y > w - 30)
     rm <- addHighGirder >=> shuffleLinks 
         $ restrictRMInLinksPD f (roomRect w h 2 2 & rmPmnts .~ plmnts)
-    return $ treeFromTrunk [ corridor] (pure $ cleatOnward rm )
+    return $ treePost [ corridor, cleatSide $ cleatOnward rm ]
      
 weaponUnderCrits :: RandomGen g => Int -> State g (MetaTree Room String)
 weaponUnderCrits i = do
@@ -166,7 +171,7 @@ weaponUnderCrits i = do
             ]
     rcp <- roomCenterPillar
     rmpils <- roomPillars 30 240 240 2 2
-    deadEndRoom' <- takeOne [ addwpat (V2 120 20) rmpils , addwpat (V2 120 20) rcp]
+    deadEndRoom' <- takeOne [ addwpat (V2 120 20) rmpils , addwpat (V2 120 20) $ cleatSide rcp]
     junctionRoom <- takeOne [ tEast, tWest]
     rToOnward "weaponUnderCrits" $ treeFromTrunk [ corridorN , corridorN] 
         $ Node junctionRoom [continuationRoom ,pure deadEndRoom' ]
@@ -177,14 +182,14 @@ weaponBehindPillar  = do
     wpos <- takeOne [V2 120 160,V2 80 40,V2 160 40,V2 220 200,V2 40 200,V2 120 35]
     cpos <- takeOne $ [V2 x y | x <- [20,220], y <- [20,40]] ++ [V2 120 160,V2 120 200]
     rcp <- roomCenterPillar
-    return $ treeFromTrunk 
+    return $ treePost 
         [ corridor
         , rcp & rmPmnts ++.~
             [sPS wpos wpa $ RandPS randFirstWeapon
             ,sPS cpos (argV $ V2 120 80 -.- cpos) randC1
             ]
+        , cleatOnward $ set rmPmnts [sPS (V2 20 60) (negate $ pi/2) randC1] corridorN
         ]
-        (pure . cleatOnward $ set rmPmnts [sPS (V2 20 60) (negate $ pi/2) randC1] corridorN)
 
 weaponBetweenPillars :: RandomGen g => State g (Tree Room)
 weaponBetweenPillars = do
@@ -211,12 +216,13 @@ weaponLongCorridor = do
     connectingRoom <- takeOne [tEast  & rmPmnts .~ [spanLightI (V2 (-30) 40) (V2 (-30) 80)] ]
     i1 <- state $ randomR (2,5)
     i2 <- state $ randomR (2,5)
-    let branch1 = treeFromTrunk (replicate i1 corridorN) (pure . cleatOnward  $ putCrs connectingRoom)
+    let branch1 = treeFromTrunk (replicate i1 corridorN) 
+            (pure . cleatSide . cleatOnward  $ putCrs connectingRoom)
     let branch2 = treeFromTrunk (replicate i2 corridorN) (pure . cleatSide    $ putWp corridor)
     return $ Node rt [branch1,branch2]
   where 
-    putCrs = over rmPmnts (++ [sPS (V2 10 40) (-pi/2) randC1 ,sPS (V2 (-10) 40) (-pi/2) randC1 ])
-    putWp = set rmPmnts [sPS (V2 20 60) 0 $ RandPS randFirstWeapon ,spanLightI (V2 0 40) (V2 40 40)]
+    putCrs = rmPmnts .++~ [sPS (V2 10 40) (-pi/2) randC1 ,sPS (V2 (-10) 40) (-pi/2) randC1 ]
+    putWp  = rmPmnts .~ [sPS (V2 20 60) 0 $ RandPS randFirstWeapon ,spanLightI (V2 0 40) (V2 40 40)]
 
 critInDeadEnd :: Room
 critInDeadEnd = deadEndRoom & rmPmnts .~ [sPS (V2 0 0) 0 randC1]