From 044a8704122d95c94275fb398debe2dd335327ab Mon Sep 17 00:00:00 2001 From: justin Date: Fri, 26 Nov 2021 14:53:06 +0000 Subject: [PATCH] Tweak start again --- src/Dodge/Room/Start.hs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Dodge/Room/Start.hs b/src/Dodge/Room/Start.hs index 000c63b96..aa1ee7521 100644 --- a/src/Dodge/Room/Start.hs +++ b/src/Dodge/Room/Start.hs @@ -66,9 +66,8 @@ room2 = lasCenSensEdge startRoom :: RandomGen g => Int -> State g (SubCompTree Room) startRoom i = join $ takeOne - [-- roomMiniIntro - --minigunfakeout - rezBoxesWp + [ chainUses <$> sequence [minigunFakeout,weaponRoom] + , rezBoxesWp , rezBoxesThenWeaponRoom , rezBoxThenWeaponRoom , rezBoxesWpCrit @@ -86,7 +85,6 @@ rezBoxStart = do ls <- rezColor return $ treeFromPost [PassDown $ rezBox ls] (UseAll door) - rezBoxesThenWeaponRoom :: RandomGen g => State g (SubCompTree Room) rezBoxesThenWeaponRoom = do rboxes <- rezBoxes @@ -98,8 +96,6 @@ rezBoxThenWeaponRoom = do rcol <- rezColor treeFromTrunk [PassDown $ rezBox rcol,PassDown door] <$> weaponRoom - - startRoom' :: RandomGen g => State g (SubCompTree Room) startRoom' = do w <- state $ randomR (100,400)