Reorganise wall placements

src/Dodge/Room/Start.hs

@@ -9,7 +9,6 @@ import Dodge.Room.Room
 import Dodge.Room.Link
 import Dodge.Room.Procedural
 import Dodge.Room.Foreground
-import Dodge.Room.Furniture
 import Dodge.Room.RoadBlock
 import Dodge.Placement.Instance
 import Dodge.Layout.Tree.Polymorphic
@@ -26,6 +25,14 @@ import Control.Lens
 import System.Random
 --import qualified Data.IntMap.Strict as IM
 
+startRoom :: RandomGen g => State g (Tree (Either Room Room))
+startRoom = join $ takeOne 
+    [ rezBoxesWp
+    , rezBoxesThenWeaponRoom
+    , rezBoxThenWeaponRoom
+    , rezBoxesWpCrit
+    ]
+
 rezBox :: LightSource -> Room
 rezBox ls = roomRect 40 60 1 1 
     & rmPmnts .~ [ sPS (V2 20 1) 0 $ PutLS ls]
@@ -65,14 +72,6 @@ rezBoxThenWeaponRoom = do
     rcol <- rezColor
     treeFromTrunk [Left $ rezBox rcol,Left door] <$> weaponRoom
 
-startRoom :: RandomGen g => State g (Tree (Either Room Room))
-startRoom = join $ takeOne 
-    [ rezBoxesWp
-    , rezBoxesThenWeaponRoom
-    , rezBoxThenWeaponRoom
-    , rezBoxesWpCrit
-    ]
-
 rezBoxesWpCrit :: RandomGen g => State g (Tree (Either Room Room))
 rezBoxesWpCrit = do
     w <- state $ randomR (200,400)