framework for damage tracking

1 files changed, 5 insertions, 3 deletions

diff --git a/src/Main.hs b/src/Main.hs
index 145df7a..b7c6a6e 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -15,7 +15,7 @@ import System.Directory
 
 import Data.Default
 import Data.CaseInsensitive (CI)
-import qualified Data.CaseInsensitive
+import qualified Data.CaseInsensitive as CI
 
 import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
@@ -183,7 +183,8 @@ rollTest = withArg $ enactTest' >=> maybe (return ()) (shellPutStrLn . ppResult)
 
 enactTest' :: (FormulaM Stats Test) -> Sh GameState (Maybe TestResult)
 enactTest' test = withFocus' $ \focus -> do
-  (newFocus, result) <- evalFormula focus (enactTest =<< test)
+  focusName <- use gFocus >>= toName . fromJust
+  (newFocus, result) <- evalFormula focusName focus (enactTest =<< test)
   gFocus' .= newFocus
   return result
       
@@ -200,5 +201,6 @@ entitySeqVal' ident = do
   case (,) <$> entity <*> sVal of
     Nothing -> return ()
     Just (entity, sVal) -> do
-      (newEntity, view (seqVal . re _Just) -> val) <- evalFormula entity sVal
+      name <- toName ident
+      (newEntity, view (seqVal . re _Just) -> val) <- evalFormula name entity sVal
       gEntities . at ident .= Just (newEntity & set eSeqVal val)