Make creature update an external function

src/Dodge/Creature/Inanimate.hs

@@ -9,23 +9,14 @@ module Dodge.Creature.Inanimate
     ) where
 import Dodge.Data
 import Dodge.Creature.Lamp
-import Dodge.WorldEvent.Explosion
-import Dodge.Spark
 import Dodge.Default
-import Dodge.Creature.State
 import qualified IntMapHelp as IM
-import Geometry
-import Dodge.SoundLogic
 import LensHelp
 
-import System.Random
-import Data.List
-
 barrel :: Creature
 barrel = defaultInanimate
-    { _crUpdate = updateBarrel
-    , _crHP = 500
-    , _crType = Barreloid
+    { _crHP = 500
+    , _crType = Barreloid PlainBarrel
     , _crState = defaultState 
         {_csSpState = Barrel []
         }
@@ -34,57 +25,11 @@ barrel = defaultInanimate
 
 explosiveBarrel :: Creature
 explosiveBarrel = defaultInanimate
-    { _crUpdate = updateExpBarrel
-    , _crHP = 400
-    , _crType = Barreloid
+    { _crHP = 400
+    , _crType = Barreloid ExplosiveBarrel
     , _crState = defaultState 
         {_csSpState = Barrel []
         }
     , _crInv = IM.empty -- IM.fromList [(0,frontArmour)]
     }
     & crMaterial .~ Crystal
-updateBarrel :: Creature -> World -> World
-updateBarrel cr
-    | _crHP cr > 0 = doDamage cr
-    | otherwise    = creatures . at (_crID cr) .~ Nothing
-
--- should generate the sparks externally using new random generators
-updateExpBarrel :: Creature -> World -> World
-updateExpBarrel cr w 
-    | _crHP cr > 0 = foldr ($) (hiss w & creatures . at (_crID cr) .~ newCr) pierceSparks
-    | otherwise    = makeExplosionAt (_crPos cr) $ stopSounds w & creatures . at (_crID cr) .~ Nothing
-  where 
-    g = _randGen w
-    damages = _csDamage $ _crState cr
-    pierceSparks :: [World -> World]
-    pierceSparks 
-      = zipWith3 (\p a -> createBarrelSpark (_crPos cr +.+ p) (a + argV p))
-                            poss as colids
-    as =  randomRs (-0.7,0.7) g
-    colids = randomRs (0,11) g
-    poss = _piercedPoints $ _csSpState $ _crState cr
-    newCr = Just $ applyFuseDamage $ set (crState . csDamage) [] $ damToExpBarrel damages cr
-    applyFuseDamage cr' = cr' & crHP %~ 
-        subtract (length . _piercedPoints . _csSpState $ _crState cr')
-    hiss | null poss = id
-         | otherwise  = soundMultiFrom [BarrelHiss 0,BarrelHiss 1] (_crPos cr) foamSprayLoopS (Just 1)
-    stopSounds = stopSoundFrom (BarrelHiss 0) . stopSoundFrom (BarrelHiss 1)
-
-damToExpBarrel :: [Damage] -> Creature -> Creature
-damToExpBarrel ds cr = foldr damToExpBarrel' (foldr damToExpBarrel' cr pierceDam) otherDam
-  where 
-    (pierceDam,otherDam) = partition isPierce ds
-    isPierce Damage{_dmType = PIERCING{}} = True
-    isPierce _             = False
-
-damToExpBarrel' :: Damage -> Creature -> Creature
-damToExpBarrel' dm cr = case _dmType dm of
-    PIERCING    -> over (crState . csSpState . piercedPoints) ((:) $ int -.- _crPos cr) 
-        $ cr & crHP -~ div amount 200
-    POISONDAM   -> cr
-    SPARKING    -> cr
---    PUSHDAM     -> cr LensHelp.& crPos .+.+~ (1 / _crMass cr *.* _dePushBack (_dmEffect dm))
-    _  -> cr LensHelp.& crHP -~ amount
-  where
-    amount = _dmAmount dm
-    int = _dmAt dm