Skip to content

Toasty stuff #1412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CreoSm wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Toasty stuff #1412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dca497b
Allow toasties in replay
CreoSm Jan 11, 2026
55d50e9
Add MultiToasty setting to AdvancedOptions
CreoSm Jan 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Themes/_fallback/Languages/en.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion Themes/_fallback/metrics.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
9 changes: 2 additions & 7 deletions src/Etterna/Models/ScoreKeepers/ScoreKeeperNormal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 1 addition & 0 deletions src/Etterna/Screen/Options/ScreenOptionsMasterPrefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,7 @@ InitializeConfOptions()

ADD(ConfOption("Center1Player", MovePref<bool>, "Off", "On"));
ADD(ConfOption("EasterEggs", MovePref<bool>, "Off", "On"));
ADD(ConfOption("MultiToasty", MovePref<bool>, "Off", "On"));
ADD(ConfOption("SortBySSRNormPercent", MovePref<bool>, "Off", "On"));
ADD(ConfOption("UseMidGrades", MovePref<bool>, "Off", "On"));
ADD(ConfOption("PackProgressInWheel", MovePref<bool>, "Off", "On"));
Expand Down
Loading