forgot to push pr

This commit is contained in:
KadeDev 2021-03-20 02:07:08 -07:00
parent 9d64479a00
commit 0f87321db5
3 changed files with 15 additions and 5 deletions

View File

@ -32,7 +32,7 @@ class MainMenuState extends MusicBeatState
var newGaming2:FlxText;
var newInput:Bool = true;
public static var kadeEngineVer:String = "1.2";
public static var kadeEngineVer:String = "1.2.1-BETA";
public static var gameVer:String = "0.2.7.1";
var magenta:FlxSprite;

View File

@ -2372,6 +2372,7 @@ class PlayState extends MusicBeatState
}
var mashing:Int = 0;
var mashViolations:Int = 0;
function noteCheck(controlArray:Array<Bool>, note:Note):Void // sorry lol
{
@ -2398,8 +2399,13 @@ class PlayState extends MusicBeatState
mashing++;
}
if (mashing <= getKeyPresses(note))
goodNoteHit(note);
// ANTI MASH CODE FOR THE BOYS
if (mashing <= getKeyPresses(note) && mashViolations < 3)
{
mashViolations++;
goodNoteHit(note, !(mashing <= getKeyPresses(note)));
}
else
{
playerStrums.members[note.noteData].animation.play('static');
@ -2412,10 +2418,14 @@ class PlayState extends MusicBeatState
}
}
function goodNoteHit(note:Note):Void
function goodNoteHit(note:Note, resetMashViolation = true):Void
{
if (mashing != 0)
mashing = 0;
if (resetMashViolation)
mashViolations = 0;
if (!note.wasGoodHit)
{
if (!note.isSustainNote)