Skip to content

Commit 0fd64a8

Browse files
committed
the limits work now yay
1 parent f04bfb7 commit 0fd64a8

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

source/options/GameplaySettingsSubState.hx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,16 @@ class GameplaySettingsSubState extends BaseOptionsMenu
8181
option.maxValue = 30;
8282
addOption(option);
8383

84+
var option:Option = new Option('Marvelous! Hit Window',
85+
'Changes the amount of time you have\nfor hitting a "Marvelous!" in milliseconds.',
86+
'marvWindow',
87+
INT);
88+
option.displayFormat = '%vms';
89+
option.scrollSpeed = 5;
90+
option.minValue = 5;
91+
option.maxValue = 44;
92+
addOption(option);
93+
8494
var option:Option = new Option('Sick! Hit Window',
8595
'Changes the amount of time you have\nfor hitting a "Sick!" in milliseconds.',
8696
'sickWindow',

source/substates/RankingSubstate.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ class RankingSubstate extends MusicBeatSubstate
159159
if (PlayState.instance.cpuControlled)
160160
{
161161
hint.y -= 35;
162-
hint.text = 'If you wanna gather that rank, disable botplay.' + FlxG.random.bool(3) ?? '\n(Dirty cheater...)';
162+
hint.text = 'Nice try, but Botplay doesn\'t count.\n(And neither does Showcase Mode, either)';
163163
}
164164

165165
if (PlayState.deathCounter >= 30)
@@ -207,7 +207,7 @@ class RankingSubstate extends MusicBeatSubstate
207207
//MusicManager.playMenuMusic();
208208
TransitionState.transitionState(FreeplayManager.getFreeplayState(), {transitionType: "stickers"});
209209

210-
if (comboRankLimit >= comboRankSetLimit && accRankLimit >= accRankSetLimit) {
210+
if (!PlayState.instance.cpuControlled && !ClientPrefs.getGameplaySetting('showcase', false) && (comboRankLimit >= comboRankSetLimit && accRankLimit >= accRankSetLimit)) {
211211
trace("Sending checks for all checked notes...");
212212
for (note in APPlayState.instance.checkedNotes) {
213213
trace("Sending check for note: " + note);

0 commit comments

Comments
 (0)