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

Convert turret facings to WAngle relative to the body.

Browse Source
This commit is contained in:
Paul Chote
2020-07-18 12:41:22 +01:00
committed by reaperrr
parent 70a86bed7a
commit 75cb5c2166
15 changed files with 189 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenRA.Mods.Cnc/Traits/Attack/AttackPopupTurreted.cs
View File

@@ -76,19 +76,12 @@ namespace OpenRA.Mods.Cnc.Traits
{
state = PopupState.Closed;
wsb.PlayCustomAnimationRepeating(self, info.ClosedIdleSequence);
turret.DesiredFacing = null;
turret.FaceTarget(self, Target.Invalid);
}
}
protected override bool CanAttack(Actor self, Target target)
{
if (state == PopupState.Transitioning)
return false;
if (!base.CanAttack(self, target))
return false;
idleTicks = 0;
if (state == PopupState.Closed)
{
state = PopupState.Transitioning;
@@ -97,9 +90,14 @@ namespace OpenRA.Mods.Cnc.Traits
state = PopupState.Open;
wsb.PlayCustomAnimationRepeating(self, wsb.Info.Sequence);
});
return false;
idleTicks = 0;
}
if (state == PopupState.Transitioning || !base.CanAttack(self, target))
return false;
idleTicks = 0;
return true;
}
@@ -107,17 +105,18 @@ namespace OpenRA.Mods.Cnc.Traits
{
if (state == PopupState.Open && idleTicks++ > info.CloseDelay)
{
turret.DesiredFacing = info.DefaultFacing.Facing;
var facingOffset = new WVec(0, -1024, 0).Rotate(WRot.FromYaw(info.DefaultFacing));
turret.FaceTarget(self, Target.FromPos(self.CenterPosition + facingOffset));
state = PopupState.Rotating;
}
else if (state == PopupState.Rotating && turret.TurretFacing == info.DefaultFacing.Facing)
else if (state == PopupState.Rotating && turret.HasAchievedDesiredFacing)
{
state = PopupState.Transitioning;
wsb.PlayCustomAnimation(self, info.ClosingSequence, () =>
{
state = PopupState.Closed;
wsb.PlayCustomAnimationRepeating(self, info.ClosedIdleSequence);
turret.DesiredFacing = null;
turret.FaceTarget(self, Target.Invalid);
});
}
}

4
OpenRA.Mods.Cnc/Traits/Render/WithEmbeddedTurretSpriteBody.cs
View File

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.Cnc.Traits.Render
var wsb = init.Actor.TraitInfos<WithSpriteBodyInfo>().FirstOrDefault();
// Show the correct turret facing
var anim = new Animation(init.World, image, Turreted.TurretFacingFromInit(init, t));
var anim = new Animation(init.World, image, t.WorldFacingFromInit(init));
anim.PlayRepeating(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), wsb.Sequence));
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p, rs.Scale);
@@ -49,7 +49,7 @@ namespace OpenRA.Mods.Cnc.Traits.Render
{
// Turret artwork is baked into the sprite, so only the first turret makes sense.
var turreted = self.TraitsImplementing<Turreted>().FirstOrDefault();
return () => WAngle.FromFacing(turreted.TurretFacing);
return () => turreted.WorldOrientation.Yaw;
}
public WithEmbeddedTurretSpriteBody(ActorInitializer init, WithSpriteBodyInfo info)

2
OpenRA.Mods.Cnc/Traits/Render/WithGunboatBody.cs
View File

@@ -50,7 +50,7 @@ namespace OpenRA.Mods.Cnc.Traits.Render
{
// Turret artwork is baked into the sprite, so only the first turret makes sense.
var turreted = self.TraitsImplementing<Turreted>().FirstOrDefault();
return () => WAngle.FromFacing(turreted.TurretFacing);
return () => turreted.WorldOrientation.Yaw;
}
public WithGunboatBody(ActorInitializer init, WithGunboatBodyInfo info)