Cleanup

2022-03-25 12:00:35 +00:00
parent cb9bdf9c55
commit a07647d89d
5 changed files with 44 additions and 46 deletions
@@ -55,11 +55,11 @@ explosiveBarrel = defaultInanimate
        {_crSpState = Barrel []
        }
    , _crInv = IM.empty -- IM.fromList [(0,frontArmour)]
-    ,_crApplyDamage = \_ c -> (id, c)
+    ,_crApplyDamage = \_ _ -> id
    }
 updateBarrel :: Creature -> World -> World
 updateBarrel cr
-    | _crHP cr > 0 = creatures . ix (_crID cr) %~ (snd . doDamage)
+    | _crHP cr > 0 = doDamage cr
    | otherwise    = creatures . at (_crID cr) .~ Nothing

 -- should generate the sparks externally using new random generators