Merge pull request #12751 from abcdefg30/d2kSequences

Fix missing sequences in all mods

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 ClockSequence = null;
-
+		[SequenceReference("BeaconImage")] public readonly string ArrowSequence = null;
-		[SequenceReference("BeaconImage")] public readonly string ArrowSequence = "arrow";
+		[SequenceReference("BeaconImage")] public readonly string CircleSequence = null;
-		[SequenceReference("BeaconImage")] public readonly string CircleSequence = "circles";
 
 		[Desc("Delay after launch, measured in ticks.")]
 		public readonly int BeaconDelay = 0;

OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs

@@ -18,7 +18,6 @@ using System.Linq;
 using System.Text;
 using OpenRA.FileSystem;
 using OpenRA.Graphics;
-using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.UtilityCommands
 {
@@ -830,6 +829,27 @@ namespace OpenRA.Mods.Common.UtilityCommands
 						RenameNodeKey(node, "WithTeslaChargeAnimation");
 				}
 
+				// Default values for ArrowSequence, CircleSequence and ClockSequence were changed (to null)
+				if (engineVersion < 20170212)
+				{
+					var supportPowerNodes = new[] { "AirstrikePower", "ParatroopersPower", "NukePower" };
+
+					if (supportPowerNodes.Any(s => node.Key.StartsWith(s, StringComparison.Ordinal)))
+					{
+						var arrow = node.Value.Nodes.FirstOrDefault(n => n.Key == "ArrowSequence");
+						if (arrow == null)
+							node.Value.Nodes.Add(new MiniYamlNode("ArrowSequence", "arrow"));
+
+						var circle = node.Value.Nodes.FirstOrDefault(n => n.Key == "CircleSequence");
+						if (circle == null)
+							node.Value.Nodes.Add(new MiniYamlNode("CircleSequence", "circles"));
+
+						var clock = node.Value.Nodes.FirstOrDefault(n => n.Key == "ClockSequence");
+						if (clock == null)
+							node.Value.Nodes.Add(new MiniYamlNode("ClockSequence", "clock"));
+					}
+				}
+
 				UpgradeActorRules(modData, engineVersion, ref node.Value.Nodes, node, depth + 1);
 			}
 

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

mods/d2k/rules/structures.yaml

@@ -839,6 +839,8 @@ high_tech_factory:
 		UnitType: ornithopter
 		DisplayBeacon: True
 		CameraActor: camera
+		ArrowSequence: arrow
+		CircleSequence: circles
 	WithProductionOverlay@WELDING:
 		Sequence: production-welding
 	Power:
@@ -957,6 +959,8 @@ palace:
 		DisplayRadarPing: True
 		CameraRange: 10c0
 		ActivationSequence:
+		ArrowSequence: arrow
+		CircleSequence: circles
 	ProduceActorPower@fremen:
 		Description: Recruit Fremen
 		LongDesc: Elite infantry unit armed with assault rifles and rockets\n  Strong vs Infantry, Vehicles\n  Weak vs Artillery\n  Special Ability: Invisibility

mods/d2k/sequences/infantry.yaml

@@ -482,7 +482,7 @@ grenadier:
 		Start: 2606
 		Facings: -8
 		Transpose: true
-	idle: DATA.R8
+	idle1: DATA.R8
 		Frames: 2700, 2707, 2714, 2721, 2728, 2735, 2742, 2749
 		Length: 8
 	idle2: DATA.R8

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:

mods/ts/rules/civilian-infantry.yaml

@@ -174,7 +174,7 @@ TRATOS:
 		Range: 4c0
 	-AutoTarget:
 	WithInfantryBody:
-		DefaultAttackSequence: attack
+		DefaultAttackSequence:
 
 OXANNA:
 	Inherits: ^Soldier
@@ -262,8 +262,6 @@ VISC_SML:
 		MaxMoveDelay: 60
 	RenderSprites:
 		Image: vissml
-	Buildable:
-		Description: infantry transmorgifies into this
 
 VISC_LRG:
 	Inherits: ^Visceroid
@@ -293,8 +291,6 @@ VISC_LRG:
 		Crushes: crate, infantry
 	RenderSprites:
 		Image: vislrg
-	Buildable:
-		Description: 2 small visceroids combine into this
 
 CIV1:
 	Inherits: ^CivilianInfantry

mods/ts/rules/husks.yaml

@@ -5,8 +5,7 @@ DSHP.Husk:
 	Aircraft:
 		TurnSpeed: 5
 		Speed: 168
-	RenderSprites:
+	-RenderSprites:
-		Image: dshp
 	RenderVoxels:
 		Image: dshp
 

mods/ts/rules/shared-infantry.yaml

@@ -91,6 +91,7 @@ FLAMEGUY:
 		Step: -10
 		HealIfBelow: 101
 	ScaredyCat:
+		PanicSequencePrefix:
 	WithDeathAnimation:
 		FallbackSequence: die
 		UseDeathTypeSuffix: false