Apply player relationship colors to all player colors #20699

PunkPun · 2023-02-25T14:31:33Z

Related #15027, #15833, #7497, #2053

I'm additionally removing the colouring on healthbars. Now with units being accordingly colored, having healthbars match feels weird. Also the removal of contrails color cache might need a rethink, though it should not really cause any performance concerns.

This PR can be seen as a jumping off point for future ingame player color changing PR's

pchote · 2023-02-25T14:38:46Z

you want to be able to differentiate between super weapon timers

Display player names as part of the timer.

Add variance
Find a way to have relationship colors when spectating

Allow multiple (e.g. 8) to be set, then loop through them.

OpenRA.Mods.Common/Widgets/Logic/Settings/DisplaySettingsLogic.cs

mods/common/chrome/settings-display.yaml

OpenRA.Mods.Common/Widgets/Logic/Settings/DisplaySettingsLogic.cs

teinarss · 2023-03-03T13:03:40Z

OpenRA.Game/Player.cs

+		readonly Color color;
+
+		/// <returns> Player color with relationship colors applied </returns>
+		public Color Color { get; private set; }
+


Why have a field color, a property Color and a method GetColor to access color?

For a multitude of reasons.

color is the actual color assigned to the player, and we do not want any code to use this value. Baring a few exception where a player instance is saved / transferred. For those cases GetColor exists

As for Color, it is basically a performance cheap way to apply various colors to the player. Currently it only happens once at the start of the game, but it should be dynamic in the future

Then this should be { get; init; }

how would that make sense?

Because of the readonly field, but we don't have support for this yet anyway.

it isn't readonly, it's set way after initialisation. And in the future we will want to set it multiple times

The field above this property.

pchote · 2023-11-11T12:17:06Z

OpenRA.Game/Player.cs

@@ -244,28 +249,40 @@ public bool IsAlliedWith(Player p)
 			return RelationshipWith(p) == PlayerRelationship.Ally;
 		}

-		public static Color PlayerRelationshipColor(Actor a)
+		/// <summary>Returns <see cref="color"/>, ignoring player relationship colors.</summary>
+		public static Color GetColor(Player p) => p.color;


Having p.Color return the colour with relationship colours and Player.GetColor(p) return the colour without relationship colours feels quite obtuse.

Can we please have a single method which takes an argument as to whether relationship colours should be used or ignored?

It's not supposed to be used. It's there only for the lua interface and setting up the game state

OpenRA.Game/Player.cs

pchote · 2023-11-11T12:25:18Z

OpenRA.Mods.Common/Graphics/ContrailRenderable.cs

 			var renderLength = length - skip;
 			if (renderLength <= 1)
 				return;

 			var screenWidth = wr.ScreenVector(new WVec(1, 0, 0))[0];
 			var wcr = Game.Renderer.WorldRgbaColorRenderer;

+			var startColor = this.startColor;
+			if (usePlayerStartColor)
+				startColor = Color.FromArgb(this.startColor.A, Player.ActorColor(owner));


These could use CachedTransforms instead.

there's no clean way to implement it

Porenutak · 2024-02-02T13:43:29Z

This feature should be always disabled in Replays and for spectators. Otherwise all players will have same color.
Side note, wouldn't blue color suit better for player allies?

PunkPun · 2024-02-03T10:56:27Z

This feature should be always disabled in Replays and for spectators. Otherwise all players will have same color.

it's disabled now

Side note, wouldn't blue color suit better for player allies?

no, red & blue is not a good default color scheme, especially for color blind people

Mailaender · 2024-05-04T14:08:23Z

The branch is called accesibility yet when enabling this I get red vs. green remap which is indistinguishable by the most common form of color blindness where I live.

And fix MutablePalette's not getting updated

PunkPun · 2024-05-04T14:16:12Z

the original version had allowed the user to set colors to bet set to whatever he wished. That functionality was removed for this PR #20699 (comment)

the current branch as well as bleed has these colors set in chrome metrics

Mailaender · 2024-05-04T14:22:47Z

I see. According to https://tl.net/forum/starcraft-2/423420-new-color-mode-with-patch-2010 StarCraft II also defaults to red/green with red/blue and orange/blue as color-blind options while we in theory have infinite options then. I am fine with that.

Mailaender · 2024-05-04T14:33:44Z

Changelog
FAQ

This comment was marked as resolved.

Sign in to view

Mailaender reviewed Feb 26, 2023

View reviewed changes

OpenRA.Mods.Common/Widgets/Logic/Settings/DisplaySettingsLogic.cs Outdated Show resolved Hide resolved

Mailaender reviewed Feb 26, 2023

View reviewed changes

mods/common/chrome/settings-display.yaml Outdated Show resolved Hide resolved

Mailaender reviewed Feb 26, 2023

View reviewed changes

mods/common/chrome/settings-display.yaml Outdated Show resolved Hide resolved

Mailaender reviewed Feb 26, 2023

View reviewed changes

OpenRA.Mods.Common/Widgets/Logic/Settings/DisplaySettingsLogic.cs Outdated Show resolved Hide resolved

