Continue tweaking sound

src/Dodge/Item/Weapon.hs

@@ -66,7 +66,7 @@ pistol = defaultGun
         [ ammoCheckI
         , hammerCheckI
         , useTimeCheckI
-        , withSoundI tap3S 
+        , withSoundStart tap3S 
         , useAmmo 1
         , randSpreadDir
         , withMuzFlareI
@@ -296,7 +296,7 @@ hvAutoGun = defaultAutoGun
     , _itUseModifiers =
         [ ammoCheckI
         , rateIncABI 24 7 (torqueBeforeAtLeast 0.1 0.1) (torqueAfterI 0.2)
-        , withSoundI bangEchoS
+        , withSoundStart bangEchoS
         , withThinSmokeI
         , withMuzFlareI
         ]
@@ -323,7 +323,7 @@ ltAutoGun = defaultAutoGun
     , _itUseModifiers = 
         [ ammoCheckI
         , useTimeCheckI
-        , withSoundI tap1S
+        , withSoundStart tap1S
         , useAmmo 1
         , withRandomDirI 0.1
         , torqueAfterI 0.2
@@ -429,7 +429,7 @@ spreadGun = defaultGun
         [ ammoCheckI
         , hammerCheckI
         , useTimeCheckI
-        , withSoundI shotgunS
+        , withSoundStart shotgunS
         , useAmmo 1
         , withRecoilI 100
         , withMuzFlareI
@@ -461,7 +461,7 @@ multGun = defaultGun
         [ ammoCheckI
         , hammerCheckI
         , useTimeCheckI
-        , withSoundI shotgunS
+        , withSoundStart shotgunS
         , useAmmo 1
         , withRecoilI 200
         , withMuzFlareI
@@ -507,7 +507,7 @@ longGun = defaultGun
         [ ammoCheckI
         , hammerCheckI
         , useTimeCheckI
-        , withSoundI bangEchoS
+        , withSoundStart bangEchoS
         , useAmmo 1
         , withThickSmokeI
         , torqueAfterI 0.05
@@ -752,10 +752,10 @@ moveRemoteBomb itid time pID w
                 $ set (projectiles .ix pID.pjUpdate) (\_ -> moveRemoteBomb itid (f time) pID)
                     w
     | time < 2 = case hitWl of
-            Just (p,_) -> soundFrom (Tap 0) p tapQuietS Nothing $ halfV updatedWorld
+            Just (p,_) -> soundStart (Tap 0) p tapQuietS Nothing $ halfV updatedWorld
             _      -> halfV updatedWorld
     | otherwise = case hitWl of
-            Just (p,_) -> soundFrom (Tap 0) p tapQuietS Nothing updatedWorld
+            Just (p,_) -> soundStart (Tap 0) p tapQuietS Nothing updatedWorld
             _      -> updatedWorld
   where 
     updatedWorld 
@@ -875,7 +875,7 @@ fireRemoteLauncher :: Creature -> World -> World
 fireRemoteLauncher cr w = setLocation 
     $ resetFire 
     $ resetName 
-    $ soundFrom (CrWeaponSound cid) pos tap4S Nothing
+    $ soundStart (CrWeaponSound cid 0) pos tap4S Nothing
     $ over projectiles addRemRocket w
   where
     i = IM.newKey $ _projectiles w
@@ -923,7 +923,7 @@ moveRemoteShell cid itid pj w
                 ( ( pjVel %~ ( (accel +.+) . (frict *.*) ) )
                 . ( pjDir .~ newdir )
                 )
-            & soundFrom (ShellSound i) newPos missileLaunchS (Just 1)
+            & soundContinue (ShellSound i) newPos missileLaunchS (Just 1)
             & smokeGen
             & makeFlameletTimed oldPos 20 (0.5 *.* rotateV (pi+sparkD) accel) Nothing 3 10
     | time > -200 = case thingHit of