Cleanup

src/Dodge/WorldEvent/Damage.hs

@@ -14,6 +14,6 @@ damThingHitWith
     -> World 
     -> World
 damThingHitWith partDT sp ep mayEiCrWl = case mayEiCrWl of
-    Just (hitp,Left  cr) -> creatures . ix (_crID cr) . crState . crDamage .:~ partDT sp hitp ep
+    Just (hitp,Left  cr) -> creatures . ix (_crID cr) . crState . csDamage .:~ partDT sp hitp ep
     Just (hitp,Right wl) -> damageWall (partDT sp hitp ep) wl
     Nothing -> id

src/Dodge/WorldEvent/Shockwave.hs

@@ -67,7 +67,7 @@ mvShockwave is w pt
     hitBlocks = wallsOnCirc p rad $ wallsNearPoint p w 
     damCr cr 
         | _crID cr `elem` is || dist (_crPos cr) p >= rad + _crRad cr  = cr
-        | otherwise = cr & crState . crDamage .:~
+        | otherwise = cr & crState . csDamage .:~
             Damage PUSHDAM dam cpos cpos cpos 
                 (PushBackDamage (25 * push *.* squashNormalizeV (_crPos cr -.- p)))
           where
@@ -107,7 +107,7 @@ moveInverseShockwave w pt
     hitBlocks = wallsOnCirc p rad $ wallsNearPoint p w 
     damCr cr 
         | dist (_crPos cr) p >= rad + _crRad cr = cr
-        | otherwise = cr & crState . crDamage .:~
+        | otherwise = cr & crState . csDamage .:~
             Damage PUSHDAM 1 cpos cpos cpos (PushBackDamage $ 25 *.* squashNormalizeV (p -.- cpos))
           where
             cpos = _crPos cr

src/Dodge/WorldEvent/SpawnParticle.hs

@@ -232,7 +232,7 @@ cloudPoisonDamage c w = w & creatures %~ flip (foldr (IM.adjust doDam)) damagedC
   where 
     damagedCrs = IM.keys $ IM.filter f $ creaturesNearPoint clpos w
     f cr = dist3 (addZ 20 $ _crPos cr) (_clPos c) < _crRad cr + _clRad c + 10
-    doDam cr = cr & crState . crDamage .:~ Damage POISONDAM 1 clpos clpos clpos NoDamageEffect
+    doDam cr = cr & crState . csDamage .:~ Damage POISONDAM 1 clpos clpos clpos NoDamageEffect
     clpos = stripZ $ _clPos c
 
 incBall :: RandomGen g => Point2 -> State g Particle