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

Disable chat for the first 5s (configurable) after joining a server.

Browse Source
This commit is contained in:
Paul Chote
2021-09-20 22:34:42 +01:00
committed by abcdefg30
parent 9eab92e90a
commit 8588af1001
9 changed files with 99 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,8 +34,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
readonly ScrollPanelWidget chatScrollPanel;
readonly ContainerWidget chatTemplate;
readonly TextFieldWidget chatText;
readonly INotifyChat[] chatTraits;
readonly CachedTransform<int, string> chatDisabledLabel;
readonly TabCompletionLogic tabCompletion = new TabCompletionLogic();
@@ -43,6 +42,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
TextNotification lastLine;
int repetitions;
bool chatEnabled = true;
[ObjectCreator.UseCtor]
public IngameChatLogic(Widget widget, OrderManager orderManager, World world, ModData modData, bool isMenuChat, Dictionary<string, MiniYaml> logicArgs)
@@ -50,8 +50,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
this.orderManager = orderManager;
modRules = modData.DefaultRules;
chatTraits = world.WorldActor.TraitsImplementing<INotifyChat>().ToArray();
var chatTraits = world.WorldActor.TraitsImplementing<INotifyChat>().ToArray();
var players = world.Players.Where(p => p != world.LocalPlayer && !p.NonCombatant && !p.IsBot);
var isObserver = orderManager.LocalClient != null && orderManager.LocalClient.IsObserver;
var alwaysDisabled = world.IsReplay || world.LobbyInfo.NonBotClients.Count() == 1;
@@ -82,7 +81,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
chatMode.IsDisabled = () =>
{
if (world.IsGameOver)
if (world.IsGameOver || !chatEnabled)
return true;
// The game is over for us, join spectator team chat
@@ -100,7 +99,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
};
}
else
chatMode.IsDisabled = () => disableTeamChat;
chatMode.IsDisabled = () => disableTeamChat || !chatEnabled;
// Disable team chat after the game ended
world.GameOver += () => disableTeamChat = true;
@@ -163,6 +162,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
return true;
};
chatDisabledLabel = new CachedTransform<int, string>(x => x > 0 ? $"Chat available in {x} seconds..." : "Chat Disabled");
if (!isMenuChat)
{
var openTeamChatKey = new HotkeyReference();
@@ -203,7 +204,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
orderManager.AddTextNotification += AddChatLineWrapper;
chatText.IsDisabled = () => world.IsReplay && !Game.Settings.Debug.EnableDebugCommandsInReplays;
chatText.IsDisabled = () => !chatEnabled || (world.IsReplay && !Game.Settings.Debug.EnableDebugCommandsInReplays);
if (!isMenuChat)
{
@@ -317,6 +318,27 @@ namespace OpenRA.Mods.Common.Widgets.Logic
Game.Sound.PlayNotification(modRules, null, "Sounds", chatLineSound, null);
}
public override void Tick()
{
var chatWasEnabled = chatEnabled;
chatEnabled = Game.RunTime >= TextNotificationsManager.ChatDisabledUntil && TextNotificationsManager.ChatDisabledUntil != uint.MaxValue;
if (chatEnabled && !chatWasEnabled)
{
chatText.Text = "";
if (Ui.KeyboardFocusWidget == null)
chatText.TakeKeyboardFocus();
}
else if (!chatEnabled)
{
var remaining = 0;
if (TextNotificationsManager.ChatDisabledUntil != uint.MaxValue)
remaining = (int)(TextNotificationsManager.ChatDisabledUntil - Game.RunTime + 999) / 1000;
chatText.Text = chatDisabledLabel.Update(remaining);
}
}
bool disposed = false;
protected override void Dispose(bool disposing)
{

29
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
View File

@@ -48,6 +48,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
readonly ScrollPanelWidget lobbyChatPanel;
readonly Widget chatTemplate;
readonly TextFieldWidget chatTextField;
readonly CachedTransform<int, string> chatDisabledLabel;
readonly ScrollPanelWidget players;
@@ -60,6 +62,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
MapPreview map;
Session.MapStatus mapStatus;
bool chatEnabled = true;
bool addBotOnMapLoad;
bool disableTeamChat;
bool insufficientPlayerSpawns;
@@ -400,12 +403,12 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var chatMode = lobby.Get<ButtonWidget>("CHAT_MODE");
chatMode.GetText = () => teamChat ? "Team" : "All";
chatMode.OnClick = () => teamChat ^= true;
chatMode.IsDisabled = () => disableTeamChat;
chatMode.IsDisabled = () => disableTeamChat || !chatEnabled;
var chatTextField = lobby.Get<TextFieldWidget>("CHAT_TEXTFIELD");
chatTextField = lobby.Get<TextFieldWidget>("CHAT_TEXTFIELD");
chatTextField.IsDisabled = () => !chatEnabled;
chatTextField.MaxLength = UnitOrders.ChatMessageMaxLength;
chatTextField.TakeKeyboardFocus();
chatTextField.OnEnterKey = _ =>
{
if (chatTextField.Text.Length == 0)
@@ -438,6 +441,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
chatTextField.OnEscKey = _ => chatTextField.YieldKeyboardFocus();
chatDisabledLabel = new CachedTransform<int, string>(x => x > 0 ? $"Chat available in {x} seconds..." : "Chat Disabled");
lobbyChatPanel = lobby.Get<ScrollPanelWidget>("CHAT_DISPLAY");
chatTemplate = lobbyChatPanel.Get("CHAT_TEMPLATE");
lobbyChatPanel.RemoveChildren();
@@ -487,6 +492,24 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
if (panel == PanelType.Options && OptionsTabDisabled())
panel = PanelType.Players;
var chatWasEnabled = chatEnabled;
chatEnabled = Game.RunTime >= TextNotificationsManager.ChatDisabledUntil && TextNotificationsManager.ChatDisabledUntil != uint.MaxValue;
if (chatEnabled && !chatWasEnabled)
{
chatTextField.Text = "";
if (Ui.KeyboardFocusWidget == null)
chatTextField.TakeKeyboardFocus();
}
else if (!chatEnabled)
{
var remaining = 0;
if (TextNotificationsManager.ChatDisabledUntil != uint.MaxValue)
remaining = (int)(TextNotificationsManager.ChatDisabledUntil - Game.RunTime + 999) / 1000;
chatTextField.Text = chatDisabledLabel.Update(remaining);
}
}
void AddChatLine(TextNotification chatLine)