File tree Expand file tree Collapse file tree 3 files changed +7
-4
lines changed Expand file tree Collapse file tree 3 files changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -92,8 +92,6 @@ class MusicBeatState extends FlxUIState
9292 if (oldStep != curStep && curStep > 0 )
9393 {
9494 stepHit ();
95- if (curStep % 4 == 0 )
96- beatHit (); // troll mode no longer breaks beats
9795
9896 if (PlayState .SONG != null )
9997 {
@@ -188,6 +186,9 @@ class MusicBeatState extends FlxUIState
188186 stage .curDecStep = curDecStep ;
189187 stage .stepHit ();
190188 });
189+
190+ if (curStep % 4 == 0 )
191+ beatHit ();
191192 }
192193
193194 // runs whenever the game hits a beat
Original file line number Diff line number Diff line change @@ -39,7 +39,8 @@ typedef PreloadedChartNote = {
3939 multSpeed : Float ,
4040 noteDensity : Float ,
4141 ignoreNote : Bool ,
42- lowPriority : Bool ,
42+ blockHit : Bool ,
43+ lowPriority : Bool
4344}
4445
4546typedef NoteSplashData = {
@@ -604,6 +605,7 @@ class Note extends FlxSprite
604605 missHealth = chartNoteData .missHealth ;
605606 hitCausesMiss = chartNoteData .hitCausesMiss ;
606607 ignoreNote = chartNoteData .ignoreNote ;
608+ blockHit = chartNoteData .blockHit ;
607609 multSpeed = chartNoteData .multSpeed ;
608610 noteDensity = chartNoteData .noteDensity ;
609611
Original file line number Diff line number Diff line change @@ -5763,7 +5763,7 @@ class PlayState extends MusicBeatState
57635763
57645764 if (Conductor .songPosition > noteKillOffset + daNote .strumTime )
57655765 {
5766- if (daNote .mustPress && (! (cpuControlled || usingBotEnergy && strumsHeld [daNote .noteData ]) || cpuControlled ) && ! daNote .ignoreNote && ! endingSong && ! daNote .wasGoodHit ) {
5766+ if (daNote .mustPress && (! (cpuControlled || usingBotEnergy && strumsHeld [daNote .noteData ]) || cpuControlled ) && ! daNote .ignoreNote && ! daNote . blockHit && ! endingSong && ! daNote .wasGoodHit ) {
57675767 noteMiss (daNote );
57685768 if (ClientPrefs .missSoundShit )
57695769 {
You can’t perform that action at this time.
0 commit comments