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

setup the minelayer rearm sound

Browse Source
This commit is contained in:
Matthias Mailänder
2014-09-28 16:05:08 +02:00
parent 45e3d41093
commit c9346d1da8
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.RA/Activities/LayMines.cs
View File

@@ -26,8 +26,9 @@ namespace OpenRA.Mods.RA.Activities
var limitedAmmo = self.TraitOrDefault<LimitedAmmo>(); var limitedAmmo = self.TraitOrDefault<LimitedAmmo>();
if (!limitedAmmo.HasAmmo()) if (!limitedAmmo.HasAmmo())
{ {
var info = self.Info.Traits.Get<MinelayerInfo>();
// rearm & repair at fix, then back out here to refill the minefield some more // rearm & repair at fix, then back out here to refill the minefield some more
var buildings = self.Info.Traits.Get<MinelayerInfo>().RearmBuildings; var buildings = info.RearmBuildings;
var rearmTarget = self.World.Actors.Where(a => self.Owner.Stances[a.Owner] == Stance.Ally var rearmTarget = self.World.Actors.Where(a => self.Owner.Stances[a.Owner] == Stance.Ally
&& buildings.Contains(a.Info.Name)) && buildings.Contains(a.Info.Name))
.ClosestTo(self); .ClosestTo(self);
@@ -38,26 +39,27 @@ namespace OpenRA.Mods.RA.Activities
return Util.SequenceActivities( return Util.SequenceActivities(
new MoveAdjacentTo(self, Target.FromActor(rearmTarget)), new MoveAdjacentTo(self, Target.FromActor(rearmTarget)),
movement.MoveTo(self.World.Map.CellContaining(rearmTarget.CenterPosition), rearmTarget), movement.MoveTo(self.World.Map.CellContaining(rearmTarget.CenterPosition), rearmTarget),
new Rearm(self), new Rearm(self, info.RearmSound),
new Repair(rearmTarget), new Repair(rearmTarget),
this); this);
} }
var ml = self.Trait<Minelayer>(); var ml = self.Trait<Minelayer>();
if (ml.Minefield.Contains(self.Location) && if (ml.Minefield.Contains(self.Location) && ShouldLayMine(self, self.Location))
ShouldLayMine(self, self.Location))
{ {
LayMine(self); LayMine(self);
return Util.SequenceActivities(new Wait(20), this); // a little wait after placing each mine, for show return Util.SequenceActivities(new Wait(20), this); // a little wait after placing each mine, for show
} }
if (ml.Minefield.Length > 0) if (ml.Minefield.Length > 0)
{
for (var n = 0; n < 20; n++) // dont get stuck forever here for (var n = 0; n < 20; n++) // dont get stuck forever here
{ {
var p = ml.Minefield.Random(self.World.SharedRandom); var p = ml.Minefield.Random(self.World.SharedRandom);
if (ShouldLayMine(self, p)) if (ShouldLayMine(self, p))
return Util.SequenceActivities( movement.MoveTo(p, 0), this ); return Util.SequenceActivities( movement.MoveTo(p, 0), this );
} }
}
// TODO: return somewhere likely to be safe (near fix) so we're not sitting out in the minefield. // TODO: return somewhere likely to be safe (near fix) so we're not sitting out in the minefield.

9
OpenRA.Mods.RA/Activities/Rearm.cs
View File

@@ -19,18 +19,21 @@ namespace OpenRA.Mods.RA.Activities
readonly LimitedAmmo limitedAmmo; readonly LimitedAmmo limitedAmmo;
int ticksPerPip = 25 * 2; int ticksPerPip = 25 * 2;
int remainingTicks = 25 * 2; int remainingTicks = 25 * 2;
string sound = null;
public Rearm(Actor self) public Rearm(Actor self, string sound = null)
{ {
limitedAmmo = self.TraitOrDefault<LimitedAmmo>(); limitedAmmo = self.TraitOrDefault<LimitedAmmo>();
if (limitedAmmo != null) if (limitedAmmo != null)
ticksPerPip = limitedAmmo.ReloadTimePerAmmo(); ticksPerPip = limitedAmmo.ReloadTimePerAmmo();
remainingTicks = ticksPerPip; remainingTicks = ticksPerPip;
this.sound = sound;
} }
public override Activity Tick(Actor self) public override Activity Tick(Actor self)
{ {
if (IsCanceled || limitedAmmo == null) return NextActivity; if (IsCanceled || limitedAmmo == null)
return NextActivity;
if (--remainingTicks == 0) if (--remainingTicks == 0)
{ {
@@ -44,6 +47,8 @@ namespace OpenRA.Mods.RA.Activities
return NextActivity; return NextActivity;
hostBuilding.Trait<RenderBuilding>().PlayCustomAnim(hostBuilding, "active"); hostBuilding.Trait<RenderBuilding>().PlayCustomAnim(hostBuilding, "active");
if (sound != null)
Sound.Play(sound, self.CenterPosition);
remainingTicks = limitedAmmo.ReloadTimePerAmmo(); remainingTicks = limitedAmmo.ReloadTimePerAmmo();
} }

4
OpenRA.Mods.RA/Minelayer.cs
View File

@@ -23,6 +23,8 @@ namespace OpenRA.Mods.RA
[ActorReference] public readonly string Mine = "minv"; [ActorReference] public readonly string Mine = "minv";
[ActorReference] public readonly string[] RearmBuildings = { "fix" }; [ActorReference] public readonly string[] RearmBuildings = { "fix" };
public readonly string RearmSound = "minelay1.aud";
public readonly float MinefieldDepth = 1.5f; public readonly float MinefieldDepth = 1.5f;
public object Create(ActorInitializer init) { return new Minelayer(init.self); } public object Create(ActorInitializer init) { return new Minelayer(init.self); }
@@ -30,7 +32,7 @@ namespace OpenRA.Mods.RA
class Minelayer : IIssueOrder, IResolveOrder, IPostRenderSelection, ISync class Minelayer : IIssueOrder, IResolveOrder, IPostRenderSelection, ISync
{ {
/* [Sync] when sync can cope with arrays! */ /* TODO: [Sync] when sync can cope with arrays! */
public CPos[] Minefield = null; public CPos[] Minefield = null;
[Sync] CPos minefieldStart; [Sync] CPos minefieldStart;
Actor self; Actor self;