Merge pull request #7998 from Mailaender/ts-proc-dock

Added the Tiberian Sun docking overlays
OpenRA · May 3, 2015 · 62b3592 · 62b3592
2 parents 622685c + d999617
commit 62b3592
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -391,6 +391,7 @@
     <Compile Include="Traits\Render\WithMakeAnimation.cs" />
     <Compile Include="Traits\Render\WithCrateBody.cs" />
     <Compile Include="Traits\Render\WithDeathAnimation.cs" />
+    <Compile Include="Traits\Render\WithDockingOverlay.cs" />
     <Compile Include="Traits\Render\WithHarvestAnimation.cs" />
     <Compile Include="Traits\Render\WithIdleOverlay.cs" />
     <Compile Include="Traits\Render\WithMuzzleFlash.cs" />

diff --git a/...s.D2k/Traits/Render/WithDockingOverlay.cs → ...ommon/Traits/Render/WithDockingOverlay.cs b/...s.D2k/Traits/Render/WithDockingOverlay.cs → ...ommon/Traits/Render/WithDockingOverlay.cs
@@ -10,10 +10,9 @@
 
 using OpenRA.Effects;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.D2k.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Rendered when a harvester is docked.")]
 	public class WithDockingOverlayInfo : ITraitInfo, Requires<RenderSpritesInfo>, Requires<IBodyOrientationInfo>

diff --git a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
@@ -81,7 +81,6 @@
     <Compile Include="Traits\Carryable.cs" />
     <Compile Include="Traits\Player\HarvesterInsurance.cs" />
     <Compile Include="Traits\Render\WithCrumbleOverlay.cs" />
-    <Compile Include="Traits\Render\WithDockingOverlay.cs" />
     <Compile Include="Traits\Render\WithDeliveryOverlay.cs" />
     <Compile Include="Traits\Sandworm.cs" />
     <Compile Include="Traits\TemporaryOwnerManager.cs" />

diff --git a/mods/ts/rules/shared-structures.yaml b/mods/ts/rules/shared-structures.yaml
@@ -88,6 +88,9 @@ PROC:
 		Sequence: idle-redlights
 	WithIdleOverlay@BIB:
 		Sequence: bib
+	WithDockingOverlay@flame:
+		Sequence: flame
+		Palette: effect
 	Power:
 		Amount: -30
 

diff --git a/mods/ts/sequences/structures.yaml b/mods/ts/sequences/structures.yaml
@@ -846,7 +846,7 @@ nahpad:
 		Offset: 0, 0
 		UseTilesetCode: false
 
-proc: # TODO: unused narefn_a, narefn_b
+proc: # TODO: unused narefn_a
 	Defaults:
 		Offset: -12, -42
 		UseTilesetCode: true
@@ -862,15 +862,19 @@ proc: # TODO: unused narefn_a, narefn_b
 	make: ntrefnmk
 		Length: 20
 		ShadowStart: 20
+	flame: ntrefn_b
+		Length: *
 	idle-redlights: ntrefn_c
 		Length: 16
 		Tick: 120
 	damaged-idle-redlights: ntrefn_c
 		Length: 16
 		Tick: 120
 	bib: ntrefnbb
+		ZOffset: -1024
 	damaged-bib: ntrefnbb
 		Start: 1
+		ZOffset: -1024
 	icon: reficon
 		Offset: 0, 0
 		UseTilesetCode: false