Skip to content

Commit 3d4130b

Browse files
xd
1 parent 6e7cadd commit 3d4130b

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

source/Note.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ class Note extends FlxSprite
173173
if (!pixelNote && texture != value)
174174
{
175175
changeSize = false;
176-
if (!Paths.noteSkinFramesMap.exists(value)) Paths.initNote(4, value);
176+
if (!Paths.noteSkinFramesMap.exists(value)) Paths.initNote(value);
177177
if (frames != @:privateAccess Paths.noteSkinFramesMap.get(value)) frames = @:privateAccess Paths.noteSkinFramesMap.get(value);
178178
if (animation != @:privateAccess Paths.noteSkinAnimsMap.get(value)) animation.copyFrom(@:privateAccess Paths.noteSkinAnimsMap.get(value));
179179

source/Paths.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,15 @@ class Paths
8787
trace(defaultSkin);
8888
}
8989

90-
public static function initNote(keys:Int = 4, ?noteSkin:String)
90+
public static function initNote(?noteSkin:String)
9191
{
9292
// Do this to be able to just copy over the note animations and not reallocate it
9393
if (noteSkin.length < 1) noteSkin = defaultSkin;
9494
var spr:FlxSprite = new FlxSprite();
9595
spr.frames = getSparrowAtlas(noteSkin.length > 1 ? noteSkin : defaultSkin);
9696

9797
// Use a for loop for adding all of the animations in the note spritesheet, otherwise it won't find the animations for the next recycle
98-
for (d in 0...keys)
98+
for (d in 0...Note.colArray.length)
9999
{
100100
if (d == 0) spr.animation.addByPrefix('purpleholdend', 'pruple end hold'); // ?????
101101
spr.animation.addByPrefix(Note.colArray[d] + 'holdend', Note.colArray[d] + ' hold end');

source/PlayState.hx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ class PlayState extends MusicBeatState
711711

712712
if (Note.globalRgbShaders.length > 0) Note.globalRgbShaders = [];
713713
Paths.initDefaultSkin(SONG.arrowSkin);
714-
Paths.initNote(4, SONG.arrowSkin);
714+
Paths.initNote(SONG.arrowSkin);
715715

716716
if(isPixelStage) {
717717
introSoundsSuffix = '-pixel';
@@ -880,7 +880,6 @@ class PlayState extends MusicBeatState
880880
if(gf != null)
881881
gf.visible = false;
882882
}
883-
callOnLuas('onCreate');
884883

885884
var file:String = Paths.json(songName + '/dialogue'); //Checks for json/Psych Engine dialogue
886885
if (OpenFlAssets.exists(file)) {
@@ -1178,6 +1177,8 @@ class PlayState extends MusicBeatState
11781177
trace ('Loading chart...');
11791178
generateSong(SONG.song, startOnTime);
11801179

1180+
callOnLuas('onCreate');
1181+
11811182
if (SONG.event7 == null || SONG.event7 == '') SONG.event7 == 'None';
11821183

11831184
if (curSong.toLowerCase() == "guns") // added this to bring back the old 2021 fnf vibes, i wish the fnf fandom revives one day :(
@@ -2894,7 +2895,7 @@ class PlayState extends MusicBeatState
28942895
noteDensity: currentMultiplier,
28952896
ignoreNote: songNotes[3] == 'Hurt Note' && gottaHitNote
28962897
};
2897-
if (swagNote.noteskin.length > 0 && !Paths.noteSkinFramesMap.exists(swagNote.noteskin)) inline Paths.initNote(4, swagNote.noteskin);
2898+
if (swagNote.noteskin.length > 0 && !Paths.noteSkinFramesMap.exists(swagNote.noteskin)) inline Paths.initNote(swagNote.noteskin);
28982899

28992900
if(!Std.isOfType(songNotes[3], String)) swagNote.noteType = ChartingState.noteTypeList[songNotes[3]]; //Backward compatibility + compatibility with Week 7 charts
29002901

source/editors/EditorPlayState.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ class EditorPlayState extends MusicBeatState
178178
FlxG.stage.addEventListener(KeyboardEvent.KEY_UP, onKeyRelease);
179179
}
180180

181-
Paths.initNote(4, PlayState.SONG.arrowSkin);
181+
Paths.initNote(PlayState.SONG.arrowSkin);
182182
Paths.initDefaultSkin(PlayState.SONG.arrowSkin);
183183
cachePopUpScore();
184184

@@ -262,7 +262,7 @@ class EditorPlayState extends MusicBeatState
262262
wasSpawned: false,
263263
ignoreNote: songNotes[3] == 'Hurt Note' && gottaHitNote
264264
};
265-
if (swagNote.noteskin.length > 0 && !Paths.noteSkinFramesMap.exists(swagNote.noteskin)) Paths.initNote(4, swagNote.noteskin);
265+
if (swagNote.noteskin.length > 0 && !Paths.noteSkinFramesMap.exists(swagNote.noteskin)) Paths.initNote(swagNote.noteskin);
266266

267267
if(!Std.isOfType(songNotes[3], String)) swagNote.noteType = ChartingState.noteTypeList[songNotes[3]]; //Backward compatibility + compatibility with Week 7 charts
268268

0 commit comments

Comments
 (0)