cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-25 08:13:45 +00:00
Code Issues Releases Wiki Activity

changing note array stuff for songload

Browse source
This commit is contained in:
Cameron Taylor 2022-01-21 17:23:12 -05:00
parent 10da0ea80f
commit 2a2d6fdf41
3 changed files with 46 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/PlayState.hx
View file

@ -1587,12 +1587,12 @@ class PlayState extends MusicBeatState
{
for (songNotes in section.sectionNotes)
{
var daStrumTime:Float = songNotes[0];
var daNoteData:Int = Std.int(songNotes[1] % 4);
var daStrumTime:Float = songNotes.strumTime;
var daNoteData:Int = Std.int(songNotes.noteData % 4);
var gottaHitNote:Bool = section.mustHitSection;
if (songNotes[1] > 3)
if (songNotes.noteData > 3)
gottaHitNote = !section.mustHitSection;
var oldNote:Note;
@ -1602,8 +1602,8 @@ class PlayState extends MusicBeatState
oldNote = null;
var swagNote:Note = new Note(daStrumTime, daNoteData, oldNote);
swagNote.sustainLength = songNotes[2];
swagNote.altNote = songNotes[3];
swagNote.sustainLength = songNotes.sustainLength;
swagNote.altNote = songNotes.altNote;
swagNote.scrollFactor.set(0, 0);
var susLength:Float = swagNote.sustainLength;

2
source/Section.hx
View file

@ -2,7 +2,7 @@ package;
typedef SwagSection =
{
var sectionNotes:Array<Dynamic>;
var sectionNotes:Array<Note>;
var lengthInSteps:Int;
var typeOfSection:Int;
var mustHitSection:Bool;

80
source/charting/ChartingState.hx
View file

@ -80,7 +80,7 @@ class ChartingState extends MusicBeatState
/*
* WILL BE THE CURRENT / LAST PLACED NOTE
**/
var curSelectedNote:Array<Dynamic>;
var curSelectedNote:Note;
var tempBpm:Float = 0;
@ -311,7 +311,7 @@ class ChartingState extends MusicBeatState
for (i in 0...SongLoad.getSong()[curSection].sectionNotes.length)
{
var note = SongLoad.getSong()[curSection].sectionNotes[i];
note[1] = (note[1] + 4) % 8;
note.noteData = (note.noteData + 4) % 8;
SongLoad.getSong()[curSection].sectionNotes[i] = note;
updateGrid();
}
@ -519,7 +519,7 @@ class ChartingState extends MusicBeatState
}
else if (wname == 'note_susLength')
{
curSelectedNote[2] = nums.value;
curSelectedNote.sustainLength = nums.value;
updateGrid();
}
else if (wname == 'section_bpm')
@ -691,24 +691,13 @@ class ChartingState extends MusicBeatState
{
if (FlxG.mouse.overlaps(note))
{
if (FlxG.keys.pressed.CONTROL)
{
selectNote(note);
}
else
{
trace('tryin to delete note...');
deleteNote(note);
}
selectNote(note);
}
});
}
else
{
if (FlxG.mouse.x > gridBG.x
&& FlxG.mouse.x < gridBG.x + gridBG.width
&& FlxG.mouse.y > gridBG.y
&& FlxG.mouse.y < gridBG.y + (GRID_SIZE * SongLoad.getSong()[curSection].lengthInSteps))
if (FlxG.mouse.overlaps(gridBG))
{
FlxG.log.add('added note');
addNote();
@ -718,6 +707,21 @@ class ChartingState extends MusicBeatState
}
}
if (FlxG.mouse.pressedRight)
{
if (FlxG.mouse.overlaps(curRenderedNotes))
{
curRenderedNotes.forEach(function(note:Note)
{
if (FlxG.mouse.overlaps(note))
{
trace('tryin to delete note...');
deleteNote(note);
}
});
}
}
if (FlxG.mouse.overlaps(gridBG))
{
dummyArrow.x = Math.floor(FlxG.mouse.x / GRID_SIZE) * GRID_SIZE;
@ -912,11 +916,8 @@ class ChartingState extends MusicBeatState
{
if (curSelectedNote != null)
{
if (curSelectedNote[2] != null)
{
curSelectedNote[2] += value;
curSelectedNote[2] = Math.max(curSelectedNote[2], 0);
}
curSelectedNote.sustainLength += value;
curSelectedNote.sustainLength = Math.max(curSelectedNote.sustainLength, 0);
}
updateNoteUI();
@ -927,14 +928,9 @@ class ChartingState extends MusicBeatState
{
if (curSelectedNote != null)
{
if (curSelectedNote[3] != null)
{
trace('ALT NOTE SHIT');
curSelectedNote[3] = !curSelectedNote[3];
trace(curSelectedNote[3]);
}
else
curSelectedNote[3] = true;
trace('ALT NOTE SHIT');
curSelectedNote.altNote = !curSelectedNote.altNote;
trace(curSelectedNote.altNote);
}
}
@ -1023,9 +1019,10 @@ class ChartingState extends MusicBeatState
for (note in SongLoad.getSong()[daSec - sectionNum].sectionNotes)
{
var strum = note[0] + Conductor.stepCrochet * (SongLoad.getSong()[daSec].lengthInSteps * sectionNum);
var strum = note.strumTime + Conductor.stepCrochet * (SongLoad.getSong()[daSec].lengthInSteps * sectionNum);
var copiedNote:Array<Dynamic> = [strum, note[1], note[2]];
var copiedNote:Note = new Note(strum, note.noteData);
copiedNote.sustainLength = note.sustainLength;
SongLoad.getSong()[daSec].sectionNotes.push(copiedNote);
}
@ -1073,7 +1070,7 @@ class ChartingState extends MusicBeatState
function updateNoteUI():Void
{
if (curSelectedNote != null)
stepperSusLength.value = curSelectedNote[2];
stepperSusLength.value = curSelectedNote.sustainLength;
}
function updateGrid():Void
@ -1098,7 +1095,7 @@ class ChartingState extends MusicBeatState
curRenderedSustains.remove(curRenderedSustains.members[0], true);
}
var sectionInfo:Array<Dynamic> = SongLoad.getSong()[curSection].sectionNotes;
var sectionInfo:Array<Note> = SongLoad.getSong()[curSection].sectionNotes;
if (SongLoad.getSong()[curSection].changeBPM && SongLoad.getSong()[curSection].bpm > 0)
{
@ -1131,9 +1128,9 @@ class ChartingState extends MusicBeatState
for (i in sectionInfo)
{
var daNoteInfo = i[1];
var daStrumTime = i[0];
var daSus = i[2];
var daNoteInfo = i.noteData;
var daStrumTime = i.strumTime;
var daSus = i.sustainLength;
var note:Note = new Note(daStrumTime, daNoteInfo % 4);
note.sustainLength = daSus;
@ -1190,7 +1187,7 @@ class ChartingState extends MusicBeatState
{
for (i in SongLoad.getSong()[curSection].sectionNotes)
{
if (i[0] == note.strumTime && i[1] % 4 == note.noteData)
if (i.strumTime == note.strumTime && i.noteData % 4 == note.noteData)
{
var placeIDK:Int = Std.int(((Math.floor(dummyArrow.y / GRID_SIZE) * GRID_SIZE)) / 40);
@ -1260,13 +1257,16 @@ class ChartingState extends MusicBeatState
FlxG.sound.play(Paths.sound('pianoStuff/piano-00' + Std.string((bullshit % 8) + 1)), FlxG.random.float(0.3, 0.6));
// trace('bullshit $bullshit'); // trace(Math.floor(dummyArrow.y / GRID_SIZE) * GRID_SIZE);
SongLoad.getSong()[curSection].sectionNotes.push([noteStrum, noteData, noteSus, noteAlt]);
var daNewNote:Note = new Note(noteStrum, noteData);
daNewNote.sustainLength = noteSus;
daNewNote.altNote = noteAlt;
SongLoad.getSong()[curSection].sectionNotes.push(daNewNote);
curSelectedNote = SongLoad.getSong()[curSection].sectionNotes[SongLoad.getSong()[curSection].sectionNotes.length - 1];
if (FlxG.keys.pressed.CONTROL)
{
SongLoad.getSong()[curSection].sectionNotes.push([noteStrum, (noteData + 4) % 8, noteSus, noteAlt]);
// SongLoad.getSong()[curSection].sectionNotes.push([noteStrum, (noteData + 4) % 8, noteSus, noteAlt]);
}
trace(noteStrum);
@ -1275,7 +1275,7 @@ class ChartingState extends MusicBeatState
updateGrid();
updateNoteUI();
autosaveSong();
// autosaveSong();
}
function getStrumTime(yPos:Float):Float