Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-27 01:55:52 -05:00
Code Issues Projects Releases Packages Wiki Activity

easy quick reset stuff in progres

Browse source
This commit is contained in:
Cameron Taylor 2021-09-24 10:56:05 -04:00
parent dc74a434c0
commit 65bbee0e36
1 changed files with 49 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
source/PlayState.hx
View file

@ -56,7 +56,11 @@ class PlayState extends MusicBeatState
private var gf:Character; private var gf:Character;
private var boyfriend:Boyfriend; private var boyfriend:Boyfriend;
/**
* Notes that should be ON SCREEN and have UPDATES running on them!
*/
private var notes:FlxTypedGroup<Note>; private var notes:FlxTypedGroup<Note>;
private var unspawnNotes:Array<Note> = []; private var unspawnNotes:Array<Note> = [];
private var strumLine:FlxSprite; private var strumLine:FlxSprite;
@ -659,8 +663,6 @@ class PlayState extends MusicBeatState
if (dialogue != null) if (dialogue != null)
{ {
doof = new DialogueBox(false, dialogue); doof = new DialogueBox(false, dialogue);
// doof.x += 70;
// doof.y = FlxG.height * 0.5;
doof.scrollFactor.set(); doof.scrollFactor.set();
doof.finishThing = startCountdown; doof.finishThing = startCountdown;
doof.cameras = [camHUD]; doof.cameras = [camHUD];
@ -674,7 +676,6 @@ class PlayState extends MusicBeatState
strumLine.y = FlxG.height - 150; // 150 just random ass number lol strumLine.y = FlxG.height - 150; // 150 just random ass number lol
strumLine.scrollFactor.set(); strumLine.scrollFactor.set();
strumLineNotes = new FlxTypedGroup<FlxSprite>(); strumLineNotes = new FlxTypedGroup<FlxSprite>();
add(strumLineNotes); add(strumLineNotes);
@ -1403,7 +1404,14 @@ class PlayState extends MusicBeatState
generateStaticArrows(1); generateStaticArrows(1);
talking = false; talking = false;
restartCountdownTimer();
}
function restartCountdownTimer():Void
{
startedCountdown = true; startedCountdown = true;
Conductor.songPosition = 0; Conductor.songPosition = 0;
Conductor.songPosition -= Conductor.crochet * 5; Conductor.songPosition -= Conductor.crochet * 5;
@ -1490,7 +1498,13 @@ class PlayState extends MusicBeatState
previousFrameTime = FlxG.game.ticks; previousFrameTime = FlxG.game.ticks;
if (!paused) if (!paused)
{
if (FlxG.sound.music != null)
FlxG.sound.music.play(true);
else
FlxG.sound.playMusic(Paths.inst(SONG.song), 1, false); FlxG.sound.playMusic(Paths.inst(SONG.song), 1, false);
}
FlxG.sound.music.onComplete = endSong; FlxG.sound.music.onComplete = endSong;
vocals.play(); vocals.play();
@ -1507,15 +1521,12 @@ class PlayState extends MusicBeatState
{ {
// FlxG.log.add(ChartParser.parse()); // FlxG.log.add(ChartParser.parse());
var songData = SONG; Conductor.changeBPM(SONG.bpm);
Conductor.changeBPM(songData.bpm);
curSong = songData.song; curSong = SONG.song;
if (SONG.needsVoices) if (SONG.needsVoices)
{
vocals = new VoicesGroup(SONG.song, SONG.voiceList); vocals = new VoicesGroup(SONG.song, SONG.voiceList);
}
else else
vocals = new VoicesGroup(SONG.song, null, false); vocals = new VoicesGroup(SONG.song, null, false);
@ -1527,10 +1538,27 @@ class PlayState extends MusicBeatState
notes = new FlxTypedGroup<Note>(); notes = new FlxTypedGroup<Note>();
add(notes); add(notes);
regenNoteData();
generatedMusic = true;
}
function regenNoteData():Void
{
// make unspawn notes shit def empty
unspawnNotes = [];
notes.forEach(function(nt)
{
nt.kill();
notes.remove(nt, true);
nt.destroy();
});
var noteData:Array<SwagSection>; var noteData:Array<SwagSection>;
// NEW SHIT // NEW SHIT
noteData = songData.notes; noteData = SONG.notes;
for (section in noteData) for (section in noteData)
{ {
@ -1582,8 +1610,6 @@ class PlayState extends MusicBeatState
} }
unspawnNotes.sort(sortByShit); unspawnNotes.sort(sortByShit);
generatedMusic = true;
} }
// Now you are probably wondering why I made 2 of these very similar functions // Now you are probably wondering why I made 2 of these very similar functions
@ -1804,6 +1830,17 @@ class PlayState extends MusicBeatState
camHUD.visible = !camHUD.visible; camHUD.visible = !camHUD.visible;
if (FlxG.keys.justPressed.K) if (FlxG.keys.justPressed.K)
{ {
startingSong = true;
FlxG.sound.music.pause();
FlxG.sound.music.time = 0;
regenNoteData();
// resyncVocals();
// FlxG.sound.music.play();
restartCountdownTimer();
// FlxScreenGrab.grab(null, true, true); // FlxScreenGrab.grab(null, true, true);
/* /*
@ -2044,7 +2081,6 @@ class PlayState extends MusicBeatState
var dunceNote:Note = unspawnNotes[0]; var dunceNote:Note = unspawnNotes[0];
notes.add(dunceNote); notes.add(dunceNote);
var index:Int = unspawnNotes.indexOf(dunceNote);
unspawnNotes.shift(); unspawnNotes.shift();
} }