Make damage application belong to hit object

src/Dodge/Default.hs

@@ -10,6 +10,7 @@ import Dodge.Data
 import Dodge.SoundLogic
 import Dodge.Picture.Layer
 import Dodge.Wall.Delete
+import Dodge.Creature.Damage
 import Geometry
 import Picture
 import ShapePicture
@@ -19,7 +20,6 @@ import Control.Lens
 import qualified Data.IntMap.Strict as IM
 import qualified Data.Map.Strict as M
 import qualified Data.Vector as V
-import Data.List
 --import Data.Monoid
 defaultCreature :: Creature
 defaultCreature = Creature
@@ -186,36 +186,6 @@ defaultConsumable = Item
     , _itTargeting = NoTargeting
     , _itValue = defaultItemValue
     }
-defaultApplyDamage :: [Damage] -> Creature -> (World -> World, Creature)
-defaultApplyDamage ds cr = (id, doPoisonDam $ foldl' (flip $ \d c -> snd $ applyIndividualDamage d c) cr ds')
-  where 
-    (ps,ds') = partition isPoison ds
-    isPoison Damage{_dmType=PoisonDam} = True
-    isPoison _ = False
-    poisonDam = quot (max 0 (sum (map _dmAmount ps))) 10
-    doPoisonDam = over crHP (\hp -> hp - poisonDam)
-
-applyDamageEffect :: Damage -> DamageEffect -> Creature -> Creature
-applyDamageEffect dm de cr = case de of
-    NoDamageEffect -> cr
-    PushDamage push pushexp pushRad -> cr 
-        & crPos %~ (+.+ (pushAmount *.* squashNormalizeV (_crPos cr -.- fromDir))) 
-      where
-        pushAmount
-            | dist (_crPos cr) fromDir == 0 = 0
-            | otherwise = min 5 $ (push*5*pushRad / (dist (_crPos cr) fromDir * _crMass cr))**pushexp
-    PushBackDamage pback -> cr
-        & crPos %~ (+.+ ((1/_crMass cr) *.* pback ))
-    TorqueDamage rot -> cr & crDir +~ rot
-  where
-    fromDir = _dmFrom dm
-
-applyIndividualDamage :: Damage -> Creature -> (World -> World, Creature)
-applyIndividualDamage dm cr = ( id
-    , cr
-      & crHP -~ _dmAmount dm
-      & applyDamageEffect dm (_dmEffect dm)
-    )
 
 defaultFlIt :: FloorItem
 defaultFlIt = FlIt {_flItRot=0,_flIt = defaultConsumable, _flItPos = V2 0 0, _flItID = 0}