Refactor sounds

src/Dodge/Creature/Action.hs

@@ -165,7 +165,8 @@ blinkAction
     :: Creature
     -> World 
     -> World
-blinkAction cr w = soundOnce teleSound 
+blinkAction cr w 
+    = soundMultiFrom [TeleSound 0,TeleSound 1] p3 teleSound Nothing
     . over radDistortion (distortionBulge ++)
     . set (creatures . ix cid . crPos) p3
     . blinkShockwave cid p3
@@ -195,9 +196,11 @@ youDropItem :: World -> World
 youDropItem w = case yourItem w of
     NoItem -> w
     _ -> rmSelectedInvItem (_yourID w) 
-        . copyItemToFloor (you w) (_crInvSel $ you w)
-        $ soundOnce putDownSound 
+        . copyItemToFloor (you w) (_crInvSel cr)
+        $ soundFrom (CrSound (_crID cr)) (_crPos cr) putDownSound Nothing
         w
+  where
+    cr = you w
 {- | Copy an inventory item to the floor. -}
 copyItemToFloor 
     :: Creature
@@ -229,7 +232,7 @@ pickUpItem
 pickUpItem cid flit w = case maybeInvSlot of
     Nothing -> w
     Just i  -> w
-        & soundOnce pickUpSound
+        & soundFrom (CrSound cid) (_flItPos flit) pickUpSound Nothing
         & updateItLocation i
         & floorItems                      %~ IM.delete (_flItID flit)
         & creatures . ix cid . crInv . ix i %~ addItem it

src/Dodge/Creature/Impulse.hs

@@ -52,9 +52,9 @@ followImpulse cr w imp = case imp of
     ChangePosture post -> (id, cr & crStance . posture .~ post)
     UseItem -> (tryUseItem cr, cr)
     SwitchToItem i -> (id, cr & crInvSel .~ i)
-    Melee cid ->
-        (hitCr cid
-        , crMvBy (10 *.* normalizeV (posFromID cid -.- cpos)) $ cr & crMeleeCooldown .~ 20) -- randomise cooldown?
+    Melee cid' ->
+        (hitCr cid'
+        , crMvBy (10 *.* normalizeV (posFromID cid' -.- cpos)) $ cr & crMeleeCooldown .~ 20) -- randomise cooldown?
     RandomTurn a -> (id, creatureTurn (rr a) cr)
     MakeSound sid -> ( soundOnceOrigin sid (CrSound (_crID cr)) (_crPos cr) , cr )
     DropItem -> undefined
@@ -78,8 +78,9 @@ followImpulse cr w imp = case imp of
     turnRad = _mvTurnRad mvType
     cpos = _crPos cr
     cdir = _crDir cr
-    posFromID cid = _crPos $ _creatures w IM.! cid
+    cid  = _crID cr
+    posFromID cid' = _crPos $ _creatures w IM.! cid'
     rr a = fst $ randomR (-a,a) $ _randGen w
     hitCr i = over (creatures . ix i . crState . crDamage) (addDam i)
-        . soundOnce hitSound
+        . soundFrom (CrSound cid) cpos hitSound Nothing
     addDam i dams = Blunt 100 cpos (posFromID i) (posFromID i) : dams 

src/Dodge/Creature/State.hs

@@ -135,11 +135,11 @@ invSideEff cr w = weaponReloadSounds cr $ IM.foldrWithKey f w (_crInv cr)
 weaponReloadSounds :: Creature -> World -> World
 weaponReloadSounds cr w = case _crInv cr IM.!? _crInvSel cr of
     Just Weapon{_wpReloadType = PassiveReload stype,_wpReloadTime=rt,_wpReloadState=rs} 
-        | rt == rs -> soundOncePos stype (_crPos cr) w
+        | rt == rs -> soundFrom (CrReloadSound 0) (_crPos cr) stype Nothing w
         | otherwise -> w
     Just Weapon{_wpReloadState = 0} -> w
     Just Weapon{_wpReloadState = 1} -> stopSoundFrom (CrReloadSound cid) w
-    Just Weapon{} -> soundFrom (CrReloadSound cid) reloadSound 1 0 w
+    Just Weapon{} -> soundFrom (CrReloadSound cid) (_crPos cr) reloadSound (Just 1) w
     _ -> w
   where 
     cid = _crID cr
@@ -221,7 +221,7 @@ updateExpBarrel cr w
     applyFuseDamage cr' = cr' & crHP %~ 
         subtract (length . _piercedPoints . _crSpState $ _crState cr')
     hiss | null poss = id
-         | otherwise  = soundMultiFrom [BarrelHiss 0,BarrelHiss 1] 41 50 1
+         | otherwise  = soundMultiFrom [BarrelHiss 0,BarrelHiss 1] (_crPos cr) 41 (Just 1)
     stopSounds = stopSoundFrom (BarrelHiss 0) . stopSoundFrom (BarrelHiss 1)
 
 damToExpBarrel :: [DamageType] -> Creature -> Creature

src/Dodge/Creature/State/WalkCycle.hs

@@ -29,7 +29,7 @@ footstepSideEffect cr w = case cr ^? crStance . carriage of
 
 makeFootstepSound :: Int -> Int -> FootForward -> Point2 -> World -> World
 makeFootstepSound currentStride maxStride ff p
-    | currentStride > maxStride = soundMultiFromPos footor (chooseFootSound ff) 3 0 p
+    | currentStride > maxStride = soundMultiFrom footor p (chooseFootSound ff) Nothing
     | otherwise = id
   where
     footor = [FootstepSound 0,FootstepSound 1]