From a0ff15fe61277955253e023ccb50ca861a98d45e Mon Sep 17 00:00:00 2001 From: justin Date: Thu, 16 Apr 2026 00:19:56 +0100 Subject: [PATCH] Add pop sound --- data/sound/pop3.POP.500.wav | Bin 0 -> 41626 bytes src/Dodge/Creature/Update.hs | 2 +- .../SoundLogic/ExternallyGeneratedSounds.hs | 229 +++++++++--------- tags | 38 +-- 4 files changed, 137 insertions(+), 132 deletions(-) create mode 100644 data/sound/pop3.POP.500.wav diff --git a/data/sound/pop3.POP.500.wav b/data/sound/pop3.POP.500.wav new file mode 100644 index 0000000000000000000000000000000000000000..7d025d1709ed58d09d60d09ca239f0804de05592 GIT binary patch literal 41626 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 literal 0 HcmV?d00001 diff --git a/src/Dodge/Creature/Update.hs b/src/Dodge/Creature/Update.hs index 28834090f..e0547ea98 100644 --- a/src/Dodge/Creature/Update.hs +++ b/src/Dodge/Creature/Update.hs @@ -134,7 +134,7 @@ splitSlimeCrit' :: Point2 -> Point2 -> Int -> Creature -> World -> Maybe World splitSlimeCrit' p v cid cr w = do (cr1,cr2) <- splitSlimeCrit p v cr let cid' = IM.newKey $ w ^. cWorld . lWorld . creatures - (s,g) = runState (takeOne [popS,pop1S,pop2S]) (w ^. randGen) + (s,g) = runState (takeOne [popS,pop1S,pop2S,pop3S]) (w ^. randGen) return $ w & cWorld . lWorld . creatures . ix cid .~ cr1 & cWorld . lWorld . creatures . at cid' ?~ (cr2 & crID .~ cid') & soundStart (CrSound cid) (cr ^. crPos . _xy) s Nothing diff --git a/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs b/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs index a4b19a68e..8e64c9a37 100644 --- a/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs +++ b/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs @@ -1,4 +1,4 @@ --- generated at 2026-04-15 21:13:20.935856206 UTC +-- generated at 2026-04-15 23:14:13.383166268 UTC module Dodge.SoundLogic.ExternallyGeneratedSounds where import Sound.Data soundToVol :: SoundID -> Float @@ -144,45 +144,46 @@ soundToVol v = case _getSoundID v of 138 -> 100 139 -> 100 140 -> 50 - 141 -> 1000 - 142 -> 500 - 143 -> 40 - 144 -> 100 - 145 -> 200 - 146 -> 500 - 147 -> 1000 - 148 -> 300 - 149 -> 100 - 150 -> 300 + 141 -> 500 + 142 -> 1000 + 143 -> 500 + 144 -> 40 + 145 -> 100 + 146 -> 200 + 147 -> 500 + 148 -> 1000 + 149 -> 300 + 150 -> 100 151 -> 300 - 152 -> 100 + 152 -> 300 153 -> 100 - 154 -> 500 - 155 -> 100 + 154 -> 100 + 155 -> 500 156 -> 100 - 157 -> 500 + 157 -> 100 158 -> 500 - 159 -> 100 + 159 -> 500 160 -> 100 - 161 -> 500 - 162 -> 40 - 163 -> 200 - 164 -> 50 - 165 -> 500 - 166 -> 2000 - 167 -> 200 - 168 -> 2000 - 169 -> 40 - 170 -> 100 + 161 -> 100 + 162 -> 500 + 163 -> 40 + 164 -> 200 + 165 -> 50 + 166 -> 500 + 167 -> 2000 + 168 -> 200 + 169 -> 2000 + 170 -> 40 171 -> 100 - 172 -> 500 - 173 -> 100 - 174 -> 1000 - 175 -> 100 - 176 -> 500 - 177 -> 8000 - 178 -> 200 - 179 -> 300 + 172 -> 100 + 173 -> 500 + 174 -> 100 + 175 -> 1000 + 176 -> 100 + 177 -> 500 + 178 -> 8000 + 179 -> 200 + 180 -> 300 _ -> 50 soundToOnomato :: SoundID -> String soundToOnomato v = case _getSoundID v of @@ -327,45 +328,46 @@ soundToOnomato v = case _getSoundID v of 138 -> "SLP" 139 -> "SPRT" 140 -> "HSS" - 141 -> "TRNKL" - 142 -> "TAK" - 143 -> "CLICK" - 144 -> "DUHDEH" - 145 -> "SHTCK" - 146 -> "DEDUM" - 147 -> "BWMP" - 148 -> "BWAAH" - 149 -> "SLP" - 150 -> "DWAAH" - 151 -> "TNKTONK" - 152 -> "VFVFVF" - 153 -> "SLP" - 154 -> "CRTINK" - 155 -> "VHHP" - 156 -> "SPRT" - 157 -> "PRUM" - 158 -> "POP" - 159 -> "SLPP" - 160 -> "FWUMP" - 161 -> "CLANG" - 162 -> "TIP" - 163 -> "CRAKLE" - 164 -> "HSSS" - 165 -> "TRINKL" - 166 -> "BANG" - 167 -> "ZMM" - 168 -> "CHUGUGUG" - 169 -> "TAPP" - 170 -> "KKSQWL" - 171 -> "SKWLL" - 172 -> "DUDURAH" - 173 -> "SKWLL" - 174 -> "TRNKL" - 175 -> "SLP" - 176 -> "WHUAWUH" - 177 -> "RINGGG" - 178 -> "QWLPH" - 179 -> "WRRR" + 141 -> "POP" + 142 -> "TRNKL" + 143 -> "TAK" + 144 -> "CLICK" + 145 -> "DUHDEH" + 146 -> "SHTCK" + 147 -> "DEDUM" + 148 -> "BWMP" + 149 -> "BWAAH" + 150 -> "SLP" + 151 -> "DWAAH" + 152 -> "TNKTONK" + 153 -> "VFVFVF" + 154 -> "SLP" + 155 -> "CRTINK" + 156 -> "VHHP" + 157 -> "SPRT" + 158 -> "PRUM" + 159 -> "POP" + 160 -> "SLPP" + 161 -> "FWUMP" + 162 -> "CLANG" + 163 -> "TIP" + 164 -> "CRAKLE" + 165 -> "HSSS" + 166 -> "TRINKL" + 167 -> "BANG" + 168 -> "ZMM" + 169 -> "CHUGUGUG" + 170 -> "TAPP" + 171 -> "KKSQWL" + 172 -> "SKWLL" + 173 -> "DUDURAH" + 174 -> "SKWLL" + 175 -> "TRNKL" + 176 -> "SLP" + 177 -> "WHUAWUH" + 178 -> "RINGGG" + 179 -> "QWLPH" + 180 -> "WRRR" _ -> error "unitialised sound" soundPathList :: [String] soundPathList = @@ -510,6 +512,7 @@ soundPathList = , "slap2.SLP.100.wav" , "bloodShort2.SPRT.100.wav" , "foamSprayFadeOut.HSS.50.wav" + , "pop3.POP.500.wav" , "metal6.TRNKL.1000.wav" , "tap1.TAK.500.wav" , "click1.CLICK.40.wav" @@ -832,81 +835,83 @@ bloodShort2S :: SoundID bloodShort2S = SoundID 139 foamSprayFadeOutS :: SoundID foamSprayFadeOutS = SoundID 140 +pop3S :: SoundID +pop3S = SoundID 141 metal6S :: SoundID -metal6S = SoundID 141 +metal6S = SoundID 142 tap1S :: SoundID -tap1S = SoundID 142 +tap1S = SoundID 143 click1S :: SoundID -click1S = SoundID 143 +click1S = SoundID 144 semitoneLoop1S :: SoundID -semitoneLoop1S = SoundID 144 +semitoneLoop1S = SoundID 145 disconnectItemS :: SoundID -disconnectItemS = SoundID 145 +disconnectItemS = SoundID 146 dedumS :: SoundID -dedumS = SoundID 146 +dedumS = SoundID 147 sawtoothFailS :: SoundID -sawtoothFailS = SoundID 147 +sawtoothFailS = SoundID 148 sineRaisePitchTwoSecS :: SoundID -sineRaisePitchTwoSecS = SoundID 148 +sineRaisePitchTwoSecS = SoundID 149 slap4S :: SoundID -slap4S = SoundID 149 +slap4S = SoundID 150 skwareFadeTwoSecS :: SoundID -skwareFadeTwoSecS = SoundID 150 +skwareFadeTwoSecS = SoundID 151 reloadFailS :: SoundID -reloadFailS = SoundID 151 +reloadFailS = SoundID 152 throb1S :: SoundID -throb1S = SoundID 152 +throb1S = SoundID 153 slap5S :: SoundID -slap5S = SoundID 153 +slap5S = SoundID 154 smallGlass3S :: SoundID -smallGlass3S = SoundID 154 +smallGlass3S = SoundID 155 reverseCymbal1S :: SoundID -reverseCymbal1S = SoundID 155 +reverseCymbal1S = SoundID 156 blood2S :: SoundID -blood2S = SoundID 156 +blood2S = SoundID 157 insertOneS :: SoundID -insertOneS = SoundID 157 +insertOneS = SoundID 158 pop2S :: SoundID -pop2S = SoundID 158 +pop2S = SoundID 159 slap1S :: SoundID -slap1S = SoundID 159 +slap1S = SoundID 160 tap4S :: SoundID -tap4S = SoundID 160 +tap4S = SoundID 161 clang1S :: SoundID -clang1S = SoundID 161 +clang1S = SoundID 162 foot1S :: SoundID -foot1S = SoundID 162 +foot1S = SoundID 163 elecCrackleS :: SoundID -elecCrackleS = SoundID 163 +elecCrackleS = SoundID 164 foamSprayLoopS :: SoundID -foamSprayLoopS = SoundID 164 +foamSprayLoopS = SoundID 165 smallGlass1S :: SoundID -smallGlass1S = SoundID 165 +smallGlass1S = SoundID 166 bangS :: SoundID -bangS = SoundID 166 +bangS = SoundID 167 buzz1S :: SoundID -buzz1S = SoundID 167 +buzz1S = SoundID 168 seagullChatterS :: SoundID -seagullChatterS = SoundID 168 +seagullChatterS = SoundID 169 foot3S :: SoundID -foot3S = SoundID 169 +foot3S = SoundID 170 bloodShort3S :: SoundID -bloodShort3S = SoundID 170 +bloodShort3S = SoundID 171 blood4S :: SoundID -blood4S = SoundID 171 +blood4S = SoundID 172 ejectS :: SoundID -ejectS = SoundID 172 +ejectS = SoundID 173 bloodShort4S :: SoundID -bloodShort4S = SoundID 173 +bloodShort4S = SoundID 174 metal1S :: SoundID -metal1S = SoundID 174 +metal1S = SoundID 175 slapClean5S :: SoundID -slapClean5S = SoundID 175 +slapClean5S = SoundID 176 warp1S :: SoundID -warp1S = SoundID 176 +warp1S = SoundID 177 tinitusS :: SoundID -tinitusS = SoundID 177 +tinitusS = SoundID 178 gut1S :: SoundID -gut1S = SoundID 178 +gut1S = SoundID 179 fireFadeS :: SoundID -fireFadeS = SoundID 179 +fireFadeS = SoundID 180 diff --git a/tags b/tags index 83ec65e97..b50bf8e4d 100644 --- a/tags +++ b/tags @@ -2856,8 +2856,8 @@ chasmTestCliffPush src/Dodge/Creature/State/WalkCycle.hs 106;" f chasmWallToSurface src/Dodge/Base/Collide.hs 132;" f checkCombineSelectionExists src/Dodge/DisplayInventory.hs 100;" f checkConnection src/Dodge/Inventory/Swap.hs 66;" f -checkDeath src/Dodge/Creature/Update.hs 220;" f -checkDeath' src/Dodge/Creature/Update.hs 223;" f +checkDeath src/Dodge/Creature/Update.hs 222;" f +checkDeath' src/Dodge/Creature/Update.hs 225;" f checkEndGame src/Dodge/Update.hs 875;" f checkErrorGL src/Shader/Compile.hs 86;" f checkFBO src/Framebuffer/Check.hs 6;" f @@ -2981,7 +2981,7 @@ copierItemUpdate src/Dodge/Creature/State.hs 136;" f copyItemToFloor src/Dodge/FloorItem.hs 14;" f corDoor src/Dodge/Room/Room.hs 411;" f cornerList src/Preload/Render.hs 236;" f -corpseOrGib src/Dodge/Creature/Update.hs 269;" f +corpseOrGib src/Dodge/Creature/Update.hs 271;" f corridor src/Dodge/Room/Corridor.hs 17;" f corridorBoss src/Dodge/LockAndKey.hs 135;" f corridorN src/Dodge/Room/Corridor.hs 58;" f @@ -3030,7 +3030,7 @@ crShape src/Dodge/Creature/Shape.hs 8;" f crSpring src/Dodge/Update.hs 984;" f crStratConMatches src/Dodge/Creature/Test.hs 78;" f crStrength src/Dodge/Creature/Statistics.hs 30;" f -crUpdate src/Dodge/Creature/Update.hs 213;" f +crUpdate src/Dodge/Creature/Update.hs 215;" f crUpdateInvidLocations src/Dodge/Inventory/Location.hs 67;" f crUpdateItemLocations src/Dodge/Inventory/Location.hs 49;" f crVocalResetTime src/Dodge/Creature/Vocalization.hs 65;" f @@ -3323,7 +3323,7 @@ doLoop src/Loop.hs 60;" f doMagnetBuBu src/Dodge/Bullet.hs 35;" f doModificationEffect src/Dodge/ModificationEffect.hs 7;" f doMouseWarping src/Dodge/Update.hs 165;" f -doPreload appDodge/Main.hs 132;" f +doPreload appDodge/Main.hs 133;" f doQuickload src/Dodge/Save.hs 83;" f doQuicksave src/Dodge/Save.hs 77;" f doRandImpulse src/Dodge/RandImpulse.hs 8;" f @@ -3332,7 +3332,7 @@ doRoomPlacements src/Dodge/Layout.hs 121;" f doRoomShift src/Dodge/Room/Link.hs 34;" f doScopeZoom src/Dodge/Update/Scroll.hs 89;" f doSectionSize src/Dodge/DisplayInventory.hs 215;" f -doSideEffects appDodge/Main.hs 117;" f +doSideEffects appDodge/Main.hs 118;" f doSlimeRadChange src/Dodge/Creature/Update.hs 126;" f doStrategyActions src/Dodge/Creature/ReaderUpdate.hs 272;" f doTabComplete src/Dodge/Terminal.hs 241;" f @@ -3495,7 +3495,7 @@ drawZone src/Dodge/Debug/Picture.hs 152;" f drawZoneCirc src/Dodge/Debug/Picture.hs 293;" f drawZoneCol src/Dodge/Debug/Picture.hs 149;" f drawZoneNearPointCursor src/Dodge/Debug/Picture.hs 286;" f -dropAll src/Dodge/Creature/Update.hs 307;" f +dropAll src/Dodge/Creature/Update.hs 309;" f dropInventoryPath src/Dodge/HeldUse.hs 1371;" f dropItem src/Dodge/Creature/Action.hs 169;" f dropper src/Dodge/Item/Scope.hs 82;" f @@ -3585,7 +3585,7 @@ faceEdges src/Polyhedra.hs 62;" f facesToVF src/Polyhedra/Geodesic.hs 70;" f farWallDistDirection src/Dodge/Update/Camera.hs 245;" f fdiv src/ShortShow.hs 41;" f -feedSlime src/Dodge/Update.hs 1049;" f +feedSlime src/Dodge/Update.hs 1051;" f feet src/Dodge/Creature/Picture.hs 191;" f filter3 src/FoldableHelp.hs 76;" f filterSectionsPair src/Dodge/DisplayInventory.hs 160;" f @@ -3662,7 +3662,7 @@ fstV2 src/Geometry/Data.hs 70;" f fuelPack src/Dodge/Item/Equipment.hs 44;" f functionalUpdate src/Dodge/Update.hs 278;" f fusePoint src/Dodge/LevelGen/StaticWalls.hs 158;" f -fuseSlimes src/Dodge/Update.hs 1062;" f +fuseSlimes src/Dodge/Update.hs 1064;" f fuseWall src/Dodge/LevelGen/StaticWalls.hs 165;" f fuseWallsWith src/Dodge/LevelGen/StaticWalls.hs 172;" f g src/ShortShow.hs 48;" f @@ -3840,7 +3840,7 @@ hotkeyToChar src/Dodge/Inventory/SelectionList.hs 201;" f hotkeyToScancode src/Dodge/Creature/YourControl.hs 62;" f hotkeyToString src/Dodge/Inventory/SelectionList.hs 198;" f hoverCrit src/Dodge/Creature/ChaseCrit.hs 77;" f -hoverCritHoverSound src/Dodge/Creature/Update.hs 190;" f +hoverCritHoverSound src/Dodge/Creature/Update.hs 192;" f hoverCritInternal src/Dodge/Humanoid.hs 46;" f hoverCritMv src/Dodge/Creature/ReaderUpdate.hs 229;" f hoverDeathSounds src/Dodge/Creature/Vocalization.hs 58;" f @@ -4537,7 +4537,7 @@ pointerToItemID src/Dodge/Item/Location.hs 42;" f pointerYourRootItem src/Dodge/Item/Location.hs 33;" f pointerYourSelectedItem src/Dodge/Item/Location.hs 26;" f pointsToPoly src/Geometry/ConvexPoly.hs 37;" f -poisonSPic src/Dodge/Creature/Update.hs 303;" f +poisonSPic src/Dodge/Creature/Update.hs 305;" f poisonSprayer src/Dodge/Item/Held/SprayGuns.hs 17;" f poke34 src/Shader/Poke.hs 518;" f pokeArrayOff src/Shader/Poke.hs 530;" f @@ -4910,7 +4910,7 @@ scaleSH src/Shape.hs 271;" f scalp src/Dodge/Creature/Picture.hs 349;" f scancodeToHotkey src/Dodge/Creature/YourControl.hs 82;" f scodeToChar src/Dodge/ScodeToChar.hs 6;" f -scorchSPic src/Dodge/Creature/Update.hs 300;" f +scorchSPic src/Dodge/Creature/Update.hs 302;" f screenBox src/Dodge/Base/Window.hs 54;" f screenPolygon src/Dodge/Base/Window.hs 18;" f screenPolygonBord src/Dodge/Base/Window.hs 28;" f @@ -4938,7 +4938,7 @@ sectionsSizes src/Dodge/DisplayInventory.hs 205;" f seedStartMenu src/Dodge/Menu.hs 85;" f seedStartOptions src/Dodge/Menu.hs 88;" f segOnCirc src/Geometry.hs 113;" f -segmentArea src/Dodge/Creature/Update.hs 171;" f +segmentArea src/Dodge/Creature/Update.hs 173;" f selNumPos src/Dodge/Render/HUD.hs 475;" f selNumPosCardinal src/Dodge/Render/HUD.hs 492;" f selSecDrawCursor src/Dodge/Render/List.hs 101;" f @@ -5107,10 +5107,10 @@ slideDoorS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 673;" f slideWindow src/ListHelp.hs 81;" f slimeCrit src/Dodge/Creature/ChaseCrit.hs 65;" f slimeCritUpdate src/Dodge/Creature/Update.hs 71;" f -slimeEatSound src/Dodge/Update.hs 1081;" f +slimeEatSound src/Dodge/Update.hs 1083;" f slimeFood src/Dodge/Update.hs 1044;" f slinkCrit src/Dodge/Creature/ChaseCrit.hs 54;" f -slinkCritUpdate src/Dodge/Creature/Update.hs 174;" f +slinkCritUpdate src/Dodge/Creature/Update.hs 176;" f slowCrush90 src/Dodge/Room/LongDoor.hs 263;" f slowCrushRoom src/Dodge/Room/LongDoor.hs 148;" f slowDoorRoom src/Dodge/Room/LongDoor.hs 309;" f @@ -5216,7 +5216,7 @@ stackText src/Picture/Base.hs 180;" f stackedInventory src/Dodge/Creature.hs 321;" f startCr src/Dodge/Creature.hs 85;" f startCrafts src/Dodge/Room/Start.hs 94;" f -startDeathTimer src/Dodge/Creature/Update.hs 254;" f +startDeathTimer src/Dodge/Creature/Update.hs 256;" f startDrag src/Dodge/Update/Input/InGame.hs 319;" f startInvList src/Dodge/Creature.hs 100;" f startInventory src/Dodge/Creature.hs 103;" f @@ -5368,7 +5368,7 @@ toBinary src/Dodge/Inventory/SelectionList.hs 154;" f toBothLnk src/Dodge/RoomLink.hs 136;" f toClosestMultiple src/HelpNum.hs 3;" f toColor8 src/Color.hs 158;" f -toDeathCarriage src/Dodge/Creature/Update.hs 262;" f +toDeathCarriage src/Dodge/Creature/Update.hs 264;" f toFloatVAs src/Shader/Compile.hs 66;" f toLabel src/Dodge/Cleat.hs 16;" f toMultiset src/Multiset.hs 64;" f @@ -5529,7 +5529,7 @@ updateCreatureStrides src/Dodge/Update.hs 373;" f updateDebris src/Dodge/Update.hs 676;" f updateDebrisChunk src/Dodge/Prop/Moving.hs 16;" f updateDebugMessageOffset src/Dodge/Update.hs 104;" f -updateDelayedEvents src/Dodge/Update.hs 1088;" f +updateDelayedEvents src/Dodge/Update.hs 1090;" f updateDisplaySections src/Dodge/DisplayInventory.hs 116;" f updateDistortion src/Dodge/Distortion.hs 8;" f updateDistortions src/Dodge/Update.hs 655;" f @@ -5587,7 +5587,7 @@ updatePlasmaBall src/Dodge/Update.hs 527;" f updatePlasmaBalls src/Dodge/Update.hs 669;" f updatePreload src/Preload/Update.hs 21;" f updateProjectile src/Dodge/Projectile/Update.hs 26;" f -updatePulse src/Dodge/Creature/Update.hs 315;" f +updatePulse src/Dodge/Creature/Update.hs 317;" f updatePulseBall src/Dodge/Update.hs 547;" f updatePulseLaser src/Dodge/Update.hs 716;" f updatePulseLasers src/Dodge/Update.hs 522;" f