epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add an option to disable chat in replays

Browse Source
This commit is contained in:
Gustas
2022-06-16 16:37:14 +03:00
committed by teinarss
parent 8a98ad51fd
commit a03e794140
9 changed files with 51 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Network/UnitOrders.cs
View File

@@ -86,7 +86,7 @@ namespace OpenRA.Network
if (orderManager.LocalClient != null && client != orderManager.LocalClient && client.Team > 0 && client.Team == orderManager.LocalClient.Team) if (orderManager.LocalClient != null && client != orderManager.LocalClient && client.Team > 0 && client.Team == orderManager.LocalClient.Team)
suffix += " (Ally)"; suffix += " (Ally)";
TextNotificationsManager.AddChatLine(client.Name + suffix, message, client.Color); TextNotificationsManager.AddChatLine(clientId, client.Name + suffix, message, client.Color);
break; break;
} }
@@ -95,7 +95,7 @@ namespace OpenRA.Network
{ {
var prefix = order.ExtraData == uint.MaxValue ? "[Spectators] " : "[Team] "; var prefix = order.ExtraData == uint.MaxValue ? "[Spectators] " : "[Team] ";
if (orderManager.LocalClient != null && client.Team == orderManager.LocalClient.Team) if (orderManager.LocalClient != null && client.Team == orderManager.LocalClient.Team)
TextNotificationsManager.AddChatLine(prefix + client.Name, message, client.Color); TextNotificationsManager.AddChatLine(clientId, prefix + client.Name, message, client.Color);
break; break;
} }
@@ -109,7 +109,7 @@ namespace OpenRA.Network
{ {
// Validate before adding the line // Validate before adding the line
if (client.IsObserver || (player != null && player.WinState != WinState.Undefined)) if (client.IsObserver || (player != null && player.WinState != WinState.Undefined))
TextNotificationsManager.AddChatLine("[Spectators] " + client.Name, message, client.Color); TextNotificationsManager.AddChatLine(clientId, "[Spectators] " + client.Name, message, client.Color);
break; break;
} }
@@ -119,7 +119,7 @@ namespace OpenRA.Network
&& world.LocalPlayer != null && world.LocalPlayer.WinState == WinState.Undefined; && world.LocalPlayer != null && world.LocalPlayer.WinState == WinState.Undefined;
if (valid && (isSameTeam || world.IsReplay)) if (valid && (isSameTeam || world.IsReplay))
TextNotificationsManager.AddChatLine("[Team" + (world.IsReplay ? " " + order.ExtraData : "") + "] " + client.Name, message, client.Color); TextNotificationsManager.AddChatLine(clientId, "[Team" + (world.IsReplay ? " " + order.ExtraData : "") + "] " + client.Name, message, client.Color);
break; break;
} }

2
OpenRA.Game/Settings.cs
View File

@@ -251,6 +251,8 @@ namespace OpenRA
public bool UseClassicMouseStyle = false; public bool UseClassicMouseStyle = false;
public bool UseAlternateScrollButton = false; public bool UseAlternateScrollButton = false;
public bool HideReplayChat = false;
public StatusBarsType StatusBars = StatusBarsType.Standard; public StatusBarsType StatusBars = StatusBarsType.Standard;
public TargetLinesType TargetLines = TargetLinesType.Manual; public TargetLinesType TargetLines = TargetLinesType.Manual;
public bool UsePlayerStanceColors = false; public bool UsePlayerStanceColors = false;

4
OpenRA.Game/TextNotification.cs
View File

