Refactor sounds

src/Dodge/Item/Weapon/Grenade.hs

@@ -31,7 +31,7 @@ moveGrenade 0 _ pID w = over projectiles (IM.delete pID)
     pj = _projectiles w IM.! pID
     explosion = _pjPayload pj
 moveGrenade time dir pID w = case hitWl of
-    Just _ -> soundOnce tapQuiet updatedWorld
+    Just (p,_) -> soundFrom (Tap 0) p tapQuiet Nothing updatedWorld
     _      -> updatedWorld
   where 
     updatedWorld = updateV $ set (projectiles . ix pID . pjPos) finalPos
@@ -42,7 +42,7 @@ moveGrenade time dir pID w = case hitWl of
     pj     = _projectiles w IM.! pID
     oldPos = _pjPos pj
     newPos = _pjVel pj +.+ oldPos
-    hitWl  = collideCircWalls' oldPos newPos 4 $ wallsNearPoint newPos w
+    hitWl  = collideCircWalls oldPos newPos 4 $ wallsNearPoint newPos w
     finalPos = maybe newPos fst hitWl
     setV v = set (projectiles .ix pID.pjVel) v
     updateV = maybe id (setV . snd) hitWl

src/Dodge/Item/Weapon/Launcher.hs

@@ -106,7 +106,7 @@ doThrust :: Projectile -> World -> World
 doThrust pj w = w
     & randGen .~ g
     & projectiles . ix i . pjVel    %~ (\v -> accel +.+ frict *.* v)
-    & soundFromPos (ShellSound i) newPos smokeTrailSound 1 250
+    & soundFrom (ShellSound i) newPos smokeTrailSound (Just 1)
     & makeFlameletTimed (oldPos -.- vel) 0 (vel +.+ rotateV (pi+sparkD) accel) Nothing 3 10
     & smokeGen
   where
@@ -174,7 +174,7 @@ moveShell pj w
     projectileExplosion = _pjPayload pj
     newPos   = oldPos +.+ vel
     hitCr    = fst <$> collideCircCrsPoint oldPos newPos 4 w
-    hitWl    = fst <$> collideCircWalls' oldPos newPos 2 (wallsNearPoint newPos w)
+    hitWl    = fst <$> collideCircWalls oldPos newPos 2 (wallsNearPoint newPos w)
     thingHit = hitCr <|> hitWl
 
 reduceSpinBy :: Float -> Projectile -> World -> World

src/Dodge/Item/Weapon/TriggerType.hs

@@ -126,7 +126,7 @@ withWarmUpI soundID f item cr w
     | _wpReloadState item /= 0 = w
     | curWarmUp < maxWarmUp = w
         & pointerToItem . wpCurWarmUp +~ 2
-        & soundFrom (CrWeaponSound cid) soundID 2 0
+        & soundFrom (CrWeaponSound cid) (_crPos cr) soundID (Just 2)
     | otherwise = w
         & pointerToItem . wpCurWarmUp .~ maxWarmUp
         & f item cr
@@ -141,7 +141,11 @@ The sound is emitted from the creature's position. -}
 withSoundI
     :: Int -- ^ Sound id
     -> ChainEffect
-withSoundI soundid f item cr = soundOncePos soundid (_crPos cr) . f item cr
+withSoundI soundid f item cr 
+    = soundFrom (CrWeaponSound cid) (_crPos cr) soundid Nothing
+    . f item cr
+  where
+    cid = _crID cr
 
 {- | Adds a sound to a creature based world effect. 
 The sound is emitted from the creature's position. -}
@@ -150,7 +154,7 @@ withSoundForI
     -> Int -- ^ Frames to play
     -> ChainEffect
 withSoundForI soundid playTime f item cr 
-    = soundFromPos (CrWeaponSound (_crID cr)) (_crPos cr) soundid playTime 0
+    = soundFrom (CrWeaponSound (_crID cr)) (_crPos cr) soundid (Just playTime)
     . f item cr
 
 afterRecoil