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

Nametags - Adjustable colors settings #6641

Merged
merged 6 commits into from
Nov 17, 2018

Conversation

zharf
Copy link
Contributor

@zharf zharf commented Oct 16, 2018

When merged this pull request will:

  • Add settings for nametag team colors
  • Make default colors lighter to make them easier to read

zharf added 2 commits October 16, 2018 17:31
Also made the default colors lighter to make them easier to read
} else {
_color = [[1, 1, 1, _alpha], [1, 0, 0, _alpha], [0, 1, 0, _alpha], [0, 0, 1, _alpha], [1, 1, 0, _alpha]] select ((["MAIN", "RED", "GREEN", "BLUE", "YELLOW"] find ([assignedTeam _target] param [0, "MAIN"])) max 0);
_color = +([GVAR(nametagColorMain), GVAR(nametagColorRed), GVAR(nametagColorGreen), GVAR(nametagColorBlue), GVAR(nametagColorYellow)] select ((["MAIN", "RED", "GREEN", "BLUE", "YELLOW"] find ([assignedTeam _target] param [0, "MAIN"])) max 0));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could be multi-line

Suggested change
_color = +([GVAR(nametagColorMain), GVAR(nametagColorRed), GVAR(nametagColorGreen), GVAR(nametagColorBlue), GVAR(nametagColorYellow)] select ((["MAIN", "RED", "GREEN", "BLUE", "YELLOW"] find ([assignedTeam _target] param [0, "MAIN"])) max 0));
_color = +(
[
GVAR(nametagColorMain),
GVAR(nametagColorRed),
GVAR(nametagColorGreen),
GVAR(nametagColorBlue),
GVAR(nametagColorYellow)
] select (
(
[
"MAIN", "RED", "GREEN", "BLUE", "YELLOW"
] find (
[assignedTeam _target] param [0, "MAIN"]
)
) max 0
)
);

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe slightly less multiline would be enough. :D

@jonpas jonpas added kind/feature kind/feature Release Notes: **ADDED:** and removed kind/feature labels Nov 3, 2018
@zharf zharf force-pushed the adjustable_nametag_colors branch from 7e8c0d3 to 3004e0e Compare November 14, 2018 11:45

[
QGVAR(nametagColorRed), "COLOR",
["str_team_red"],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe [format ["%1 %2",localize "str_team", localize "str_team_red"]],
so we get "Team Red"?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was considering this but I'm not proficient enough in all the languages to know if the word order for that would be grammatically correct (for Finnish it would be reversed...)

@PabstMirror PabstMirror added this to the 3.12.4 milestone Nov 15, 2018
@PabstMirror
Copy link
Contributor

Overall looks great and should really help people with color problems
I don't really care for the lighter colors, maybe keep default a little closer to the old values [1.00, 0.5, 0.5, 1] (but I guess I can just change it myself now if I don't like it 😄 )

@PabstMirror PabstMirror changed the title Adjustable nametag colors Nametags - Adjustable colors settings Nov 17, 2018
@PabstMirror PabstMirror added the kind/enhancement Release Notes: **IMPROVED:** label Nov 17, 2018
@PabstMirror PabstMirror merged commit e007230 into acemod:master Nov 17, 2018
BaerMitUmlaut pushed a commit that referenced this pull request Aug 5, 2019
* Move hard coded nametag team colors to settings

Also made the default colors lighter to make them easier to read

* Added myself to contributors

* Fixed Nametag to Name Tag

* Optimized array copying

* Moved team color settings to color subcategory and used vanilla localization strings

* Split a long line into a more readable multiline solution
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/enhancement Release Notes: **IMPROVED:** kind/feature Release Notes: **ADDED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants