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

Merge pull request #7722 from penev92/bleed_diplomacyWindow

Browse Source 
Closes #7391
This commit is contained in:
Matthias Mailänder
2015-04-05 08:34:38 +02:00
parent a013cf4fca 2c108a1845
commit 3f48c649f0
4 changed files with 23 additions and 4 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
{ {

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

@@ -11,6 +11,7 @@
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
using OpenRA.Widgets; using OpenRA.Widgets;
namespace OpenRA.Mods.Common.Widgets.Logic namespace OpenRA.Mods.Common.Widgets.Logic
@@ -53,9 +54,17 @@ namespace OpenRA.Mods.Common.Widgets.Logic
nameLabel.GetColor = () => pp.Color.RGB; nameLabel.GetColor = () => pp.Color.RGB;
var flag = item.Get<ImageWidget>("FACTIONFLAG"); var flag = item.Get<ImageWidget>("FACTIONFLAG");
flag.GetImageName = () => pp.Country.Race;
flag.GetImageCollection = () => "flags"; flag.GetImageCollection = () => "flags";
item.Get<LabelWidget>("FACTION").GetText = () => pp.Country.Name; if (lp.Stances[pp] == Stance.Ally || lp.WinState != WinState.Undefined)
{
flag.GetImageName = () => pp.Country.Race;
item.Get<LabelWidget>("FACTION").GetText = () => pp.Country.Name;
}
else
{
flag.GetImageName = () => pp.PlayerReference.RaceFlagName;
item.Get<LabelWidget>("FACTION").GetText = () => pp.PlayerReference.Race;
}
var team = item.Get<LabelWidget>("TEAM"); var team = item.Get<LabelWidget>("TEAM");
var teamNumber = (client == null) ? 0 : client.Team; var teamNumber = (client == null) ? 0 : client.Team;

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

@@ -464,8 +464,11 @@ namespace OpenRA.Mods.Common.Widgets.Logic
public static void AddPlayerFlagAndName(ScrollItemWidget template, Player player) public static void AddPlayerFlagAndName(ScrollItemWidget template, Player player)
{ {
var flag = template.Get<ImageWidget>("FLAG"); var flag = template.Get<ImageWidget>("FLAG");
flag.GetImageName = () => player.Country.Race;
flag.GetImageCollection = () => "flags"; flag.GetImageCollection = () => "flags";
if (player.World.RenderPlayer != null && player.World.RenderPlayer.Stances[player] != Stance.Ally)
flag.GetImageName = () => player.PlayerReference.RaceFlagName;
else
flag.GetImageName = () => player.Country.Race;
var playerName = template.Get<LabelWidget>("PLAYER"); var playerName = template.Get<LabelWidget>("PLAYER");
var client = player.World.LobbyInfo.ClientWithIndex(player.ClientIndex); var client = player.World.LobbyInfo.ClientWithIndex(player.ClientIndex);