From dca497bab1bcd8c45eb42c85bb4958db65def053 Mon Sep 17 00:00:00 2001 From: CreoSm Date: Sun, 11 Jan 2026 16:32:56 +0930 Subject: [PATCH 1/2] Allow toasties in replay --- src/Etterna/Models/ScoreKeepers/ScoreKeeperNormal.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Etterna/Models/ScoreKeepers/ScoreKeeperNormal.cpp b/src/Etterna/Models/ScoreKeepers/ScoreKeeperNormal.cpp index 784334df97..8ff39f9a53 100644 --- a/src/Etterna/Models/ScoreKeepers/ScoreKeeperNormal.cpp +++ b/src/Etterna/Models/ScoreKeepers/ScoreKeeperNormal.cpp @@ -592,14 +592,9 @@ ScoreKeeperNormal::HandleTapRowScore(const NoteData& nd, int iRow) AddTapRowScore(scoreOfLastTap, nd, iRow); // only score once per row + // handle combo logic -#ifndef DEBUG - if ((GamePreferences::m_AutoPlay != PC_HUMAN || - m_pPlayerState->m_PlayerOptions.GetCurrent().m_fPlayerAutoPlay != 0)) { - m_cur_toasty_combo = 0; - return; - } -#endif // DEBUG + // Toasty combo if (scoreOfLastTap >= m_toasty_min_tns) { From 55d50e9e16d19a7a8b700b433ac9f9e6e5e629db Mon Sep 17 00:00:00 2001 From: CreoSm Date: Sun, 11 Jan 2026 16:33:28 +0930 Subject: [PATCH 2/2] Add MultiToasty setting to AdvancedOptions --- Themes/_fallback/Languages/en.ini | 2 ++ Themes/_fallback/metrics.ini | 3 ++- src/Etterna/Screen/Options/ScreenOptionsMasterPrefs.cpp | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index 026249bc2f..719c7bbabd 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -304,6 +304,7 @@ Display Options=BGFit, Appearance and UI options. FixKeyboardLayout=Turn this on to have the game force your keyboard layout to US (00000409) while focused on the game. Requires game restart. ScrollDir=Set the scroll direction of the notes. EasterEggs=Enable or disable some special easter eggs. +MultiToasty=Allow toasties to appear multiple times per stage. Edit Songs/Steps=Edit Songs/Steps Practice Songs/Steps=Practice Songs/Steps EditorShowBGChangesPlay=Choose whether to display song backgrounds while playing. @@ -873,6 +874,7 @@ Display Options=Display Options Duration seconds=Duration seconds ScrollDir=Scroll Direction EasterEggs=Easter Eggs +MultiToasty=Multiple Toasties Edit Songs/Steps=Edit Songs/Steps FastNoteRendering=Fast Note Rendering FailOffForFirstStageEasy=Fail Off First Easy diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index dd5f275c3b..07d6375351 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -2215,7 +2215,7 @@ LineGO="lua,GlobalOffsetSeconds()" Fallback="ScreenOptionsServiceChild" NextScreen="ScreenOptionsService" PrevScreen="ScreenOptionsService" -LineNames="3,4,SI,SM,HN,SSR,14,30,OsuLifts,ReplayMods,ReplayOffsets,PR,PackProgress,MinidumpUpload,AllowSongDeletion" +LineNames="3,4,SI,SM,HN,SSR,14,MultiToasty,30,OsuLifts,ReplayMods,ReplayOffsets,PR,PackProgress,MinidumpUpload,AllowSongDeletion" #LineScore="lua,UserPrefScoringMode()" Line3="lua,JudgeDifficulty()" Line4="conf,LifeDifficulty" @@ -2224,6 +2224,7 @@ LineSM="lua,SpeedModIncLarge()" LineHN="conf,MinTNSToHideNotes" LineSSR="conf,SortBySSRNormPercent" Line14="conf,EasterEggs" +LineMultiToasty="conf,MultiToasty" Line30="conf,FastLoad" LineAllowSongDeletion="conf,AllowSongDeletion" #Line31="conf,FastLoadAdditionalSongs" diff --git a/src/Etterna/Screen/Options/ScreenOptionsMasterPrefs.cpp b/src/Etterna/Screen/Options/ScreenOptionsMasterPrefs.cpp index 108ea1eb8c..d74470be1e 100644 --- a/src/Etterna/Screen/Options/ScreenOptionsMasterPrefs.cpp +++ b/src/Etterna/Screen/Options/ScreenOptionsMasterPrefs.cpp @@ -844,6 +844,7 @@ InitializeConfOptions() ADD(ConfOption("Center1Player", MovePref, "Off", "On")); ADD(ConfOption("EasterEggs", MovePref, "Off", "On")); + ADD(ConfOption("MultiToasty", MovePref, "Off", "On")); ADD(ConfOption("SortBySSRNormPercent", MovePref, "Off", "On")); ADD(ConfOption("UseMidGrades", MovePref, "Off", "On")); ADD(ConfOption("PackProgressInWheel", MovePref, "Off", "On"));