From f3e1a3416493d6d23cf2360b8c4148fd8b0746b6 Mon Sep 17 00:00:00 2001
From: justin <justin.g.kruger@gmail.com>
Date: Tue, 14 Jun 2022 19:08:44 +0100
Subject: [PATCH] Cleanup

---
 src/Dodge/Floor.hs     |  2 +-
 src/Dodge/Room/Room.hs | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Dodge/Floor.hs b/src/Dodge/Floor.hs
index 30c19c046..11ce87f1d 100644
--- a/src/Dodge/Floor.hs
+++ b/src/Dodge/Floor.hs
@@ -41,12 +41,12 @@ initialAnoTree = OnwardList
         $ intersperse (AnTree $ tToBTree "door" . pure <$> shuffleLinks (cleatOnward door))
     [ IntAnno $ AnTree . startRoom
 --     ,  (SpecificRoom . return . tToBTree $ treePost [corridor,corridor,cleatOnward corridor])
+    , AnRoom $ roomCCrits 10
     , AnTree $ tToBTree "spawners" <$> spawnerRoom
     , AnRoom pistolerRoom
     , AnRoom doubleCorridorBarrels
     , IntAnno $ PassthroughLockKeyLists
         [(sensorRoomRunPast ELECTRICAL, takeOne [STATICMODULE,SPARKGUN] )] itemRooms
-    , AnRoom $ roomCCrits 10
     , IntAnno $ PassthroughLockKeyLists keyCardRunPastRand itemRooms
     , IntAnno $ AnTree . warningRooms
     , AnTree $ rToOnward "chaseCrit+armourChaseCrit rectRoom"
diff --git a/src/Dodge/Room/Room.hs b/src/Dodge/Room/Room.hs
index eecd30882..4af55cefe 100644
--- a/src/Dodge/Room/Room.hs
+++ b/src/Dodge/Room/Room.hs
@@ -20,7 +20,6 @@ import Dodge.Room.Girder
 import Dodge.Room.Modify.Girder
 import Dodge.LevelGen.Data
 import RandomHelp
-import Dodge.Default.Wall
 import Dodge.Tree
 import Dodge.Placement.Instance
 --import Dodge.LevelGen.Data
@@ -38,19 +37,19 @@ import qualified Data.Set as S
 
 roomC :: RandomGen g => Float -> Float -> State g Room
 roomC w h = do
-    wl <- takeOne 
-            [ sPS (V2 0 0) 0 $ PutWall (rectNSWE (h-60) 0 (w/2-10) (w/2+10)) defaultCrystalWall
-            , windowLine (V2 (w/2) 0) (V2 (w/2) (h-60))
-            ]
+    wallf <- takeOne [ crystalLine , windowLine ]
     ntanks <- takeOne [0,0,0,0,0,1,1,1,1,2,3,4]
-    thetank <- randomTank <&> plSpot .~ unusedOffPathAwayFromLink 50
+    thetank <- randomTank <&> plSpot .~ (rprBool $ \rp _ ->
+        _rpPlacementUse rp == 0
+        && RoomPosOffPath `S.member` _rpType rp
+        && (xV2 (_rpPos rp) > w / 2 + 5 || xV2 (_rpPos rp) < w / 2 - 5  ))
     maybeaddgird <- takeOne [return, addRandomGirderFrom West 0, addRandomGirderFrom North 0]
     maybeaddgird =<< shuffleLinks (roomRectAutoLinks w h
         & rmLinks %~ 
             ( setInLinks (\rl -> S.fromList [FromEdge East 0,OnEdge South] `S.isSubsetOf` _rlType rl)
             . setOutLinks (\rl -> OnEdge West `S.member` _rlType rl)
             )
-        & rmPmnts .++~ (wl : replicate ntanks thetank)
+        & rmPmnts .++~ (wallf (V2 (w/2) 0) (V2 (w/2) (h-60)) : replicate ntanks thetank)
         & rmRandPSs .~ [farside]
         )
   where