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 'master' of https://github.com/ninjamuffin99/funkin-secret

Browse source
This commit is contained in:
Cameron Taylor 2022-02-05 11:12:03 -05:00
parent 2c91016e76 5f75520b67
commit 36b5466057
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/PlayState.hx
View file

@ -3118,10 +3118,13 @@ class PlayState extends MusicBeatState
iconP1.updateHitbox(); iconP1.updateHitbox();
iconP2.updateHitbox(); iconP2.updateHitbox();
var song = SongLoad.getSong();
var step = Math.floor(curStep / 16);
if (curBeat % 8 == 7 if (curBeat % 8 == 7
&& SongLoad.getSong()[Math.floor(curStep / 16)].mustHitSection && song[step].mustHitSection
&& combo > 5 && combo > 5
&& !SongLoad.getSong()[Math.floor(curStep / 16) + 1].mustHitSection) && song.length > step + 1// GK: this fixes an error on week 1 where song[step + 1] was null
&& !song[step + 1].mustHitSection)
{ {
var animShit:ComboCounter = new ComboCounter(-100, 300, combo); var animShit:ComboCounter = new ComboCounter(-100, 300, combo);
animShit.scrollFactor.set(0.6, 0.6); animShit.scrollFactor.set(0.6, 0.6);