summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sequence.cabal2
-rw-r--r--sequence.nix2
-rw-r--r--src/Main.hs6
3 files changed, 6 insertions, 4 deletions
diff --git a/sequence.cabal b/sequence.cabal
index d47291e..05672e7 100644
--- a/sequence.cabal
+++ b/sequence.cabal
@@ -2,7 +2,7 @@
2-- documentation, see http://haskell.org/cabal/users-guide/ 2-- documentation, see http://haskell.org/cabal/users-guide/
3 3
4name: sequence 4name: sequence
5version: 0.0.0 5version: 0.0.1
6-- synopsis: 6-- synopsis:
7-- description: 7-- description:
8license: MIT 8license: MIT
diff --git a/sequence.nix b/sequence.nix
index 1dc252a..1e2dd40 100644
--- a/sequence.nix
+++ b/sequence.nix
@@ -6,7 +6,7 @@
6}: 6}:
7mkDerivation { 7mkDerivation {
8 pname = "sequence"; 8 pname = "sequence";
9 version = "0.0.0"; 9 version = "0.0.1";
10 src = ./.; 10 src = ./.;
11 isLibrary = false; 11 isLibrary = false;
12 isExecutable = true; 12 isExecutable = true;
diff --git a/src/Main.hs b/src/Main.hs
index 605d66d..2d9f876 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -142,7 +142,8 @@ stateOutline = do
142 toDesc x 142 toDesc x
143 factionIndex id = fromJust $ elemIndex (view faction' $ faction id) factions 143 factionIndex id = fromJust $ elemIndex (view faction' $ faction id) factions
144 colsAllG top . ([maybe "" show $ view seqVal seq] :) <$> mapM factionColumn [0..(length factions - 1)] 144 colsAllG top . ([maybe "" show $ view seqVal seq] :) <$> mapM factionColumn [0..(length factions - 1)]
145 layoutTableToString <$> rowGs <*> pure (Just (roundStr round : factions, repeat def)) <*> pure (repeat def) <*> pure unicodeBoldHeaderS 145 -- layoutTableToString <$> rowGs <*> pure (Just (roundStr round : factions, repeat def)) <*> pure (repeat def) <*> pure unicodeBoldHeaderS
146 tableString <$> pure (repeat def) <*> pure unicodeBoldHeaderS <*> pure (titlesH $ roundStr round : factions) <*> rowGs
146 147
147focusNotes :: GameState -> String 148focusNotes :: GameState -> String
148focusNotes st 149focusNotes st
@@ -431,7 +432,8 @@ dumpLog :: Sh GameState ()
431dumpLog = use gLog >>= mapMOf (each . _1) toName >>= shellPutStrLn . toTable 432dumpLog = use gLog >>= mapMOf (each . _1) toName >>= shellPutStrLn . toTable
432 where 433 where
433 toTable :: Seq (String, String) -> String 434 toTable :: Seq (String, String) -> String
434 toTable (map (rowG . toListOf both) . toList -> table) = layoutTableToString table (Just (["Entity", "String"], [def, def])) [def, def] unicodeBoldHeaderS 435 -- toTable (map (rowG . toListOf both) . toList -> table) = layoutTableToString table (Just (["Entity", "String"], [def, def])) [def, def] unicodeBoldHeaderS
436 toTable (map (rowG . toListOf both) . toList -> table) = tableString [def, def] unicodeBoldHeaderS (titlesH ["Entity", "String"]) table
435 437
436printVal :: Completable (Formula Stats) -> Sh GameState () 438printVal :: Completable (Formula Stats) -> Sh GameState ()
437printVal = withArg $ \formula -> withFocus $ \focusId -> do 439printVal = withArg $ \formula -> withFocus $ \focusId -> do