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

Port GrantUpgradeCrateAction to GrantExternalConditionCrateAction.

Browse Source
This commit is contained in:
Paul Chote
2016-11-20 17:15:12 +00:00
parent 764401be10
commit 6e29dfecfe
2 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -307,7 +307,7 @@
<Compile Include="Traits\Crates\GiveCashCrateAction.cs" /> <Compile Include="Traits\Crates\GiveCashCrateAction.cs" />
<Compile Include="Traits\Crates\GiveMcvCrateAction.cs" /> <Compile Include="Traits\Crates\GiveMcvCrateAction.cs" />
<Compile Include="Traits\Crates\GiveUnitCrateAction.cs" /> <Compile Include="Traits\Crates\GiveUnitCrateAction.cs" />
<Compile Include="Traits\Crates\GrantUpgradeCrateAction.cs" /> <Compile Include="Traits\Crates\GrantExternalConditionCrateAction.cs" />
<Compile Include="Traits\Crates\HealUnitsCrateAction.cs" /> <Compile Include="Traits\Crates\HealUnitsCrateAction.cs" />
<Compile Include="Traits\Crates\HideMapCrateAction.cs" /> <Compile Include="Traits\Crates\HideMapCrateAction.cs" />
<Compile Include="Traits\Crates\LevelUpCrateAction.cs" /> <Compile Include="Traits\Crates\LevelUpCrateAction.cs" />

42
OpenRA.Mods.Common/Traits/Crates/GrantUpgradeCrateAction.cs → OpenRA.Mods.Common/Traits/Crates/GrantExternalConditionCrateAction.cs
View File

@@ -15,11 +15,11 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Grants an upgrade to the collector.")] [Desc("Grants an upgrade to the collector.")]
public class GrantUpgradeCrateActionInfo : CrateActionInfo public class GrantExternalConditionCrateActionInfo : CrateActionInfo
{ {
[UpgradeGrantedReference, FieldLoader.Require] [FieldLoader.Require]
[Desc("The upgrades to apply.")] [Desc("The condition to apply. Must be included in the target actor's ExternalConditions list.")]
public readonly string[] Upgrades = { }; public readonly string Condition = null;
[Desc("Duration of the upgrade (in ticks). Set to 0 for a permanent upgrade.")] [Desc("Duration of the upgrade (in ticks). Set to 0 for a permanent upgrade.")]
public readonly int Duration = 0; public readonly int Duration = 0;
@@ -30,37 +30,36 @@ namespace OpenRA.Mods.Common.Traits
[Desc("The maximum number of extra collectors to grant the crate action to.", "-1 = no limit")] [Desc("The maximum number of extra collectors to grant the crate action to.", "-1 = no limit")]
public readonly int MaxExtraCollectors = 4; public readonly int MaxExtraCollectors = 4;
public override object Create(ActorInitializer init) { return new GrantUpgradeCrateAction(init.Self, this); } public override object Create(ActorInitializer init) { return new GrantExternalConditionCrateAction(init.Self, this); }
} }
public class GrantUpgradeCrateAction : CrateAction public class GrantExternalConditionCrateAction : CrateAction
{ {
readonly Actor self; readonly Actor self;
readonly GrantUpgradeCrateActionInfo info; readonly GrantExternalConditionCrateActionInfo info;
public GrantUpgradeCrateAction(Actor self, GrantUpgradeCrateActionInfo info) public GrantExternalConditionCrateAction(Actor self, GrantExternalConditionCrateActionInfo info)
: base(self, info) : base(self, info)
{ {
this.self = self; this.self = self;
this.info = info; this.info = info;
} }
bool AcceptsUpgrade(Actor a) bool AcceptsCondition(Actor a)
{ {
var um = a.TraitOrDefault<UpgradeManager>(); var um = a.TraitOrDefault<UpgradeManager>();
return um != null && (info.Duration > 0 ? return um != null && um.AcceptsExternalCondition(a, info.Condition);
info.Upgrades.Any(u => um.AcknowledgesUpgrade(a, u)) : info.Upgrades.Any(u => um.AcceptsUpgrade(a, u)));
} }
public override int GetSelectionShares(Actor collector) public override int GetSelectionShares(Actor collector)
{ {
return AcceptsUpgrade(collector) ? info.SelectionShares : 0; return AcceptsCondition(collector) ? info.SelectionShares : 0;
} }
public override void Activate(Actor collector) public override void Activate(Actor collector)
{ {
var actorsInRange = self.World.FindActorsInCircle(self.CenterPosition, info.Range) var actorsInRange = self.World.FindActorsInCircle(self.CenterPosition, info.Range)
.Where(a => a != self && a != collector && a.Owner == collector.Owner && AcceptsUpgrade(a)); .Where(a => a != self && a != collector && a.Owner == collector.Owner && AcceptsCondition(a));
if (info.MaxExtraCollectors > -1) if (info.MaxExtraCollectors > -1)
actorsInRange = actorsInRange.Take(info.MaxExtraCollectors); actorsInRange = actorsInRange.Take(info.MaxExtraCollectors);
@@ -73,19 +72,10 @@ namespace OpenRA.Mods.Common.Traits
continue; continue;
var um = a.TraitOrDefault<UpgradeManager>(); var um = a.TraitOrDefault<UpgradeManager>();
foreach (var u in info.Upgrades)
{ // Condition token is ignored because we never revoke this condition.
if (info.Duration > 0) if (um != null)
{ um.GrantCondition(a, info.Condition, true, info.Duration);
if (um.AcknowledgesUpgrade(a, u))
um.GrantTimedUpgrade(a, u, info.Duration);
}
else
{
if (um.AcceptsUpgrade(a, u))
um.GrantUpgrade(a, u, this);
}
}
} }
}); });