Skip to content

Commit

Permalink
bruhhh
Browse files Browse the repository at this point in the history
Fixed stuff related to rating colors not working
  • Loading branch information
JordanSantiagoYT committed Nov 21, 2023
1 parent 3238ab5 commit ee7de70
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions source/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -2210,7 +2210,7 @@ class PlayState extends MusicBeatState
healthBar.visible = false;
iconP2.visible = iconP1.visible = false;
}
if (ClientPrefs.hideHud) {
if (ClientPrefs.hideHud && ClientPrefs.showcaseMode) {
scoreTxt.destroy();
botplayTxt.visible = false;
healthBarBG.visible = false;
Expand Down Expand Up @@ -7158,7 +7158,7 @@ if (ClientPrefs.showNPS) {
allSicks = false;

}
if (Std.string(daRating) == 'shit' && ClientPrefs.shitGivesMiss && ClientPrefs.ratingIntensity == 'Normal')
if (daRating.name == 'shit' && ClientPrefs.shitGivesMiss && ClientPrefs.ratingIntensity == 'Normal')
{
noteMiss(note);
}
Expand All @@ -7173,39 +7173,39 @@ if (ClientPrefs.showNPS) {
switch (ClientPrefs.healthGainType)
{
case 'VS Impostor':
switch(Std.string(daRating))
switch(daRating.name)
{
case 'marv', 'sick': health += note.hitHealth * healthGain * polyphony;
case 'good': health += note.hitHealth * 0.5 * healthGain * polyphony;
case 'bad': health += note.hitHealth * 0.25 * healthGain * polyphony;
case 'shit': health += note.hitHealth * 0.1 * healthGain * polyphony;
}
case 'Leather Engine':
switch(Std.string(daRating))
switch(daRating.name)
{
case 'marv', 'sick': health += 0.012 * healthGain * polyphony;
case 'good': health += -0.008 * healthGain * polyphony;
case 'bad': health += -0.018 * healthGain * polyphony;
case 'shit': health += -0.023 * healthGain * polyphony;
}
case 'Kade (1.4.2 to 1.6)', 'Doki Doki+':
switch(Std.string(daRating))
switch(daRating.name)
{
case 'marv', 'sick': health += (ClientPrefs.healthGainType == 'Doki Doki+' ? 0.077 : 0.1) * healthGain * polyphony;
case 'good': health += 0.04 * healthGain * polyphony;
case 'bad': health -= 0.06 * healthGain * polyphony;
case 'shit': health -= (ClientPrefs.healthGainType == 'Doki Doki+' ? 0.1 : 0.2) * healthGain * polyphony;
}
case 'Kade (1.6+)':
switch(Std.string(daRating))
switch(daRating.name)
{
case 'marv', 'sick': health += 0.017 * healthGain * polyphony;
case 'good': health += 0 * healthGain * polyphony;
case 'bad': health += -0.03 * healthLoss;
case 'shit': health += -0.06 * healthLoss;
}
case 'Kade (1.2)':
switch(Std.string(daRating))
switch(daRating.name)
{
case 'marv', 'sick': health += 0.023 * healthGain * polyphony;
case 'good': health += 0.004 * healthGain * polyphony;
Expand Down Expand Up @@ -7294,9 +7294,8 @@ if (!allSicks && ClientPrefs.colorRatingFC && shits > 0 && noteDiff > ClientPref
}
if (!allSicks && ClientPrefs.colorRatingHit && ClientPrefs.hudType != 'Tails Gets Trolled V4' && ClientPrefs.hudType != 'Doki Doki+')
{
switch (Std.string(daRating)) //This is so stupid, but it works
switch (daRating.name) //This is so stupid, but it works
{
case 'marv': rating.color = FlxColor.YELLOW;
case 'sick': rating.color = FlxColor.CYAN;
case 'good': rating.color = FlxColor.LIME;
case 'bad': rating.color = FlxColor.ORANGE;
Expand Down Expand Up @@ -7335,7 +7334,7 @@ if (!allSicks && ClientPrefs.colorRatingHit && ClientPrefs.hudType != 'Tails Get
});
}
});
switch (Std.string(daRating)) //This is so stupid, but it works
switch (daRating.name) //This is so stupid, but it works
{
case 'marv': msTxt.color = FlxColor.YELLOW;
case 'sick': msTxt.color = FlxColor.CYAN;
Expand Down

0 comments on commit ee7de70

Please sign in to comment.