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

Merge Plane and Helicopter into Aircraft

Browse Source
This commit is contained in:
Pavel Penev
2015-08-06 18:33:52 +03:00
parent 0ee1ad3fa4
commit 8a44366667
28 changed files with 401 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.D2k/Activities/DeliverUnit.cs
View File

@@ -23,7 +23,7 @@ namespace OpenRA.Mods.D2k.Activities
readonly IMove movement;
readonly Carryable carryable;
readonly Carryall carryall;
readonly Helicopter helicopter;
readonly Aircraft aircraft;
readonly IPositionable positionable;
readonly IFacing cargoFacing;
readonly IFacing selfFacing;
@@ -39,7 +39,7 @@ namespace OpenRA.Mods.D2k.Activities
cargo = carryall.Carrying;
movement = self.Trait<IMove>();
carryable = cargo.Trait<Carryable>();
helicopter = self.Trait<Helicopter>();
aircraft = self.Trait<Aircraft>();
positionable = cargo.Trait<IPositionable>();
cargoFacing = cargo.Trait<IFacing>();
selfFacing = self.Trait<IFacing>();
@@ -95,7 +95,7 @@ namespace OpenRA.Mods.D2k.Activities
return this;
}
if (HeliFly.AdjustAltitude(self, helicopter, helicopter.Info.LandAltitude))
if (HeliFly.AdjustAltitude(self, aircraft, aircraft.Info.LandAltitude))
return this;
state = State.Release;
return Util.SequenceActivities(new Wait(15), this);

6
OpenRA.Mods.D2k/Activities/PickupUnit.cs
View File

@@ -22,7 +22,7 @@ namespace OpenRA.Mods.D2k.Activities
readonly IMove movement;
readonly Carryable carryable;
readonly Carryall carryall;
readonly Helicopter helicopter;
readonly Aircraft aircraft;
readonly IFacing cargoFacing;
readonly IFacing selfFacing;
@@ -37,7 +37,7 @@ namespace OpenRA.Mods.D2k.Activities
cargoFacing = cargo.Trait<IFacing>();
movement = self.Trait<IMove>();
carryall = self.Trait<Carryall>();
helicopter = self.Trait<Helicopter>();
aircraft = self.Trait<Aircraft>();
selfFacing = self.Trait<IFacing>();
state = State.Intercept;
}
@@ -90,7 +90,7 @@ namespace OpenRA.Mods.D2k.Activities
state = State.TakeOff;
return this;
case State.TakeOff:
if (HeliFly.AdjustAltitude(self, helicopter, helicopter.Info.CruiseAltitude))
if (HeliFly.AdjustAltitude(self, aircraft, aircraft.Info.CruiseAltitude))
return this;
return NextActivity;
}

3
OpenRA.Mods.D2k/Traits/Carryall.cs
View File

@@ -50,7 +50,8 @@ namespace OpenRA.Mods.D2k.Traits
IsBusy = false;
IsCarrying = false;
var helicopter = self.Info.TraitInfoOrDefault<HelicopterInfo>();
var helicopter = self.Info.TraitInfoOrDefault<AircraftInfo>();
carryHeight = helicopter != null ? helicopter.LandAltitude : WDist.Zero;
}