@@ -20,14 +20,16 @@ namespace OpenRA
{ {
public readonly TextNotificationPool Pool; public readonly TextNotificationPool Pool;
public readonly string Prefix; public readonly string Prefix;
public readonly int ClientId;
public readonly string Text; public readonly string Text;
public readonly Color? PrefixColor; public readonly Color? PrefixColor;
public readonly Color? TextColor; public readonly Color? TextColor;
public readonly DateTime Time; public readonly DateTime Time;
public TextNotification(TextNotificationPool pool, string prefix, string text, Color? prefixColor, Color? textColor) public TextNotification(TextNotificationPool pool, int clientId, string prefix, string text, Color? prefixColor, Color? textColor)
{ {
Pool = pool; Pool = pool;
ClientId = clientId;
Prefix = prefix; Prefix = prefix;
Text = text; Text = text;
PrefixColor = prefixColor; PrefixColor = prefixColor;

17
OpenRA.Game/TextNotificationsManager.cs
View File

@@ -16,6 +16,7 @@ namespace OpenRA
{ {
public static class TextNotificationsManager public static class TextNotificationsManager
{ {
public static readonly int SystemClientId = -1;
static readonly string SystemMessageLabel; static readonly string SystemMessageLabel;
public static long ChatDisabledUntil { get; internal set; } public static long ChatDisabledUntil { get; internal set; }
@@ -32,17 +33,17 @@ namespace OpenRA
return; return;
if (player == null || player == player.World.LocalPlayer) if (player == null || player == player.World.LocalPlayer)
AddTextNotification(TextNotificationPool.Transients, SystemMessageLabel, text); AddTextNotification(TextNotificationPool.Transients, SystemClientId, SystemMessageLabel, text);
} }
public static void AddFeedbackLine(string text) public static void AddFeedbackLine(string text)
{ {
AddTextNotification(TextNotificationPool.Feedback, SystemMessageLabel, text); AddTextNotification(TextNotificationPool.Feedback, SystemClientId, SystemMessageLabel, text);
} }
public static void AddMissionLine(string prefix, string text, Color? prefixColor = null) public static void AddMissionLine(string prefix, string text, Color? prefixColor = null)
{ {
AddTextNotification(TextNotificationPool.Mission, prefix, text, prefixColor); AddTextNotification(TextNotificationPool.Mission, SystemClientId, prefix, text, prefixColor);
} }
public static void AddSystemLine(string text) public static void AddSystemLine(string text)
@@ -52,12 +53,12 @@ namespace OpenRA
public static void AddSystemLine(string prefix, string text) public static void AddSystemLine(string prefix, string text)
{ {
AddTextNotification(TextNotificationPool.System, prefix, text); AddTextNotification(TextNotificationPool.System, SystemClientId, prefix, text);
} }
public static void AddChatLine(string prefix, string text, Color? prefixColor = null, Color? textColor = null) public static void AddChatLine(int clientId, string prefix, string text, Color? prefixColor = null, Color? textColor = null)
{ {
AddTextNotification(TextNotificationPool.Chat, prefix, text, prefixColor, textColor); AddTextNotification(TextNotificationPool.Chat, clientId, prefix, text, prefixColor, textColor);
} }
public static void Debug(string s, params object[] args) public static void Debug(string s, params object[] args)
@@ -65,10 +66,10 @@ namespace OpenRA
AddSystemLine("Debug", string.Format(s, args)); AddSystemLine("Debug", string.Format(s, args));
} }
static void AddTextNotification(TextNotificationPool pool, string prefix, string text, Color? prefixColor = null, Color? textColor = null) static void AddTextNotification(TextNotificationPool pool, int clientId, string prefix, string text, Color? prefixColor = null, Color? textColor = null)
{ {
if (IsPoolEnabled(pool)) if (IsPoolEnabled(pool))
Game.OrderManager.AddTextNotification(new TextNotification(pool, prefix, text, prefixColor, textColor)); Game.OrderManager.AddTextNotification(new TextNotification(pool, clientId, prefix, text, prefixColor, textColor));
} }
static bool IsPoolEnabled(TextNotificationPool pool) static bool IsPoolEnabled(TextNotificationPool pool)

10
OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameChatLogic.cs
View File

@@ -265,7 +265,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (!IsNotificationEligible(notification)) if (!IsNotificationEligible(notification))
return; return;
chatOverlayDisplay?.AddNotification(notification); if (!IsNotificationMuted(notification))
chatOverlayDisplay?.AddNotification(notification);
// HACK: Force disable the chat notification sound for the in-menu chat dialog // HACK: Force disable the chat notification sound for the in-menu chat dialog
// This works around our inability to disable the sounds for the in-game dialog when it is hidden // This works around our inability to disable the sounds for the in-game dialog when it is hidden
@@ -282,7 +283,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (scrolledToBottom) if (scrolledToBottom)
chatScrollPanel.ScrollToBottom(smooth: true); chatScrollPanel.ScrollToBottom(smooth: true);
if (!suppressSound) if (!suppressSound && !IsNotificationMuted(notification))
Game.Sound.PlayNotification(modRules, null, "Sounds", chatLineSound, null); Game.Sound.PlayNotification(modRules, null, "Sounds", chatLineSound, null);
} }
@@ -325,5 +326,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
base.Dispose(disposing); base.Dispose(disposing);
} }
bool IsNotificationMuted(TextNotification notification)
{
return Game.Settings.Game.HideReplayChat && world.IsReplay && notification.ClientId != TextNotificationsManager.SystemClientId;
}
} }
} }

