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

Merge HeliLand into Land activity

Browse Source
This commit is contained in:
reaperrr
2019-03-27 00:52:18 +01:00
committed by Paul Chote
parent bc3cabdea0
commit 14bd5ada1a
10 changed files with 55 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Activities/Air/HeliFly.cs
View File

@@ -164,7 +164,7 @@ namespace OpenRA.Mods.Common.Activities
{
if (info.TurnToLand)
self.QueueActivity(new Turn(self, info.InitialFacing));
self.QueueActivity(new HeliLand(self, true));
self.QueueActivity(new Land(self, true));
activity = NextActivity;
}

81
OpenRA.Mods.Common/Activities/Air/HeliLand.cs
View File

@@ -1,81 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2019 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version. For more
* information, see COPYING.
*/
#endregion
using OpenRA.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Activities
{
public class HeliLand : Activity
{
readonly Aircraft aircraft;
readonly WDist landAltitude;
readonly bool requireSpace;
readonly Actor ignoreActor;
bool soundPlayed;
bool landingInitiated;
public HeliLand(Actor self, bool requireSpace, Actor ignoreActor = null)
: this(self, requireSpace, self.Trait<Aircraft>().LandAltitude, ignoreActor) { }
public HeliLand(Actor self, bool requireSpace, WDist landAltitude, Actor ignoreActor = null)
{
this.requireSpace = requireSpace;
this.landAltitude = landAltitude;
this.ignoreActor = ignoreActor;
aircraft = self.Trait<Aircraft>();
}
public override Activity Tick(Actor self)
{
if (ChildActivity != null)
{
ChildActivity = ActivityUtils.RunActivity(self, ChildActivity);
if (ChildActivity != null)
return this;
}
if (IsCanceling)
{
aircraft.RemoveInfluence();
return NextActivity;
}
if (requireSpace && !landingInitiated)
{
var landingCell = self.Location;
if (!aircraft.CanLand(landingCell, ignoreActor))
{
QueueChild(self, new Wait(25), true);
self.NotifyBlocker(landingCell);
return this;
}
aircraft.AddInfluence(landingCell);
aircraft.EnteringCell(self);
landingInitiated = true;
}
if (!soundPlayed && aircraft.Info.LandingSounds.Length > 0 && !self.IsAtGroundLevel())
{
Game.Sound.Play(SoundType.World, aircraft.Info.LandingSounds, self.World, aircraft.CenterPosition);
soundPlayed = true;
}
if (HeliFly.AdjustAltitude(self, aircraft, landAltitude))
return this;
return NextActivity;
}
}
}

48
OpenRA.Mods.Common/Activities/Air/Land.cs
View File

@@ -21,18 +21,33 @@ namespace OpenRA.Mods.Common.Activities
readonly Aircraft aircraft;
readonly bool requireSpace;
readonly Actor ignoreActor;
readonly WDist landAltitude;
readonly bool ignoreTarget;
bool landingInitiated;
bool soundPlayed;
public Land(Actor self, Target t, bool requireSpace, Actor ignoreActor = null)
public Land(Actor self, Target t, bool requireSpace, WDist landAltitude, Actor ignoreActor = null)
{
target = t;
aircraft = self.Trait<Aircraft>();
this.requireSpace = requireSpace;
this.ignoreActor = ignoreActor;
this.landAltitude = landAltitude != WDist.Zero ? landAltitude : aircraft.Info.LandAltitude;
}
public Land(Actor self, Target t, bool requireSpace, Actor ignoreActor = null)
: this(self, t, requireSpace, WDist.Zero, ignoreActor) { }
public Land(Actor self, bool requireSpace, WDist landAltitude, Actor ignoreActor = null)
: this(self, Target.FromPos(self.CenterPosition), requireSpace, landAltitude, ignoreActor)
{
ignoreTarget = true;
}
public Land(Actor self, bool requireSpace, Actor ignoreActor = null)
: this(self, requireSpace, WDist.Zero, ignoreActor) { }
public override Activity Tick(Actor self)
{
if (ChildActivity != null)
@@ -42,8 +57,11 @@ namespace OpenRA.Mods.Common.Activities
return this;
}
if (!target.IsValidFor(self))
if (!ignoreTarget && !target.IsValidFor(self))
{
Cancel(self);
return NextActivity;
}
if (IsCanceling)
{
@@ -53,11 +71,13 @@ namespace OpenRA.Mods.Common.Activities
if (requireSpace && !landingInitiated)
{
var landingCell = self.World.Map.CellContaining(target.CenterPosition);
var landingCell = !aircraft.Info.VTOL ? self.World.Map.CellContaining(target.CenterPosition) : self.Location;
if (!aircraft.CanLand(landingCell, ignoreActor))
{
// Maintain holding pattern.
if (!aircraft.Info.CanHover)
QueueChild(self, new FlyCircle(self, 25), true);
self.NotifyBlocker(landingCell);
return this;
}
@@ -67,12 +87,22 @@ namespace OpenRA.Mods.Common.Activities
landingInitiated = true;
}
if (!soundPlayed && aircraft.Info.LandingSounds.Length > 0 && !self.IsAtGroundLevel())
var altitude = self.World.Map.DistanceAboveTerrain(self.CenterPosition);
if (aircraft.Info.VTOL)
{
Game.Sound.Play(SoundType.World, aircraft.Info.LandingSounds, self.World, aircraft.CenterPosition);
soundPlayed = true;
var landAlt = !ignoreTarget ? self.World.Map.DistanceAboveTerrain(target.CenterPosition) : landAltitude;
if (!soundPlayed && aircraft.Info.LandingSounds.Length > 0 && altitude != landAlt)
PlayLandingSound(self);
if (HeliFly.AdjustAltitude(self, aircraft, landAlt))
return this;
return NextActivity;
}
if (!soundPlayed && aircraft.Info.LandingSounds.Length > 0 && altitude != landAltitude)
PlayLandingSound(self);
var d = target.CenterPosition - self.CenterPosition;
// The next move would overshoot, so just set the final position
@@ -88,5 +118,11 @@ namespace OpenRA.Mods.Common.Activities
return this;
}
void PlayLandingSound(Actor self)
{
Game.Sound.Play(SoundType.World, aircraft.Info.LandingSounds, self.World, aircraft.CenterPosition);
soundPlayed = true;
}
}
}

