Hlinting

src/Dodge/WorldEvent/Explosion.hs

@@ -1,3 +1,6 @@
+{-
+Explosions: creation of shockwave and particles at a given point.
+ -}
 module Dodge.WorldEvent.Explosion
   where
 
@@ -18,20 +21,24 @@ import System.Random
 import qualified Data.IntMap.Strict as IM
 import Control.Lens
 
--- The following should be improved.... I've made a first pass
-makePoisonExplosionAt :: Point2 -> World -> World
+makePoisonExplosionAt 
+    :: Point2   -- ^ Position
+    -> World 
+    -> World
 makePoisonExplosionAt p w = soundOncePos grenadeBang p $ foldr (makeGasCloud p) w vels
   where 
-    vels = evalState (sequence ( replicate 25 (randInCirc 2) )) (_randGen w)
--- just change the number after replicate to get more or less clouds
+    vels = replicateM 25 (randInCirc 2) & evalState $ _randGen w
+-- just change the number after replicateM to get more or less clouds
 -- suggested change: use random positions, offset from p, rather than velocities
 -- so, p +.+ randomOffset
 -- currently the clouds push away from each other rather hard if they are close
 
-makeTeslaExplosionAt :: Point2 -> World -> World
+makeTeslaExplosionAt 
+    :: Point2   -- ^ Position
+    -> World 
+    -> World
 makeTeslaExplosionAt pos w = soundOncePos grenadeBang pos $ foldr ($) w listOfFunctions -- a bit shorter
   where 
-    -- rad or 360? Radians (hopefully) everywhere
     xs = randomRs (0, 2*pi) $ _randGen w
     j = newProjectileKey w
     pks = [j..]
@@ -39,31 +46,32 @@ makeTeslaExplosionAt pos w = soundOncePos grenadeBang pos $ foldr ($) w listOfFu
             (\i -> over projectiles (IM.insert (pks!!i) (makeTeslaArcAt (pks!!i) pos (xs!!i)))) 
             [1 .. 29]
             
--- slightly more work done on this one, want the flames to last for different
--- times
--- the new flames are directly added to the list of particles
-makeFlameExplosionAt :: Point2 -> World -> World
-makeFlameExplosionAt p w = soundOncePos grenadeBang p $ over particles' (newFlames ++ ) w
+makeFlameExplosionAt 
+    :: Point2   -- ^ Position
+    -> World 
+    -> World
+makeFlameExplosionAt p w = soundOncePos grenadeBang p $ over particles (newFlames ++ ) w
   where 
     newFlames = zipWith makeFlameWithVelAndTime velocities timers
     makeFlameWithVelAndTime vel time = aFlameParticle time p vel Nothing
-    velocities = evalState (sequence ( replicate 15 (randInCirc 1) )) (_randGen w)
+    velocities = replicateM 15 (randInCirc 1) & evalState $ _randGen w
     timers     = randomRs (80,100) $ _randGen w
     -- the ( Nthing :: Maybe Int ) here is "maybe" a creature id that the
     -- particle passes through for the first frame of its existence
 
-
-makeExplosionAt :: Point2 -> World -> World
+makeExplosionAt 
+    :: Point2   -- ^ Position
+    -> World 
+    -> World
 makeExplosionAt p w = soundOncePos grenadeBang p
     . addFlames 
     . explosionFlashAt p
     $ makeShockwaveAt [] p 50 10 1 white
         w
   where 
-    fVs = fst $ runState ((sequence . take 75 . repeat . randInCirc) 1) $ _randGen w
-    fPs' = evalState ((sequence . take 75 . repeat . randInCirc) 15) $ _randGen w
-    fPs = map (pushAgainstWalls . (+.+) p . (*.*) 0.5) 
-              fPs'
+    fVs  = replicateM 75 (randInCirc 1)  & evalState $ _randGen w
+    fPs' = replicateM 75 (randInCirc 15) & evalState $ _randGen w
+    fPs  = map (pushAgainstWalls . (+.+) p . (*.*) 0.5) fPs'
     inversePushOut v = (15 - magV v) * 0.01 *.* v
     fVs' = zipWith (+.+) fVs $ map inversePushOut fPs'
     sizes = randomRs (2,6) $ _randGen w
@@ -71,6 +79,6 @@ makeExplosionAt p w = soundOncePos grenadeBang p
     mF q v size time = makeFlameletTimed q v Nothing size time
     newFs = zipWith4 mF fPs (fmap (3 *.*) fVs') sizes times
     addFlames w = foldr ($) w newFs
-    pushAgainstWalls q = fromMaybe q $ fmap (\(x,y)-> x +.+ y) 
+    pushAgainstWalls q = maybe q (uncurry (+.+)) 
                                      $ collidePointWalls p q $ wallsNearPoint q w