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

Add a backup for unloaded bots

Browse Source
This commit is contained in:
Gustas
2025-03-30 13:53:19 +03:00
committed by Paul Chote
parent 27297a1ba9
commit d70c30763b
4 changed files with 62 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs
View File

@@ -33,6 +33,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
[FluentReference]
const string Bots = "options-lobby-slot.bots";
[FluentReference]
const string BotPlayer = "label-bot-player";
[FluentReference]
const string BotsDisabled = "options-lobby-slot.bots-disabled";
@@ -432,7 +435,13 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var font = Game.Renderer.Fonts[label.Font];
var clientName = new CachedTransform<MapStatus, string>(s =>
WidgetUtils.TruncateText(c.IsBot ? map.GetMessage(c.Name) : c.Name, label.Bounds.Width, font));
{
var name = c.Name;
if (c.IsBot && !map.TryGetMessage(c.Name, out name))
name = FluentProvider.GetMessage(BotPlayer);
return WidgetUtils.TruncateText(name, label.Bounds.Width, font);
});
label.GetText = () => clientName.Update(map.Status);
@@ -453,7 +462,19 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var closed = FluentProvider.GetMessage(Closed);
var open = FluentProvider.GetMessage(Open);
var clientName = new CachedTransform<MapStatus, string>(s => c.IsBot ? map.GetMessage(c.Name) : c.Name);
var clientName = new CachedTransform<MapStatus, string>(s =>
{
if (c.IsBot)
{
if (map.TryGetMessage(c.Name, out var message))
return message;
else
return FluentProvider.GetMessage(BotPlayer);
}
return c.Name;
});
slot.GetText = () => truncated.Update(c != null ?
clientName.Update(map.Status)
: s.Closed ? closed : open);

24
OpenRA.Mods.Common/Widgets/Logic/ServerListLogic.cs
View File

@@ -14,6 +14,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using BeaconLib;
using OpenRA.Graphics;
using OpenRA.Network;
using OpenRA.Primitives;
using OpenRA.Server;
@@ -49,6 +50,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
[FluentReference("bots")]
const string BotsLabel = "label-bots-count";
[FluentReference]
const string BotPlayer = "label-bot-player";
[FluentReference("spectators")]
const string SpectatorsLabel = "label-spectators-count";
@@ -604,15 +608,21 @@ namespace OpenRA.Mods.Common.Widgets.Logic
foreach (var option in kv.Value)
{
var o = option;
var playerName = o.IsBot ? currentMap.GetMessage(o.Name) : o.Name;
var playerName = new CachedTransform<(MapStatus, int, SpriteFont), string>(s =>
{
var name = o.IsBot
? currentMap.TryGetMessage(o.Name, out var msg) ? msg : FluentProvider.GetMessage(BotPlayer)
: o.Name;
return WidgetUtils.TruncateText(name, s.Item2, s.Item3);
});
var item = ScrollItemWidget.Setup(clientTemplate, () => false, () => { });
if (!o.IsSpectator && server.Mod == modData.Manifest.Id)
{
var label = item.Get<LabelWidget>("LABEL");
var font = Game.Renderer.Fonts[label.Font];
var name = WidgetUtils.TruncateText(playerName, label.Bounds.Width, font);
label.GetText = () => name;
label.GetText = () => playerName.Update((currentMap.Status, label.Bounds.Width, font));
label.GetColor = () => o.Color;
var flag = item.Get<ImageWidget>("FLAG");
@@ -624,11 +634,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
var label = item.Get<LabelWidget>("NOFLAG_LABEL");
var font = Game.Renderer.Fonts[label.Font];
var name = WidgetUtils.TruncateText(playerName, label.Bounds.Width, font);
// Force spectator color to prevent spoofing by the server
var color = o.IsSpectator ? Color.White : o.Color;
label.GetText = () => name;
label.GetText = () => playerName.Update((currentMap.Status, label.Bounds.Width, font));
label.GetColor = () => color;
}
@@ -765,7 +774,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var preview = modData.MapCache[game.Map];
var tooltip = new CachedTransform<MapStatus, string>(s =>
{
var displayClients = game.Clients.Select(c => c.IsBot ? preview.GetMessage(c.Name) : c.Name);
var displayClients = game.Clients.Select(c => c.IsBot
? preview.TryGetMessage(c.Name, out var msg) ? msg : FluentProvider.GetMessage(BotPlayer)
: c.Name);
if (game.Clients.Length > 10)
displayClients = displayClients
.Take(9)