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

Prepare short game code for trait-defined lobby options.

Browse Source
This commit is contained in:
Paul Chote
2016-04-24 15:35:37 +01:00
parent e3bc73a168
commit 0a7c80ef6e
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/PlayerExtensions.cs
View File

@@ -18,7 +18,8 @@ namespace OpenRA.Mods.Common
{ {
public static bool HasNoRequiredUnits(this Player player) public static bool HasNoRequiredUnits(this Player player)
{ {
if (player.World.LobbyInfo.GlobalSettings.ShortGame) var mapOptions = player.World.WorldActor.Trait<MapOptions>();
if (mapOptions.ShortGame)
return !player.World.ActorsHavingTrait<MustBeDestroyed>(t => t.Info.RequiredForShortGame).Any(a => a.Owner == player); return !player.World.ActorsHavingTrait<MustBeDestroyed>(t => t.Info.RequiredForShortGame).Any(a => a.Owner == player);
return !player.World.ActorsHavingTrait<MustBeDestroyed>().Any(a => a.Owner == player && a.IsInWorld); return !player.World.ActorsHavingTrait<MustBeDestroyed>().Any(a => a.Owner == player && a.IsInWorld);
} }

10
OpenRA.Mods.Common/Traits/World/MapOptions.cs
View File

@@ -39,5 +39,13 @@ namespace OpenRA.Mods.Common.Traits
public readonly bool DifficultyLocked = false; public readonly bool DifficultyLocked = false;
} }
public class MapOptions { } public class MapOptions : INotifyCreated
{
public bool ShortGame { get; private set; }
void INotifyCreated.Created(Actor self)
{
ShortGame = self.World.LobbyInfo.GlobalSettings.ShortGame;
}
}
} }