diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2016-06-13 18:44:54 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2016-06-13 18:44:54 +0200 |
| commit | 12dce406808620989646a163ff77a0782eb5ef63 (patch) | |
| tree | a12d4af28af55ba7b851ec8ca3e5f1bf27f572e6 /src/Sequence | |
| parent | ae1ea97cdcca8d230dbee9460ae5d28242404d20 (diff) | |
| download | 2017-01-16_17:13:37-12dce406808620989646a163ff77a0782eb5ef63.tar 2017-01-16_17:13:37-12dce406808620989646a163ff77a0782eb5ef63.tar.gz 2017-01-16_17:13:37-12dce406808620989646a163ff77a0782eb5ef63.tar.bz2 2017-01-16_17:13:37-12dce406808620989646a163ff77a0782eb5ef63.tar.xz 2017-01-16_17:13:37-12dce406808620989646a163ff77a0782eb5ef63.zip | |
combat rounds
Diffstat (limited to 'src/Sequence')
| -rw-r--r-- | src/Sequence/Types.hs | 2 | ||||
| -rw-r--r-- | src/Sequence/Utils.hs | 2 |
2 files changed, 2 insertions, 2 deletions
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] | |||
| 159 | gRounds' = to $ nub . sort . toListOf gRounds | 159 | gRounds' = to $ nub . sort . toListOf gRounds |
| 160 | 160 | ||
| 161 | gRound :: Getter GameState Int | 161 | gRound :: Getter GameState Int |
| 162 | gRound = to $ getMin . (<> Min 0) . view (gRounds . _Unwrapped) | 162 | 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 | |||
| 61 | withFocus' :: (Entity -> Sh GameState a) -> Sh GameState (Maybe a) | 61 | withFocus' :: (Entity -> Sh GameState a) -> Sh GameState (Maybe a) |
| 62 | withFocus' f = preuse gFocus' >>= maybe (Nothing <$ shellPutErrLn "Currently not focusing any entity") (fmap Just . f) | 62 | withFocus' f = preuse gFocus' >>= maybe (Nothing <$ shellPutErrLn "Currently not focusing any entity") (fmap Just . f) |
| 63 | 63 | ||
| 64 | focusState :: MonadState GameState m => Traversal' GameState a -> StateT a (MaybeT m) b -> m (Maybe b) | 64 | focusState :: MonadState s m => Traversal' s a -> StateT a (MaybeT m) b -> m (Maybe b) |
| 65 | focusState lens action = runMaybeT $ uncurry (<$) . over _2 (lens .=) =<< runStateT action =<< MaybeT (preuse lens) | 65 | focusState lens action = runMaybeT $ uncurry (<$) . over _2 (lens .=) =<< runStateT action =<< MaybeT (preuse lens) |
| 66 | 66 | ||
| 67 | unaligned = view faction' def | 67 | unaligned = view faction' def |