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

Replace the obsolete race check from GiveUnitCrateAction.

Browse Source
This commit is contained in:
Paul Chote
2014-07-15 10:15:35 +12:00
parent 709f29184a
commit e3dae2edd0
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Mods.RA/Crates/GiveUnitCrateAction.cs
View File

@@ -19,9 +19,15 @@ namespace OpenRA.Mods.RA.Crates
class GiveUnitCrateActionInfo : CrateActionInfo class GiveUnitCrateActionInfo : CrateActionInfo
{ {
[ActorReference] [ActorReference]
[Desc("Unit to give")]
public readonly string Unit = null; public readonly string Unit = null;
[Desc("Override the owner of the newly spawned unit: e.g Creeps or Neutral")]
public readonly string Owner = null; public readonly string Owner = null;
[Desc("Races that are allowed to trigger this action")]
public readonly string[] Race = null;
public override object Create(ActorInitializer init) { return new GiveUnitCrateAction(init.self, this); } public override object Create(ActorInitializer init) { return new GiveUnitCrateAction(init.self, this); }
} }
@@ -34,14 +40,12 @@ namespace OpenRA.Mods.RA.Crates
public bool CanGiveTo(Actor collector) public bool CanGiveTo(Actor collector)
{ {
var bi = self.World.Map.Rules.Actors[Info.Unit].Traits.GetOrDefault<BuildableInfo>(); if (Info.Race != null && !Info.Race.Contains(collector.Owner.Country.Race))
return false;
// this unit is not buildable by the collector's country, so
// don't give them free ones either.
if (Info.Owner == null && bi != null && !bi.Owner.Contains(collector.Owner.Country.Race)) return false;
// avoid dumping tanks in the sea, and ships on dry land. // avoid dumping tanks in the sea, and ships on dry land.
if (!GetSuitableCells(collector.Location).Any()) return false; if (!GetSuitableCells(collector.Location).Any())
return false;
return true; return true;
} }