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

Merge PlaceSimpleBeacon and AnimatedBeacon into PlaceBeacon and Beacon

Browse Source
This commit is contained in:
abcdefg30
2018-12-26 10:36:42 +01:00
committed by reaperrr
parent 8edbf665c5
commit 8578ce1346
8 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Traits/Player/PlaceBeacon.cs
View File

@@ -28,6 +28,7 @@ namespace OpenRA.Mods.Common.Traits
[PaletteReference("IsPlayerPalette")] public readonly string Palette = "player";
public readonly string BeaconImage = "beacon";
[SequenceReference("BeaconImage")] public readonly string BeaconSequence = null;
[SequenceReference("BeaconImage")] public readonly string ArrowSequence = "arrow";
[SequenceReference("BeaconImage")] public readonly string CircleSequence = "circles";
@@ -58,8 +59,8 @@ namespace OpenRA.Mods.Common.Traits
if (playerBeacon != null)
self.World.Remove(playerBeacon);
playerBeacon = new Beacon(self.Owner, order.Target.CenterPosition, info.Duration,
info.Palette, info.IsPlayerPalette, info.BeaconImage, info.ArrowSequence, info.CircleSequence);
playerBeacon = new Beacon(self.Owner, order.Target.CenterPosition, info.Duration, info.Palette, info.IsPlayerPalette,
info.BeaconImage, info.BeaconSequence, info.ArrowSequence, info.CircleSequence);
self.World.Add(playerBeacon);

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

@@ -166,6 +166,7 @@ namespace OpenRA.Mods.Common.Traits
Info.BeaconImage,
Info.BeaconPoster,
Info.BeaconPosterPalette,
Info.BeaconSequence,
Info.ArrowSequence,
Info.CircleSequence,
Info.ClockSequence,

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

@@ -140,6 +140,7 @@ namespace OpenRA.Mods.Common.Traits
Info.BeaconImage,
Info.BeaconPoster,
Info.BeaconPosterPalette,
Info.BeaconSequence,
Info.ArrowSequence,
Info.CircleSequence,
Info.ClockSequence,

1
OpenRA.Mods.Common/Traits/SupportPowers/ParatroopersPower.cs
View File

@@ -211,6 +211,7 @@ namespace OpenRA.Mods.Common.Traits
Info.BeaconImage,
Info.BeaconPoster,
Info.BeaconPosterPalette,
Info.BeaconSequence,
Info.ArrowSequence,
Info.CircleSequence,
Info.ClockSequence,

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

@@ -77,6 +77,7 @@ namespace OpenRA.Mods.Common.Traits
[SequenceReference("BeaconImage")] public readonly string BeaconPoster = null;
[PaletteReference] public readonly string BeaconPosterPalette = "chrome";
[SequenceReference("BeaconImage")] public readonly string ClockSequence = null;
[SequenceReference("BeaconImage")] public readonly string BeaconSequence = null;
[SequenceReference("BeaconImage")] public readonly string ArrowSequence = null;
[SequenceReference("BeaconImage")] public readonly string CircleSequence = null;