PunkPun force-pushed the accesibility branch 3 times, most recently from fa2468d to 6b59e6b Compare February 28, 2023 09:59

This comment was marked as resolved.

Sign in to view

PunkPun force-pushed the accesibility branch from 6b59e6b to bbfaca3 Compare February 28, 2023 11:40

Mailaender previously approved these changes Feb 28, 2023

View reviewed changes

Mailaender added the PR: Needs +2 label Feb 28, 2023

PunkPun dismissed Mailaender’s stale review via dff388b February 28, 2023 14:02

PunkPun force-pushed the accesibility branch from bbfaca3 to dff388b Compare February 28, 2023 14:02

This comment was marked as resolved.

Sign in to view

teinarss reviewed Mar 3, 2023

View reviewed changes

PunkPun mentioned this pull request Mar 3, 2023

Add player names to support weapon timers #20722

Merged

Mailaender added the PR: Unaddressed comment(s) label Mar 11, 2023

PunkPun force-pushed the accesibility branch from dff388b to 78fffc0 Compare March 18, 2023 10:52

PunkPun removed the PR: Unaddressed comment(s) label Mar 18, 2023

PunkPun force-pushed the accesibility branch 2 times, most recently from c7e91c1 to 488c179 Compare March 18, 2023 11:01

PunkPun force-pushed the accesibility branch from 488c179 to ef65a35 Compare April 28, 2023 13:23

Mailaender added the PR: Rebase me! label May 19, 2023

This comment was marked as resolved.

Sign in to view

PunkPun force-pushed the accesibility branch from ef65a35 to a761157 Compare June 11, 2023 13:55

PunkPun removed the PR: Rebase me! label Jun 11, 2023

PunkPun added the PR: Needs +2 label Sep 29, 2023

PunkPun force-pushed the accesibility branch 2 times, most recently from 6601029 to 1c84480 Compare October 27, 2023 10:49

pchote reviewed Nov 11, 2023

View reviewed changes

PunkPun force-pushed the accesibility branch 4 times, most recently from 032148d to 3af9b7b Compare November 16, 2023 13:28

PunkPun force-pushed the accesibility branch from 3af9b7b to 9b79fb9 Compare December 2, 2023 19:50

PunkPun force-pushed the accesibility branch from 9b79fb9 to 3e40bcc Compare February 3, 2024 10:54

PunkPun mentioned this pull request Feb 5, 2024

Add Streamer Mode settings to sanitize player names #21320

Open

PunkPun force-pushed the accesibility branch from 3e40bcc to 619d30a Compare March 9, 2024 19:36

PunkPun added 5 commits May 4, 2024 17:11

Make PlayerRelationShipColor static

aa90a3a

Remove player colors from healthbars

5b3b8e9

Make player stance colours universally respected

4ac478d

Make sure palettes are updated if colors are toggled in game runtime

6166b70

And fix MutablePalette's not getting updated

Remove color caches

da19bfb

Mailaender added the PR: Rebase me! label May 4, 2024

PunkPun force-pushed the accesibility branch from 619d30a to da19bfb Compare May 4, 2024 14:26

PunkPun removed the PR: Rebase me! label May 4, 2024

Mailaender merged commit 6b463f9 into OpenRA:bleed May 4, 2024
3 checks passed

PunkPun deleted the accesibility branch May 4, 2024 14:32

PunkPun mentioned this pull request May 4, 2024

Editor: allow setting player colors #2053

Open

Mailaender mentioned this pull request May 7, 2024

Feature request: team colors #2462

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Apply player relationship colors to all player colors #20699

Apply player relationship colors to all player colors #20699

PunkPun commented Feb 25, 2023 •

edited

pchote commented Feb 25, 2023

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

teinarss Mar 3, 2023

PunkPun Mar 3, 2023

abcdefg30 Mar 6, 2023

PunkPun Mar 16, 2023

abcdefg30 Mar 18, 2023

PunkPun Mar 18, 2023

abcdefg30 Mar 18, 2023

This comment was marked as resolved.

pchote Nov 11, 2023

PunkPun Nov 11, 2023

pchote Nov 11, 2023

PunkPun Nov 11, 2023

Porenutak commented Feb 2, 2024 •

edited

PunkPun commented Feb 3, 2024

Mailaender commented May 4, 2024

PunkPun commented May 4, 2024

Mailaender commented May 4, 2024

Mailaender commented May 4, 2024

Apply player relationship colors to all player colors #20699

Apply player relationship colors to all player colors #20699

Conversation

PunkPun commented Feb 25, 2023 • edited

pchote commented Feb 25, 2023

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as resolved.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Porenutak commented Feb 2, 2024 • edited

PunkPun commented Feb 3, 2024

Mailaender commented May 4, 2024

PunkPun commented May 4, 2024

Mailaender commented May 4, 2024

Mailaender commented May 4, 2024

PunkPun commented Feb 25, 2023 •

edited

Porenutak commented Feb 2, 2024 •

edited