Cleanup

2025-06-14 23:16:29 +01:00
parent 02498e5abb
commit 078a3cc7ea
19 changed files with 29 additions and 60 deletions
@@ -23,7 +23,7 @@ updateExpBarrel cr w
    | otherwise = makeExplosionAt (_crPos cr) 0 $ stopSounds w & cWorld . lWorld . creatures . at (_crID cr) .~ Nothing
  where
    g = _randGen w
-    damages = _csDamage $ _crState cr
+    damages = cr ^. crDamage
    pierceSparks :: [World -> World]
    pierceSparks =
        zipWith
@@ -32,7 +32,7 @@ updateExpBarrel cr w
            as
    as = randomRs (-0.7, 0.7) g
    poss = _piercedPoints $ _barrelType $ _crType cr
-    newCr = Just $ applyFuseDamage $ set (crState . csDamage) [] $ damsToExpBarrel damages cr
+    newCr = Just $ applyFuseDamage $ set crDamage [] $ damsToExpBarrel damages cr
    applyFuseDamage cr' =
        cr' & crHP
            %~ subtract (length . _piercedPoints . _barrelType $ _crType cr')