From 5084b30f3fbe6585cf2f4b5f32bf68e873e7ff16 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Thu, 20 Jun 2013 21:42:48 +1200
Subject: [PATCH] Simplify RenderGunboat.

---
 OpenRA.Mods.Cnc/RenderGunboat.cs | 69 ++++++++++++++------------------
 mods/cnc/rules/ships.yaml        |  2 +
 mods/cnc/sequences/campaign.yaml | 18 +++++----
 3 files changed, 42 insertions(+), 47 deletions(-)

diff --git a/OpenRA.Mods.Cnc/RenderGunboat.cs b/OpenRA.Mods.Cnc/RenderGunboat.cs
index 1e8a29fa34..5f48da7d60 100644
--- a/OpenRA.Mods.Cnc/RenderGunboat.cs
+++ b/OpenRA.Mods.Cnc/RenderGunboat.cs
@@ -10,66 +10,55 @@
 
 using System;
 using System.Linq;
+using OpenRA.FileFormats;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Render
 {
-	class RenderGunboatInfo : RenderSimpleInfo
+	class RenderGunboatInfo : RenderSpritesInfo, Requires<IBodyOrientationInfo>
 	{
-		public override object Create(ActorInitializer init) { return new RenderGunboat(init.self); }
+		[Desc("Turreted 'Turret' key to display")]
+		public readonly string Turret = "primary";
+
+		public override object Create(ActorInitializer init) { return new RenderGunboat(init.self, this); }
 	}
 
-	class RenderGunboat : RenderSimple, INotifyDamageStateChanged
+	class RenderGunboat : RenderSprites, INotifyDamageStateChanged
 	{
-		IFacing facing;
-		string lastDir = "left";
-		string lastDamage = "";
+		Animation left, right;
 
-		static Func<int> TurretFacingFunc(Actor self)
+		public RenderGunboat(Actor self, RenderGunboatInfo info)
+			: base(self)
 		{
-			return () => self.HasTrait<Turreted>() ? self.TraitsImplementing<Turreted>().First().turretFacing : 0;
-		}
+			var name = GetImage(self);
+			var facing = self.Trait<IFacing>();
+			var turret = self.TraitsImplementing<Turreted>()
+				.First(t => t.Name == info.Turret);
 
-		public RenderGunboat(Actor self)
-			: base(self, TurretFacingFunc(self))
-		{
-			facing = self.Trait<IFacing>();
-			anim.Play("left");
+			left = new Animation(name, () => turret.turretFacing);
+			left.Play("left");
+			anims.Add("left", new AnimationWithOffset(left, null, () => facing.Facing > 128, 0));
 
-			var wake = new Animation(anim.Name);
-			wake.Play("left-wake");
+			right = new Animation(name, () => turret.turretFacing);
+			right.Play("right");
+			anims.Add("right", new AnimationWithOffset(right, null, () => facing.Facing <= 128, 0));
 
-			var leftOffset = new WVec(43, 86, 0);
-			var rightOffset = new WVec(-43, 86, 0);
-			anims.Add("wake", new AnimationWithOffset(wake,
-				() => anims["wake"].Animation.CurrentSequence.Name == "left-wake" ? leftOffset : rightOffset,
-			    () => false, -87));
+			var leftWake = new Animation(name);
+			leftWake.Play("wake-left");
+			anims.Add("wake-left", new AnimationWithOffset(leftWake, null, () => facing.Facing > 128, -87));
 
-			self.Trait<IBodyOrientation>().QuantizedFacings = anim.CurrentSequence.Facings;
-		}
+			var rightWake = new Animation(name);
+			rightWake.Play("wake-right");
+			anims.Add("wake-right", new AnimationWithOffset(rightWake, null, () => facing.Facing <= 128, -87));
 
-		public override void Tick(Actor self)
-		{
-			var dir = (facing.Facing > 128) ? "right" : "left";
-			if (dir != lastDir)
-			{
-				anim.ReplaceAnim(dir+lastDamage);
-				anims["wake"].Animation.ReplaceAnim(dir+"-wake");
-				lastDir = dir;
-			}
-			base.Tick(self);
+			self.Trait<IBodyOrientation>().QuantizedFacings = 2;
 		}
 
 		public void DamageStateChanged(Actor self, AttackInfo e)
 		{
-			if (e.DamageState >= DamageState.Critical)
-				lastDamage = "-critical";
-			else if (e.DamageState >= DamageState.Heavy)
-				lastDamage = "-damaged";
-			else if (e.DamageState < DamageState.Heavy)
-				lastDamage = "";
-			anim.ReplaceAnim(lastDir+lastDamage);
+			left.ReplaceAnim(NormalizeSequence(left, e.DamageState, "left"));
+			right.ReplaceAnim(NormalizeSequence(right, e.DamageState, "right"));
 		}
 	}
 }
diff --git a/mods/cnc/rules/ships.yaml b/mods/cnc/rules/ships.yaml
index de7e133560..820cebe690 100644
--- a/mods/cnc/rules/ships.yaml
+++ b/mods/cnc/rules/ships.yaml
@@ -24,6 +24,8 @@ BOAT:
 		LocalOffset: 213,-180,0, 213,128,0, 213,0,0
 	AttackTurreted:
 	RenderGunboat:
+	Selectable:
+		Bounds: 42,24
 	AutoTarget:
 		AllowMovement: false
 	WithSmoke:
diff --git a/mods/cnc/sequences/campaign.yaml b/mods/cnc/sequences/campaign.yaml
index 903bf1c040..9053b858f7 100644
--- a/mods/cnc/sequences/campaign.yaml
+++ b/mods/cnc/sequences/campaign.yaml
@@ -12,22 +12,26 @@ boat:
 	left:
 		Start: 0
 		Facings: 32
-	left-damaged:
+	damaged-left:
 		Start: 32
-	left-critical:
+		Facings: 32
+	critical-left:
 		Start: 64
-	left-wake: wake
+		Facings: 32
+	wake-left: wake
 		Start: 6
 		Length: 6
+		Offset: 1,2
 	right:
 		Start: 96
 		Facings: 32
-	right-damaged:
+	damaged-right:
 		Start: 128
 		Facings: 32
-	right-critical:
+	critical-right:
 		Start: 160
 		Facings: 32
-	right-wake: wake
+	wake-right: wake
 		Start: 0
-		Length: 6
\ No newline at end of file
+		Length: 6
+		Offset: -1,2
\ No newline at end of file