From 12dce406808620989646a163ff77a0782eb5ef63 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 13 Jun 2016 18:44:54 +0200 Subject: combat rounds --- src/Sequence/Types.hs | 2 +- src/Sequence/Utils.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Sequence') diff --git a/src/Sequence/Types.hs b/src/Sequence/Types.hs index 59397d5..4aa55d3 100644 --- a/src/Sequence/Types.hs +++ b/src/Sequence/Types.hs @@ -159,4 +159,4 @@ gRounds' :: Getter GameState [Int] gRounds' = to $ nub . sort . toListOf gRounds gRound :: Getter GameState Int -gRound = to $ getMin . (<> Min 0) . view (gRounds . _Unwrapped) +gRound = to $ fromMaybe 0 . minimumOf gRounds diff --git a/src/Sequence/Utils.hs b/src/Sequence/Utils.hs index dc6657a..513cb0b 100644 --- a/src/Sequence/Utils.hs +++ b/src/Sequence/Utils.hs @@ -61,7 +61,7 @@ withFocus f = use gFocus >>= maybe (shellPutErrLn $ "Currently not focusing any withFocus' :: (Entity -> Sh GameState a) -> Sh GameState (Maybe a) withFocus' f = preuse gFocus' >>= maybe (Nothing <$ shellPutErrLn "Currently not focusing any entity") (fmap Just . f) -focusState :: MonadState GameState m => Traversal' GameState a -> StateT a (MaybeT m) b -> m (Maybe b) +focusState :: MonadState s m => Traversal' s a -> StateT a (MaybeT m) b -> m (Maybe b) focusState lens action = runMaybeT $ uncurry (<$) . over _2 (lens .=) =<< runStateT action =<< MaybeT (preuse lens) unaligned = view faction' def -- cgit v1.2.3