From 08a8042b0aaf3da440c9f84417dc801e552c2265 Mon Sep 17 00:00:00 2001 From: Joalor64 Date: Wed, 19 Jun 2024 11:51:32 -0400 Subject: [PATCH] lur --- source/meta/data/options/LanguageState.hx | 5 ----- source/objects/userinterface/note/Note.hx | 4 ---- source/objects/userinterface/note/StrumNote.hx | 5 +++++ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/source/meta/data/options/LanguageState.hx b/source/meta/data/options/LanguageState.hx index ebfad479..af2f46be 100644 --- a/source/meta/data/options/LanguageState.hx +++ b/source/meta/data/options/LanguageState.hx @@ -85,11 +85,6 @@ class LanguageState extends MusicBeatState add(icon); } - var versionShit:FlxText = new FlxText(12, FlxG.height - 24, 0, "NOTE: Language support does work, but the actual data for the languages hasn't been added yet.", 12); - versionShit.scrollFactor.set(); - versionShit.setFormat(Paths.font('vcr.ttf'), 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); - add(versionShit); - changeSelection(); } diff --git a/source/objects/userinterface/note/Note.hx b/source/objects/userinterface/note/Note.hx index a866e49c..0c2003ef 100644 --- a/source/objects/userinterface/note/Note.hx +++ b/source/objects/userinterface/note/Note.hx @@ -258,11 +258,9 @@ class Note extends FlxSprite if(texture.length < 1) { skin = PlayState.SONG.arrowSkin; if(skin == null || skin.length < 1) { - /* skin = 'noteskins/NOTE_assets-${ClientPrefs.noteSkin.toLowerCase()}'; } if(ClientPrefs.noteSkin == null) { - */ skin = 'NOTE_assets'; } } @@ -281,13 +279,11 @@ class Note extends FlxSprite defaultWidth = 157; defaultHeight = 154; if(PlayState.isPixelStage) { - /* if (FileSystem.exists(Paths.modFolders('images/pixelUI/$blahblah.png')) && FileSystem.exists(Paths.modFolders('images/pixelUI/' + blahblah + 'ENDS.png'))) { blahblah = 'noteskins/NOTE_assets-${ClientPrefs.noteSkin.toLowerCase()}'; } else { blahblah = 'NOTE_assets'; } - */ if(isSustainNote) { loadGraphic(Paths.image('pixelUI/' + blahblah + 'ENDS')); width = width / 4; diff --git a/source/objects/userinterface/note/StrumNote.hx b/source/objects/userinterface/note/StrumNote.hx index 34870326..3aaa0a13 100644 --- a/source/objects/userinterface/note/StrumNote.hx +++ b/source/objects/userinterface/note/StrumNote.hx @@ -41,6 +41,11 @@ class StrumNote extends FlxSprite } */ if(PlayState.SONG.arrowSkin != null && PlayState.SONG.arrowSkin.length > 1) skin = PlayState.SONG.arrowSkin; + switch (ClientPrefs.noteSkin) { + case 'Chip': skin = 'noteskins/NOTE_assets-chip'; + case 'Future' : skin = 'noteskins/NOTE_assets-future'; + default: skin = 'NOTE_assets'; + } shader = colorMask.shader; texture = skin; //Load texture and anims