diff --git a/assets/data/charts/test/modchart.hx b/assets/data/charts/test/modchart.hx new file mode 100644 index 00000000..a7886b1f --- /dev/null +++ b/assets/data/charts/test/modchart.hx @@ -0,0 +1,3 @@ +function create() { + importScript("data/scripts/pixel"); +} \ No newline at end of file diff --git a/assets/data/scripts/pixel.hx b/assets/data/scripts/pixel.hx index eb7868c9..55fd1a61 100644 --- a/assets/data/scripts/pixel.hx +++ b/assets/data/scripts/pixel.hx @@ -9,7 +9,9 @@ var daPixelZoom = 6; // strum.animation.add("scroll", [6 + strum.ID]); // } +var song = PlayState.SONG.song.toLowerCase(); function onNoteCreation(event) { + if (song == "test" && event.note.mustPress) return; event.cancel(); var note = event.note; @@ -25,6 +27,7 @@ function onNoteCreation(event) { note.updateHitbox(); } function onStrumCreation(event) { + if (song == "test" && event.player == 1) return; event.cancel(); var strum = event.strum; diff --git a/assets/images/game/NOTE_assets.png b/assets/images/game/NOTE_assets.png index 7777b7ed..935955cf 100644 Binary files a/assets/images/game/NOTE_assets.png and b/assets/images/game/NOTE_assets.png differ diff --git a/assets/images/game/NOTE_assets.xml b/assets/images/game/NOTE_assets.xml index 804182be..099fcaa5 100644 --- a/assets/images/game/NOTE_assets.xml +++ b/assets/images/game/NOTE_assets.xml @@ -1,53 +1,92 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/songs/test/Voices.mp3 b/assets/songs/test/Voices.mp3 index 96252663..70ea05e0 100644 Binary files a/assets/songs/test/Voices.mp3 and b/assets/songs/test/Voices.mp3 differ diff --git a/assets/songs/test/Voices.ogg b/assets/songs/test/Voices.ogg index 49f0f5d1..47ce763c 100644 Binary files a/assets/songs/test/Voices.ogg and b/assets/songs/test/Voices.ogg differ diff --git a/buildnumber.txt b/buildnumber.txt index dab082fe..4d642625 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -1095 \ No newline at end of file +1102 \ No newline at end of file diff --git a/source/funkin/game/Note.hx b/source/funkin/game/Note.hx index 0ae24d8e..47ab06fe 100644 --- a/source/funkin/game/Note.hx +++ b/source/funkin/game/Note.hx @@ -1,5 +1,6 @@ package funkin.game; +import flixel.FlxG; import flixel.FlxCamera; import flixel.FlxSprite; import flixel.graphics.frames.FlxAtlasFrames; @@ -209,8 +210,13 @@ class Note extends FlxSprite // is long sustain lastScrollSpeed = scrollSpeed; - scale.y = stepLength / 100 * 1.5 * scrollSpeed * 0.7; + // scale.y = stepLength / 100 * 1.5 * scrollSpeed * 0.7; + scale.y = (stepLength * (0.45 * FlxMath.roundDecimal(scrollSpeed, 2))) / frameHeight; updateHitbox(); + if (antialiasing && !FlxG.forceNoAntialiasing) { + // dumbass antialiasing + scale.y += 3 / frameHeight; + } } if (!wasGoodHit) return;