Host can change Team and Spawn of any player. #12936 #13002
Conversation
| @@ -25,6 +25,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic | |||
| { | |||
| public class LobbyLogic : ChromeLogic | |||
| { | |||
| const string TeamDropdownWidgetName = "TEAM_DROPDOWN"; | |||
There was a problem hiding this comment.
Defining these as constants is inconsistent with the rest of this file (and all of the other chrome logic), so this actually hurts readability. Please keep these inline.
| dropdown.IsDisabled = () => s.LockTeam || orderManager.LocalClient.IsReady; | ||
| dropdown.OnMouseDown = _ => ShowTeamDropDown(dropdown, c, orderManager, map.PlayerCount); | ||
| dropdown.GetText = () => (c.Team == 0) ? "-" : c.Team.ToString(); | ||
|
|
||
| if (widgetId != "TEAM") |
There was a problem hiding this comment.
I am not sure if I should take into account external mods in this phase. I would make it simpler if I didn't want to keep compatibility with external mods.
I think that check is needed - when it is called for host - EditableTemplate, I don't want to hide it. It is hidden only when it is called from NonEditableTemplate with TEAM_DROPDOWN. The TEAM is in boh sections as Label and as Dropdown. I didn't rename it for compatibility.
There was a problem hiding this comment.
SetupEditableTeamWidget should only ever act on the TEAM widget.
There was a problem hiding this comment.
The chrome logic classes are intimately tied with the yaml, so backwards compatibility is not a goal.
|
Updated, we don't need backward compatibility, so it is now simpler. |
| @@ -723,8 +724,16 @@ void UpdatePlayerList() | |||
| () => panel = PanelType.Kick, () => panel = PanelType.Players); | |||
| LobbyUtils.SetupColorWidget(template, slot, client); | |||
| LobbyUtils.SetupFactionWidget(template, slot, client, factions); | |||
| LobbyUtils.SetupTeamWidget(template, slot, client); | |||
| LobbyUtils.SetupSpawnWidget(template, slot, client); | |||
| if (isHost) { | |||
There was a problem hiding this comment.
You should move the brace to a new line.
| dropdown.IsDisabled = () => s.LockTeam || orderManager.LocalClient.IsReady; | ||
| dropdown.OnMouseDown = _ => ShowTeamDropDown(dropdown, c, orderManager, map.PlayerCount); | ||
| dropdown.GetText = () => (c.Team == 0) ? "-" : c.Team.ToString(); | ||
|
|
||
| HideChildWidget(parent, "TEAM"); |
There was a problem hiding this comment.
You will also need to hide TEAM_DROPDOWN in SetupTeamWidget in case the template is reused when the player surrenders admin (as a future feature).
| @@ -450,6 +450,15 @@ public static void SetupEditableSpawnWidget(Widget parent, Session.Slot s, Sessi | |||
| ShowSpawnDropDown(dropdown, c, orderManager, spawnPoints); | |||
| }; | |||
| dropdown.GetText = () => (c.SpawnPoint == 0) ? "-" : Convert.ToChar('A' - 1 + c.SpawnPoint).ToString(); | |||
|
|
|||
| HideChildWidget(parent, "SPAWN"); | |||
|
Updated |
| @@ -666,6 +666,7 @@ void UpdatePlayerList() | |||
| if (orderManager.LocalClient == null) | |||
| return; | |||
|
|
|||
| var isHost = Game.IsHost; | |||
There was a problem hiding this comment.
It is not changing, used in loop so retrieved only once.
|
👍 |
Host can change Team and Spawn of any player to make it simpler and quicker to setup new game.