Rocket smoke.

OpenE2140 · Mar 8, 2023 · 637e506 · 637e506
1 parent e643a35
commit 637e506
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/OpenRA.Mods.OpenE2140/Assets/VirtualAssets/VirtualAssetsBuilder.cs b/OpenRA.Mods.OpenE2140/Assets/VirtualAssets/VirtualAssetsBuilder.cs
@@ -39,6 +39,7 @@ private record FrameInfo(int Frame, bool FlipX);
 	private static readonly Color[] LightOffPalette;
 	private static readonly Color[] PlayerPalette;
 	private static readonly Color[] ShadowsPalette;
+	private static readonly Color[] SmokePalette;
 
 	static VirtualAssetsBuilder()
 	{
@@ -100,6 +101,12 @@ static VirtualAssetsBuilder()
 		VirtualAssetsBuilder.ShadowsPalette = new Color[256];
 		VirtualAssetsBuilder.ShadowsPalette[253] = Color.FromArgb(0x20000000);
 		VirtualAssetsBuilder.ShadowsPalette[254] = Color.FromArgb(0x40000000);
+
+		VirtualAssetsBuilder.SmokePalette = new Color[256];
+
+		// TODO find right colors
+		for (var i = 0; i < 10; i++)
+			VirtualAssetsBuilder.SmokePalette[i + 1] = Color.FromArgb(i * 8, i * 8, i * 8);
 	}
 
 	public static Dictionary<string, Stream> BuildAssets(IReadOnlyFileSystem? fileSystem, string name, IReadOnlyPackage package)
@@ -210,6 +217,9 @@ private static byte[] BuildSpriteSheet(Mix mix, MiniYamlNode sheetNode)
 							if (sheetFlags.Contains("Shadow"))
 								VirtualAssetsBuilder.ApplyPalette(VirtualAssetsBuilder.ShadowsPalette, 253, 2, palette, 253, 2, 0, false);
 
+							if (sheetFlags.Contains("Smoke"))
+								VirtualAssetsBuilder.ApplyPalette(VirtualAssetsBuilder.SmokePalette, 0, 256, palette, 0, 256, 0, false);
+
 							if (sheetFlags.Contains("Muzzle"))
 							{
 								if (animationNode.Key == "muzzle")

diff --git a/mods/e2140/content/shared/sequences/projectiles.yaml b/mods/e2140/content/shared/sequences/projectiles.yaml
@@ -12,3 +12,6 @@ projectile_heavy_rocket: projectile_heavy_rocket.vspr
 		BlendMode: Additive
 
 missile_trail: missile_trail.vspr
+	idle:
+		Tick: 70
+		BlendMode: Additive
diff --git a/mods/e2140/content/ucs/vehicles/tiger_assault/weapons.yaml b/mods/e2140/content/ucs/vehicles/tiger_assault/weapons.yaml
@@ -10,11 +10,10 @@ ucs_vehicles_tiger_assault:
 		Speed: 260
 		Arm: 2
 		Blockable: false
-		ContrailLength: 10
 		Inaccuracy: 128
 		Image: projectile_rocket
 		Palette:
-		#TrailImage: missile_trail
+		TrailImage: missile_trail
 		TrailInterval: 0
 		TrailPalette:
 		Shadow: True

diff --git a/mods/e2140/virtualassets/SPRM0.MIX.yaml b/mods/e2140/virtualassets/SPRM0.MIX.yaml
@@ -3,11 +3,9 @@ projectile_rocket:
 	idle: 62-70 16
 	explode: 47-55
 
-missile_trail:
-	idle: 157,157,158,158,159,159,160,160
-	# sequence: 1,1,2,2,3,3,4,4
-	# sprites: 157-159
-
+missile_trail: Smoke
+	idle: 157-159
+
 projectile_heavy_rocket:
 	idle: 88-96 16
 	explode: 8-15