Burstfirerewrite

1 files changed, 11 insertions, 4 deletions

diff --git a/src/Sequence/Utils.hs b/src/Sequence/Utils.hs
index 9f03ca7..667d520 100644
--- a/src/Sequence/Utils.hs
+++ b/src/Sequence/Utils.hs
@@ -2,7 +2,7 @@
 
 module Sequence.Utils
   ( TimerLength(..), TimerOrigin(..)
-  , withArg, withFocus, withFocus'
+  , withArg, (<~>), withFocus, withFocus'
   , focusState
   , toName, toDesc
   , outputLogged
@@ -65,6 +65,10 @@ withArg f (Completable str) = arg str >>= \a -> case a of
   Nothing -> shellPutErrLn $ "Could not parse ‘" ++ str ++ "’"
   Just a  -> f a
 
+infixr 0 <~>
+(<~>) :: Argument a st => Completable a -> (a -> Sh st ()) -> Sh st ()
+(<~>) = flip withArg
+
 withFocus :: (EntityIdentifier -> Sh GameState ()) -> Sh GameState ()
 withFocus f = use gFocus >>= maybe (shellPutErrLn $ "Currently not focusing any entity") f
 
@@ -178,9 +182,12 @@ instance Completion (Formula Stats) GameState where
   complete _ st (CI.foldCase -> prefix) = return . map CI.original . filter ((prefix `isPrefixOf`) . CI.foldedCase) . Map.keys $ Map.filter (isJust . (\a -> preview (gFocus' . eStats . folding a) st)) statAccessors
 
 instance Argument (Formula Stats) GameState where
-  arg (CI.mk -> name) = runMaybeT $ do
-    accessor <- MaybeT . return $ Map.lookup name statAccessors
-    MaybeT . preuse $ gFocus' . eStats . folding accessor
+  arg (CI.mk -> name) = runMaybeT $ fromAccessor `mplus` fromNumber
+    where
+      fromAccessor = do
+        accessor <- MaybeT . return $ Map.lookup name statAccessors
+        MaybeT . preuse $ gFocus' . eStats . folding accessor
+      fromNumber = MaybeT . return . fmap fromInteger . (readMaybe :: String -> Maybe Integer) $ CI.original name
 
 statAccessors :: Map (CI String) (Stats -> Maybe (Formula Stats))
 statAccessors = [ ("Stärke", preview sAStrength)