diff --git a/data/sound/seagullBark.UGGAUGGA.5000.wav b/data/sound/seagullBark.UGGAUGGA.5000.wav new file mode 100644 index 000000000..200ff470a Binary files /dev/null and b/data/sound/seagullBark.UGGAUGGA.5000.wav differ diff --git a/data/sound/seagullChatter.CHUGUGUG.10000.wav b/data/sound/seagullChatter.CHUGUGUG.10000.wav new file mode 100644 index 000000000..8fcb5ab1b Binary files /dev/null and b/data/sound/seagullChatter.CHUGUGUG.10000.wav differ diff --git a/data/sound/seagullWhistle.WE-OH.5000.wav b/data/sound/seagullWhistle.WE-OH.5000.wav new file mode 100644 index 000000000..af0b160ac Binary files /dev/null and b/data/sound/seagullWhistle.WE-OH.5000.wav differ diff --git a/src/Dodge/Room/Start.hs b/src/Dodge/Room/Start.hs index bc3ee7a4e..6d9840f2d 100644 --- a/src/Dodge/Room/Start.hs +++ b/src/Dodge/Room/Start.hs @@ -47,14 +47,23 @@ minigunfakeout = do ,Left keyholeCorridor,Left corridor]) `treeFromPost` Right door +centralLasTurret :: Room +centralLasTurret = roomOctogon + +rezThenLasTurret :: RandomGen g => State g (Tree (Either Room Room)) +rezThenLasTurret = do + rbox <- rezBoxStart + return $ rbox `appendEitherTree` [return $ Right roomOctogon] + startRoom :: RandomGen g => State g (Tree (Either Room Room)) startRoom = join $ takeOne - [ minigunfakeout - , rezBoxesWp - , rezBoxesThenWeaponRoom - , rezBoxThenWeaponRoom - , rezBoxesWpCrit - , runPastStart + [ rezThenLasTurret + --,minigunfakeout + --, rezBoxesWp + --, rezBoxesThenWeaponRoom + --, rezBoxThenWeaponRoom + --, rezBoxesWpCrit + --, runPastStart ] runPastStart :: RandomGen g => State g (Tree (Either Room Room))