Remove external corpses, handle them as creatures

src/Dodge/Barreloid.hs

@@ -18,19 +18,20 @@ updateBarreloid = \case
     PlainBarrel -> updateBarrel
 
 updateExpBarrel :: [Point2] -> Creature -> World -> World
-updateExpBarrel ps cr w
-    | cr ^. crHP > 0 =
+updateExpBarrel ps cr w = case cr ^. crHP of
+    HP x | x > 0 ->
         w
             & hiss
             & cWorld . lWorld . creatures . ix (_crID cr) %~ damsToExpBarrel damages
-            & cWorld . lWorld . creatures . ix (_crID cr) . crHP
+            & cWorld . lWorld . creatures . ix (_crID cr) . crHP . _HP
                 -~ length (_piercedPoints . _barrelType $ _crType cr)
             & cWorld . lWorld . creatures . ix (_crID cr) . crDamage .~ mempty
             & flip (foldl' f) ps
-    | otherwise =
+    HP _ ->
         w
             & makeExplosionAt ((cr ^. crPos) `v2z` 20) 0
-            & cWorld . lWorld . creatures . at (_crID cr) .~ Nothing
+            & cWorld . lWorld . creatures . ix (_crID cr) . crHP .~ CrIsGibs
+    _ -> w
   where
     f w' p = makeSpark NormalSpark (p + normalizeV p + cr ^. crPos) (argV p) w'
     damages = cr ^. crDamage
@@ -39,9 +40,10 @@ updateExpBarrel ps cr w
         | otherwise = soundContinue (BarrelHiss (_crID cr)) (_crPos cr) foamSprayLoopS (Just 1)
 
 updateBarrel :: Creature -> World -> World
-updateBarrel cr
-    | _crHP cr > 0 = doDamage (cr ^. crID)
-    | otherwise = cWorld . lWorld . creatures . at (_crID cr) .~ Nothing
+updateBarrel cr = case cr ^. crHP of
+    HP x | x > 0 -> doDamage (cr ^. crID)
+    HP _ -> cWorld . lWorld . creatures . ix (_crID cr) . crHP .~ CrIsGibs
+    _ -> id
 
 damsToExpBarrel :: [Damage] -> Creature -> Creature
 damsToExpBarrel = flip $ foldl' damToExpBarrel
@@ -49,8 +51,8 @@ damsToExpBarrel = flip $ foldl' damToExpBarrel
 damToExpBarrel :: Creature -> Damage -> Creature
 damToExpBarrel cr dm = case dm of
     Piercing x p _ ->
-        cr & crHP -~ div x 200
+        cr & crHP . _HP -~ div x 200
             & crType . barrelType . piercedPoints .:~ (p - _crPos cr)
     Poison{} -> cr
     Sparking{} -> cr
-    _ -> cr & crHP -~ fromMaybe 0 (dm ^? dmAmount)
+    _ -> cr & crHP . _HP -~ fromMaybe 0 (dm ^? dmAmount)