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

Unhardcode beacon sprites for documentation and lint testing.

Browse Source
This commit is contained in:
Matthias Mailänder
2016-02-14 11:31:55 +01:00
parent cc9f84f136
commit 76124b7c79
5 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Effects/Beacon.cs
View File

@@ -51,20 +51,20 @@ namespace OpenRA.Mods.Common.Effects
}
// Support power beacons are expected to clean themselves up
public Beacon(Player owner, WPos position, string palettePrefix, string posterType, string posterPalette, Func<float> clockFraction)
public Beacon(Player owner, WPos position, string palettePrefix, string posterCollection, string posterType, string posterPalette, string clockSequence, Func<float> clockFraction)
: this(owner, position, -1, palettePrefix)
{
this.posterPalette = posterPalette;
if (posterType != null)
{
poster = new Animation(owner.World, "beacon");
poster = new Animation(owner.World, posterCollection);
poster.Play(posterType);
if (clockFraction != null)
{
clock = new Animation(owner.World, "beacon");
clock.PlayFetchIndex("clock", () => Exts.Clamp((int)(clockFraction() * (clock.CurrentSequence.Length - 1)), 0, clock.CurrentSequence.Length - 1));
clock = new Animation(owner.World, posterCollection);
clock.PlayFetchIndex(clockSequence, () => Exts.Clamp((int)(clockFraction() * (clock.CurrentSequence.Length - 1)), 0, clock.CurrentSequence.Length - 1));
}
}
}

2
OpenRA.Mods.Common/Traits/SupportPowers/AirstrikePower.cs
View File

@@ -170,8 +170,10 @@ namespace OpenRA.Mods.Common.Traits
self.Owner,
target - new WVec(0, 0, altitude),
Info.BeaconPalettePrefix,
Info.BeaconImage,
Info.BeaconPoster,
Info.BeaconPosterPalette,
Info.ClockSequence,
() => 1 - ((distanceTestActor.CenterPosition - target).HorizontalLength - info.BeaconDistanceOffset.Length) * 1f / distance);
w.Add(beacon);

2
OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs
View File

@@ -135,8 +135,10 @@ namespace OpenRA.Mods.Common.Traits
order.Player,
targetPosition,
Info.BeaconPalettePrefix,
Info.BeaconImage,
Info.BeaconPoster,
Info.BeaconPosterPalette,
Info.ClockSequence,
() => missile.FractionComplete);
Action removeBeacon = () => self.World.AddFrameEndTask(w =>

6
OpenRA.Mods.Common/Traits/SupportPowers/SupportPower.cs
View File

@@ -45,9 +45,11 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Beacons are only supported on the Airstrike and Nuke powers")]
public readonly bool DisplayBeacon = false;
public readonly string BeaconPalettePrefix = "player";
public readonly string BeaconPoster = null;
[PaletteReference(true)] public readonly string BeaconPalettePrefix = "player";
public readonly string BeaconImage = "beacon";
[SequenceReference("BeaconImage")] public readonly string BeaconPoster = null;
[PaletteReference] public readonly string BeaconPosterPalette = "chrome";
[SequenceReference("BeaconImage")] public readonly string ClockSequence = "clock";
public readonly bool DisplayRadarPing = false;

2
OpenRA.Mods.RA/Traits/SupportPowers/ParatroopersPower.cs
View File

@@ -205,8 +205,10 @@ namespace OpenRA.Mods.RA.Traits
self.Owner,
target - new WVec(0, 0, altitude),
Info.BeaconPalettePrefix,
Info.BeaconImage,
Info.BeaconPoster,
Info.BeaconPosterPalette,
Info.ClockSequence,
() => 1 - ((distanceTestActor.CenterPosition - target).HorizontalLength - info.BeaconDistanceOffset.Length) * 1f / distance);
w.Add(beacon);