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

Convert Parachutable to conditions.

Browse Source
This commit is contained in:
Paul Chote
2016-12-03 16:46:40 +00:00
parent a846e484c7
commit bcb3d52eb0
7 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.Common/Activities/Parachute.cs
View File

@@ -17,7 +17,6 @@ namespace OpenRA.Mods.Common.Activities
{
public class Parachute : Activity
{
readonly UpgradeManager um;
readonly IPositionable pos;
readonly ParachutableInfo para;
readonly WVec fallVector;
@@ -29,7 +28,6 @@ namespace OpenRA.Mods.Common.Activities
public Parachute(Actor self, WPos dropPosition, Actor ignoreActor = null)
{
um = self.TraitOrDefault<UpgradeManager>();
pos = self.TraitOrDefault<IPositionable>();
ignore = ignoreActor;
@@ -44,9 +42,8 @@ namespace OpenRA.Mods.Common.Activities
{
triggered = true;
if (um != null)
foreach (var u in para.ParachuteUpgrade)
um.GrantUpgrade(self, u, this);
foreach (var np in self.TraitsImplementing<INotifyParachute>())
np.OnParachute(self);
// Place the actor and retrieve its visual position (CenterPosition)
pos.SetPosition(self, dropPosition);
@@ -60,12 +57,8 @@ namespace OpenRA.Mods.Common.Activities
var dat = self.World.Map.DistanceAboveTerrain(currentPosition);
pos.SetPosition(self, currentPosition - new WVec(WDist.Zero, WDist.Zero, dat));
if (um != null)
foreach (var u in para.ParachuteUpgrade)
um.RevokeUpgrade(self, u, this);
foreach (var npl in self.TraitsImplementing<INotifyParachuteLanded>())
npl.OnLanded(ignore);
foreach (var np in self.TraitsImplementing<INotifyParachute>())
np.OnLanded(self, ignore);
return NextActivity;
}