Refactor sounds

src/Dodge/Item/Weapon.hs

@@ -751,10 +751,10 @@ moveRemoteBomb itid time pID w
                 $ set (projectiles .ix pID.pjUpdate) (\_ -> moveRemoteBomb itid (f time) pID)
                     w
     | time < 2 = case hitWl of
-            Just _ -> soundOnce tapQuiet $ halfV updatedWorld
+            Just (p,_) -> soundFrom (Tap 0) p tapQuiet Nothing $ halfV updatedWorld
             _      -> halfV updatedWorld
     | otherwise = case hitWl of
-            Just _ -> soundOnce tapQuiet updatedWorld
+            Just (p,_) -> soundFrom (Tap 0) p tapQuiet Nothing updatedWorld
             _      -> updatedWorld
   where 
     updatedWorld 
@@ -768,7 +768,7 @@ moveRemoteBomb itid time pID w
     -- this is hacky, should use a version of collidePointWalls' that collides
     -- circles and walls
     invShift x = x -.- 5 *.* normalizeV (_pjVel pj)
-    hitWl  = collideCircWalls' oldPos newPos 4 $ wallsNearPoint newPos w
+    hitWl  = collideCircWalls oldPos newPos 4 $ wallsNearPoint newPos w
     finalPos = maybe newPos (invShift . fst) hitWl
     setV v = set (projectiles . ix pID . pjVel) v
     updateV = maybe id (setV . snd) hitWl
@@ -874,7 +874,7 @@ fireRemoteLauncher :: Creature -> World -> World
 fireRemoteLauncher cr w = setLocation 
     $ resetFire 
     $ resetName 
-    $ soundOnce launcherSound
+    $ soundFrom (CrWeaponSound cid) pos launcherSound Nothing
     $ over projectiles addRemRocket w
   where
     i = IM.newKey $ _projectiles w
@@ -922,7 +922,7 @@ moveRemoteShell cid itid pj w
                 ( ( pjVel %~ ( (accel +.+) . (frict *.*) ) )
                 . ( pjDir .~ newdir )
                 )
-            & soundFromPos (ShellSound i) newPos smokeTrailSound 1 250
+            & soundFrom (ShellSound i) newPos smokeTrailSound (Just 1)
             & smokeGen
             & makeFlameletTimed oldPos 20 (0.5 *.* rotateV (pi+sparkD) accel) Nothing 3 10
     | time > -200 = case thingHit of
@@ -944,7 +944,7 @@ moveRemoteShell cid itid pj w
     (frict,g)  = randomR (0.6,0.9) $ _randGen w
     (sparkD,_) = randomR (-0.5,0.5) $ _randGen w
     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
     r1 = _randGen w & evalState (randInCirc 10)
     smokeGen = makeSmokeCloudAt $ addZ 20 $ oldPos +.+ r1 +.+ 30 *.* normalizeV (oldPos -.- newPos)