justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Add sound for distributer

Browse Source
This commit is contained in:
justin
2025-12-31 13:06:46 +00:00
parent 6db7efece1
commit fa07f989c2
5 changed files with 462 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/sound/lowWhir.WHRR.100.wav
BIN
View File
Binary file not shown.
src/Dodge/Machine/Update.hs
+1 -1
View File
@@ -161,7 +161,7 @@ mcBackgroundSound mc = case mc ^. mcType of
McDamSensor{} -> Just (fridgeHumS,1) McDamSensor{} -> Just (fridgeHumS,1)
McProxSensor{} -> Just (throbC4S,0.5) McProxSensor{} -> Just (throbC4S,0.5)
McStorage{} -> Nothing McStorage{} -> Nothing
McDistributer{} -> Just (whirS,0.5) McDistributer{} -> Just (lowWhirS,1)
McTrigger{} -> Just (throb1S,0.5) McTrigger{} -> Just (throb1S,0.5)
mcApplyDamage :: [Damage] -> Machine -> World -> World mcApplyDamage :: [Damage] -> Machine -> World -> World
src/Dodge/Room/Tutorial.hs
+5 -3
View File
@@ -49,9 +49,9 @@ tutAnoTree = do
foldMTRS foldMTRS
[ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox [ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox
, corDoor , corDoor
-- , return $ tToBTree "cor" $ return $ cleatOnward corridor , return $ tToBTree "cor" $ return $ cleatOnward corridor
-- , tToBTree "sdr" . return . cleatOnward <$> , tToBTree "sdr" . return . cleatOnward <$>
-- (shuffleLinks =<< distributerRoom BulletAmmo 100000) (shuffleLinks =<< distributerRoom BulletAmmo 100000)
-- , return $ tToBTree "cor" $ return $ cleatOnward corridor -- , return $ tToBTree "cor" $ return $ cleatOnward corridor
-- --, tToBTree "sdr" . return . cleatOnward <$> slowDoorRoom -- --, tToBTree "sdr" . return . cleatOnward <$> slowDoorRoom
---- , tToBTree "sr" . return . cleatOnward <$> tanksRoom [] [] ---- , tToBTree "sr" . return . cleatOnward <$> tanksRoom [] []
@@ -62,6 +62,8 @@ tutAnoTree = do
-- , return $ tToBTree "cor" $ return $ cleatOnward corridor -- , return $ tToBTree "cor" $ return $ cleatOnward corridor
-- , return $ tToBTree "cor" $ return $ cleatOnward corridor -- , return $ tToBTree "cor" $ return $ cleatOnward corridor
-- , return $ tToBTree "cor" $ return $ cleatOnward corridor -- , return $ tToBTree "cor" $ return $ cleatOnward corridor
, return $ tToBTree "cor" $ return $ cleatOnward corridor
, return $ tToBTree "cor" $ return $ cleatOnward corridor
, return $ tToBTree "cor" $ return $ cleatOnward corridor , return $ tToBTree "cor" $ return $ cleatOnward corridor
, return $ tToBTree "door" $ return $ cleatOnward door , return $ tToBTree "door" $ return $ cleatOnward door
, tutHub , tutHub
src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs
+453 -418
View File
File diff suppressed because it is too large Load Diff
src/Dodge/Update.hs
+3 -3
View File
@@ -287,7 +287,7 @@ functionalUpdate =
. over uvWorld updateGasses . over uvWorld updateGasses
. over uvWorld updateDusts . over uvWorld updateDusts
. over uvWorld updateGusts . over uvWorld updateGusts
. over uvWorld (updateIMl' (_terminals . _lWorld . _cWorld) tmUpdate) . over uvWorld (updateIMl' (_terminals . _lWorld . _cWorld) updateTerminal)
. over uvWorld (updateIMl' (_machines . _lWorld . _cWorld) updateMachine) . over uvWorld (updateIMl' (_machines . _lWorld . _cWorld) updateMachine)
. over uvWorld (updateIMl' (_creatures . _lWorld . _cWorld) updateCreature) . over uvWorld (updateIMl' (_creatures . _lWorld . _cWorld) updateCreature)
-- creatures should be updated early so that crOldPos is set before any position change -- creatures should be updated early so that crOldPos is set before any position change
@@ -487,8 +487,8 @@ zoneDusts w = w & dsZoning .~ foldl' (flip zoneDust) mempty (w ^. cWorld . lWorl
displayTerminalLineString :: TerminalLineString -> (String, Color) displayTerminalLineString :: TerminalLineString -> (String, Color)
displayTerminalLineString (TerminalLineConst str col) = (str, col) displayTerminalLineString (TerminalLineConst str col) = (str, col)
tmUpdate :: Terminal -> World -> World updateTerminal :: Terminal -> World -> World
tmUpdate tm w = fromMaybe w $ do updateTerminal tm w = fromMaybe w $ do
guard $ tm ^. tmStatus == TerminalLineRead guard $ tm ^. tmStatus == TerminalLineRead
tl <- w ^? cWorld . lWorld . terminals . ix (_tmID tm) . tmFutureLines . ix 0 tl <- w ^? cWorld . lWorld . terminals . ix (_tmID tm) . tmFutureLines . ix 0
return $ case tl of return $ case tl of