1 files changed, 35 insertions, 13 deletions

diff --git a/src/Main.hs b/src/Main.hs
index f46fd3e..e6d694a 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -78,26 +78,33 @@ main = do
                                     , cmd "test" rollTest "Roll a test using the stats of the currently focused entity"
                                     , cmd "combat" entitySeqVal "Roll sequence value for the current focus and enter combat"
                                     , cmd "combat'" factionSeqVal "Roll sequence values for all members of a faction and have them enter combat"
+                                    , cmd "spend" spendSeq "Spend some of the current focus´ AP"
+                                    , cmd "delay" delay "Spend AP until the current focus´ sequence is no higher than the next highest"
                                     ]
                   }
   void $ runShell description haskelineBackend (def :: GameState)
 
 stateOutline :: GameState -> String
 stateOutline st
-  | null pQueue = ""
-  | otherwise   = layoutTableToString rowGs (Just ("" : factions, repeat def)) (repeat def) unicodeBoldHeaderS
+  | null (st ^. priorityQueue) = ""
+  | otherwise                  = unlines . map table $ st ^. gRounds'
   where
+    table round = layoutTableToString rowGs (Just (roundStr round : factions, repeat def)) (repeat def) unicodeBoldHeaderS
+      where
+        pQueue = filter (\(v, _) -> round == v ^. seqRound . _Wrapped)$ st ^. priorityQueue
+        protoRows = groupBy ((==) `on` fst) pQueue
+        faction id = fromJust $ view eFaction <$> Map.lookup id (st ^. gEntities)
+        factionIndex id = fromJust $ elemIndex (view faction' $ faction id) factions
+        rowGs = do
+          rowGroup'@((seq, _):_) <- protoRows
+          let
+            rowGroup = map snd rowGroup'
+            factionColumn i = [evalState ?? st $ toName x | x <- rowGroup, factionIndex x == i ]
+          return . colsAllG top $ [maybe "" show $ view seqVal seq] : map factionColumn [0..(length factions - 1)]
+    roundStr 0 = "Current Round"
+    roundStr 1 = "Next Round"
+    roundStr n = show n ++ " Rounds later"
     factions = map (view faction') $ st ^. inhabitedFactions
-    pQueue = st ^. priorityQueue
-    protoRows = groupBy ((==) `on` fst) pQueue
-    faction id = fromJust $ view eFaction <$> Map.lookup id (st ^. gEntities)
-    factionIndex id = fromJust $ elemIndex (view faction' $ faction id) factions
-    rowGs = do
-      rowGroup'@((seq, _):_) <- protoRows
-      let
-        rowGroup = map snd rowGroup'
-        factionColumn i = [evalState ?? st $ toName x | x <- rowGroup, factionIndex x == i ]
-      return . colsAllG top $ [show $ view seqVal seq] : map factionColumn [0..(length factions - 1)]
 
 -- Query state
 listFactions, listEntities :: Sh GameState ()
@@ -203,6 +210,21 @@ entitySeqVal' ident = void . runMaybeT $ do
   round <- use gRound
   (newEntity, sNum) <- evalFormula name entity sVal
   let val = Just $ def
-            & set seqRound round
+            & set (seqRound . _Wrapped) round
             & set seqVal (Just sNum)
+            & set seqEpsilon (entity ^. eStats . sSeqEpsilon)
   gEntities . at ident .= Just (newEntity & set eSeqVal val)
+
+spendSeq :: Int -> Sh GameState ()
+spendSeq n = withFocus $ \focusId -> do
+  gEntities . ix focusId . eStats . sSequence . _Just . seqVal . _Just -= n
+
+delay :: Sh GameState ()
+delay = withFocus $ \focusId -> () <$ runMaybeT (delay' focusId)
+  where
+    delay' focusId = do
+      tipId <- MaybeT $ preuse tip
+      tipSeq <- MaybeT . preuse $ gEntities . ix tipId . eStats . sSequence . _Just . seqVal . _Just
+      focusSeq <- MaybeT . preuse $ gEntities . ix focusId . eStats . sSequence . _Just . seqVal . _Just
+      guard $ focusSeq > tipSeq
+      lift . spendSeq $ focusSeq - tipSeq