1 files changed, 5 insertions, 4 deletions

diff --git a/src/Sequence/Utils.hs b/src/Sequence/Utils.hs
index 9fc0ab2..517c3c2 100644
--- a/src/Sequence/Utils.hs
+++ b/src/Sequence/Utils.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE ViewPatterns, FlexibleContexts, MultiParamTypeClasses, FunctionalDependencies, FlexibleInstances, UndecidableInstances, OverloadedStrings #-}
 
 module Sequence.Utils
-  ( withArg, withFocus
+  ( withArg, withFocus, withFocus'
   , toName
   , Argument(..)
   , Completion(..)
@@ -48,9 +48,10 @@ withArg f (Completable str) = arg str >>= \a -> case a of
   Just a  -> f a
 
 withFocus :: (EntityIdentifier -> Sh GameState ()) -> Sh GameState ()
-withFocus f = use gFocus >>= \focus -> case focus of
-  Nothing -> shellPutErrLn $ "Currently not focusing any entity"
-  Just id -> f id
+withFocus f = use gFocus >>= maybe (shellPutErrLn $ "Currently not focusing any entity") f
+
+withFocus' :: (Entity -> Sh GameState a) -> Sh GameState (Maybe a)
+withFocus' f = preuse gFocus' >>= maybe (Nothing <$ shellPutErrLn "Currently not focusing any entity") (fmap Just . f)
 
 unaligned = view faction' def