Make damage application belong to hit object

src/Dodge/Creature/Inanimate.hs

@@ -59,7 +59,7 @@ explosiveBarrel = defaultInanimate
     }
 updateBarrel :: Creature -> World -> World
 updateBarrel cr
-    | _crHP cr > 0 = creatures . ix (_crID cr) %~ doDamage
+    | _crHP cr > 0 = creatures . ix (_crID cr) %~ (snd . doDamage)
     | otherwise    = creatures . at (_crID cr) .~ Nothing
 
 -- should generate the sparks externally using new random generators

src/Dodge/Creature/Lamp.hs

@@ -62,7 +62,7 @@ updateLamp h i cr w
         & creatures . at cid .~ Nothing
     | otherwise = w 
         & lightSources . ix i . lsParam . lsPos .~ addZ h cpos
-        & creatures . ix cid %~ doDamage
+        & creatures . ix cid %~ (snd . doDamage)
   where
     cpos = _crPos cr
     cid  = _crID cr

src/Dodge/Creature/State.hs

@@ -47,14 +47,16 @@ stateUpdate :: (Creature -> World -> (World -> World, Creature))
     -> Creature -> World -> World
 stateUpdate = stateUpdateDamage doDamage
 
-stateUpdateDamage :: (Creature -> Creature) 
+stateUpdateDamage :: (Creature -> (World -> World,Creature)) 
     -> (Creature -> World -> (World -> World, Creature)) 
 --    -> CRUpdate
     -> Creature -> World -> World
-stateUpdateDamage damageupdate u cr w = case u (updateMovement cr) w of
-    (f, upcr) -> mvcrhammerup . invSideEff upcr . movementSideEff cr . deathEff . f $ w
-        & creatures . at (_crID cr) .~  (stepReloading . damageupdate <$> crOrCorpse upcr)
+stateUpdateDamage damageupdate u cr w =  
+    mvcrhammerup . invSideEff upcr . movementSideEff cr . deathEff . f . g $ w
+        & creatures . at (_crID cr) .~  (stepReloading <$> crOrCorpse upcr')
   where
+    (f,upcr) = u (updateMovement cr) w
+    (g,upcr') = damageupdate upcr
     mvcrhammerup = creatures . ix (_crID cr) . crHammerPosition %~ moveHammerUp
     crOrCorpse cr' 
         | cr' ^. crHP > 0 = Just cr'
@@ -80,13 +82,13 @@ setOldPos cr = cr
     & crOldPos .~ _crPos cr
     & crOldDir .~ _crDir cr
 
-clearDamage :: Creature -> Creature
-clearDamage = crState . crDamage .~ []
+clearDamage :: Creature -> (World-> World,Creature)
+clearDamage cr = (id,cr&crState . crDamage .~ [])
 
-doDamage :: Creature -> Creature
-doDamage cr = set (crState . crDamage) [] 
-    . over (crState . crPastDamage) (advancePastDamages dams)
-    $ snd $ _crApplyDamage cr dams cr
+doDamage :: Creature -> (World -> World, Creature)
+doDamage cr = set (_2 . crState . crDamage) [] 
+    . over (_2 . crState . crPastDamage) (advancePastDamages dams)
+    $ _crApplyDamage cr dams cr
   where 
     dams = _crDamage $ _crState cr