Skip to content

Commit 0618e20

Browse files
committed
dw about it
1 parent d70bc05 commit 0618e20

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

source/cutscenes/DialogueStyle.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class PsychDialogueStyle extends DialogueStyle {
8383
public function makeDialogueBox():FlxSprite{
8484
box = new FlxSprite(70, 370);
8585
box.antialiasing = ClientPrefs.data.antialiasing;
86-
box.frames = Paths.getSparrowAtlas('dialogue/boxes/speech_bubble' + ClientPrefs.data.menuTheme == "Dark" ? '_dark' : '');
86+
box.frames = Paths.getSparrowAtlas('dialogue/boxes/speech_bubble' + (ClientPrefs.data.menuTheme == "Dark" ? '_dark' : ''));
8787
box.scrollFactor.set();
8888
box.animation.addByPrefix('normal', 'speech bubble normal', 24);
8989
box.animation.addByPrefix('angry', 'AHH speech bubble', 24);

source/states/LoadingState.hx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,13 @@ class LoadingState extends MusicBeatState
220220

221221
bar.scale.x = barWidth * curPercent;
222222
bar.updateHitbox();
223+
224+
if (curPercent > 90 && timePassed > 6000) {
225+
var yourtakingtoolong:FlxText = new FlxText(520, 400, 400, 'IF YOU\'RE READING THIS, IT\'S STUCK!\nPRESS F4 TO ESCAPE TO THE MAIN MENU!', 32);
226+
yourtakingtoolong.setFormat(Paths.font("vcr.ttf"), 32, FlxColor.WHITE, LEFT, OUTLINE_FAST, FlxColor.BLACK);
227+
yourtakingtoolong.borderSize = 2;
228+
addBehindBar(yourtakingtoolong);
229+
}
223230
}
224231

225232
#if HSCRIPT_ALLOWED

source/states/PlayState.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6370,7 +6370,7 @@ class PlayState extends MusicBeatState
63706370
var noteDiff:Float = Math.abs(note.strumTime - Conductor.songPosition + ClientPrefs.data.ratingOffset);
63716371
vocals.volume = 1 * vocalVolumeMultiplier;
63726372

6373-
if (!ClientPrefs.data.comboStacking && comboGroup.members.length > 0 || comboGroup.members.length > 50)
6373+
if (!ClientPrefs.data.comboStacking && comboGroup.members.length > 0 || comboGroup.members.length > 1000)
63746374
{
63756375
for (spr in comboGroup)
63766376
{
@@ -6379,8 +6379,8 @@ class PlayState extends MusicBeatState
63796379
comboGroup.remove(spr);
63806380
spr.destroy();
63816381
}
6382-
if (comboGroup.members.length > 200) comboGroup.clear();
63836382
}
6383+
if (comboGroup.members.length > 200) comboGroup.clear();
63846384

63856385
var placement:Float = FlxG.width * 0.35;
63866386
var rating:FlxSprite = new FlxSprite();

0 commit comments

Comments
 (0)