Cleanup warnings

src/Dodge/Item/Weapon/Bullet.hs

@@ -4,8 +4,9 @@ Effects of bullets upon impact with walls or creatures, and possibly force field
 module Dodge.Item.Weapon.Bullet
     where
 import Dodge.Data
-import Dodge.Base
+--import Dodge.Base
 import Dodge.WorldEvent
+import Dodge.WorldEvent.DamageBlock
 import Dodge.SoundLogic
 import Dodge.RandomHelp
 import Dodge.WorldEvent.Shockwave
@@ -17,14 +18,14 @@ import Picture
 import System.Random
 import Control.Lens
 import Control.Monad.State
-import qualified Data.IntMap.Strict as IM
+--import Data.Maybe
+--import qualified Data.IntMap.Strict as IM
 -- | Basic bullet hit creature effect.
 bulHitCr' :: Particle -> Point2 -> Creature -> World -> World
 bulHitCr' bt p cr w 
     | crIsArmouredFrom p cr
         = createSpark 8 colID p1 (argV (p1 -.- p) + d1) Nothing . addDamageArmoured $ w
-    | otherwise
-        = addDamage . hitSound . flashEff $ w
+    | otherwise = addDamage . makeHitSound . flashEff $ w
   where
     sp = head $ _btTrail' bt
     bulVel = _btVel' bt
@@ -32,19 +33,17 @@ 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 ++)
-    hitSound = soundMultiFrom [CrHitSound 0] 15 10 0
+    makeHitSound = soundMultiFrom [CrHitSound 0] 15 10 0
     flashEff = over worldEvents (bloodFlashAt p . )
     cid = _crID cr
-    (d1,g)  = randomR (-0.7,0.7) $ _randGen w
+    (d1,_)  = randomR (-0.7,0.7) $ _randGen w
     (colID,_) = randomR (0,11) $ _randGen w
     p1 = p +.+ 2 *.* safeNormalizeV (p -.- _crPos cr)
 {- | Bounce off armoured creatures, otherwise do damage.  -}
 bulBounceArmCr' :: Particle -> Point2 -> Creature -> World -> World
 bulBounceArmCr' bt p cr w 
-    | crIsArmouredFrom p cr
-        = addBouncer . addDamageArmoured $ w
-    | otherwise
-        = addDamage . hitSound . flashEff $ w
+    | crIsArmouredFrom p cr = addBouncer . addDamageArmoured $ w
+    | otherwise = addDamage . makeHitSound . flashEff $ w
   where
     sp = head $ _btTrail' bt
     bulVel = _btVel' bt
@@ -52,7 +51,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 ++)
-    hitSound = soundMultiFrom [CrHitSound 0] 15 10 0
+    makeHitSound = soundMultiFrom [CrHitSound 0] 15 10 0
     flashEff = over worldEvents ((.) $ bloodFlashAt p)
     cid = _crID cr
     newDir = safeNormalizeV (p -.- _crPos cr)
@@ -77,7 +76,7 @@ bulPenCr' bt p cr w
     $ over worldEvents (addPiercer . )
     w
   where 
-    (d1,g)  = randomR (-0.7,0.7) $ _randGen w
+    (d1,_)  = randomR (-0.7,0.7) $ _randGen w
     cid = _crID cr
     sp = head $ _btTrail' bt
     ep = sp +.+ _btVel' bt
@@ -100,7 +99,7 @@ hvBulHitCr' bt p cr w
     $ soundMultiFrom [CrHitSound 0] 15 10 0
     w
   where 
-    (d1,g)  = randomR (-0.7,0.7) $ _randGen w
+    (d1,_)  = randomR (-0.7,0.7) $ _randGen w
     cid = _crID cr
     sp = head $ _btTrail' bt
     ep = sp +.+ _btVel' bt
@@ -131,32 +130,24 @@ bulConCr' bt p cr w
     sp = head $ _btTrail' bt
     ep = sp +.+ _btVel' bt
     mkwave = over worldEvents $ (.) (makeShockwaveAt [] p 15 4 1 white)
+
 {- | Hitting wall effects: create a spark, damage blocks.  -}
 bulHitWall' :: Particle -> Point2 -> Wall -> World -> World
-bulHitWall' bt p x w = damageBlocks x
-    $ createSpark 8 colID pOut (reflectDir x) Nothing
+bulHitWall' bt p x w = damageBlocksBy 5 x
+    $ createSpark 8 12 pOut (reflectDir x) Nothing
     $ set randGen g
     w
   where 
     sp = head $ _btTrail' bt
     pOut = p +.+ safeNormalizeV (sp -.- p)
