From 270975a590c9f49f231be3c73baaa02019ae4428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Wed, 2 Jul 2014 09:53:29 +0200
Subject: [PATCH 1/6] fix crash when docking with a voxel harvester

---
 .../Activities/VoxelHarvesterDockSequence.cs  | 73 +++++++++++++++++++
 OpenRA.Mods.TS/OpenRA.Mods.TS.csproj          |  6 ++
 OpenRA.Mods.TS/TiberianSunRefinery.cs         | 30 ++++++++
 mods/ts/rules/structures.yaml                 |  2 +-
 4 files changed, 110 insertions(+), 1 deletion(-)
 create mode 100644 OpenRA.Mods.TS/Activities/VoxelHarvesterDockSequence.cs
 create mode 100644 OpenRA.Mods.TS/TiberianSunRefinery.cs

diff --git a/OpenRA.Mods.TS/Activities/VoxelHarvesterDockSequence.cs b/OpenRA.Mods.TS/Activities/VoxelHarvesterDockSequence.cs
new file mode 100644
index 0000000000..37ba084601
--- /dev/null
+++ b/OpenRA.Mods.TS/Activities/VoxelHarvesterDockSequence.cs
@@ -0,0 +1,73 @@
+#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 OpenRA.Mods.RA;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.RA.Move;
+using OpenRA.Mods.RA.Render;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.TS
+{
+	public class SimpleHarvesterDockSequence : Activity
+	{
+		enum State { Turn, Dock, Loop, Undock }
+
+		readonly Actor proc;
+		readonly Harvester harv;
+		State state;
+
+		public SimpleHarvesterDockSequence(Actor self, Actor proc)
+		{
+			this.proc = proc;
+			state = State.Turn;
+			harv = self.Trait<Harvester>();
+		}
+
+		public override Activity Tick(Actor self)
+		{
+			switch (state)
+			{
+				case State.Turn:
+					state = State.Dock;
+					return Util.SequenceActivities(new Turn(160), this);
+				case State.Dock:
+					if (proc.IsInWorld && !proc.IsDead())
+						foreach (var nd in proc.TraitsImplementing<INotifyDocking>())
+							nd.Docked(proc, self);
+					state = State.Loop;
+					return this;
+				case State.Loop:
+					if (!proc.IsInWorld || proc.IsDead() || harv.TickUnload(self, proc))
+						state = State.Undock;
+					return this;
+				case State.Undock:
+					if (proc.IsInWorld && !proc.IsDead())
+						foreach (var nd in proc.TraitsImplementing<INotifyDocking>())
+							nd.Undocked(proc, self);
+					return NextActivity;
+			}
+
+			throw new InvalidOperationException("Invalid harvester dock state");
+		}
+
+		public override void Cancel(Actor self)
+		{
+			state = State.Undock;
+		}
+
+		public override IEnumerable<Target> GetTargets(Actor self)
+		{
+			yield return Target.FromActor(proc);
+		}
+	}
+}
diff --git a/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj b/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj
index f7054807f5..5735d2e813 100644
--- a/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj
+++ b/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj
@@ -40,10 +40,16 @@
       <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
       <Name>OpenRA.Game</Name>
     </ProjectReference>
+    <ProjectReference Include="..\OpenRA.Mods.RA\OpenRA.Mods.RA.csproj">
+      <Project>{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}</Project>
+      <Name>OpenRA.Mods.RA</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Widgets\Logic\TSInstallFromCDLogic.cs" />
     <Compile Include="ShroudPalette.cs" />
+    <Compile Include="Activities\VoxelHarvesterDockSequence.cs" />
+    <Compile Include="TiberianSunRefinery.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
new file mode 100644
index 0000000000..df21f4ecaf
--- /dev/null
+++ b/OpenRA.Mods.TS/TiberianSunRefinery.cs
@@ -0,0 +1,30 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 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 OpenRA.Mods.RA;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.TS
+{
+	public class TiberianSunRefineryInfo : OreRefineryInfo
+	{
+		public override object Create(ActorInitializer init) { return new TiberianSunRefinery(init.self, this); }
+	}
+
+	public class TiberianSunRefinery : OreRefinery
+	{
+		public TiberianSunRefinery(Actor self, TiberianSunRefineryInfo info) : base(self, info) { }
+
+		public override Activity DockSequence(Actor harv, Actor self)
+		{
+			return new SimpleHarvesterDockSequence(harv, self);
+		}
+	}
+}
diff --git a/mods/ts/rules/structures.yaml b/mods/ts/rules/structures.yaml
index 139a913aa1..9e53688443 100644
--- a/mods/ts/rules/structures.yaml
+++ b/mods/ts/rules/structures.yaml
@@ -133,7 +133,7 @@ PROC:
 	RevealsShroud:
 		Range: 6
 #	Bib:
