Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split score multiplier and unranked label colours #2314

Merged
merged 13 commits into from May 31, 2018

Conversation

@Joehuu
Copy link
Member

@Joehuu Joehuu commented Mar 24, 2018

Resolves #2313. Chose yellow for lower multiplier, the color of the diff inc section.
Edit: Chose (Unranked) label to be blue, the same colour as the special section.

@@ -13,7 +13,7 @@ public class OsuModAutopilot : Mod
public override string ShortenedName => "AP";
public override FontAwesome Icon => FontAwesome.fa_osu_mod_autopilot;
public override string Description => @"Automatic cursor movement - just follow the rhythm.";
public override double ScoreMultiplier => 0;
public override double ScoreMultiplier => 1;
public override bool Ranked => false;

This comment has been minimized.

Loading

}
else
{
RankedLabel.Text = null;

This comment has been minimized.

Loading

RankedLabel.Text = null;
if (!ranked)
{
RankedLabel.Text += " (Unranked)";

This comment has been minimized.

Loading

This comment has been minimized.

Loading

This comment has been minimized.

Loading

This comment has been minimized.

Loading

This comment has been minimized.

Loading

This comment has been minimized.

Loading

{
AddAssert("check for ranked", () => !modSelect.MultiplierLabel.Text.EndsWith(unranked_suffix));
AddAssert("check for ranked", () => !modSelect.RankedLabel.Text.EndsWith(unranked_suffix));

This comment has been minimized.

Loading

@@ -182,13 +182,13 @@ private void testMultiplierTextColour(Mod mod, Color4 colour)
checkLabelColor(Color4.White);
}

private void testMultiplierTextUnranked(Mod mod)
private void testRankedTextUnranked(Mod mod)

This comment has been minimized.

Loading

@Aergwyn
Copy link
Member

@Aergwyn Aergwyn commented Mar 25, 2018

Chose yellow for lower multiplier, the color of the diff inc section.

Now that you say it. I may have a weird suggestion.
Difficulty decreasing mods are green and difficulty increasing mods are yellow. Shouldn't the multiplier colour reflect that? Right now you click the green mods and get a yellow colour and vice versa.
Maybe it would be interesting to see how it is if you swap it so below 1 is green and above 1 is yellow.

Then again I'm no UX person but the conflicting colours would be still weird imho.

Loading

@Joehuu
Copy link
Member Author

@Joehuu Joehuu commented Mar 25, 2018

That would make special mods that decrease confusing. I plan to move the mods on #2250, and to make your idea work, the special section would have to have the decreasing mods moved to the reduction section and (Unranked) will have to be blue. And the sections have to be renamed to Score Decrease and etc. Lastly I have another suggestion, shouldn’t the Score Multiplier: be coloured from the multiplier like on stable?

Loading

@Joehuu
Copy link
Member Author

@Joehuu Joehuu commented Mar 25, 2018

Nvm, your suggestion wouldn't make sense if you have a diff increase mod and reduction mod at the same time. That'll result in green(multiplier less than 1.0) with your suggestion. I plan to make (Unranked) blue from special though. And leave the multiplier < 1.0 as red.

Loading

@@ -110,14 +119,11 @@ private void updateMods()
RankedLabel.Text = null;

This comment has been minimized.

Loading

This comment has been minimized.

Loading

This comment has been minimized.

Loading

@Joehuu Joehuu changed the title Score multiplier edits Split score multiplier and unranked label colours Mar 25, 2018
{
Text = @"Score Multiplier: ",

This comment has been minimized.

Loading

This comment has been minimized.

Loading

This comment has been minimized.

Loading

This comment has been minimized.

Loading

if (multiplier > 1.0)
MultiplierLabel.FadeColour(HighMultiplierColour, 200);
else if (multiplier < 1.0)
MultiplierLabel.FadeColour(LowMultiplierColour, 200);
else
MultiplierLabel.FadeColour(Color4.White, 200);

RankedLabel.Text = "(Unranked)";

This comment has been minimized.

Loading

MultiplierLabel.Text = $"{multiplier:N2}x";
if (!ranked)
MultiplierLabel.Text += " (Unranked)";
ScoreLabel.Text = "Score Multiplier:";

This comment has been minimized.

Loading

@@ -57,6 +59,7 @@ private void load(OsuColour colours, OsuGame osu, RulesetStore rulesets, AudioMa

LowMultiplierColour = colours.Red;
HighMultiplierColour = colours.Green;
RankedColour = colours.Blue;

This comment has been minimized.

Loading

RankedLabel.Text = "(Unranked)";
RankedLabel.FadeColour(RankedColour, 200);
RankedLabel.FadeOut(200);
if (!ranked)

This comment has been minimized.

Loading

{
AddAssert("check for ranked", () => !modSelect.MultiplierLabel.Text.EndsWith(unranked_suffix));
AddAssert("check for ranked", () => !modSelect.RankedLabel.Text.Equals(unranked_suffix));

This comment has been minimized.

Loading

This comment has been minimized.

Loading

@peppy peppy added this to the Candidate Issues milestone Mar 29, 2018
{
AddAssert("check for ranked", () => !modSelect.MultiplierLabel.Text.EndsWith(unranked_suffix));
AddWaitStep(1, "wait for fade");
AddAssert("check for ranked", () => modSelect.RankedLabel.Alpha.Equals(0));

This comment has been minimized.

Loading

This comment has been minimized.

Loading

peppy
peppy approved these changes May 31, 2018
@peppy peppy merged commit db89b92 into ppy:master May 31, 2018
1 check passed
Loading
@Joehuu Joehuu deleted the score-multiplier-edits branch May 31, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants