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

Merge pull request #11167 from pchote/fix-gps-satellite-palette

Browse Source 
Fix GPS satellite palette.
This commit is contained in:
Oliver Brakmann
2016-04-24 13:17:26 +02:00
parent d88f8d348b d70356b47f
commit 23e5889a70
3 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,17 +18,17 @@ namespace OpenRA.Mods.RA.Effects
{
class GpsSatellite : IEffect
{
readonly GpsPowerInfo info;
readonly Animation anim;
readonly string palette;
WPos pos;
public GpsSatellite(World world, WPos pos, GpsPowerInfo info)
public GpsSatellite(World world, WPos pos, string image, string sequence, string palette)
{
this.info = info;
this.palette = palette;
this.pos = pos;
anim = new Animation(world, info.SatelliteImage);
anim.PlayRepeating(info.SatelliteSequence);
anim = new Animation(world, image);
anim.PlayRepeating(sequence);
}
public void Tick(World world)
@@ -42,7 +42,7 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<IRenderable> Render(WorldRenderer wr)
{
return anim.Render(pos, wr.Palette(info.SatellitePalette));
return anim.Render(pos, wr.Palette(palette));
}
}
}

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

@@ -19,19 +19,21 @@ namespace OpenRA.Mods.RA.Effects
class SatelliteLaunch : IEffect
{
readonly GpsPowerInfo info;
readonly Actor launcher;
readonly Animation doors;
readonly WPos pos;
int frame = 0;
public SatelliteLaunch(Actor a, GpsPowerInfo info)
public SatelliteLaunch(Actor launcher, GpsPowerInfo info)
{
this.info = info;
this.launcher = launcher;
doors = new Animation(a.World, info.DoorImage);
doors = new Animation(launcher.World, info.DoorImage);
doors.PlayThen(info.DoorSequence,
() => a.World.AddFrameEndTask(w => w.Remove(this)));
() => launcher.World.AddFrameEndTask(w => w.Remove(this)));
pos = a.CenterPosition;
pos = launcher.CenterPosition;
}
public void Tick(World world)
@@ -39,12 +41,16 @@ namespace OpenRA.Mods.RA.Effects
doors.Tick();
if (++frame == 19)
world.AddFrameEndTask(w => w.Add(new GpsSatellite(world, pos, info)));
{
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)));
}
}
public IEnumerable<IRenderable> Render(WorldRenderer wr)
{
return doors.Render(pos, wr.Palette(info.DoorPalette));
var palette = info.DoorPaletteIsPlayerPalette ? info.DoorPalette + launcher.Owner.InternalName : info.DoorPalette;
return doors.Render(pos, wr.Palette(palette));
}
}
}

14
OpenRA.Mods.RA/Traits/SupportPowers/GpsPower.cs
View File

@@ -25,11 +25,21 @@ namespace OpenRA.Mods.RA.Traits
public readonly string DoorImage = "atek";
[SequenceReference("DoorImage")] public readonly string DoorSequence = "active";
[PaletteReference] public readonly string DoorPalette = "effect";
[Desc("Palette to use for rendering the launch animation")]
[PaletteReference("DoorPaletteIsPlayerPalette")] public readonly string DoorPalette = "player";
[Desc("Custom palette is a player palette BaseName")]
public readonly bool DoorPaletteIsPlayerPalette = true;
public readonly string SatelliteImage = "sputnik";
[SequenceReference("SatelliteImage")] public readonly string SatelliteSequence = "idle";
[PaletteReference] public readonly string SatellitePalette = "effect";
[Desc("Palette to use for rendering the satellite projectile")]
[PaletteReference("SatellitePaletteIsPlayerPalette")] public readonly string SatellitePalette = "player";
[Desc("Custom palette is a player palette BaseName")]
public readonly bool SatellitePaletteIsPlayerPalette = true;
public override object Create(ActorInitializer init) { return new GpsPower(init.Self, this); }
}