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

Merge branch 'feature/scripted-modules' of https://github.com/ninjamuffin99/Funkin-secret into feature/scripted-modules

Browse source
This commit is contained in:
Cameron Taylor 2022-04-18 20:24:03 -04:00
parent 22de93705c 956666db85
commit 061b16bde7
2 changed files with 24 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
source/funkin/play/PlayState.hx
View file

@ -832,7 +832,6 @@ class PlayState extends MusicBeatState implements IHook
// swagNote.data = songNotes;
swagNote.data.sustainLength = songNotes.sustainLength;
swagNote.data.altNote = songNotes.altNote;
swagNote.scrollFactor.set(0, 0);
var susLength:Float = swagNote.data.sustainLength;
@ -938,11 +937,7 @@ class PlayState extends MusicBeatState implements IHook
regenNoteData(); // loads the note data from start
health = 1;
songScore = 0;
<<<<<<< HEAD
Countdown.performCountdown(currentStageId.startsWith('school'));
=======
restartCountdownTimer();
>>>>>>> origin/master
needsReset = false;
}
@ -1258,19 +1253,11 @@ class PlayState extends MusicBeatState implements IHook
// TODO: Why the hell is the noteMiss logic in two different places?
if (daNote.tooLate)
{
<<<<<<< HEAD
var event:NoteScriptEvent = new NoteScriptEvent(ScriptEvent.NOTE_MISS, daNote, true);
dispatchEvent(event);
health -= 0.0775;
=======
if (curStage != null)
{
curStage.onNoteMiss(daNote);
}
// lose less health on sustain notes!
health -= 0.0775 * (daNote.isSustainNote ? 0.2 : 1); // if it's sustain, multiply it by 0.2 (not checked for balence yet), else keep it same (multiply by 1)
>>>>>>> origin/master
vocals.volume = 0;
killCombo();
}
@ -1538,15 +1525,9 @@ class PlayState extends MusicBeatState implements IHook
switch (currentStageId)
{
case 'limo':
<<<<<<< HEAD
cameraFollowPoint.x = currentStage.getBoyfriend().getMidpoint().x - 300;
case 'mall':
cameraFollowPoint.y = currentStage.getBoyfriend().getMidpoint().y - 200;
=======
camFollow.x = boyfriend.getMidpoint().x - 300;
case 'mallXmas':
camFollow.y = boyfriend.getMidpoint().y - 200;
>>>>>>> origin/master
case 'school' | 'schoolEvil':
cameraFollowPoint.x = currentStage.getBoyfriend().getMidpoint().x - 200;
cameraFollowPoint.y = currentStage.getBoyfriend().getMidpoint().y - 200;
@ -1739,17 +1720,8 @@ class PlayState extends MusicBeatState implements IHook
if (!super.stepHit())
return false;
<<<<<<< HEAD
if (Math.abs(FlxG.sound.music.time - (Conductor.songPosition - Conductor.offset)) > 20
|| (currentSong.needsVoices && Math.abs(vocals.time - (Conductor.songPosition - Conductor.offset)) > 20))
=======
override function stepHit()
{
super.stepHit();
if (Math.abs(FlxG.sound.music.time - (Conductor.songPosition - Conductor.offset)) > 20
|| Math.abs(vocals.checkSyncError(Conductor.songPosition - Conductor.offset)) > 20)
>>>>>>> origin/master
{
resyncVocals();
}

36
source/funkin/play/stage/Stage.hx
View file

@ -321,33 +321,45 @@ class Stage extends FlxSpriteGroup implements IHook implements IPlayStateScripte
for (prop in this.namedProps)
{
remove(prop);
prop.kill();
prop.destroy();
if (prop != null)
{
remove(prop);
prop.kill();
prop.destroy();
}
}
namedProps.clear();
for (char in this.characters)
{
remove(char);
char.kill();
char.destroy();
if (char != null)
{
remove(char);
char.kill();
char.destroy();
}
}
characters.clear();
for (bopper in boppers)
{
remove(bopper);
bopper.kill();
bopper.destroy();
if (bopper != null)
{
remove(bopper);
bopper.kill();
bopper.destroy();
}
}
boppers = [];
for (sprite in this.group)
{
remove(sprite);
sprite.kill();
sprite.destroy();
if (sprite != null)
{
sprite.kill();
sprite.destroy();
remove(sprite);
}
}
group.clear();
}