-    (colID,g) = randomR (0,11) $ _randGen w
-    (a, _) = randomR (-0.1,0.1) $ _randGen w
-    spid = newKey $ _projectiles w
+    (a, g) = randomR (-0.2,0.2) $ _randGen w
     reflectDir wall = a + argV (reflectIn (uncurry (-.-) (_wlLine wall)) (p -.- sp) )
-    damageBlocks wall w = case wall ^? blHP of 
-          Just hp -> foldr (\j -> walls . ix j . blHP -~ 5) w (_blIDs wall)
-          _ -> w
 {- | Bounce off walls, do damage to blocks.  -}
 bulBounceWall' :: Particle -> Point2 -> Wall -> World -> World
-bulBounceWall' bt p wl w = damageBlocks wl $ over worldEvents addBouncer w
+bulBounceWall' bt p wl w = damageBlocksBy 5 wl $ over worldEvents addBouncer w
   where 
     sp = head $ _btTrail' bt
     pOut = p +.+ safeNormalizeV (sp -.- p)
-    damageBlocks wall w
-      = case wall ^? blHP of 
-          Just hp -> foldr (\j -> walls . ix j . blHP -~ 5) w (_blIDs wall)
-          _ -> w
     bouncer = (aGenBulAt' Nothing (_btColor' bt) pOut reflectVel 
                                       (_btHitEffect' bt) (_btWidth' bt)
               ) {_btTimer' = _btTimer' bt - 1}
@@ -174,14 +165,10 @@ bulIncWall'
     -> Wall 
     -> World 
     -> World
-bulIncWall' bt p wl w =  damageBlocks wl $ incFlamelets w
+bulIncWall' bt p wl w =  damageBlocksBy 5 wl $ incFlamelets w
   where   
     sp = head $ _btTrail' bt
     pOut = p +.+ safeNormalizeV (sp -.- p)
-    damageBlocks wall w
-      = case wall ^? blHP of 
-          Just hp -> foldr (\j -> walls . ix j . blHP -~ 5) w (_blIDs wall)
-          _ -> w
     wallV = uncurry (-.-) (_wlLine wl)
     reflectVel = safeNormalizeV $ reflectIn wallV (_btVel' bt)
     incFlamelets = over worldEvents $ (.) (makeFlameletTimed pOut reflectVel Nothing 3 20)
@@ -192,15 +179,8 @@ bulConWall'
     -> Wall 
     -> World 
     -> World
-bulConWall' bt p wl w =  damageBlocks wl $ mkwave w
-  where
-    sp = head $ _btTrail' bt
-    pOut = p +.+ safeNormalizeV (sp -.- p)
-    damageBlocks wall w
-      = case wall ^? blHP of 
-          Just hp -> foldr (\j -> walls . ix j . blHP -~ 5) w (_blIDs wall)
-          _ -> w
-    mkwave = over worldEvents ( makeShockwaveAt [] p 15 4 1 white . ) 
+bulConWall' _ p wl = damageBlocksBy 1 wl . 
+    over worldEvents ( makeShockwaveAt [] p 15 4 1 white . ) 
 
 hvBulHitWall' 
     :: Particle 
@@ -208,18 +188,14 @@ hvBulHitWall'
     -> Wall 
     -> World 
     -> World
-hvBulHitWall' bt p x w =  damageBlocks x $ set randGen g $ foldr ($) w (sparks pOut sv)
+hvBulHitWall' bt p x w =  damageBlocksBy 5 x $ set randGen g $ foldr ($) w (sparks pOut sv)
   where 
     sp = head $ _btTrail' bt
     pOut = p +.+ safeNormalizeV (sp -.- p)
-    (a, g) = randomR (-0.1,0.1) $ _randGen w
-    spid = newKey $ _projectiles w
+    (a, g) = randomR (-0.2,0.2) $ _randGen w
     reflectDir wall = a + 
         argV (reflectIn (uncurry (-.-) (_wlLine wall)) (p -.- sp) )
     sv = unitVectorAtAngle $ reflectDir x
-    damageBlocks wall w = case wall ^? blHP of 
-        Just hp -> foldr (\j -> walls . ix j . blHP -~ 20) w (_blIDs wall)
-        _ -> w
     cs      = take 10 $ randomRs (0,11) $ _randGen w
     ds      = randomRs (-0.7,0.7) $ _randGen w
     ts      = randomRs (4,8) $ _randGen w