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

Tidy transformation trait/activity.

Browse Source
This commit is contained in:
Paul Chote
2014-06-21 15:24:49 +12:00
parent 6536f92b12
commit 7dfc822d76
2 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.RA/Activities/Transform.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information
/*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
* Copyright 2007-2014 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. For more information,
@@ -16,8 +16,8 @@ namespace OpenRA.Mods.RA.Activities
{
class Transform : Activity
{
public readonly string ToActor = null;
public CVec Offset = new CVec(0, 0);
public readonly string ToActor;
public CVec Offset = CVec.Zero;
public int Facing = 96;
public string[] Sounds = { };
public int ForceHealthPercentage = 0;
@@ -25,12 +25,13 @@ namespace OpenRA.Mods.RA.Activities
public Transform(Actor self, string toActor)
{
this.ToActor = toActor;
ToActor = toActor;
}
public override Activity Tick(Actor self)
{
if (IsCanceled) return NextActivity;
if (IsCanceled)
return NextActivity;
self.World.AddFrameEndTask(w =>
{
@@ -53,7 +54,8 @@ namespace OpenRA.Mods.RA.Activities
new FacingInit(Facing),
};
if (SkipMakeAnims) init.Add(new SkipMakeAnimsInit());
if (SkipMakeAnims)
init.Add(new SkipMakeAnimsInit());
var health = self.TraitOrDefault<Health>();
if (health != null)
@@ -70,7 +72,6 @@ namespace OpenRA.Mods.RA.Activities
init.Add(new RuntimeCargoInit(cargo.Passengers.ToArray()));
var a = w.CreateActor(ToActor, init);
foreach (var nt in self.TraitsImplementing<INotifyTransformed>())
nt.OnTransformed(a);

17
OpenRA.Mods.RA/Transforms.cs
View File

@@ -30,14 +30,14 @@ namespace OpenRA.Mods.RA
class Transforms : IIssueOrder, IResolveOrder, IOrderVoice
{
Actor self;
TransformsInfo Info;
BuildingInfo bi;
readonly Actor self;
readonly TransformsInfo info;
readonly BuildingInfo bi;
public Transforms(Actor self, TransformsInfo info)
{
this.self = self;
Info = info;
this.info = info;
bi = self.World.Map.Rules.Actors[info.IntoActor].Traits.GetOrDefault<BuildingInfo>();
}
@@ -52,7 +52,7 @@ namespace OpenRA.Mods.RA
if (b != null && b.Locked)
return false;
return (bi == null || self.World.CanPlaceBuilding(Info.IntoActor, bi, self.Location + (CVec)Info.Offset, self));
return bi == null || self.World.CanPlaceBuilding(info.IntoActor, bi, self.Location + (CVec)info.Offset, self);
}
public IEnumerable<IOrderTargeter> Orders
@@ -74,8 +74,9 @@ namespace OpenRA.Mods.RA
if (!CanDeploy() || (b != null && !b.Lock()))
{
foreach (var s in Info.NoTransformSounds)
foreach (var s in info.NoTransformSounds)
Sound.PlayToPlayer(self.Owner, s);
return;
}
@@ -83,13 +84,13 @@ namespace OpenRA.Mods.RA
self.CancelActivity();
if (self.HasTrait<IFacing>())
self.QueueActivity(new Turn(Info.Facing));
self.QueueActivity(new Turn(info.Facing));
var rb = self.TraitOrDefault<RenderBuilding>();
if (rb != null && self.Info.Traits.Get<RenderBuildingInfo>().HasMakeAnimation)
self.QueueActivity(new MakeAnimation(self, true, () => rb.PlayCustomAnim(self, "make")));
self.QueueActivity(new Transform(self, Info.IntoActor) { Offset = (CVec)Info.Offset, Facing = Info.Facing, Sounds = Info.TransformSounds });
self.QueueActivity(new Transform(self, info.IntoActor) { Offset = (CVec)info.Offset, Facing = info.Facing, Sounds = info.TransformSounds });
}
public void ResolveOrder(Actor self, Order order)