Skip to content

Commit 2d396a5

Browse files
committed
last minute fixes
1 parent 3ac8741 commit 2d396a5

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
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');
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/objects/charting/ChartingStrumNote.hx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,11 @@ class ChartingStrumNote extends FlxSprite
138138
}
139139
else
140140
{
141+
var ogSkin:String = texture;
142+
if (texture == 'noteSkins/NOTE_assets')
143+
texture = 'noteSkins/' + (PlayState.isPixelStage ? ogSkin : 'strums');
144+
141145
frames = Paths.getSparrowAtlas(texture);
142-
143146
antialiasing = ClientPrefs.data.antialiasing;
144147
setGraphicSize(Std.int(width * Note.scales[PlayState.mania]));
145148
animationArray[0] = Note.keysShit.get(PlayState.mania).get('strumAnims')[noteData];

source/options/ControlsSubState.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ class ControlsSubState extends MusicBeatSubstate
279279
options.push([true]);
280280
options.push([true, defaultKey]);
281281

282-
bg = new FlxSprite().loadGraphic(Paths.image('menuDesat'));
282+
bg = new FlxSprite().loadGraphic(ClientPrefs.getBGImage());
283283
bg.color = keyboardColor;
284284
bg.antialiasing = ClientPrefs.data.antialiasing;
285285
bg.screenCenter();
@@ -298,7 +298,7 @@ class ControlsSubState extends MusicBeatSubstate
298298
grpBlacks = new FlxTypedGroup<AttachedSprite>();
299299
add(grpBlacks);
300300
selectSpr = new AttachedSprite();
301-
selectSpr.makeGraphic(250, 78, FlxColor.WHITE);
301+
selectSpr.makeGraphic(250, 78, ClientPrefs.data.menuTheme == "Dark" ? FlxColor.BLACK : FlxColor.WHITE);
302302
selectSpr.copyAlpha = false;
303303
selectSpr.alpha = 0.75;
304304
add(selectSpr);

source/options/LanguageSubState.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class LanguageSubState extends MusicBeatSubstate
1313
{
1414
super();
1515

16-
var bg = new FlxSprite().loadGraphic(Paths.image('menuDesat'));
16+
var bg = new FlxSprite().loadGraphic(ClientPrefs.getBGImage());
1717
bg.color = 0xFFea71fd;
1818
bg.antialiasing = ClientPrefs.data.antialiasing;
1919
bg.screenCenter();

source/options/NotesColorSubState.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class NotesColorSubState extends MusicBeatSubstate
6060
Cursor.show();
6161

6262
onPixel = PlayState.isPixelStage;
63-
var bg:FlxSprite = new FlxSprite().loadGraphic(Paths.image('menuDesat'));
63+
var bg:FlxSprite = new FlxSprite().loadGraphic(ClientPrefs.getBGImage());
6464
bg.color = 0xFFEA71FD;
6565
bg.screenCenter();
6666
bg.antialiasing = ClientPrefs.data.antialiasing;
@@ -655,7 +655,7 @@ class NotesColorSubState extends MusicBeatSubstate
655655
for (i in 0...Note.colArray.length)
656656
{
657657
if(!onPixel) bigNote.animation.addByPrefix('note$i', Note.colArray[i] + '0', 24, true);
658-
else bigNote.animation.add('note$i', [i + 4], 24, true);
658+
else bigNote.animation.add('note$i', [i + 5], 24, true);
659659
}
660660
insert(members.indexOf(myNotes) + 1, bigNote);
661661
_storedColor = getShaderColor();

0 commit comments

Comments
 (0)