diff --git a/source/PlayState.hx b/source/PlayState.hx index e3661c1..2086bb2 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -1323,6 +1323,7 @@ class PlayState extends MusicBeatState healthBarBG.cameras = [camHUD]; iconP1.cameras = [camHUD]; iconP2.cameras = [camHUD]; + iconP3.cameras = [camHUD]; scoreTxt.cameras = [camHUD]; botplayTxt.cameras = [camHUD]; timeBar.cameras = [camHUD]; @@ -1781,6 +1782,9 @@ class PlayState extends MusicBeatState if(ret != FunkinLua.Function_Stop) { generateStaticArrows(0); generateStaticArrows(1); + if(curSong == 'Antivoid') { + generateStaticArrows(2); + } for (i in 0...playerStrums.length) { setOnLuas('defaultPlayerStrumX' + i, playerStrums.members[i].x); setOnLuas('defaultPlayerStrumY' + i, playerStrums.members[i].y); @@ -2906,7 +2910,7 @@ class PlayState extends MusicBeatState } } - if (!daNote.mustPress && daNote.wasGoodHit && !daNote.hitByOpponent && !daNote.ignoreNote) + if (!daNote.mustPress && daNote.wasGoodHit && !daNote.hitByOpponent && !daNote.ignoreNote && daNote.noteType != 'No Animation') { opponentNoteHit(daNote); } @@ -4381,7 +4385,7 @@ class PlayState extends MusicBeatState if(note.isSustainNote && !note.animation.curAnim.name.endsWith('end')) { time += 0.15; } - StrumPlayAnim(false, Std.int(Math.abs(note.noteData)) % 4, time); + StrumPlayAnim(1, Std.int(Math.abs(note.noteData)) % 4, time); } else { playerStrums.forEach(function(spr:StrumNote) { @@ -5019,9 +5023,9 @@ class PlayState extends MusicBeatState #end } - function StrumPlayAnim(isDad:Bool, id:Int, time:Float) { + function StrumPlayAnim(isDad:Int, id:Int, time:Float) { var spr:StrumNote = null; - if(isDad) { + if(isDad == 0) { spr = strumLineNotes.members[id]; } else if(isDad == 1) { spr = playerStrums.members[id]; diff --git a/source/options/GameplaySettingsSubState.hx b/source/options/GameplaySettingsSubState.hx index 5b50f67..fb1b037 100644 --- a/source/options/GameplaySettingsSubState.hx +++ b/source/options/GameplaySettingsSubState.hx @@ -63,6 +63,13 @@ class GameplaySettingsSubState extends BaseOptionsMenu true); addOption(option); + var option:Option = new Option('Beta Songs', + "If checked, the beta version of the song will play\ninstead of the new one (Will only work on:\nTrespass, Darkness, Problem and Discrepancy)", + 'betaSongs', + 'bool', + false); + addOption(option); + var option:Option = new Option('Disable Reset Button', "If checked, pressing Reset won't do anything.", 'noReset', @@ -70,13 +77,6 @@ class GameplaySettingsSubState extends BaseOptionsMenu false); addOption(option); - var option:Option = new Option('Beta Songs', //Name - 'An option for Cautionary Quartet mod that allows you to play the beta songs.', //Description - 'betaSongs', //Save data variable name - 'bool', //Variable type - false); //Default value - addOption(option); - /*var option:Option = new Option('Note Delay', 'Changes how late a note is spawned.\nUseful for preventing audio lag from wireless earphones.', 'noteOffset',