From 6228a962f6ae69118b523709d94f53a60a406510 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Wed, 8 Sep 2010 01:55:50 +1200
Subject: [PATCH] Idle animations for the rest of the cnc infantry; fix a
 potential desync.

---
 OpenRA.Mods.RA/IdleAnimation.cs |  2 +-
 mods/cnc/infantry.yaml          | 15 +++++++++++++--
 mods/cnc/sequences-infantry.xml | 16 +++++++++++++++-
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/OpenRA.Mods.RA/IdleAnimation.cs b/OpenRA.Mods.RA/IdleAnimation.cs
index c4b2ee9704..cbaf71184b 100644
--- a/OpenRA.Mods.RA/IdleAnimation.cs
+++ b/OpenRA.Mods.RA/IdleAnimation.cs
@@ -37,7 +37,7 @@ namespace OpenRA.Mods.RA
 
 		public void Idle(Actor self)
 		{
-			self.QueueActivity(new Activities.IdleAnimation(Info.Animations.Random(Game.CosmeticRandom),
+			self.QueueActivity(new Activities.IdleAnimation(Info.Animations.Random(self.World.SharedRandom),
 			                                                Info.IdleWaitTicks));
 		}
 	}
diff --git a/mods/cnc/infantry.yaml b/mods/cnc/infantry.yaml
index dc7c3fcab6..d5c0cafa98 100644
--- a/mods/cnc/infantry.yaml
+++ b/mods/cnc/infantry.yaml
@@ -18,7 +18,8 @@ E1:
 	AttackBase:
 		PrimaryWeapon: M16
 	TakeCover:
-	
+	IdleAnimation:
+		Animations: idle1,idle2,idle3	
 E2:
 	Inherits: ^Infantry
 	Valued:
@@ -42,6 +43,8 @@ E2:
 		PrimaryOffset: 0,0,0,-10
 		FireDelay: 15
 	TakeCover:	
+	IdleAnimation:
+		Animations: idle1,idle2
 	
 E3:
 	Inherits: ^Infantry
@@ -94,6 +97,8 @@ E4:
 	-RenderInfantry:
 	RenderInfantry:
 	WithMuzzleFlash:
+	IdleAnimation:
+		Animations: idle1,idle2
 
 E5:
 	Inherits: ^Infantry
@@ -122,6 +127,8 @@ E5:
 	RenderInfantry:
 	WithMuzzleFlash:
 	-PoisonedByTiberium:
+	IdleAnimation:
+		Animations: idle1,idle2
 
 E6:
 	Inherits: ^Infantry
@@ -146,6 +153,8 @@ E6:
 	EngineerRepair:
 	EngineerCapture:
 	-AutoTarget:
+	IdleAnimation:
+		Animations: idle1,idle2
 
 RMBO:
 	Inherits: ^Infantry
@@ -172,4 +181,6 @@ RMBO:
 		PrimaryWeapon: Sniper
 	TakeCover:
 	C4Demolition:
-		C4Delay: .03
\ No newline at end of file
+		C4Delay: .03
+	IdleAnimation:
+		Animations: idle1,idle2,idle3
\ No newline at end of file
diff --git a/mods/cnc/sequences-infantry.xml b/mods/cnc/sequences-infantry.xml
index 58f46010e9..ae0afa1470 100644
--- a/mods/cnc/sequences-infantry.xml
+++ b/mods/cnc/sequences-infantry.xml
@@ -12,7 +12,10 @@
     <sequence name="crawl" start="144" length="4" facings="8" />
     <sequence name="standup" start="176" length="2" facings="8" />
     <sequence name="prone-shoot" start="192" length="8" facings="8" />
-    <sequence name="die1" start="311" length="8" />
+    <sequence name="idle1" start="257" length="15" />
+    <sequence name="idle2" start="272" length="16" />
+    <sequence name="idle3" start="289" length="22" />
+    <sequence name="die1" start="381" length="9" />
     <sequence name="die5" start="418" length="18" />
     <sequence name="die4" start="406" length="12" />
     <sequence name="die3" start="398" length="8" />
@@ -25,6 +28,8 @@
     <sequence name="shoot" start="64" length="20" facings="8" />
     <sequence name="crawl" start="240" length="4" facings="8" />
     <sequence name="prone-shoot" start="288" length="12" facings="8" />
+    <sequence name="idle1" start="384" length="16" />
+    <sequence name="idle2" start="400" length="13" />
     <sequence name="die5" start="546" length="18" />
     <sequence name="die4" start="534" length="12" />
     <sequence name="die3" start="526" length="8" />
@@ -53,6 +58,8 @@
     <sequence name="shoot" start="64" length="16" facings="8" />
     <sequence name="crawl" start="208" length="4" facings="8" />
     <sequence name="prone-shoot" start="256" length="16" facings="8" />
+    <sequence name="idle1" start="384" length="16" />
+    <sequence name="idle2" start="400" length="16" />
     <sequence name="die5" start="546" length="18" />
     <sequence name="die4" start="534" length="12" />
     <sequence name="die3" start="526" length="8" />
@@ -67,6 +74,8 @@
     <sequence name="shoot" start="64" length="16" facings="8" />
     <sequence name="crawl" start="208" length="4" facings="8" />
     <sequence name="prone-shoot" start="256" length="16" facings="8" />
+    <sequence name="idle1" start="384" length="16" />
+    <sequence name="idle2" start="400" length="16" />
     <sequence name="die5" start="546" length="18" />
     <sequence name="die4" start="534" length="12" />
     <sequence name="die3" start="526" length="8" />
@@ -79,6 +88,8 @@
     <sequence name="stand2" start="8" length="1" facings="8" />
     <sequence name="run" start="16" length="6" facings="8" />
     <sequence name="crawl" start="82" length="4" facings="8" />
+    <sequence name="idle1" start="114" length="6" />
+    <sequence name="idle2" start="200" length="6" />
     <sequence name="die5" start="182" length="18" />
     <sequence name="die4" start="170" length="12" />
     <sequence name="die3" start="162" length="8" />
@@ -202,6 +213,9 @@
     <sequence name="shoot" start="64" length="4" facings="8" />
     <sequence name="crawl" start="112" length="4" facings="8" />
     <sequence name="prone-shoot" start="160" length="4" facings="8" />
+    <sequence name="idle1" start="192" length="16" />
+    <sequence name="idle2" start="208" length="16" />
+    <sequence name="idle3" start="224" length="15" />
     <sequence name="die5" start="354" length="18" />
     <sequence name="die4" start="342" length="12" />
     <sequence name="die3" start="334" length="8" />