From 9ee2b7ffd6e721cfa5d30bedef752686b8053995 Mon Sep 17 00:00:00 2001 From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com> Date: Fri, 11 Nov 2022 01:19:01 +0100 Subject: [PATCH] fixed psych events trying to be added as normal notes --- buildnumber.txt | 2 +- source/funkin/game/Note.hx | 5 +++++ source/funkin/game/PlayState.hx | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/buildnumber.txt b/buildnumber.txt index cc009011..1b01ac63 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -1277 \ No newline at end of file +1279 \ No newline at end of file diff --git a/source/funkin/game/Note.hx b/source/funkin/game/Note.hx index 809bddfb..852f4e05 100644 --- a/source/funkin/game/Note.hx +++ b/source/funkin/game/Note.hx @@ -27,6 +27,11 @@ class Note extends FlxSprite public var tooLate:Bool = false; public var wasGoodHit:Bool = false; + /** + * Whenever that note should be avoided by Botplay. + */ + public var avoid:Bool = false; + /** * The note that comes before this one (sustain and not) */ diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 99de6412..1a69f284 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -554,6 +554,8 @@ class PlayState extends MusicBeatState if (songNotes == null) continue; var daStrumTime:Float = songNotes[0]; var daNoteData:Int = Std.int(songNotes[1] % 8); + + if (daNoteData < 0) continue; var daNoteType:Int = Std.int(songNotes[1] / 8); var gottaHitNote:Bool = daNoteData >= 4 ? !section.mustHitSection : section.mustHitSection;