Hlinting

src/Dodge/WorldEvent/Shockwave.hs

@@ -20,16 +20,17 @@ makeShockwaveAt
     -> Color    -- ^ Color of shockwave.
     -> World    -- ^ Start world.
     -> World
-makeShockwaveAt is p rad dam push col = over particles' ((:) theShockwave)
-    where theShockwave = shockwaveAt is p rad dam push col 10
+makeShockwaveAt is p rad dam push col = over particles (theShockwave :)
+  where 
+    theShockwave = shockwaveAt is p rad dam push col 10
 
 shockwaveAt 
     :: [Int]    -- ^ IDs of invulnerable creatures.
-    ->  Point2 -> Float -> Int -> Float -> Color -> Int -> Particle'
+    ->  Point2 -> Float -> Int -> Float -> Color -> Int -> Particle
 shockwaveAt is p rad dam push col maxtime
     = Shockwave'
         { _ptDraw       = drawShockwave
-        , _ptUpdate'    = mvShockwave' is
+        , _ptUpdate'    = mvShockwave is
         , _btColor'     = col
         , _btPos'       = p
         , _btRad'       = rad
@@ -39,7 +40,10 @@ shockwaveAt is p rad dam push col maxtime
         , _btTimer'     = maxtime
         }
 
-drawShockwave :: Particle' -> Picture
+{-
+Shockwave picture.
+-}
+drawShockwave :: Particle -> Picture
 drawShockwave pt = pic 
   where
     pic = onLayer PtLayer $ uncurry translate p 
@@ -51,10 +55,10 @@ drawShockwave pt = pic
     tFraction = fromIntegral t / fromIntegral (_btMaxTime' pt)
     t    = _btTimer' pt
 
-mvShockwave' 
+mvShockwave
     :: [Int]    -- ^ IDs of invulnerable creatures.
-    -> World -> Particle' -> (World, Maybe Particle')
-mvShockwave' is w pt 
+    -> World -> Particle -> (World, Maybe Particle)
+mvShockwave is w pt 
     | _btTimer' pt <= 0 = (w, Nothing)
     | otherwise
         = (dams w , Just $ set btTimer' (t - 1) pt) --  $ set ptDraw (const pic) pt)
@@ -83,32 +87,51 @@ mvShockwave' is w pt
 
 -------------------------------------------------
 
-inverseShockwaveAt :: Point2 -> Float -> Int -> Float -> Float -> World -> World
-inverseShockwaveAt p rad dam push pushexp = over particles' ((:) theShockwave)
-    where theShockwave 
-            = Particle' 
-                { _ptDraw = const blank
-                , _ptUpdate' = moveInverseShockWave 10 p rad push pushexp
-                }
-moveInverseShockWave :: Int -> Point2 -> Float -> Float -> Float -> World -> Particle' -> (World, Maybe Particle')
+{-
+Create a shockwave going from an outside circle into a center point.
+ -}
+inverseShockwaveAt 
+    :: Point2   -- Center position
+    -> Float    -- Radius
+    -> Int      -- Damage
+    -> Float    -- Push amount
+    -> Float    -- Push amount parameter
+    -> World 
+    -> World
+inverseShockwaveAt p rad dam push pushexp = over particles (theShockwave :)
+  where 
+    theShockwave = Particle
+        { _ptDraw = const blank
+        , _ptUpdate' = moveInverseShockWave 10 p rad push pushexp
+        }
+moveInverseShockWave 
+    :: Int      -- ^ Timer
+    -> Point2   -- ^ Center position
+    -> Float    -- ^ Radius
+    -> Float    -- ^ Push amount
+    -> Float    -- ^ Push amount parameter
+    -> World
+    -> Particle 
+    -> (World, Maybe Particle)
 moveInverseShockWave 0 _ _ _    _       w _  = (w, Nothing)
 moveInverseShockWave t p r push pushexp w pt 
     = (dams w, Just $ newupdate $ newpic pt )
-    where newupdate = set ptUpdate' $ moveInverseShockWave (t-1) p r push pushexp
-          newpic = set ptDraw (const $ onLayer PtLayer $ uncurry translate p 
-                                $ color cyan $ thickCircle rad thickness)
-          rad = r - (4/40) * r * fromIntegral (10 - t)
-          thickness = (fromIntegral (10 - t))**2 * rad / 40
-          dams = over creatures (IM.map damCr) . flip (foldr damageBlocks) hitBlocks
-          hitBlocks = wallsOnCirc p rad $ wallsNearPoint p w 
-          damageBlocks wall w
-            = case wall ^? blHP of 
-                Just hp -> foldr (\j -> over (walls . ix j . blHP) (\y -> y - 1)) 
-                                 w 
-                                 (_blIDs wall)
-                _ -> w
-          damCr cr | dist (_crPos cr) p < rad + _crRad cr 
-                                = over (crState . crDamage) 
-                                       ((:) $ PushDam 1 (25 *.* safeNormalizeV (p -.- _crPos cr)))
-                                       cr
-                   | otherwise  = cr
+  where 
+    newupdate = set ptUpdate' $ moveInverseShockWave (t-1) p r push pushexp
+    newpic = set ptDraw (const $ onLayer PtLayer $ uncurry translate p 
+                          $ color cyan $ thickCircle rad thickness)
+    rad = r - (4/40) * r * fromIntegral (10 - t)
+    thickness = fromIntegral (10 - t) **2 * rad / 40
+    dams = over creatures (IM.map damCr) . flip (foldr damageBlocks) hitBlocks
+    hitBlocks = wallsOnCirc p rad $ wallsNearPoint p w 
+    damageBlocks wall w
+      = case wall ^? blHP of 
+          Just hp -> foldr (\j -> over (walls . ix j . blHP) (\y -> y - 1)) 
+                           w 
+                           (_blIDs wall)
+          _ -> w
+    damCr cr | dist (_crPos cr) p < rad + _crRad cr 
+                          = over (crState . crDamage) 
+                                 ((:) $ PushDam 1 (25 *.* safeNormalizeV (p -.- _crPos cr)))
+                                 cr
+             | otherwise  = cr