From 49db8f804eaf780e3d50f4ecec2e9c10a674b6fe Mon Sep 17 00:00:00 2001
From: justin <justin.g.kruger@gmail.com>
Date: Sun, 31 Oct 2021 13:43:54 +0000
Subject: [PATCH] Cleanup

---
 src/Dodge/WorldEvent/HitEffect.hs     |  3 +--
 src/Dodge/WorldEvent/Sound.hs         | 22 ++++++++++++----------
 src/Dodge/WorldEvent/SpawnParticle.hs |  7 ++++++-
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/Dodge/WorldEvent/HitEffect.hs b/src/Dodge/WorldEvent/HitEffect.hs
index 724cbd238..1cc91a8ca 100644
--- a/src/Dodge/WorldEvent/HitEffect.hs
+++ b/src/Dodge/WorldEvent/HitEffect.hs
@@ -3,8 +3,7 @@ module Dodge.WorldEvent.HitEffect
     , doFlameDam
     , noEff
     , penWalls
-    )
-    where
+    ) where
 import Dodge.Data
 import Dodge.Data.DamageType
 import Dodge.Creature.State.Data
diff --git a/src/Dodge/WorldEvent/Sound.hs b/src/Dodge/WorldEvent/Sound.hs
index 245aeca88..490c30c7a 100644
--- a/src/Dodge/WorldEvent/Sound.hs
+++ b/src/Dodge/WorldEvent/Sound.hs
@@ -1,28 +1,30 @@
 module Dodge.WorldEvent.Sound
+    ( mkSoundBreakGlass
+    , mkSoundSplinterGlass
+    , mkSoundSplinterBlock
+    )
   where
 import Dodge.Data
 import Dodge.Data.SoundOrigin
 import Dodge.SoundLogic
 import Dodge.SoundLogic.LoadSound
+import Sound.Data
 import Geometry.Data
 import Dodge.RandomHelp
 
---import System.Random
 import Control.Lens
 import Control.Monad.State.Lazy
 
+originIDsAt :: SoundOrigin -> [SoundID] -> Point2 -> World -> World
+originIDsAt so sids p w = soundStart so p sid Nothing $ set randGen g w
+  where
+    (sid,g) = _randGen w & runState (takeOne sids)
 
 mkSoundBreakGlass :: Point2 -> World -> World
-mkSoundBreakGlass p w = soundStart (GlassBreakSound 0) p soundid Nothing $ set randGen g w
-  where
-    (soundid,g) = _randGen w & runState (takeOne [glassShat1S,glassShat2S,glassShat3S,glassShat4S])
+mkSoundBreakGlass = originIDsAt (GlassBreakSound 0) [glassShat1S,glassShat2S,glassShat3S,glassShat4S]
 
 mkSoundSplinterGlass :: Point2 -> World -> World
-mkSoundSplinterGlass p w = soundStart (GlassBreakSound 1) p soundid Nothing $ set randGen g w
-  where
-    (soundid,g) = _randGen w & runState (takeOne [smallGlass1S,smallGlass2S,smallGlass3S,smallGlass4S])
+mkSoundSplinterGlass = originIDsAt (GlassBreakSound 1) [smallGlass1S,smallGlass2S,smallGlass3S,smallGlass4S]
 
 mkSoundSplinterBlock :: Point2 -> World -> World
-mkSoundSplinterBlock p w = soundStart (BlockDegradeSound 1) p soundid Nothing $ set randGen g w
-  where
-    (soundid,g) = _randGen w & runState (takeOne [impact1S,impact2S,impact3S,impact4S])
+mkSoundSplinterBlock = originIDsAt (BlockDegradeSound 1) [impact1S,impact2S,impact3S,impact4S]
diff --git a/src/Dodge/WorldEvent/SpawnParticle.hs b/src/Dodge/WorldEvent/SpawnParticle.hs
index 26c4910f2..064992e47 100644
--- a/src/Dodge/WorldEvent/SpawnParticle.hs
+++ b/src/Dodge/WorldEvent/SpawnParticle.hs
@@ -2,7 +2,12 @@
 Creation of particles in the world.
  -}
 module Dodge.WorldEvent.SpawnParticle
-  where
+    ( createSparkCol
+    , makeGasCloud
+    , aFlameParticle
+    , makeFlameletTimed
+    , makeTeslaArcAt
+    ) where
 import Dodge.Data
 import Dodge.Data.DamageType
 import Dodge.Data.SoundOrigin