-	TiberiumRefinery:
+	TiberianSunRefinery:
 	StoresResources:
 		PipColor: Green
 		PipCount: 15

From 9199cf4669eac340e40ffb348ca9d14a84214e4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Thu, 3 Jul 2014 11:54:33 +0200
Subject: [PATCH 2/6] get to work automatically

---
 mods/ts/rules/structures.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mods/ts/rules/structures.yaml b/mods/ts/rules/structures.yaml
index 9e53688443..287d02fe6a 100644
--- a/mods/ts/rules/structures.yaml
+++ b/mods/ts/rules/structures.yaml
@@ -142,6 +142,7 @@ PROC:
 		Value: 600
 	FreeActor:
 		Actor: HARV
+		InitialActivity: FindResources
 		SpawnOffset: 3,4
 		Facing: 64
 	WithIdleOverlay@REDLIGHTS:

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 3/6] 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:

From 7385fcbf3f1aeb8326c168d06df33c0e7eaeed68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 5 Jul 2014 08:51:08 +0200
Subject: [PATCH 4/6] fix VoxelAnimation.DisableFunc being ignored

---
 OpenRA.Game/Graphics/VoxelRenderable.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/OpenRA.Game/Graphics/VoxelRenderable.cs b/OpenRA.Game/Graphics/VoxelRenderable.cs
index 3d6fe80e4f..2d6686acae 100644
--- a/OpenRA.Game/Graphics/VoxelRenderable.cs
+++ b/OpenRA.Game/Graphics/VoxelRenderable.cs
@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -89,8 +89,10 @@ namespace OpenRA.Graphics
 		static readonly float[] groundNormal = new float[] {0,0,1,1};
 		public void BeforeRender(WorldRenderer wr)
 		{
+			var draw = voxels.Where(v => v.DisableFunc == null || !v.DisableFunc());
+
 			renderProxy = Game.Renderer.WorldVoxelRenderer.RenderAsync(
-				wr, voxels, camera, scale, groundNormal, lightSource,
+				wr, draw, camera, scale, groundNormal, lightSource,
 				lightAmbientColor, lightDiffuseColor,
 			    palette, normalsPalette, shadowPalette);
 		}

From f4f127e3d162249ba0d90b6d60524ac82df33971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Fri, 4 Jul 2014 09:02:46 +0200
Subject: [PATCH 5/6] spaces to tabs

---
 OpenRA.Game/Graphics/VoxelRenderable.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenRA.Game/Graphics/VoxelRenderable.cs b/OpenRA.Game/Graphics/VoxelRenderable.cs
index 2d6686acae..d951a31d30 100644
--- a/OpenRA.Game/Graphics/VoxelRenderable.cs
+++ b/OpenRA.Game/Graphics/VoxelRenderable.cs
@@ -94,7 +94,7 @@ namespace OpenRA.Graphics
 			renderProxy = Game.Renderer.WorldVoxelRenderer.RenderAsync(
 				wr, draw, camera, scale, groundNormal, lightSource,
 				lightAmbientColor, lightDiffuseColor,
-			    palette, normalsPalette, shadowPalette);
+				palette, normalsPalette, shadowPalette);
 		}
 
 		public void Render(WorldRenderer wr)

From d6c60f6436d2a07dca0f7b6fd2d0f8a1fc8bf59b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 5 Jul 2014 08:56:14 +0200
Subject: [PATCH 6/6] tweak the DockOffset a bit

---
 mods/ts/rules/structures.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mods/ts/rules/structures.yaml b/mods/ts/rules/structures.yaml
index 287d02fe6a..0f390d2fc2 100644
--- a/mods/ts/rules/structures.yaml
+++ b/mods/ts/rules/structures.yaml
@@ -134,6 +134,7 @@ PROC:
 		Range: 6
 #	Bib:
 	TiberianSunRefinery:
+		DockOffset: 4,3
 	StoresResources:
 		PipColor: Green
 		PipCount: 15