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

remove silly exploit on undeploying MCV

Browse Source
This commit is contained in:
Chris Forbes
2010-07-08 21:49:25 +12:00
parent 3093928d95
commit 40ae25c895
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenRA.Mods.RA/Activities/TransformIntoActor.cs
View File

@@ -46,23 +46,27 @@ namespace OpenRA.Mods.RA.Activities
{ {
if (isCanceled) return NextActivity; if (isCanceled) return NextActivity;
self.World.AddFrameEndTask( _ => self.World.AddFrameEndTask(_ =>
{ {
var oldHP = self.GetMaxHP(); self.World.Remove(self);
var newHP = Rules.Info[actor].Traits.Get<OwnedActorInfo>().HP;
var newHealth = (transferPercentage) ? (int)((float)self.Health/oldHP*newHP) : Math.Min(self.Health, newHP);
self.Health = 0;
self.World.Remove( self );
foreach (var s in sounds) foreach (var s in sounds)
Sound.PlayToPlayer(self.Owner, s, self.CenterLocation); Sound.PlayToPlayer(self.Owner, s, self.CenterLocation);
var a = self.World.CreateActor( actor, self.Location + offset, self.Owner ); var a = self.World.CreateActor(actor, self.Location + offset, self.Owner);
a.Health = newHealth; a.Health = GetHealthToTransfer(self, a, transferPercentage);
} ); });
return this; return this;
} }
public void Cancel(Actor self) { isCanceled = true; NextActivity = null; } public void Cancel(Actor self) { isCanceled = true; NextActivity = null; }
public static int GetHealthToTransfer(Actor from, Actor to, bool transferPercentage)
{
var oldHP = from.GetMaxHP();
var newHP = to.GetMaxHP();
return (transferPercentage)
? (int)((float)from.Health / oldHP * newHP)
: Math.Min(from.Health, newHP);
}
} }
} }

1
OpenRA.Mods.RA/Activities/UndeployMcv.cs
View File

@@ -33,6 +33,7 @@ namespace OpenRA.Mods.RA.Activities
w.Remove(self); w.Remove(self);
var mcv = w.CreateActor("mcv", self.Location + new int2(1, 1), self.Owner); var mcv = w.CreateActor("mcv", self.Location + new int2(1, 1), self.Owner);
mcv.Health = TransformIntoActor.GetHealthToTransfer(self, mcv, true);
mcv.traits.Get<Unit>().Facing = 96; mcv.traits.Get<Unit>().Facing = 96;
} }