Skip to content
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.

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

Made combo breaks, actually be combo breaks. #470

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 11 additions & 3 deletions source/funkin/game/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -265,9 +265,9 @@ class PlayState extends MusicBeatState
public var combo:Int = 0;

/**
* Whenever the misses should show "Combo Breaks" instead of "Misses"
* Whenever the misses counter should count your "Combo Breaks" with it.
*/
public var comboBreaks:Bool = !Options.ghostTapping;
public var comboBreaks:Bool = Options.comboBreaks;
/**
* Health bar background.
*/
Expand Down Expand Up @@ -311,6 +311,10 @@ class PlayState extends MusicBeatState
* The player's amount of misses.
*/
public var misses:Int = 0;
/**
* The player's amount of breaks. (should be counted with the misses, so "breaks + misses")
*/
public var breaks:Int = 0;
/**
* The player's accuracy (shortcut to `accuracyPressedNotes / totalAccuracyAmount`).
*/
Expand Down Expand Up @@ -1226,7 +1230,7 @@ class PlayState extends MusicBeatState

function updateRatingStuff() {
scoreTxt.text = 'Score:$songScore';
missesTxt.text = '${comboBreaks ? "Combo Breaks" : "Misses"}:$misses';
missesTxt.text = '${comboBreaks ? "Combo Breaks" : "Misses"}:${comboBreaks ? (breaks + misses) : misses}'; // yes, this is how combo breaks work, if you don't believe me, heres proof, https://github.com/user-attachments/assets/ee1d30d5-6763-46bc-aca2-d6dbf71339d6

if (curRating == null)
curRating = new ComboRating(0, "[N/A]", 0xFF888888);
Expand Down Expand Up @@ -1684,6 +1688,10 @@ class PlayState extends MusicBeatState
displayCombo(event);
if (event.displayRating)
displayRating(event.rating, event);
if (comboBreaks && (event.rating == 'bad' || event.rating == 'shit')) {
breaks += 1;
combo = 0;
}
ratingNum += 1;
}
}
Expand Down
1 change: 1 addition & 0 deletions source/funkin/options/Options.hx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class Options
public static var naughtyness:Bool = true;
public static var downscroll:Bool = false;
public static var ghostTapping:Bool = true;
public static var comboBreaks:Bool = false;
public static var flashingMenu:Bool = true;
public static var camZoomOnBeat:Bool = true;
public static var fpsCounter:Bool = true;
Expand Down
4 changes: 4 additions & 0 deletions source/funkin/options/categories/GameplayOptions.hx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ class GameplayOptions extends OptionsScreen {
"Ghost Tapping",
"If unchecked, trying to hit any strum that have no note that can be hit will cause a miss.",
"ghostTapping"));
add(new Checkbox(
"Combo Breaks",
"If checked, hitting bads and shits break your combo, and adds to the miss **counter**, not your actual misses.",
"comboBreaks"));
add(offsetSetting = new NumOption(
"Song Offset",
"Changes the offset that songs should start with.",
Expand Down