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

Use proper names and flags for unknown players

Browse Source
This commit is contained in:
penev92
2015-04-03 17:30:44 +03:00
parent a26be8188c
commit 2c108a1845
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Game/Map/PlayerReference.cs
View File

@@ -27,6 +27,7 @@ namespace OpenRA
public bool LockRace = false; public bool LockRace = false;
public string Race; public string Race;
public string RaceFlagName;
// ColorRamp naming retained for backward compatibility // ColorRamp naming retained for backward compatibility
public bool LockColor = false; public bool LockColor = false;

8
OpenRA.Game/Player.cs
View File

@@ -46,7 +46,9 @@ namespace OpenRA
public Shroud Shroud; public Shroud Shroud;
public World World { get; private set; } public World World { get; private set; }
static CountryInfo ChooseCountry(World world, string name, bool requireSelectable = true) string selectedCountryName;
CountryInfo ChooseCountry(World world, string name, bool requireSelectable = true)
{ {
var selectableCountries = world.Map.Rules.Actors["world"].Traits var selectableCountries = world.Map.Rules.Actors["world"].Traits
.WithInterface<CountryInfo>().Where(c => !requireSelectable || c.Selectable) .WithInterface<CountryInfo>().Where(c => !requireSelectable || c.Selectable)
@@ -55,6 +57,8 @@ namespace OpenRA
var selected = selectableCountries.FirstOrDefault(c => c.Race == name) var selected = selectableCountries.FirstOrDefault(c => c.Race == name)
?? selectableCountries.Random(world.SharedRandom); ?? selectableCountries.Random(world.SharedRandom);
selectedCountryName = selected.Name;
// Don't loop infinite // Don't loop infinite
for (var i = 0; i <= 10 && selected.RandomRaceMembers.Any(); i++) for (var i = 0; i <= 10 && selected.RandomRaceMembers.Any(); i++)
{ {
@@ -83,6 +87,8 @@ namespace OpenRA
PlayerName = client.Name; PlayerName = client.Name;
botType = client.Bot; botType = client.Bot;
Country = ChooseCountry(world, client.Race); Country = ChooseCountry(world, client.Race);
pr.Race = selectedCountryName;
pr.RaceFlagName = client.Race;
} }
else else
{ {

2
OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoStatsLogic.cs
View File

@@ -62,7 +62,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
} }
else else
{ {
flag.GetImageName = () => pp.PlayerReference.Race; flag.GetImageName = () => pp.PlayerReference.RaceFlagName;
item.Get<LabelWidget>("FACTION").GetText = () => pp.PlayerReference.Race; item.Get<LabelWidget>("FACTION").GetText = () => pp.PlayerReference.Race;
} }

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

@@ -466,7 +466,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var flag = template.Get<ImageWidget>("FLAG"); var flag = template.Get<ImageWidget>("FLAG");
flag.GetImageCollection = () => "flags"; flag.GetImageCollection = () => "flags";
if (player.World.RenderPlayer != null && player.World.RenderPlayer.Stances[player] != Stance.Ally) if (player.World.RenderPlayer != null && player.World.RenderPlayer.Stances[player] != Stance.Ally)
flag.GetImageName = () => player.PlayerReference.Race; flag.GetImageName = () => player.PlayerReference.RaceFlagName;
else else
flag.GetImageName = () => player.Country.Race; flag.GetImageName = () => player.Country.Race;