Refactor damages

src/Dodge/Creature/Damage.hs

@@ -21,7 +21,7 @@ defaultApplyDamage ds cr w =
         & cWorld . lWorld . creatures . ix (_crID cr) %~ doPoisonDam
   where
     (ps, ds') = partition isPoison ds
-    isPoison Damage{_dmType = POISONDAM} = True
+    isPoison Poison{} = True
     isPoison _ = False
     poisonDam = quot (max 0 (sum (map _dmAmount ps))) 10
     doPoisonDam = crHP -~ poisonDam
@@ -49,7 +49,7 @@ applyIndividualDamage :: Creature -> World -> Damage -> World
 applyIndividualDamage cr w dm = applyIndividualDamage' cr w dm
 
 applyIndividualDamage' :: Creature -> World -> Damage -> World
-applyIndividualDamage' cr w dm = case _dmType dm of
+applyIndividualDamage' cr w dm = case dm of
     Piercing{} -> applyPiercingDamage cr dm w
     _ -> w & damageHP cr (_dmAmount dm)
 
@@ -61,7 +61,7 @@ applyPiercingDamage cr dm
     f = cWorld . lWorld . creatures . ix (_crID cr) . crPos -~ _dmVector dm
             / V2 x x
     x = crMass (_crType cr)
-    p = _dmAt dm
+    p = _dmPos dm
     p1 = p +.+ 2 *.* squashNormalizeV (p -.- _crPos cr)
 
 damageHP :: Creature -> Int -> World -> World