Tweak starting rooms

src/Dodge/Room/Room.hs

@@ -251,8 +251,10 @@ weaponEmptyRoom = do
             --,sPS (V2 (w/2) (h/2))      0 putLamp
             ,mntLightLnkCond unusedLnkToPS
             ]
-    (fmap connectRoom . randomiseOutLinks) =<< 
+    treeFromTrunk [Left corridor] 
+        <$> ((fmap connectRoom . randomiseOutLinks) =<< 
         changeLinkTo ((\p -> dist p (V2 (w/2) 0) < 10) . fst) (set rmPmnts plmnts $ roomRect w h 2 2)
+        )
      
 weaponUnderCrits :: RandomGen g => State g (Tree (Either Room Room))
 weaponUnderCrits = do
@@ -275,18 +277,20 @@ weaponUnderCrits = do
 
 weaponBehindPillar :: RandomGen g => State g (Tree (Either Room Room))
 weaponBehindPillar  = do
-      cpos <- takeOne $ [V2 x y | x <- [20,220], y <- [20,220]] ++ [V2 120 160,V2 120 200]
-      let d p = argV $ V2 120 80 -.- p
-      let plmnts1 = 
-            [sPS (V2 120 160)  0 $ RandPS randFirstWeapon
-            ,sPS cpos (d cpos) randC1
-            ]
-      rcp <- roomCenterPillar
-      return $ treeFromTrunk 
-        [Left door
-        ,Left $ over rmLinks tail $ over rmPmnts (++ plmnts1) rcp
-        ]
-        (connectRoom $ set rmPmnts [sPS (V2 20 60) (negate $ pi/2) randC1] corridorN)
+    wpa  <- state $ randomR (0,pi)
+    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]
+    let d p = argV $ V2 120 80 -.- p
+    let plmnts1 = 
+          [sPS wpos wpa $ RandPS randFirstWeapon
+          ,sPS cpos (d cpos) randC1
+          ]
+    rcp <- roomCenterPillar
+    return $ treeFromTrunk 
+      [Left corridor
+      ,Left $ over rmLinks tail $ over rmPmnts (++ plmnts1) rcp
+      ]
+      (connectRoom $ set rmPmnts [sPS (V2 20 60) (negate $ pi/2) randC1] corridorN)
 
 weaponBetweenPillars :: RandomGen g => State g (Tree (Either Room Room))
 weaponBetweenPillars = do

src/Dodge/Room/Start.hs

@@ -48,11 +48,15 @@ rezBoxesThenWeaponRoom = do
     wroom  <- weaponRoom
     return $ rboxes `appendEitherTree` [wroom]
 
+rezBoxThenWeaponRoom :: RandomGen g => State g (Tree (Either Room Room))
+rezBoxThenWeaponRoom = treeFromTrunk [Left rezBox,Left door] <$> weaponRoom
+
 startRoom :: RandomGen g => State g (Tree (Either Room Room))
 startRoom = join $ takeOne 
-    [-- rezBoxesWp
-    rezBoxesThenWeaponRoom
-    --, rezBoxesWpCrit
+    [ rezBoxesWp
+    , rezBoxesThenWeaponRoom
+    , rezBoxThenWeaponRoom
+    , rezBoxesWpCrit
     ]
 
 rezBoxesWpCrit :: RandomGen g => State g (Tree (Either Room Room))