diff --git a/assets/shared/images/dokistuff/bad-pixel.png b/assets/shared/images/dokistuff/bad-pixel.png new file mode 100644 index 00000000000..91001f645e9 Binary files /dev/null and b/assets/shared/images/dokistuff/bad-pixel.png differ diff --git a/assets/shared/images/dokistuff/combo-pixel.png b/assets/shared/images/dokistuff/combo-pixel.png new file mode 100644 index 00000000000..f72c678f09d Binary files /dev/null and b/assets/shared/images/dokistuff/combo-pixel.png differ diff --git a/assets/shared/images/dokistuff/good-pixel.png b/assets/shared/images/dokistuff/good-pixel.png new file mode 100644 index 00000000000..a44147ee05f Binary files /dev/null and b/assets/shared/images/dokistuff/good-pixel.png differ diff --git a/assets/shared/images/dokistuff/marv-pixel.png b/assets/shared/images/dokistuff/marv-pixel.png new file mode 100644 index 00000000000..572c665fa65 Binary files /dev/null and b/assets/shared/images/dokistuff/marv-pixel.png differ diff --git a/assets/shared/images/dokistuff/num0-pixel.png b/assets/shared/images/dokistuff/num0-pixel.png new file mode 100644 index 00000000000..45760ba41f3 Binary files /dev/null and b/assets/shared/images/dokistuff/num0-pixel.png differ diff --git a/assets/shared/images/dokistuff/num1-pixel.png b/assets/shared/images/dokistuff/num1-pixel.png new file mode 100644 index 00000000000..46b6e1924d4 Binary files /dev/null and b/assets/shared/images/dokistuff/num1-pixel.png differ diff --git a/assets/shared/images/dokistuff/num2-pixel.png b/assets/shared/images/dokistuff/num2-pixel.png new file mode 100644 index 00000000000..db8d6b48df8 Binary files /dev/null and b/assets/shared/images/dokistuff/num2-pixel.png differ diff --git a/assets/shared/images/dokistuff/num3-pixel.png b/assets/shared/images/dokistuff/num3-pixel.png new file mode 100644 index 00000000000..2dd73cc505d Binary files /dev/null and b/assets/shared/images/dokistuff/num3-pixel.png differ diff --git a/assets/shared/images/dokistuff/num4-pixel.png b/assets/shared/images/dokistuff/num4-pixel.png new file mode 100644 index 00000000000..bd2b5cde547 Binary files /dev/null and b/assets/shared/images/dokistuff/num4-pixel.png differ diff --git a/assets/shared/images/dokistuff/num5-pixel.png b/assets/shared/images/dokistuff/num5-pixel.png new file mode 100644 index 00000000000..3cb566eb459 Binary files /dev/null and b/assets/shared/images/dokistuff/num5-pixel.png differ diff --git a/assets/shared/images/dokistuff/num6-pixel.png b/assets/shared/images/dokistuff/num6-pixel.png new file mode 100644 index 00000000000..729f2c2cf4c Binary files /dev/null and b/assets/shared/images/dokistuff/num6-pixel.png differ diff --git a/assets/shared/images/dokistuff/num7-pixel.png b/assets/shared/images/dokistuff/num7-pixel.png new file mode 100644 index 00000000000..da16cffc97a Binary files /dev/null and b/assets/shared/images/dokistuff/num7-pixel.png differ diff --git a/assets/shared/images/dokistuff/num8-pixel.png b/assets/shared/images/dokistuff/num8-pixel.png new file mode 100644 index 00000000000..9453c01bcdb Binary files /dev/null and b/assets/shared/images/dokistuff/num8-pixel.png differ diff --git a/assets/shared/images/dokistuff/num9-pixel.png b/assets/shared/images/dokistuff/num9-pixel.png new file mode 100644 index 00000000000..0305d7a36c8 Binary files /dev/null and b/assets/shared/images/dokistuff/num9-pixel.png differ diff --git a/assets/shared/images/dokistuff/shit-pixel.png b/assets/shared/images/dokistuff/shit-pixel.png new file mode 100644 index 00000000000..2e9e9a566ba Binary files /dev/null and b/assets/shared/images/dokistuff/shit-pixel.png differ diff --git a/assets/shared/images/dokistuff/sick-pixel.png b/assets/shared/images/dokistuff/sick-pixel.png new file mode 100644 index 00000000000..3b74379b153 Binary files /dev/null and b/assets/shared/images/dokistuff/sick-pixel.png differ diff --git a/assets/shared/images/goldstuff/marv-pixel.png b/assets/shared/images/goldstuff/marv-pixel.png new file mode 100644 index 00000000000..5b65b3e3641 Binary files /dev/null and b/assets/shared/images/goldstuff/marv-pixel.png differ diff --git a/assets/shared/images/goldstuff/num0-pixel.png b/assets/shared/images/goldstuff/num0-pixel.png new file mode 100644 index 00000000000..92ad7e5996f Binary files /dev/null and b/assets/shared/images/goldstuff/num0-pixel.png differ diff --git a/assets/shared/images/goldstuff/num1-pixel.png b/assets/shared/images/goldstuff/num1-pixel.png new file mode 100644 index 00000000000..0a99affa066 Binary files /dev/null and b/assets/shared/images/goldstuff/num1-pixel.png differ diff --git a/assets/shared/images/goldstuff/num2-pixel.png b/assets/shared/images/goldstuff/num2-pixel.png new file mode 100644 index 00000000000..8ca46e6ab40 Binary files /dev/null and b/assets/shared/images/goldstuff/num2-pixel.png differ diff --git a/assets/shared/images/goldstuff/num3-pixel.png b/assets/shared/images/goldstuff/num3-pixel.png new file mode 100644 index 00000000000..242f5bb4df7 Binary files /dev/null and b/assets/shared/images/goldstuff/num3-pixel.png differ diff --git a/assets/shared/images/goldstuff/num4-pixel.png b/assets/shared/images/goldstuff/num4-pixel.png new file mode 100644 index 00000000000..f38697e5ec4 Binary files /dev/null and b/assets/shared/images/goldstuff/num4-pixel.png differ diff --git a/assets/shared/images/goldstuff/num5-pixel.png b/assets/shared/images/goldstuff/num5-pixel.png new file mode 100644 index 00000000000..2ad7d54d030 Binary files /dev/null and b/assets/shared/images/goldstuff/num5-pixel.png differ diff --git a/assets/shared/images/goldstuff/num6-pixel.png b/assets/shared/images/goldstuff/num6-pixel.png new file mode 100644 index 00000000000..6222d0728be Binary files /dev/null and b/assets/shared/images/goldstuff/num6-pixel.png differ diff --git a/assets/shared/images/goldstuff/num7-pixel.png b/assets/shared/images/goldstuff/num7-pixel.png new file mode 100644 index 00000000000..f1502c644e3 Binary files /dev/null and b/assets/shared/images/goldstuff/num7-pixel.png differ diff --git a/assets/shared/images/goldstuff/num8-pixel.png b/assets/shared/images/goldstuff/num8-pixel.png new file mode 100644 index 00000000000..d5dbeae7c3b Binary files /dev/null and b/assets/shared/images/goldstuff/num8-pixel.png differ diff --git a/assets/shared/images/goldstuff/num9-pixel.png b/assets/shared/images/goldstuff/num9-pixel.png new file mode 100644 index 00000000000..8944bbb9553 Binary files /dev/null and b/assets/shared/images/goldstuff/num9-pixel.png differ diff --git a/assets/shared/images/goldstuff/sick-pixel.png b/assets/shared/images/goldstuff/sick-pixel.png new file mode 100644 index 00000000000..5b65b3e3641 Binary files /dev/null and b/assets/shared/images/goldstuff/sick-pixel.png differ diff --git a/assets/shared/images/kadethings/bad-pixel.png b/assets/shared/images/kadethings/bad-pixel.png new file mode 100644 index 00000000000..954074262cf Binary files /dev/null and b/assets/shared/images/kadethings/bad-pixel.png differ diff --git a/assets/shared/images/kadethings/combo-pixel.png b/assets/shared/images/kadethings/combo-pixel.png new file mode 100644 index 00000000000..f72c678f09d Binary files /dev/null and b/assets/shared/images/kadethings/combo-pixel.png differ diff --git a/assets/shared/images/kadethings/good-pixel.png b/assets/shared/images/kadethings/good-pixel.png new file mode 100644 index 00000000000..2f5362f7352 Binary files /dev/null and b/assets/shared/images/kadethings/good-pixel.png differ diff --git a/assets/shared/images/kadethings/marv-pixel.png b/assets/shared/images/kadethings/marv-pixel.png new file mode 100644 index 00000000000..572c665fa65 Binary files /dev/null and b/assets/shared/images/kadethings/marv-pixel.png differ diff --git a/assets/shared/images/kadethings/num0-pixel.png b/assets/shared/images/kadethings/num0-pixel.png new file mode 100644 index 00000000000..45760ba41f3 Binary files /dev/null and b/assets/shared/images/kadethings/num0-pixel.png differ diff --git a/assets/shared/images/kadethings/num1-pixel.png b/assets/shared/images/kadethings/num1-pixel.png new file mode 100644 index 00000000000..46b6e1924d4 Binary files /dev/null and b/assets/shared/images/kadethings/num1-pixel.png differ diff --git a/assets/shared/images/kadethings/num2-pixel.png b/assets/shared/images/kadethings/num2-pixel.png new file mode 100644 index 00000000000..db8d6b48df8 Binary files /dev/null and b/assets/shared/images/kadethings/num2-pixel.png differ diff --git a/assets/shared/images/kadethings/num3-pixel.png b/assets/shared/images/kadethings/num3-pixel.png new file mode 100644 index 00000000000..2dd73cc505d Binary files /dev/null and b/assets/shared/images/kadethings/num3-pixel.png differ diff --git a/assets/shared/images/kadethings/num4-pixel.png b/assets/shared/images/kadethings/num4-pixel.png new file mode 100644 index 00000000000..bd2b5cde547 Binary files /dev/null and b/assets/shared/images/kadethings/num4-pixel.png differ diff --git a/assets/shared/images/kadethings/num5-pixel.png b/assets/shared/images/kadethings/num5-pixel.png new file mode 100644 index 00000000000..3cb566eb459 Binary files /dev/null and b/assets/shared/images/kadethings/num5-pixel.png differ diff --git a/assets/shared/images/kadethings/num6-pixel.png b/assets/shared/images/kadethings/num6-pixel.png new file mode 100644 index 00000000000..729f2c2cf4c Binary files /dev/null and b/assets/shared/images/kadethings/num6-pixel.png differ diff --git a/assets/shared/images/kadethings/num7-pixel.png b/assets/shared/images/kadethings/num7-pixel.png new file mode 100644 index 00000000000..da16cffc97a Binary files /dev/null and b/assets/shared/images/kadethings/num7-pixel.png differ diff --git a/assets/shared/images/kadethings/num8-pixel.png b/assets/shared/images/kadethings/num8-pixel.png new file mode 100644 index 00000000000..9453c01bcdb Binary files /dev/null and b/assets/shared/images/kadethings/num8-pixel.png differ diff --git a/assets/shared/images/kadethings/num9-pixel.png b/assets/shared/images/kadethings/num9-pixel.png new file mode 100644 index 00000000000..0305d7a36c8 Binary files /dev/null and b/assets/shared/images/kadethings/num9-pixel.png differ diff --git a/assets/shared/images/kadethings/shit-pixel.png b/assets/shared/images/kadethings/shit-pixel.png new file mode 100644 index 00000000000..e8719c46d84 Binary files /dev/null and b/assets/shared/images/kadethings/shit-pixel.png differ diff --git a/assets/shared/images/kadethings/sick-pixel.png b/assets/shared/images/kadethings/sick-pixel.png new file mode 100644 index 00000000000..6b67fbc4326 Binary files /dev/null and b/assets/shared/images/kadethings/sick-pixel.png differ diff --git a/assets/shared/images/pixelUI/NOTE_assets_colored.png b/assets/shared/images/pixelUI/NOTE_assets_colored.png new file mode 100644 index 00000000000..cc738291a42 Binary files /dev/null and b/assets/shared/images/pixelUI/NOTE_assets_colored.png differ diff --git a/assets/shared/images/pixelUI/NOTE_assets_coloredENDS.png b/assets/shared/images/pixelUI/NOTE_assets_coloredENDS.png new file mode 100644 index 00000000000..6bafd91215b Binary files /dev/null and b/assets/shared/images/pixelUI/NOTE_assets_coloredENDS.png differ diff --git a/assets/shared/images/pixelUI/NOTE_assets_doki.png b/assets/shared/images/pixelUI/NOTE_assets_doki.png new file mode 100644 index 00000000000..266ca18103b Binary files /dev/null and b/assets/shared/images/pixelUI/NOTE_assets_doki.png differ diff --git a/assets/shared/images/pixelUI/NOTE_assets_dokiENDS.png b/assets/shared/images/pixelUI/NOTE_assets_dokiENDS.png new file mode 100644 index 00000000000..ee01bad285c Binary files /dev/null and b/assets/shared/images/pixelUI/NOTE_assets_dokiENDS.png differ diff --git a/assets/shared/images/pixelUI/RED_NOTE_assets.png b/assets/shared/images/pixelUI/RED_NOTE_assets.png new file mode 100644 index 00000000000..cc738291a42 Binary files /dev/null and b/assets/shared/images/pixelUI/RED_NOTE_assets.png differ diff --git a/assets/shared/images/pixelUI/RED_NOTE_assetsENDS.png b/assets/shared/images/pixelUI/RED_NOTE_assetsENDS.png new file mode 100644 index 00000000000..6bafd91215b Binary files /dev/null and b/assets/shared/images/pixelUI/RED_NOTE_assetsENDS.png differ diff --git a/assets/shared/images/pixelUI/marv-pixel.png b/assets/shared/images/pixelUI/marv-pixel.png new file mode 100644 index 00000000000..572c665fa65 Binary files /dev/null and b/assets/shared/images/pixelUI/marv-pixel.png differ diff --git a/assets/shared/images/tgtstuff/bad-pixel.png b/assets/shared/images/tgtstuff/bad-pixel.png new file mode 100644 index 00000000000..1d7753964f0 Binary files /dev/null and b/assets/shared/images/tgtstuff/bad-pixel.png differ diff --git a/assets/shared/images/tgtstuff/combo-pixel.png b/assets/shared/images/tgtstuff/combo-pixel.png new file mode 100644 index 00000000000..0cc55baf96d Binary files /dev/null and b/assets/shared/images/tgtstuff/combo-pixel.png differ diff --git a/assets/shared/images/tgtstuff/good-pixel.png b/assets/shared/images/tgtstuff/good-pixel.png new file mode 100644 index 00000000000..085ba6d8eaf Binary files /dev/null and b/assets/shared/images/tgtstuff/good-pixel.png differ diff --git a/assets/shared/images/tgtstuff/marv-pixel.png b/assets/shared/images/tgtstuff/marv-pixel.png new file mode 100644 index 00000000000..572c665fa65 Binary files /dev/null and b/assets/shared/images/tgtstuff/marv-pixel.png differ diff --git a/assets/shared/images/tgtstuff/num0-pixel.png b/assets/shared/images/tgtstuff/num0-pixel.png new file mode 100644 index 00000000000..131cb993440 Binary files /dev/null and b/assets/shared/images/tgtstuff/num0-pixel.png differ diff --git a/assets/shared/images/tgtstuff/num1-pixel.png b/assets/shared/images/tgtstuff/num1-pixel.png new file mode 100644 index 00000000000..ba3aebbc535 Binary files /dev/null and b/assets/shared/images/tgtstuff/num1-pixel.png differ diff --git a/assets/shared/images/tgtstuff/num2-pixel.png b/assets/shared/images/tgtstuff/num2-pixel.png new file mode 100644 index 00000000000..a503e879233 Binary files /dev/null and b/assets/shared/images/tgtstuff/num2-pixel.png differ diff --git a/assets/shared/images/tgtstuff/num3-pixel.png b/assets/shared/images/tgtstuff/num3-pixel.png new file mode 100644 index 00000000000..8e1e2fb07c3 Binary files /dev/null and b/assets/shared/images/tgtstuff/num3-pixel.png differ diff --git a/assets/shared/images/tgtstuff/num4-pixel.png b/assets/shared/images/tgtstuff/num4-pixel.png new file mode 100644 index 00000000000..c2c16f094be Binary files /dev/null and b/assets/shared/images/tgtstuff/num4-pixel.png differ diff --git a/assets/shared/images/tgtstuff/num5-pixel.png b/assets/shared/images/tgtstuff/num5-pixel.png new file mode 100644 index 00000000000..3e75f1feedd Binary files /dev/null and b/assets/shared/images/tgtstuff/num5-pixel.png differ diff --git a/assets/shared/images/tgtstuff/num6-pixel.png b/assets/shared/images/tgtstuff/num6-pixel.png new file mode 100644 index 00000000000..47bd2ec5795 Binary files /dev/null and b/assets/shared/images/tgtstuff/num6-pixel.png differ diff --git a/assets/shared/images/tgtstuff/num7-pixel.png b/assets/shared/images/tgtstuff/num7-pixel.png new file mode 100644 index 00000000000..3d31c9a5987 Binary files /dev/null and b/assets/shared/images/tgtstuff/num7-pixel.png differ diff --git a/assets/shared/images/tgtstuff/num8-pixel.png b/assets/shared/images/tgtstuff/num8-pixel.png new file mode 100644 index 00000000000..4786d8fab6a Binary files /dev/null and b/assets/shared/images/tgtstuff/num8-pixel.png differ diff --git a/assets/shared/images/tgtstuff/num9-pixel.png b/assets/shared/images/tgtstuff/num9-pixel.png new file mode 100644 index 00000000000..355c4affd61 Binary files /dev/null and b/assets/shared/images/tgtstuff/num9-pixel.png differ diff --git a/assets/shared/images/tgtstuff/shit-pixel.png b/assets/shared/images/tgtstuff/shit-pixel.png new file mode 100644 index 00000000000..729e3034957 Binary files /dev/null and b/assets/shared/images/tgtstuff/shit-pixel.png differ diff --git a/assets/shared/images/tgtstuff/sick-pixel.png b/assets/shared/images/tgtstuff/sick-pixel.png new file mode 100644 index 00000000000..762ab103d90 Binary files /dev/null and b/assets/shared/images/tgtstuff/sick-pixel.png differ diff --git a/source/PlayState.hx b/source/PlayState.hx index 12c28488310..06d365b7203 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -7257,17 +7257,14 @@ if (ClientPrefs.showNPS) { if (allSicks && ClientPrefs.marvRateColor == 'Golden' && noteDiff < ClientPrefs.sickWindow && ClientPrefs.hudType != 'Tails Gets Trolled V4' && ClientPrefs.hudType != 'Doki Doki+' && !ClientPrefs.noMarvJudge) { pixelShitPart1 = 'goldstuff/'; - pixelShitPart2 = ''; } if (!allSicks && ClientPrefs.marvRateColor == 'Golden' && noteDiff < ClientPrefs.marvWindow && ClientPrefs.hudType != 'Tails Gets Trolled V4' && ClientPrefs.hudType != 'Doki Doki+' && !ClientPrefs.noMarvJudge) { pixelShitPart1 = 'goldstuff/'; - pixelShitPart2 = ''; } if (!allSicks && ClientPrefs.marvRateColor == 'Rainbow' && noteDiff < ClientPrefs.marvWindow && ClientPrefs.hudType != 'Tails Gets Trolled V4' && ClientPrefs.hudType != 'Doki Doki+' && !ClientPrefs.noMarvJudge) { pixelShitPart1 = ''; - pixelShitPart2 = ''; } if (ClientPrefs.ratesAndCombo) { var rating = new FlxSprite().loadGraphic(Paths.image(pixelShitPart1 + daRating.image + pixelShitPart2)); diff --git a/source/StrumNote.hx b/source/StrumNote.hx index fb7427b91e8..4e36c06c78a 100644 --- a/source/StrumNote.hx +++ b/source/StrumNote.hx @@ -47,8 +47,6 @@ class StrumNote extends FlxSprite var skin:String = 'NOTE_assets'; if(PlayState.instance != null && PlayState.SONG.arrowSkin != null && PlayState.SONG.arrowSkin.length > 1) skin = PlayState.SONG.arrowSkin; - if (!PlayState.isPixelStage) - { if(ClientPrefs.noteStyleThing == 'VS Nonsense V2') { skin = 'Nonsense_NOTE_assets'; } @@ -76,7 +74,6 @@ class StrumNote extends FlxSprite if(ClientPrefs.noteColorStyle == 'Char-Based') { skin = 'NOTE_assets_colored'; } - } texture = skin; //Load texture and anims scrollFactor.set(); diff --git a/source/editors/ChartingState.hx b/source/editors/ChartingState.hx index 0fe4cdac8ff..d3f79fa351a 100644 --- a/source/editors/ChartingState.hx +++ b/source/editors/ChartingState.hx @@ -1187,7 +1187,7 @@ class ChartingState extends MusicBeatState if(value == 0) { return; } - if(Math.isNaN(_song.notes[curSection].sectionNotes.length)) { + if(_song.notes[curSection].sectionNotes.length < 1 || Math.isNaN(_song.notes[curSection].sectionNotes.length)) { trace ("HEY! your section doesn't have any notes! please place at least 1 note then try using this."); return; //prevent a crash if the section doesn't have any notes } @@ -1657,9 +1657,11 @@ class ChartingState extends MusicBeatState }; lilBuddiesBox = new FlxUICheckBox(mouseScrollingQuant.x + 150, mouseScrollingQuant.y, null, null, "Lil' Buddies", 100); - lilBuddiesBox.checked = true; + if (FlxG.save.data.lilBuddies == null) FlxG.save.data.lilBuddies = false; + lilBuddiesBox.checked = FlxG.save.data.lilBuddies; lilBuddiesBox.callback = function() { + FlxG.save.data.lilBuddies = lilBuddiesBox.checked; lilBf.visible = lilBuddiesBox.checked; lilOpp.visible = lilBuddiesBox.checked; lilStage.visible = lilBuddiesBox.checked; @@ -2628,7 +2630,7 @@ class ChartingState extends MusicBeatState var data:Int = note.noteData % 4; var noteDataToCheck:Int = note.noteData; if(noteDataToCheck > -1 && note.mustPress != _song.notes[curSec].mustHitSection) noteDataToCheck += 4; - if (ClientPrefs.enableColorShader || ClientPrefs.showNotes && ClientPrefs.enableColorShader) + if ((ClientPrefs.enableColorShader || ClientPrefs.showNotes && ClientPrefs.enableColorShader) && vortex) strumLineNotes.members[noteDataToCheck].playAnim('confirm', true, note.colorSwap.hue, note.colorSwap.saturation, note.colorSwap.brightness); else strumLineNotes.members[noteDataToCheck].playAnim('confirm', true); @@ -2646,7 +2648,7 @@ class ChartingState extends MusicBeatState } data = note.noteData; - if (note.mustPress) { + if (note.mustPress && lilBuddiesBox.checked) { if (ClientPrefs.enableColorShader || ClientPrefs.showNotes && ClientPrefs.enableColorShader) { lilBuddiesColorSwap.hue = note.colorSwap.hue; @@ -2655,7 +2657,7 @@ class ChartingState extends MusicBeatState } lilBf.animation.play("" + (data % 4), true); } - if (!note.mustPress) + if (!note.mustPress && lilBuddiesBox.checked) { if (ClientPrefs.enableColorShader || ClientPrefs.showNotes && ClientPrefs.enableColorShader) {