4
OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
View File

@@ -192,7 +192,7 @@ namespace OpenRA.Mods.Common.Activities
if (aircraft.Info.TurnToLand)
Queue(self, new Turn(self, aircraft.Info.InitialFacing));
Queue(self, new HeliLand(self, true));
Queue(self, new Land(self, true));
return NextActivity;
}
else
@@ -230,7 +230,7 @@ namespace OpenRA.Mods.Common.Activities
if (aircraft.Info.TurnToDock)
QueueChild(self, new Turn(self, aircraft.Info.InitialFacing), true);
QueueChild(self, new HeliLand(self, true, dest), true);
QueueChild(self, new Land(self, true, dest), true);
}
else
QueueChild(self, new Land(self, Target.FromPos(dest.CenterPosition + offset), true, dest), true);

2
OpenRA.Mods.Common/Activities/DeliverUnit.cs
View File

@@ -109,7 +109,7 @@ namespace OpenRA.Mods.Common.Activities
// Make sure that the carried actor is on the ground before releasing it
if (self.World.Map.DistanceAboveTerrain(carryablePosition) != WDist.Zero)
QueueChild(self, new HeliLand(self, true), true);
QueueChild(self, new Land(self, true), true);
// Pause briefly before releasing for visual effect
if (carryall.Info.UnloadingDelay > 0)

2
OpenRA.Mods.Common/Activities/PickupUnit.cs
View File

@@ -126,7 +126,7 @@ namespace OpenRA.Mods.Common.Activities
if (targetPosition.Z != self.CenterPosition.Z)
{
QueueChild(self, new HeliLand(self, false, self.World.Map.DistanceAboveTerrain(targetPosition)), true);
QueueChild(self, new Land(self, false, self.World.Map.DistanceAboveTerrain(targetPosition)), true);
return this;
}

2
OpenRA.Mods.Common/Activities/Transform.cs
View File

@@ -39,7 +39,7 @@ namespace OpenRA.Mods.Common.Activities
QueueChild(self, new Turn(self, Facing));
if (self.Info.HasTraitInfo<AircraftInfo>())
QueueChild(self, new HeliLand(self, true));
QueueChild(self, new Land(self, true));
}
public override Activity Tick(Actor self)

2
OpenRA.Mods.Common/Scripting/Global/ReinforcementsGlobal.cs
View File

@@ -183,7 +183,7 @@ namespace OpenRA.Mods.Common.Scripting
Move(transport, destination);
transport.QueueActivity(new Turn(transport, aircraft.Info.InitialFacing));
transport.QueueActivity(new HeliLand(transport, true));
transport.QueueActivity(new Land(transport, true));
}
else
{

8
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -314,14 +314,14 @@ namespace OpenRA.Mods.Common.Traits
// Add land activity if LandOnCondidion resolves to true and the actor can land at the current location.
if (!ForceLanding && landNow.HasValue && landNow.Value && airborne && CanLand(self.Location)
&& !(self.CurrentActivity is HeliLand || self.CurrentActivity is Turn))
&& !((self.CurrentActivity is Land && Info.VTOL) || self.CurrentActivity is Turn))
{
self.CancelActivity();
if (Info.TurnToLand)
self.QueueActivity(new Turn(self, Info.InitialFacing));
self.QueueActivity(new HeliLand(self, true));
self.QueueActivity(new Land(self, true));
ForceLanding = true;
}
@@ -625,7 +625,7 @@ namespace OpenRA.Mods.Common.Traits
if (Info.TurnToLand)
self.QueueActivity(new Turn(self, Info.InitialFacing));
self.QueueActivity(new HeliLand(self, true));
self.QueueActivity(new Land(self, true));
}
else if (!Info.CanHover && !atLandAltitude)
self.QueueActivity(new FlyCircle(self, -1, Info.IdleTurnSpeed > -1 ? Info.IdleTurnSpeed : TurnSpeed));
@@ -815,7 +815,7 @@ namespace OpenRA.Mods.Common.Traits
if (!Info.VTOL)
return new Land(self, target, false);
return new HeliLand(self, false);
return new Land(self, false);
}
public Activity VisualMove(Actor self, WPos fromPos, WPos toPos)

2
OpenRA.Mods.Common/Traits/Cargo.cs
View File

@@ -193,7 +193,7 @@ namespace OpenRA.Mods.Common.Traits
Unloading = true;
if (aircraft != null)
self.QueueActivity(new HeliLand(self, true));
self.QueueActivity(new Land(self, true));
self.QueueActivity(new UnloadCargo(self, true));
}
}