1
OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameTransientNotificationsLogic.cs
View File

@@ -55,6 +55,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
repetitions++; repetitions++;
lineToDisplay = new TextNotification( lineToDisplay = new TextNotification(
notification.Pool, notification.Pool,
notification.ClientId,
notification.Prefix, notification.Prefix,
$"{notification.Text} ({repetitions + 1})", $"{notification.Text} ({repetitions + 1})",
notification.PrefixColor, notification.PrefixColor,

2
OpenRA.Mods.Common/Widgets/Logic/Settings/DisplaySettingsLogic.cs
View File

@@ -74,6 +74,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (panel.GetOrNull<CheckboxWidget>("PAUSE_SHELLMAP_CHECKBOX") != null) if (panel.GetOrNull<CheckboxWidget>("PAUSE_SHELLMAP_CHECKBOX") != null)
SettingsUtils.BindCheckboxPref(panel, "PAUSE_SHELLMAP_CHECKBOX", gs, "PauseShellmap"); SettingsUtils.BindCheckboxPref(panel, "PAUSE_SHELLMAP_CHECKBOX", gs, "PauseShellmap");
SettingsUtils.BindCheckboxPref(panel, "HIDE_REPLAY_CHAT_CHECKBOX", gs, "HideReplayChat");
var windowModeDropdown = panel.Get<DropDownButtonWidget>("MODE_DROPDOWN"); var windowModeDropdown = panel.Get<DropDownButtonWidget>("MODE_DROPDOWN");
windowModeDropdown.OnMouseDown = _ => ShowWindowModeDropdown(windowModeDropdown, ds, scrollPanel); windowModeDropdown.OnMouseDown = _ => ShowWindowModeDropdown(windowModeDropdown, ds, scrollPanel);
windowModeDropdown.GetText = () => ds.Mode == WindowMode.Windowed ? windowModeDropdown.GetText = () => ds.Mode == WindowMode.Windowed ?

13
mods/cnc/chrome/settings-display.yaml
View File

@@ -182,6 +182,19 @@ Container@DISPLAY_PANEL:
Height: 20 Height: 20
Font: Regular Font: Regular
Text: Show Game Event Notifications Text: Show Game Event Notifications
Container@ROW:
Width: PARENT_RIGHT - 24
Height: 20
Children:
Container@HIDE_REPLAY_CHAT_CHECKBOX_CONTAINER:
X: 10
Width: PARENT_RIGHT / 2 - 10
Children:
Checkbox@HIDE_REPLAY_CHAT_CHECKBOX:
Width: PARENT_RIGHT
Height: 20
Font: Regular
Text: Hide Chat in Replays
Container@SPACER: Container@SPACER:
Background@SECTION_HEADER: Background@SECTION_HEADER:
X: 5 X: 5

9
mods/common/chrome/settings-display.yaml
View File

@@ -195,6 +195,15 @@ Container@DISPLAY_PANEL:
Height: 20 Height: 20
Font: Regular Font: Regular
Text: Pause Menu Background Text: Pause Menu Background
Container@HIDE_REPLAY_CHAT_CHECKBOX_CONTAINER:
X: PARENT_RIGHT / 2 + 10
Width: PARENT_RIGHT / 2 - 10
Children:
Checkbox@HIDE_REPLAY_CHAT_CHECKBOX:
Width: PARENT_RIGHT
Height: 20
Font: Regular
Text: Hide Chat in Replays
Container@SPACER: Container@SPACER:
Background@SECTION_HEADER: Background@SECTION_HEADER:
X: 5 X: 5