From a4a9e46e2d68dc3b00575acfc7cbe055d5174979 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sat, 11 Feb 2017 15:38:42 +0100 Subject: [PATCH] Change the default value for the sequence definitions on SupportPower.cs --- .../Traits/SupportPowers/SupportPower.cs | 7 +++---- mods/cnc/rules/structures.yaml | 6 ++++++ mods/ra/rules/structures.yaml | 12 ++++++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/SupportPower.cs b/OpenRA.Mods.Common/Traits/SupportPowers/SupportPower.cs index d2f70cacd5..15fbce2a67 100644 --- a/OpenRA.Mods.Common/Traits/SupportPowers/SupportPower.cs +++ b/OpenRA.Mods.Common/Traits/SupportPowers/SupportPower.cs @@ -59,10 +59,9 @@ namespace OpenRA.Mods.Common.Traits 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"; - - [SequenceReference("BeaconImage")] public readonly string ArrowSequence = "arrow"; - [SequenceReference("BeaconImage")] public readonly string CircleSequence = "circles"; + [SequenceReference("BeaconImage")] public readonly string ClockSequence = null; + [SequenceReference("BeaconImage")] public readonly string ArrowSequence = null; + [SequenceReference("BeaconImage")] public readonly string CircleSequence = null; [Desc("Delay after launch, measured in ticks.")] public readonly int BeaconDelay = 0; diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml index 4ba7867577..eb3aac7512 100644 --- a/mods/cnc/rules/structures.yaml +++ b/mods/cnc/rules/structures.yaml @@ -494,6 +494,9 @@ HQ: BeaconPosterPalette: beaconposter DisplayRadarPing: True CameraActor: camera + ArrowSequence: arrow + ClockSequence: clock + CircleSequence: circles SupportPowerChargeBar: Power: Amount: -50 @@ -643,6 +646,9 @@ TMPL: BeaconPosterPalette: beaconposter DisplayRadarPing: True CameraRange: 10c0 + ArrowSequence: arrow + ClockSequence: clock + CircleSequence: circles SupportPowerChargeBar: Power: Amount: -150 diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 9930d38ebc..9ea7fc81f3 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -38,6 +38,9 @@ MSLO: BeaconPoster: atomicon FlashType: Nuke CameraRange: 10c0 + ArrowSequence: arrow + ClockSequence: clock + CircleSequence: circles CanPowerDown: PowerupSound: EnablePower PowerdownSound: DisablePower @@ -1231,6 +1234,9 @@ AFLD: QuantizedFacings: 8 DisplayBeacon: true BeaconPoster: camicon + ArrowSequence: arrow + ClockSequence: clock + CircleSequence: circles ParatroopersPower@paratroopers: OrderName: SovietParatroopers Prerequisites: aircraft.soviet @@ -1245,6 +1251,9 @@ AFLD: CameraActor: camera.paradrop DisplayBeacon: true BeaconPoster: pinficon + ArrowSequence: arrow + ClockSequence: clock + CircleSequence: circles AirstrikePower@parabombs: OrderName: UkraineParabombs Prerequisites: aircraft.ukraine @@ -1261,6 +1270,9 @@ AFLD: BeaconPoster: pbmbicon SquadSize: 3 SquadOffset: 1792,1792,0 + ArrowSequence: arrow + ClockSequence: clock + CircleSequence: circles ProductionBar: SupportPowerChargeBar: PrimaryBuilding: