diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b0289f89..601265c13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,12 +12,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Other charting editor workflow improvements - More hair physics - Heads appear at top of chart editor to help show which side ur charting for +### Changed +- Tweaked code relating to inputs, hopefully making notes that are close together more fair to hit ### Removed - Removed APE ### Fixed - Old Verison popup screen weirdness ([Thanks to gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/155)) - Song no longer loops when finishing the song. ([Thanks Injourn for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/132)) -- Screen wipe being cut off in the limo/mom stage. +- Screen wipe being cut off in the limo/mom stage. Should fill the whole screen now. ## [0.2.5] - 2020-12-27 ### Added diff --git a/source/PlayState.hx b/source/PlayState.hx index c5551f0d0..368b7befb 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -1262,38 +1262,40 @@ class PlayState extends MusicBeatState if (daNote.canBeHit && daNote.mustPress && !daNote.tooLate) { possibleNotes.push(daNote); + trace(possibleNotes[0].strumTime); + possibleNotes.sort((a, b) -> Std.int(a.strumTime - b.strumTime)); + trace(possibleNotes[0].strumTime); } }); if (possibleNotes.length > 0) { - for (daNote in possibleNotes) + var daNote = possibleNotes[0]; + + if (perfectMode) + noteCheck(true, daNote); + + switch (daNote.noteData) { - if (perfectMode) - noteCheck(true, daNote); + case 2: // NOTES YOU JUST PRESSED + if (upP || rightP || downP || leftP) + noteCheck(upP, daNote); + case 3: + if (upP || rightP || downP || leftP) + noteCheck(rightP, daNote); + case 1: + if (upP || rightP || downP || leftP) + noteCheck(downP, daNote); + case 0: + if (upP || rightP || downP || leftP) + noteCheck(leftP, daNote); + } - switch (daNote.noteData) - { - case 2: // NOTES YOU JUST PRESSED - if (upP || rightP || downP || leftP) - noteCheck(upP, daNote); - case 3: - if (upP || rightP || downP || leftP) - noteCheck(rightP, daNote); - case 1: - if (upP || rightP || downP || leftP) - noteCheck(downP, daNote); - case 0: - if (upP || rightP || downP || leftP) - noteCheck(leftP, daNote); - } - - if (daNote.wasGoodHit) - { - daNote.kill(); - notes.remove(daNote, true); - daNote.destroy(); - } + if (daNote.wasGoodHit) + { + daNote.kill(); + notes.remove(daNote, true); + daNote.destroy(); } } else @@ -1312,16 +1314,16 @@ class PlayState extends MusicBeatState { // NOTES YOU ARE HOLDING case 2: - if (up && daNote.prevNote.wasGoodHit) + if (up) goodNoteHit(daNote); case 3: - if (right && daNote.prevNote.wasGoodHit) + if (right) goodNoteHit(daNote); case 1: - if (down && daNote.prevNote.wasGoodHit) + if (down) goodNoteHit(daNote); case 0: - if (left && daNote.prevNote.wasGoodHit) + if (left) goodNoteHit(daNote); } } @@ -1460,7 +1462,9 @@ class PlayState extends MusicBeatState if (keyP) goodNoteHit(note); else + { badNoteCheck(); + } } function goodNoteHit(note:Note):Void