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

Trigger RA GPS reveal from sat missile effect instead of DelayedAction

Browse Source
This commit is contained in:
reaperrr
2016-11-18 15:35:35 +01:00
parent 5635c61007
commit 4e92311a59
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Mods.RA/Effects/GpsSatellite.cs
View File

@@ -18,14 +18,19 @@ namespace OpenRA.Mods.RA.Effects
{
class GpsSatellite : IEffect
{
readonly Player launcher;
readonly Animation anim;
readonly string palette;
readonly int revealDelay;
WPos pos;
int tick;
public GpsSatellite(World world, WPos pos, string image, string sequence, string palette)
public GpsSatellite(World world, WPos pos, string image, string sequence, string palette, int revealDelay, Player launcher)
{
this.palette = palette;
this.pos = pos;
this.launcher = launcher;
this.revealDelay = revealDelay;
anim = new Animation(world, image);
anim.PlayRepeating(sequence);
@@ -36,8 +41,12 @@ namespace OpenRA.Mods.RA.Effects
anim.Tick();
pos += new WVec(0, 0, 427);
if (pos.Z > pos.Y)
if (++tick > revealDelay)
{
var watcher = launcher.PlayerActor.Trait<GpsWatcher>();
watcher.ReachedOrbit(launcher);
world.AddFrameEndTask(w => w.Remove(this));
}
}
public IEnumerable<IRenderable> Render(WorldRenderer wr)

2
OpenRA.Mods.RA/Effects/SatelliteLaunch.cs
View File

@@ -43,7 +43,7 @@ namespace OpenRA.Mods.RA.Effects
if (++frame == 19)
{
var palette = info.SatellitePaletteIsPlayerPalette ? info.SatellitePalette + launcher.Owner.InternalName : info.SatellitePalette;
world.AddFrameEndTask(w => w.Add(new GpsSatellite(world, pos, info.SatelliteImage, info.SatelliteSequence, palette)));
world.AddFrameEndTask(w => w.Add(new GpsSatellite(world, pos, info.SatelliteImage, info.SatelliteSequence, palette, info.RevealDelay * 25, launcher.Owner)));
}
}