Raven/livesplit-asl
1
0
Fork 0
mirror of https://github.com/RavenX8/livesplit-asl.git synced 2026-04-03 12:49:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added ACS and AMS first stage game time exception

Browse Source
This commit is contained in:
raven
2020-03-10 15:55:21 -04:00
parent d19d6adf0d
commit 7c12232f4a
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SonicGenerations.asl
View File

@@ -78,7 +78,7 @@ startup
settings.CurrentDefaultParent = null; settings.CurrentDefaultParent = null;
} }
init init
{ {
if (modules.First().ModuleMemorySize == 0x1CAB000) if (modules.First().ModuleMemorySize == 0x1CAB000)
@@ -122,6 +122,7 @@ init
vars.lives = 0; vars.lives = 0;
vars.stage_id = 0; vars.stage_id = 0;
vars.stage_code = ""; vars.stage_code = "";
vars.has_split = false;
vars.in_boss = false; vars.in_boss = false;
vars.in_final_boss = false; vars.in_final_boss = false;
vars.prev_stage_state = false; vars.prev_stage_state = false;
@@ -148,6 +149,7 @@ exit
vars.lives = 0; vars.lives = 0;
vars.stage_id = 0; vars.stage_id = 0;
vars.stage_code = ""; vars.stage_code = "";
vars.has_split = false;
vars.in_boss = false; vars.in_boss = false;
vars.in_final_boss = false; vars.in_final_boss = false;
vars.prev_stage_state = false; vars.prev_stage_state = false;
@@ -289,7 +291,7 @@ split
(current.stage_name == old.stage_name) && (current.stage_name == old.stage_name) &&
(vars.current_stage_state != vars.prev_stage_state) ) (vars.current_stage_state != vars.prev_stage_state) )
{ {
vars.DebugOutput("Split condition triggered"); //vars.DebugOutput("Split condition triggered");
vars.prev_stage_state = vars.current_stage_state; vars.prev_stage_state = vars.current_stage_state;
rtnValue = true; rtnValue = true;
@@ -326,6 +328,7 @@ split
{ {
return false; return false;
} }
if(rtnValue == true) vars.has_split = true;
} }
return rtnValue; return rtnValue;
} }
@@ -347,7 +350,10 @@ isLoading
gameTime gameTime
{ {
if(current.stage_loading || (((timer.Run.CategoryName != "Any%") && current.map_id == 27))) { if(current.stage_loading ||
((timer.Run.CategoryName != "Any%") &&
(current.map_id == 27 ||
(vars.gameTimeBuffer > 0 && (current.stage_time < 1) && vars.has_split == false)))) {
vars.currentCalcGameTime = vars.totalStageTime = vars.gameTimeBuffer = 0; vars.currentCalcGameTime = vars.totalStageTime = vars.gameTimeBuffer = 0;
return TimeSpan.FromSeconds( vars.totalStageTime ); return TimeSpan.FromSeconds( vars.totalStageTime );
} }