Skip to content

Commit

Permalink
Merge pull request #52 from PixlJacket/master
Browse files Browse the repository at this point in the history
simply judgement optimizations
  • Loading branch information
Yoshubs authored Sep 27, 2021
2 parents 6c907c5 + 1dd2c5e commit eed0e0a
Showing 1 changed file with 9 additions and 11 deletions.
20 changes: 9 additions & 11 deletions source/gameFolder/meta/state/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ class PlayState extends MusicBeatState

public static var health:Float = 1; // mario
public static var combo:Int = 0;

public static var misses:Int = 0;

public var generatedMusic:Bool = false;
Expand Down Expand Up @@ -1068,9 +1069,11 @@ class PlayState extends MusicBeatState
var score:Int = 50;

// notesplashes
if (baseRating == "sick") // create the note splash if you hit a sick
if (baseRating == "sick")
// create the note splash if you hit a sick
createSplash(coolNote, strumline);
else // if it isn't a sick, and you had a sick combo, then it becomes not sick :(
else
// if it isn't a sick, and you had a sick combo, then it becomes not sick :(
if (allSicks)
allSicks = false;

Expand Down Expand Up @@ -1103,14 +1106,8 @@ class PlayState extends MusicBeatState
// deletes all combo sprites prior to initalizing new ones
if (lastCombo != null)
{
for (i in 0...lastCombo.length - 1)
{
lastCombo[i].kill();
lastCombo.remove(lastCombo[i]);
}
if (lastCombo.length == 1)
while (lastCombo.length > 0)
{
//this part is very jank, but it works
lastCombo[0].kill();
lastCombo.remove(lastCombo[0]);
}
Expand Down Expand Up @@ -1150,9 +1147,8 @@ class PlayState extends MusicBeatState
if (Init.trueSettings.get('Fixed Judgements'))
{
numScore.cameras = [camHUD];
numScore.x += 100;
numScore.y += 50;
} else
}
numScore.x += 100;
}
}
Expand Down Expand Up @@ -1453,7 +1449,9 @@ class PlayState extends MusicBeatState
Highscore.saveScore(SONG.song, songScore, storyDifficulty);

if (!isStoryMode)
{
Main.switchState(this, new FreeplayState());
}
else
{
// set the campaign's score higher
Expand Down

0 comments on commit eed0e0a

Please sign in to comment.