From 44004fa0ca3283490ae7e83b4a9944da39563315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=9C=20Rodney=2C=20An=20Imaginative=20Person=20?= =?UTF-8?q?=F0=9F=92=99?= Date: Sat, 30 Nov 2024 15:21:08 -0500 Subject: [PATCH 1/8] Update PlayState.hx --- source/funkin/game/PlayState.hx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 1b5bf86c9..88d76ef68 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -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`). */ @@ -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 combo breaks work, if you don't believe me, heres proof, https://www.google.com/search?client=opera-gx&q=How+do+combo+breaks+work+in+rhythm+games%3F&sourceid=opera&ie=UTF-8&oe=UTF-8 if (curRating == null) curRating = new ComboRating(0, "[N/A]", 0xFF888888); @@ -1684,6 +1688,8 @@ class PlayState extends MusicBeatState displayCombo(event); if (event.displayRating) displayRating(event.rating, event); + if (event.rating == 'bad' || event.rating == 'shit') + breaks += 1; ratingNum += 1; } } From 0394733f045c1b19b8a09d454c92dc2f7feb7650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=9C=20Rodney=2C=20An=20Imaginative=20Person=20?= =?UTF-8?q?=F0=9F=92=99?= Date: Sat, 30 Nov 2024 15:22:13 -0500 Subject: [PATCH 2/8] =?UTF-8?q?fuck=20typos=20=F0=9F=98=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/funkin/game/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 88d76ef68..c58a90a17 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -1230,7 +1230,7 @@ class PlayState extends MusicBeatState function updateRatingStuff() { scoreTxt.text = 'Score:$songScore'; - missesTxt.text = '${comboBreaks ? "Combo Breaks" : "Misses"}:${comboBreaks ? (breaks + misses) : misses}'; // yes, this is combo breaks work, if you don't believe me, heres proof, https://www.google.com/search?client=opera-gx&q=How+do+combo+breaks+work+in+rhythm+games%3F&sourceid=opera&ie=UTF-8&oe=UTF-8 + missesTxt.text = '${comboBreaks ? "Combo Breaks" : "Misses"}:${comboBreaks ? (breaks + misses) : misses}'; // yes, this is combo how breaks work, if you don't believe me, heres proof, https://www.google.com/search?client=opera-gx&q=How+do+combo+breaks+work+in+rhythm+games%3F&sourceid=opera&ie=UTF-8&oe=UTF-8 if (curRating == null) curRating = new ComboRating(0, "[N/A]", 0xFF888888); From c55c826da6fcc1f3ba1efe93019a98fcf7ce9b2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=9C=20Rodney=2C=20An=20Imaginative=20Person=20?= =?UTF-8?q?=F0=9F=92=99?= Date: Sat, 30 Nov 2024 15:22:52 -0500 Subject: [PATCH 3/8] omg me wtf --- source/funkin/game/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index c58a90a17..7079f6a4e 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -1230,7 +1230,7 @@ class PlayState extends MusicBeatState function updateRatingStuff() { scoreTxt.text = 'Score:$songScore'; - missesTxt.text = '${comboBreaks ? "Combo Breaks" : "Misses"}:${comboBreaks ? (breaks + misses) : misses}'; // yes, this is combo how breaks work, if you don't believe me, heres proof, https://www.google.com/search?client=opera-gx&q=How+do+combo+breaks+work+in+rhythm+games%3F&sourceid=opera&ie=UTF-8&oe=UTF-8 + 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://www.google.com/search?client=opera-gx&q=How+do+combo+breaks+work+in+rhythm+games%3F&sourceid=opera&ie=UTF-8&oe=UTF-8 if (curRating == null) curRating = new ComboRating(0, "[N/A]", 0xFF888888); From 68e9e9dbe25599cb3388858f2dbe77415303c273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=9C=20Rodney=2C=20An=20Imaginative=20Person=20?= =?UTF-8?q?=F0=9F=92=99?= Date: Sat, 30 Nov 2024 15:25:14 -0500 Subject: [PATCH 4/8] better link --- source/funkin/game/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 7079f6a4e..cfec83384 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -1230,7 +1230,7 @@ class PlayState extends MusicBeatState function updateRatingStuff() { scoreTxt.text = 'Score:$songScore'; - 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://www.google.com/search?client=opera-gx&q=How+do+combo+breaks+work+in+rhythm+games%3F&sourceid=opera&ie=UTF-8&oe=UTF-8 + 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); From bf276de5745bcaa5190426f2fddbed217eb48fa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=9C=20Rodney=2C=20An=20Imaginative=20Furball=20?= =?UTF-8?q?=F0=9F=92=99?= Date: Thu, 12 Dec 2024 19:10:51 -0500 Subject: [PATCH 5/8] woops --- source/funkin/game/PlayState.hx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index cfec83384..64c8df44d 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -1688,8 +1688,10 @@ class PlayState extends MusicBeatState displayCombo(event); if (event.displayRating) displayRating(event.rating, event); - if (event.rating == 'bad' || event.rating == 'shit') + if (comboBreaks && (event.rating == 'bad' || event.rating == 'shit')) { breaks += 1; + combo = 0; + } ratingNum += 1; } } From 8a11ea1792930374122e053c95a59ecd22751f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=9C=20Rodney=2C=20An=20Imaginative=20Furball=20?= =?UTF-8?q?=F0=9F=92=99?= Date: Fri, 13 Dec 2024 19:21:51 -0500 Subject: [PATCH 6/8] added option --- source/funkin/game/PlayState.hx | 2 +- source/funkin/options/Options.hx | 1 + source/funkin/options/categories/GameplayOptions.hx | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 64c8df44d..da7876b30 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -267,7 +267,7 @@ class PlayState extends MusicBeatState /** * Whenever the misses should show "Combo Breaks" instead of "Misses" */ - public var comboBreaks:Bool = !Options.ghostTapping; + public var comboBreaks:Bool = Options.comboBreaks; /** * Health bar background. */ diff --git a/source/funkin/options/Options.hx b/source/funkin/options/Options.hx index a9bf72ac1..912efb1c0 100644 --- a/source/funkin/options/Options.hx +++ b/source/funkin/options/Options.hx @@ -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; diff --git a/source/funkin/options/categories/GameplayOptions.hx b/source/funkin/options/categories/GameplayOptions.hx index 15c0ba603..60c4dacfd 100644 --- a/source/funkin/options/categories/GameplayOptions.hx +++ b/source/funkin/options/categories/GameplayOptions.hx @@ -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.", + "comboBreaks")); add(offsetSetting = new NumOption( "Song Offset", "Changes the offset that songs should start with.", From 715f6d465deaf6058af3ed7c06d05754be90adc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=9C=20Rodney=2C=20An=20Imaginative=20Furball=20?= =?UTF-8?q?=F0=9F=92=99?= Date: Fri, 13 Dec 2024 19:27:06 -0500 Subject: [PATCH 7/8] made descriptions consistent --- source/funkin/game/PlayState.hx | 2 +- source/funkin/options/categories/GameplayOptions.hx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index da7876b30..518b6fb80 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -265,7 +265,7 @@ class PlayState extends MusicBeatState public var combo:Int = 0; /** - * Whenever the misses should show "Combo Breaks" instead of "Misses" + * Whenever the misses should add-on your "Combo Breaks" instead of just "Misses". */ public var comboBreaks:Bool = Options.comboBreaks; /** diff --git a/source/funkin/options/categories/GameplayOptions.hx b/source/funkin/options/categories/GameplayOptions.hx index 60c4dacfd..4a5527fe3 100644 --- a/source/funkin/options/categories/GameplayOptions.hx +++ b/source/funkin/options/categories/GameplayOptions.hx @@ -20,7 +20,7 @@ class GameplayOptions extends OptionsScreen { "ghostTapping")); add(new Checkbox( "Combo Breaks", - "If checked, hitting bads and shits break your combo.", + "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", From 9d567323f808c0d26f3bc1297646bdc2ddfe84ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=9C=20Rodney=2C=20An=20Imaginative=20Furball=20?= =?UTF-8?q?=F0=9F=92=99?= Date: Fri, 13 Dec 2024 19:27:54 -0500 Subject: [PATCH 8/8] Update PlayState.hx --- source/funkin/game/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 518b6fb80..360a1eab1 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -265,7 +265,7 @@ class PlayState extends MusicBeatState public var combo:Int = 0; /** - * Whenever the misses should add-on your "Combo Breaks" instead of just "Misses". + * Whenever the misses counter should count your "Combo Breaks" with it. */ public var comboBreaks:Bool = Options.comboBreaks; /**