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

Player: move player name resolve in a dedicated function

Browse Source 
Signed-off-by: Paul Chote <pchote@users.noreply.github.com>
This commit is contained in:
Paul Chote
2020-09-23 16:50:55 +02:00
committed by abcdefg30
parent d708f46d50
commit 41814a881d
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenRA.Game/Player.cs
View File

@@ -123,6 +123,18 @@ namespace OpenRA
return factions.FirstOrDefault(f => f.InternalName == factionName) ?? factions.First(); return factions.FirstOrDefault(f => f.InternalName == factionName) ?? factions.First();
} }
public static string ResolvePlayerName(Session.Client client, IEnumerable<Session.Client> clients, IEnumerable<IBotInfo> botInfos)
{
if (client.Bot != null)
{
var botInfo = botInfos.First(b => b.Type == client.Bot);
var botsOfSameType = clients.Where(c => c.Bot == client.Bot).ToArray();
return botsOfSameType.Length == 1 ? botInfo.Name : "{0} {1}".F(botInfo.Name, botsOfSameType.IndexOf(client) + 1);
}
return client.Name;
}
public Player(World world, Session.Client client, PlayerReference pr) public Player(World world, Session.Client client, PlayerReference pr)
{ {
World = world; World = world;
@@ -136,14 +148,7 @@ namespace OpenRA
{ {
ClientIndex = client.Index; ClientIndex = client.Index;
Color = client.Color; Color = client.Color;
if (client.Bot != null) PlayerName = ResolvePlayerName(client, world.LobbyInfo.Clients, world.Map.Rules.Actors["player"].TraitInfos<IBotInfo>());
{
var botInfo = world.Map.Rules.Actors["player"].TraitInfos<IBotInfo>().First(b => b.Type == client.Bot);
var botsOfSameType = world.LobbyInfo.Clients.Where(c => c.Bot == client.Bot).ToArray();
PlayerName = botsOfSameType.Length == 1 ? botInfo.Name : "{0} {1}".F(botInfo.Name, botsOfSameType.IndexOf(client) + 1);
}
else
PlayerName = client.Name;
BotType = client.Bot; BotType = client.Bot;
Faction = ChooseFaction(world, client.Faction, !pr.LockFaction); Faction = ChooseFaction(world, client.Faction, !pr.LockFaction);