diff --git a/Deltarune.asl b/Deltarune.asl index eb3bc34..490dad3 100644 --- a/Deltarune.asl +++ b/Deltarune.asl @@ -312,7 +312,8 @@ init // Object variables in order: done, old room, new room, old fight, new fight, special condition vars.splits = new Dictionary>() { - {1, new Dictionary { + {1, new Dictionary + { {"Ch1_School", new object[] {false, "room_insidecloset_ch1", "room_dark1_ch1", -1, -1, 0}}, {"Ch1_CastleTown_DoorClose", new object[] {false, null, "room_castle_darkdoor_ch1", -1, -1, 1}}, {"Ch1_CastleTown_RoomChange", new object[] {false, "room_castle_darkdoor_ch1", "room_field_start_ch1", -1, -1, 0}}, @@ -336,7 +337,9 @@ init {"Ch1_Fountain_Enter", new object[] {false, "room_cc_prefountain_ch1", "room_cc_fountain_ch1", -1, -1, 0}}, {"Ch1_Fountain_Exit", new object[] {false, "room_cc_fountain_ch1", "room_school_unusedroom_ch1", -1, -1, 0}} }}, - {2, new Dictionary { + + {2, new Dictionary + { {"Ch2_Library", new object[] {false, "room_library_ch2", "room_dw_cyber_intro_1_ch2", -1, -1, 0}}, {"Ch2_ArcadeGameText", new object[] {false, null, "room_dw_cyber_queen_boxing_ch2", -1, -1, 6}}, {"Ch2_ArcadeGameLeave", new object[] {false, "room_dw_cyber_queen_boxing_ch2", "room_dw_cyber_musical_door_ch2", -1, -1, 0}}, @@ -471,7 +474,14 @@ update print("[DELTARUNE] All Chapters: Chapter " + ch + " started, timer resumed"); timer.IsGameTimePaused = false; } - vars.forceSplit = (settings["AC_Continue"] && timer.CurrentTime.RealTime > TimeSpan.FromSeconds(0)); // Workaround for Chapter 1 splitting right after starting + if(settings["AC_Continue"]) + { + if(current.chapter == 1) + vars.forceSplit = (timer.CurrentTime.RealTime > TimeSpan.FromSeconds(0)); // Workaround for Chapter 1 splitting right after starting + + else + vars.forceSplit = (old.namerEvent != 75); // Workaround for Chapter 2+ splitting on the cut to black after starting + } } } @@ -534,13 +544,14 @@ onReset split { - if(current.chapter == 0) return; - if(vars.forceSplit) { vars.forceSplit = false; return true; } + + if(current.chapter == 0) // Don't try to split if on Chapter Select + return; int done = 0, oldRoom = 1, diff --git a/README.md b/README.md index e7f3c03..ec6366a 100644 --- a/README.md +++ b/README.md @@ -11,35 +11,36 @@ This is a LiveSplit Autosplitter for DELTARUNE speedruns. ### Easy way -To use the Autosplitter, follow these easy steps: +To use the autosplitter, follow these easy steps: -1. Open your splits and go in `Edit Splits` -2. Insert `Deltarune` or `Deltarune Category Extensions` on the Game Name section +1. Open your splits and go in `Edit Splits`; +2. Insert `Deltarune` or `Deltarune Category Extensions` as the Game Name; 3. You should now have access to the autosplitter and be able to activate it. -![Split edition header with the Game Name and the suggested autosplitter](/assets/quickInstall.png) +![Splits Editor header with the Game Name and the suggested autosplitter](/assets/quickInstall.png) ### Manual way (also for developers) 1. Download the [latest release of the autosplitter](https://github.com/Tenebrosful/DELTARUNE-Livesplit.Autosplitter/releases) -or clone the repository -2. Open LiveSplit and add in your layout the component `Control -> Scriptable Auto Splitter` -3. Insert in `Script Path` the path to the autosplitter file +or clone the repository; +2. Open LiveSplit and add the component `Control -> Scriptable Auto Splitter` on your layout; +3. Insert the path to the autosplitter file in `Script Path`. -![Layout Editor with the path Control > Scriptable Auto Splitter when adding a new component](/assets/manualInstall.png) +![Layout Editor with Control -> Scriptable Auto Splitter selected](/assets/manualInstall.png) -> The autosplitter file will auto-refresh when you save it +> The autosplitter file will auto-refresh when you save it. ## How to use -To use and configure the autosplitter, just click `Settings` and enable the location you want the autosplitter to split on. +To use and configure the autosplitter, just click `Settings` and enable the locations you want the autosplitter +to split on. ![Settings options with Start, Split, Reset and individual splits that can be enabled or disabled](/assets/options.png) ### All Chapters If you enable the All Chapters section, you will have to put your LiveSplit to In-Game Time (IGT) otherwise some functionalities -like the timer pause might not work. +like the timer pause will not work. ## Want to help with / request something? diff --git a/assets/manualInstall.png b/assets/manualInstall.png index 68404e2..7d4c463 100644 Binary files a/assets/manualInstall.png and b/assets/manualInstall.png differ diff --git a/assets/options.png b/assets/options.png index 09a23b3..b39474d 100644 Binary files a/assets/options.png and b/assets/options.png differ diff --git a/assets/quickInstall.png b/assets/quickInstall.png index 6021f9d..46e94e1 100644 Binary files a/assets/quickInstall.png and b/assets/quickInstall.png differ