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

prone while not moving fix

Browse Source
This commit is contained in:
Chris Forbes
2009-12-18 12:07:49 +13:00
parent 2d951c931d
commit 278eb7b4f7
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRa.Game/Traits/RenderInfantry.cs
View File

@@ -26,8 +26,7 @@ namespace OpenRa.Game.Traits
if (float2.WithinEpsilon(self.CenterLocation, Util.CenterOfCell(mobile.toCell), 2)) return false; if (float2.WithinEpsilon(self.CenterLocation, Util.CenterOfCell(mobile.toCell), 2)) return false;
var dir = Util.QuantizeFacing(self.traits.Get<Unit>().Facing, 8); var dir = Util.QuantizeFacing(self.traits.Get<Unit>().Facing, 8);
var takeCover = self.traits.GetOrDefault<TakeCover>(); var prefix = IsProne(self) ? "crawl-" : "run-";
var prefix = (takeCover != null && takeCover.IsProne) ? "crawl-" : "run-";
if (anim.CurrentSequence.Name.StartsWith(prefix)) if (anim.CurrentSequence.Name.StartsWith(prefix))
anim.ReplaceAnim(prefix + dir); anim.ReplaceAnim(prefix + dir);
@@ -38,14 +37,18 @@ namespace OpenRa.Game.Traits
} }
bool inAttack = false; bool inAttack = false;
bool IsProne(Actor self)
{
var takeCover = self.traits.GetOrDefault<TakeCover>();
return takeCover != null && takeCover.IsProne;
}
public void Attacking(Actor self) public void Attacking(Actor self)
{ {
var dir = Util.QuantizeFacing(self.traits.Get<Unit>().Facing, 8); var dir = Util.QuantizeFacing(self.traits.Get<Unit>().Facing, 8);
inAttack = true; inAttack = true;
var takeCover = self.traits.GetOrDefault<TakeCover>(); var prefix = IsProne(self) ? "prone-shoot-" : "shoot-";
var prefix = (takeCover != null && takeCover.IsProne) ? "prone-shoot-" : "shoot-";
anim.PlayThen(prefix + dir, () => inAttack = false); anim.PlayThen(prefix + dir, () => inAttack = false);
} }
@@ -58,8 +61,13 @@ namespace OpenRa.Game.Traits
/* todo: idle anims, etc */ /* todo: idle anims, etc */
anim.PlayFacing("stand", var dir = Util.QuantizeFacing(self.traits.Get<Unit>().Facing, 8);
() => self.traits.Get<Unit>().Facing);
if (IsProne(self))
anim.PlayFetchIndex("crawl-" + dir, () => 0); /* what a hack. */
else
anim.PlayFacing("stand",
() => self.traits.Get<Unit>().Facing);
} }
public override IEnumerable<Tuple<Sprite, float2, int>> Render(Actor self) public override IEnumerable<Tuple<Sprite, float2, int>> Render(Actor self)