This commit is contained in:
Yoshman29
2023-03-29 13:36:40 +02:00
parent 129aa6a739
commit b2a4baa11f
3 changed files with 6 additions and 9 deletions
+2 -6
View File
@@ -53,10 +53,6 @@ class Note extends FlxSprite
* The next sustain after this one
*/
public var nextSustain:Note;
/**
* The parent note of the sustains, the top note
*/
public var parentNote:Note;
/**
* Name of the splash.
@@ -97,12 +93,13 @@ class Note extends FlxSprite
public var animSuffix:String = "";
private static function customTypePathExists(path:String) {
if (__customNoteTypeExists.exists(path))
return __customNoteTypeExists[path];
return __customNoteTypeExists[path] = Assets.exists(path);
}
public function new(strumLine:StrumLine, noteData:ChartNote, sustain:Bool = false, sustainLength:Float = 0, sustainOffset:Float = 0, ?parentNote:Null<Note> = null)
public function new(strumLine:StrumLine, noteData:ChartNote, sustain:Bool = false, sustainLength:Float = 0, sustainOffset:Float = 0)
{
super();
@@ -113,7 +110,6 @@ class Note extends FlxSprite
this.isSustainNote = sustain;
this.sustainLength = sustainLength;
this.strumLine = strumLine;
this.parentNote = parentNote;
x += 50;
// MAKE SURE ITS DEFINITELY OFF SCREEN?
+2 -1
View File
@@ -1303,13 +1303,14 @@ class PlayState extends MusicBeatState
__justPressed = CoolUtil.getDefault(event.justPressed, []);
__justReleased = CoolUtil.getDefault(event.justReleased, []);
if (__pressed.contains(true)) {
for(c in p.characters)
if (c.lastAnimContext != DANCE)
c.__lockAnimThisFrame = true;
__funcsToExec.push(function(note:Note) {
if (__pressed[note.strumID] && (note.isSustainNote && (note.parentNote != null ? note.parentNote.wasGoodHit : true)) && note.canBeHit && !note.wasGoodHit) {
if (__pressed[note.strumID] && note.isSustainNote && note.canBeHit && !note.wasGoodHit) {
goodNoteHit(p, note);
}
});
+2 -2
View File
@@ -79,14 +79,14 @@ class StrumLine extends FlxTypedGroup<Strum> {
public function generate(strumLine:ChartStrumLine) {
if (strumLine.notes != null) for(note in strumLine.notes) {
var parentNote:Note = notes.add(new Note(this, note, false));
notes.add(new Note(this, note, false));
if (note.sLen > Conductor.stepCrochet * 0.75) {
var len:Float = note.sLen;
var curLen:Float = 0;
while(len > 10) {
curLen = Math.min(len, Conductor.stepCrochet);
notes.add(new Note(this, note, true, curLen, note.sLen - len, parentNote));
notes.add(new Note(this, note, true, curLen, note.sLen - len));
len -= curLen;
}
}