1 files changed, 18 insertions, 2 deletions

diff --git a/src/Main.hs b/src/Main.hs
index e6d694a..36f2687 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -59,7 +59,10 @@ main = do
     description = initialShellDescription
                   { historyFile = Just historyFile
                   , prompt = \st -> return $ maybe "" (++ " ") ((evalState ?? st) . toName <$> view gFocus st) ++ "→ "
-                  , beforePrompt = gets stateOutline >>= (\str -> if null str then return () else shellPutStrLn str)
+                  , beforePrompt = do
+                      { gets stateOutline >>= (\str -> if null str then return () else shellPutStr str)
+                      ; gets focusNotes >>= (\str -> if null str then return () else shellPutStrLn str)
+                      }
                   , commandStyle = OnlyCommands
                   , shellCommands = [ exitCommand "exit"
                                     , helpCommand "help"
@@ -80,6 +83,7 @@ main = do
                                     , 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"
+                                    , cmd "note" addNote "Add a note to the current focus"
                                     ]
                   }
   void $ runShell description haskelineBackend (def :: GameState)
@@ -106,6 +110,15 @@ stateOutline st
     roundStr n = show n ++ " Rounds later"
     factions = map (view faction') $ st ^. inhabitedFactions
 
+focusNotes :: GameState -> String
+focusNotes = maybe "" (unlines . map dotted) . preview (gFocus' . eNotes)
+  where
+    dotted "" = " • "
+    dotted str
+      | fstL : [] <- lines str = " • " ++ fstL
+      | fstL : tailL <- lines str = " • " ++ fstL ++ "\n" ++ unlines (map ("   " ++ ) tailL)
+      | otherwise = ""
+
 -- Query state
 listFactions, listEntities :: Sh GameState ()
 listFactions = use inhabitedFactions >>= mapM_ (shellPutStrLn . view faction')
@@ -119,7 +132,7 @@ blur     = gFocus .= Nothing
 -- Manual focus
 setFocus :: Completable EntityIdentifier -> Sh GameState ()
 setFocus = withArg $ \ident -> gFocus ?= ident
-
+ 
 -- Drop information
 remove :: Sh GameState ()
 remove = withFocus $ \ident -> do
@@ -228,3 +241,6 @@ delay = withFocus $ \focusId -> () <$ runMaybeT (delay' focusId)
       focusSeq <- MaybeT . preuse $ gEntities . ix focusId . eStats . sSequence . _Just . seqVal . _Just
       guard $ focusSeq > tipSeq
       lift . spendSeq $ focusSeq - tipSeq
+
+addNote :: String -> Sh GameState ()
+addNote note = withFocus $ \focusId -> gEntities . ix focusId . eNotes %= (note :)