From d708bed77ddb906d59787c3edf3633c069e87858 Mon Sep 17 00:00:00 2001 From: Jonathan Lamothe Date: Mon, 4 Nov 2019 03:00:02 -0500 Subject: [PATCH] simplified goalsAllowedPrompt --- src/Mtlstats/Actions/GoalieInput.hs | 6 ++++++ src/Mtlstats/Prompt/GoalieInput.hs | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Mtlstats/Actions/GoalieInput.hs b/src/Mtlstats/Actions/GoalieInput.hs index acae846..c8280a9 100644 --- a/src/Mtlstats/Actions/GoalieInput.hs +++ b/src/Mtlstats/Actions/GoalieInput.hs @@ -28,6 +28,7 @@ import qualified Data.Map as M import Data.Maybe (fromMaybe) import Lens.Micro ((^.), (&), (.~), (%~), (+~)) +import Mtlstats.Config import Mtlstats.Types import Mtlstats.Util @@ -56,6 +57,10 @@ recordGoalieStats s = fromMaybe s $ do & gsMinsPlayed +~ mins & gsGoalsAllowed +~ goals + tryFinish = if mins >= gameLength + then finishGoalieEntry + else id + Just $ s & progMode.gameStateL %~ (gameGoalieStats %~ updateMap gid newGoalieStats bumpStats) @@ -66,3 +71,4 @@ recordGoalieStats s = fromMaybe s $ do %~ modifyNth gid (\goalie -> goalie & gYtd %~ bumpStats & gLifetime %~ bumpStats) + & tryFinish diff --git a/src/Mtlstats/Prompt/GoalieInput.hs b/src/Mtlstats/Prompt/GoalieInput.hs index bda49d2..c811c43 100644 --- a/src/Mtlstats/Prompt/GoalieInput.hs +++ b/src/Mtlstats/Prompt/GoalieInput.hs @@ -53,7 +53,4 @@ goalieMinsPlayedPrompt = numPrompt "Minutes played: " $ goalsAllowedPrompt :: Prompt goalsAllowedPrompt = numPrompt "Goals allowed: " $ \n -> do modify (progMode.gameStateL.gameGoalsAllowed ?~ n) - mins <- fromMaybe 0 <$> gets (^.progMode.gameStateL.gameGoalieMinsPlayed) - when (mins >= gameLength) $ - modify $ progMode.gameStateL.gameGoaliesRecorded .~ True modify recordGoalieStats