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

Remove ExcludedActors from crate actions. Use a tag trait for cloakable actors. Ban MCV from receiving cloak.

Browse Source
This commit is contained in:
Paul Chote
2011-07-01 00:07:04 +12:00
parent f360559869
commit 11a9bc7e43
6 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Crate.cs
View File

@@ -59,7 +59,7 @@ namespace OpenRA.Mods.RA
public void OnCrush(Actor crusher)
{
var shares = self.TraitsImplementing<CrateAction>().Select(
a => Pair.New(a, a.GetSelectionSharesOuter(crusher)));
a => Pair.New(a, a.GetSelectionShares(crusher)));
var totalShares = shares.Sum(a => a.Second);
var n = self.World.SharedRandom.Next(totalShares);

9
OpenRA.Mods.RA/CrateAction.cs
View File

@@ -19,7 +19,6 @@ namespace OpenRA.Mods.RA
public int SelectionShares = 10;
public string Effect = null;
public string Notification = null;
public string[] ExcludedActorTypes = { };
public virtual object Create(ActorInitializer init) { return new CrateAction(init.self, this); }
}
@@ -35,14 +34,6 @@ namespace OpenRA.Mods.RA
this.info = info;
}
public int GetSelectionSharesOuter(Actor collector)
{
if (info.ExcludedActorTypes.Contains(collector.Info.Name))
return 0;
return GetSelectionShares(collector);
}
public virtual int GetSelectionShares(Actor collector)
{
return info.SelectionShares;

7
OpenRA.Mods.RA/Crates/CloakCrateAction.cs
View File

@@ -32,8 +32,8 @@ namespace OpenRA.Mods.RA.Crates
public override int GetSelectionShares(Actor collector)
{
return collector.HasTrait<Cloak>()
? 0 : base.GetSelectionShares(collector);
return collector.HasTrait<AcceptsCloakCrate>() && !collector.HasTrait<Cloak>()
? base.GetSelectionShares(collector) : 0;
}
public override void Activate(Actor collector)
@@ -61,4 +61,7 @@ namespace OpenRA.Mods.RA.Crates
base.Activate(collector);
}
}
public class AcceptsCloakCrateInfo : TraitInfo<AcceptsCloakCrate> {}
public class AcceptsCloakCrate {}
}