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

Merge pull request #11918 from abc013/CapturableHuskFaction

Browse Source 
Fix mcv husks losing their faction after being captured
This commit is contained in:
Paul Chote
2016-09-03 11:54:56 +01:00
committed by GitHub
parent 4a90ff834e 85feaf0091
commit 67cc12436f
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.Common/Traits/TransformOnCapture.cs
View File

@@ -20,19 +20,24 @@ namespace OpenRA.Mods.Common.Traits
public readonly int ForceHealthPercentage = 0;
public readonly bool SkipMakeAnims = true;
public virtual object Create(ActorInitializer init) { return new TransformOnCapture(this); }
public virtual object Create(ActorInitializer init) { return new TransformOnCapture(init, this); }
}
public class TransformOnCapture : INotifyCapture
{
readonly TransformOnCaptureInfo info;
readonly string faction;
public TransformOnCapture(TransformOnCaptureInfo info) { this.info = info; }
public TransformOnCapture(ActorInitializer init, TransformOnCaptureInfo info)
{
this.info = info;
faction = init.Contains<FactionInit>() ? init.Get<FactionInit, string>() : init.Self.Owner.Faction.InternalName;
}
public void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner)
{
var facing = self.TraitOrDefault<IFacing>();
var transform = new Transform(self, info.IntoActor) { ForceHealthPercentage = info.ForceHealthPercentage };
var transform = new Transform(self, info.IntoActor) { ForceHealthPercentage = info.ForceHealthPercentage, Faction = faction };
if (facing != null) transform.Facing = facing.Facing;
transform.SkipMakeAnims = info.SkipMakeAnims;
self.CancelActivity();