diff --git a/pop1_apple.asl b/pop1_apple.asl index daf38fb..dcf1d0d 100644 --- a/pop1_apple.asl +++ b/pop1_apple.asl @@ -39,7 +39,7 @@ startup start { - return(current.Level == 1 && current.Ticks == 0); + return (current.Level == 1 && current.Ticks == 0); } gameTime @@ -56,7 +56,7 @@ gameTime reset { - return((current.Reset1 == 0 && current.Reset2 == 0 && current.Reset3 == 0) || game.ProcessName != "AppleWin"); + return (current.Reset1 == 0 && current.Reset2 == 0 && current.Reset3 == 0); } split diff --git a/pop_3d.asl b/pop_3d.asl index 53d4955..e13a818 100644 --- a/pop_3d.asl +++ b/pop_3d.asl @@ -24,10 +24,11 @@ startup } } -init +exit { - vars.gameRunning = true; - game.Exited += (s, e) => vars.gameRunning = false; + // we do not need to unpause the IGT timer because the next time the game is running, the isLoading block will run and then it will be handled there + // however if we didn't have an isLoading block, then we would need to explicitly unpause in the init block + timer.IsGameTimePaused = true; } reset @@ -46,7 +47,7 @@ start isLoading { - return (current.xPos == 0 && current.yPos == 0 && current.zPos == 0) || !vars.gameRunning; + return current.xPos == 0 && current.yPos == 0 && current.zPos == 0; } split diff --git a/pop_tfs.asl b/pop_tfs.asl index ac1e2d1..4e1d41a 100644 --- a/pop_tfs.asl +++ b/pop_tfs.asl @@ -135,9 +135,6 @@ startup init { - vars.gameRunning = true; - game.Exited += (s, e) => vars.gameRunning = false; - // This is a split which triggers when the prince is within a certain range of coords vars.SplitTFSpos = (Func )((xTarg, yTarg, zTarg, range) => { return @@ -157,9 +154,16 @@ init }); } +exit +{ + // we do not need to unpause the IGT timer because the next time the game is running, the isLoading block will run and then it will be handled there + // however if we didn't have an isLoading block, then we would need to explicitly unpause in the init block + timer.IsGameTimePaused = true; +} + isLoading { - return (current.isMenu == 0 || current.isLoading || !vars.gameRunning); + return (current.isMenu == 0 || current.isLoading); } reset