justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Refactor sound

Browse Source
This commit is contained in:
justin
2021-09-12 17:52:34 +01:00
parent ea333a363b
commit 51a85bd1ec
97 changed files with 409 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Particle/Bullet/HitEffect.hs
+7 -6
View File
@@ -11,6 +11,7 @@ import Dodge.WorldEvent
import Dodge.Particle.Bullet.Spawn
import Dodge.WorldEvent.DamageBlock
import Dodge.SoundLogic
import Dodge.SoundLogic.LoadSound
import Dodge.RandomHelp
import Dodge.WorldEvent.Shockwave
import Dodge.Creature.State.Data
@@ -37,7 +38,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] p 15 (Just 10)
makeHitSound = soundMultiFrom [CrHitSound 0] p hit1S (Just 10)
flashEff = over worldEvents (bloodFlashAt p . )
cid = _crID cr
(d1,_) = randomR (-0.7,0.7) $ _randGen w
@@ -55,7 +56,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] p 15 (Just 10)
makeHitSound = soundMultiFrom [CrHitSound 0] p hit1S (Just 10)
flashEff = over worldEvents ((.) $ bloodFlashAt p)
cid = _crID cr
newDir = safeNormalizeV (p -.- _crPos cr)
@@ -76,7 +77,7 @@ bulPenCr' bt p cr w
]
++
)
$ soundMultiFrom [CrHitSound 0] ep 15 (Just 10)
$ soundMultiFrom [CrHitSound 0] ep hit1S (Just 10)
$ over worldEvents (addPiercer . )
w
where
@@ -100,7 +101,7 @@ hvBulHitCr bt p cr w
]
++
)
$ soundMultiFrom [CrHitSound 0] ep 15 (Just 10)
$ soundMultiFrom [CrHitSound 0] ep hit1S (Just 10)
w
where
(d1,_) = randomR (-0.7,0.7) $ _randGen w
@@ -112,7 +113,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] p 15 (Just 10)
. soundMultiFrom [CrHitSound 0] p hit1S (Just 10)
$ incFlamelets
w
where
@@ -126,7 +127,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] p 15 (Just 10)
. soundMultiFrom [CrHitSound 0] p hit1S (Just 10)
$ mkwave
w
where