Cleanup warnings

src/Dodge/WorldEvent/Shockwave.hs

@@ -4,6 +4,7 @@ module Dodge.WorldEvent.Shockwave
     )
   where
 import Dodge.Data
+import Dodge.WorldEvent.DamageBlock
 import Dodge.Creature.State.Data
 import Dodge.Base
 import Dodge.Picture.Layer
@@ -72,14 +73,8 @@ mvShockwave is w pt
     t    = _btTimer' pt
     tFraction = fromIntegral t / fromIntegral (_btMaxTime' pt)
     rad = r - (3/4) * r * tFraction
-    dams = over creatures (IM.map damCr) . flip (IM.foldr damageBlocks) hitBlocks
+    dams = over creatures (IM.map damCr) . flip (IM.foldr (damageBlocksBy 1)) 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 | _crID cr `elem` is = cr
              | dist (_crPos cr) p < rad + _crRad cr 
                           = over (crState . crDamage) 
@@ -100,7 +95,7 @@ inverseShockwaveAt
     -> Float    -- Push amount parameter
     -> World 
     -> World
-inverseShockwaveAt p rad dam push pushexp = over particles (theShockwave :)
+inverseShockwaveAt p rad _ push pushexp = over particles (theShockwave :)
   where 
     theShockwave = Particle
         { _ptDraw = const blank
@@ -124,14 +119,8 @@ moveInverseShockWave t p r push pushexp w pt
                           $ 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
+    dams = over creatures (IM.map damCr) . flip (foldr (damageBlocksBy 1)) 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)))