Merge PlaceSimpleBeacon and AnimatedBeacon into PlaceBeacon and Beacon

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

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,

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,

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,

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;