Stop new old sounds from playing during rewinding

2021-11-26 19:57:03 +00:00
parent f29c200a27
commit e231b851d9
4 changed files with 27 additions and 21 deletions
@@ -65,13 +65,13 @@ room2 :: RandomGen g => Int -> State g (SubCompTree Room)
 room2 = lasCenSensEdge    

 startRoom :: RandomGen g => Int -> State g (SubCompTree Room)
-startRoom i = join $ takeOne 
-    [ chainUses <$> sequence [minigunFakeout,weaponRoom]
-    , rezBoxesWp
-    , rezBoxesThenWeaponRoom
-    , rezBoxThenWeaponRoom
-    , rezBoxesWpCrit
-    , runPastStart i
+startRoom i = join $ uncurry takeOneWeighted $ unzip 
+    [ (,) (0.5::Float) $ chainUses <$> sequence [minigunFakeout,weaponRoom]
+    , (,) 1 $ rezBoxesWp
+    , (,) 1 $ rezBoxesThenWeaponRoom
+    , (,) 1 $ rezBoxThenWeaponRoom
+    , (,) 1 $ rezBoxesWpCrit
+    , (,) 1 $ runPastStart i
    ]

 runPastStart :: RandomGen g => Int -> State g (SubCompTree Room)