align entities to factions

1 files changed, 6 insertions, 1 deletions

diff --git a/src/Main.hs b/src/Main.hs
index 639673c..903da05 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -46,6 +46,7 @@ main = do
                                     , cmd "factions" listFactions "List all inhabited factions"
                                     , cmd "members" listFaction "List all members of a faction"
                                     , cmd "entities" listEntities "List all entities"
+                                    , cmd "align" alignEntity "Align an entity to a faction creating it, if necessary"
                                     ]
                   }
   void $ runShell description haskelineBackend (def :: GameState)
@@ -68,10 +69,14 @@ stateOutline st
       return . colsAllG top $ [show (seqVal' ^. seqVal)] : map factionColumn [0..(length factions - 1)]
 
 listFaction :: Completable Faction -> Sh GameState ()
-listFaction (Completable (flip (set faction') def -> qFaction)) = use gEntities >>= mapM_ (shellPutStrLn <=< toName) . Map.keys . Map.filter ((==) qFaction . view eFaction)
+listFaction = withArg $ \qFaction -> use gEntities >>= mapM_ (shellPutStrLn <=< toName) . Map.keys . Map.filter ((==) qFaction . view eFaction)
 
 listFactions :: Sh GameState ()
 listFactions = use inhabitedFactions >>= mapM_ (shellPutStrLn . view faction')
 
 listEntities :: Sh GameState ()
 listEntities = use (gEntities . to Map.keys) >>= mapM_ (shellPutStrLn <=< toName)
+
+alignEntity :: Completable EntityIdentifier -> Completable Faction -> Sh GameState ()
+alignEntity ident' nFaction' = flip withArg nFaction' $ \nFaction -> flip withArg ident' $ \ident -> do
+  gEntities %= Map.adjust (set eFaction nFaction) ident