Refactor sounds

This commit is contained in:
2021-09-09 14:58:07 +01:00
parent be7b2d2cd7
commit 70c97f5367
26 changed files with 113 additions and 162 deletions
+6 -6
View File
@@ -35,7 +35,7 @@ bulHitCr bt p cr w
mvDams = [ PushDam 1 $ 2 *.* bulVel ]
addDamage = creatures . ix cid . crState . crDamage %~ ((Piercing 100 sp p ep : mvDams) ++ )
addDamageArmoured = creatures . ix cid . crState . crDamage %~ (mvDams ++)
makeHitSound = soundMultiFrom [CrHitSound 0] 15 10 0
makeHitSound = soundMultiFrom [CrHitSound 0] p 15 (Just 10)
flashEff = over worldEvents (bloodFlashAt p . )
cid = _crID cr
(d1,_) = randomR (-0.7,0.7) $ _randGen w
@@ -53,7 +53,7 @@ bulBounceArmCr' bt p cr w
mvDams = [ PushDam 1 $ 2 *.* bulVel ]
addDamage = creatures . ix cid . crState . crDamage %~ ((Piercing 100 sp p ep : mvDams) ++ )
addDamageArmoured = creatures . ix cid . crState . crDamage %~ (mvDams ++)
makeHitSound = soundMultiFrom [CrHitSound 0] 15 10 0
makeHitSound = soundMultiFrom [CrHitSound 0] p 15 (Just 10)
flashEff = over worldEvents ((.) $ bloodFlashAt p)
cid = _crID cr
newDir = safeNormalizeV (p -.- _crPos cr)
@@ -74,7 +74,7 @@ bulPenCr' bt p cr w
]
++
)
$ soundMultiFrom [CrHitSound 0] 15 10 0
$ soundMultiFrom [CrHitSound 0] ep 15 (Just 10)
$ over worldEvents (addPiercer . )
w
where
@@ -98,7 +98,7 @@ hvBulHitCr bt p cr w
]
++
)
$ soundMultiFrom [CrHitSound 0] 15 10 0
$ soundMultiFrom [CrHitSound 0] ep 15 (Just 10)
w
where
(d1,_) = randomR (-0.7,0.7) $ _randGen w
@@ -110,7 +110,7 @@ bulIncCr' :: Particle -> Point2 -> Creature -> World -> World
bulIncCr' bt p cr w
= over (creatures . ix cid . crState . crDamage)
( Piercing 60 sp p ep : )
$ soundMultiFrom [CrHitSound 0] 15 10 0
. soundMultiFrom [CrHitSound 0] p 15 (Just 10)
$ incFlamelets
w
where
@@ -124,7 +124,7 @@ bulConCr' :: Particle -> Point2 -> Creature -> World -> World
bulConCr' bt p cr w
= over (creatures . ix cid . crState . crDamage)
( Piercing 60 sp p ep : )
$ soundMultiFrom [CrHitSound 0] 15 10 0
. soundMultiFrom [CrHitSound 0] p 15 (Just 10)
$ mkwave
w
where