From 6734cd96a456f1d8a0e48ceec42666afe28b965a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Wed, 2 Jul 2014 10:58:18 +0200
Subject: [PATCH] add a voxel harvester unload animation

---
 .../Activities/VoxelHarvesterDockSequence.cs  |  8 ++-
 OpenRA.Mods.TS/OpenRA.Mods.TS.csproj          |  1 +
 OpenRA.Mods.TS/TiberianSunRefinery.cs         |  2 +-
 OpenRA.Mods.TS/WithVoxelUnloadBody.cs         | 61 +++++++++++++++++++
 mods/ts/rules/vehicles.yaml                   |  2 +-
 mods/ts/sequences/voxels.yaml                 |  4 +-
 6 files changed, 71 insertions(+), 7 deletions(-)
 create mode 100755 OpenRA.Mods.TS/WithVoxelUnloadBody.cs

diff --git a/OpenRA.Mods.TS/Activities/VoxelHarvesterDockSequence.cs b/OpenRA.Mods.TS/Activities/VoxelHarvesterDockSequence.cs
index 37ba084601..142756c4d5 100644
--- a/OpenRA.Mods.TS/Activities/VoxelHarvesterDockSequence.cs
+++ b/OpenRA.Mods.TS/Activities/VoxelHarvesterDockSequence.cs
@@ -18,19 +18,21 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.TS
 {
-	public class SimpleHarvesterDockSequence : Activity
+	public class VoxelHarvesterDockSequence : Activity
 	{
 		enum State { Turn, Dock, Loop, Undock }
 
 		readonly Actor proc;
 		readonly Harvester harv;
+		readonly WithVoxelUnloadBody body;
 		State state;
 
-		public SimpleHarvesterDockSequence(Actor self, Actor proc)
+		public VoxelHarvesterDockSequence(Actor self, Actor proc)
 		{
 			this.proc = proc;
 			state = State.Turn;
 			harv = self.Trait<Harvester>();
+			body = self.Trait<WithVoxelUnloadBody>();
 		}
 
 		public override Activity Tick(Actor self)
@@ -45,6 +47,7 @@ namespace OpenRA.Mods.TS
 						foreach (var nd in proc.TraitsImplementing<INotifyDocking>())
 							nd.Docked(proc, self);
 					state = State.Loop;
+					body.Docked = true;
 					return this;
 				case State.Loop:
 					if (!proc.IsInWorld || proc.IsDead() || harv.TickUnload(self, proc))
@@ -54,6 +57,7 @@ namespace OpenRA.Mods.TS
 					if (proc.IsInWorld && !proc.IsDead())
 						foreach (var nd in proc.TraitsImplementing<INotifyDocking>())
 							nd.Undocked(proc, self);
+					body.Docked = false;
 					return NextActivity;
 			}
 
diff --git a/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj b/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj
index 5735d2e813..17c23d245a 100644
--- a/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj
+++ b/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj
@@ -50,6 +50,7 @@
     <Compile Include="ShroudPalette.cs" />
     <Compile Include="Activities\VoxelHarvesterDockSequence.cs" />
     <Compile Include="TiberianSunRefinery.cs" />
+    <Compile Include="WithVoxelUnloadBody.cs" />
   </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/OpenRA.Mods.TS/TiberianSunRefinery.cs b/OpenRA.Mods.TS/TiberianSunRefinery.cs
index df21f4ecaf..7b986746d6 100644
--- a/OpenRA.Mods.TS/TiberianSunRefinery.cs
+++ b/OpenRA.Mods.TS/TiberianSunRefinery.cs
@@ -24,7 +24,7 @@ namespace OpenRA.Mods.TS
 
 		public override Activity DockSequence(Actor harv, Actor self)
 		{
-			return new SimpleHarvesterDockSequence(harv, self);
+			return new VoxelHarvesterDockSequence(harv, self);
 		}
 	}
 }
diff --git a/OpenRA.Mods.TS/WithVoxelUnloadBody.cs b/OpenRA.Mods.TS/WithVoxelUnloadBody.cs
new file mode 100755
index 0000000000..5109661dec
--- /dev/null
+++ b/OpenRA.Mods.TS/WithVoxelUnloadBody.cs
@@ -0,0 +1,61 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using OpenRA.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA.Render
+{
+	public class WithVoxelUnloadBodyInfo : ITraitInfo, Requires<RenderVoxelsInfo>
+	{
+		[Desc("Voxel sequence name to use when docked to a refinery.")]
+		public readonly string UnloadSequence = "unload";
+
+		[Desc("Voxel sequence name to use when undocked from a refinery.")]
+		public readonly string IdleSequence = "idle";
+
+		public object Create(ActorInitializer init) { return new WithVoxelUnloadBody(init.self, this); }
+	}
+
+	public class WithVoxelUnloadBody : IAutoSelectionSize
+	{
+		public bool Docked;
+
+		readonly int2 size;
+
+		public WithVoxelUnloadBody(Actor self, WithVoxelUnloadBodyInfo info)
+		{
+			var body = self.Trait<IBodyOrientation>();
+			var rv = self.Trait<RenderVoxels>();
+
+			var idleVoxel = VoxelProvider.GetVoxel(rv.Image, info.IdleSequence);
+			rv.Add(new VoxelAnimation(idleVoxel, () => WVec.Zero,
+				() => new[]{ body.QuantizeOrientation(self, self.Orientation) },
+				() => Docked,
+				() => 0));
+
+			// Selection size
+			var rvi = self.Info.Traits.Get<RenderVoxelsInfo>();
+			var s = (int)(rvi.Scale * idleVoxel.Size.Aggregate(Math.Max));
+			size = new int2(s, s);
+
+			var unloadVoxel = VoxelProvider.GetVoxel(rv.Image, info.UnloadSequence);
+			rv.Add(new VoxelAnimation(unloadVoxel, () => WVec.Zero,
+				() => new[]{ body.QuantizeOrientation(self, self.Orientation) },
+				() => !Docked,
+				() => 0));
+		}
+
+		public int2 SelectionSize(Actor self) { return size; }
+	}
+}
diff --git a/mods/ts/rules/vehicles.yaml b/mods/ts/rules/vehicles.yaml
index e34dc45c0c..98e931d32b 100644
--- a/mods/ts/rules/vehicles.yaml
+++ b/mods/ts/rules/vehicles.yaml
@@ -101,7 +101,7 @@ HARV:
 	-GainsExperience:
 	RenderSprites:
 	RenderVoxels:
-	WithVoxelBody:
+	WithVoxelUnloadBody:
 	Explodes:
 		Weapon: TiberiumExplosion
 
diff --git a/mods/ts/sequences/voxels.yaml b/mods/ts/sequences/voxels.yaml
index 8caf4b2f24..08f3a54140 100644
--- a/mods/ts/sequences/voxels.yaml
+++ b/mods/ts/sequences/voxels.yaml
@@ -3,9 +3,7 @@ mcv:
 
 harv:
 	idle:
-
-horv:
-	idle:
+	unload: horv
 
 apc: # TODO apcw in water
 	idle: