From 5971fae5ec24ea17c8d5bbf503c954a8c975ae4f Mon Sep 17 00:00:00 2001 From: jgk Date: Tue, 17 Aug 2021 23:38:08 +0200 Subject: [PATCH] Commit before trying to use traverseMaybe for creature update --- src/Dodge/Creature/State.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Dodge/Creature/State.hs b/src/Dodge/Creature/State.hs index ef609ab4a..355a3af34 100644 --- a/src/Dodge/Creature/State.hs +++ b/src/Dodge/Creature/State.hs @@ -39,11 +39,11 @@ meleeCooldown u w (f,g) cr = u w (f,g) $ cr & crMeleeCooldown . _Just %~ (max 0 -- the whole of this update cycle could do with a rethink, it is becoming -- convoluted stateUpdate :: CRUpdate -> CRUpdate -stateUpdate u w (f,g) cr = case u w (f,g) cr of +stateUpdate u w (f,g) cr = case u w (f,g) (updateMovement g cr) of ((f',g') , maybeCr) -> ( (invSideEff cr . movementSideEff cr . deathEff . f' , g') - , fmap (stepReloading . stepItemUseCooldown . doDamage . crAutoReload . updateMovement g') $ crOrCorpse =<< maybeCr + , fmap (stepReloading . stepItemUseCooldown . doDamage . crAutoReload) $ crOrCorpse =<< maybeCr ) where crOrCorpse cr'''