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

declare SVC -> CVC dep, rather than silently not working

Browse Source
This commit is contained in:
Chris Forbes
2011-07-09 11:34:41 +12:00
committed by Paul Chote
parent 002a8edb4c
commit 1076ebb884
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.RA/Strategic/StrategicVictoryConditions.cs
View File

@@ -17,7 +17,7 @@ namespace OpenRA.Mods.RA
/// <summary>
/// Attach to players only kthx :)
/// </summary>
public class StrategicVictoryConditionsInfo : ITraitInfo
public class StrategicVictoryConditionsInfo : ITraitInfo, Requires<ConquestVictoryConditionsInfo>
{
public readonly int TicksToHold = 25 * 60 * 5; // ~5 minutes
public readonly bool ResetOnHoldLost = true;
@@ -116,10 +116,6 @@ namespace OpenRA.Mods.RA
{
if (self.Owner.WinState != WinState.Undefined || self.Owner.NonCombatant) return;
var cvc = self.TraitOrDefault<ConquestVictoryConditions>();
if (cvc == null)
return; // Cannot work without ConquestVictoryConditions
// See if any of the conditions are met to increase the count
if (TotalCritical > 0)
{
@@ -188,7 +184,7 @@ namespace OpenRA.Mods.RA
// Player has won
foreach (var p in self.World.Players)
{
var cvc = p.PlayerActor.TraitOrDefault<ConquestVictoryConditions>();
var cvc = p.PlayerActor.Trait<ConquestVictoryConditions>();
if ((p.WinState == WinState.Undefined) && (p == self.Owner || (p.Stances[self.Owner] == Stance.Ally && self.Owner.Stances[p] == Stance.Ally)))
{