epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10505 from Mailaender/palette-conf

Browse Source 
Fixed parachute palette configuration for Red Alert 2
This commit is contained in:
Paul Chote
2016-01-17 21:54:56 +00:00
parent d151343216 0317c984cb
commit 3ccbb480ad
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Traits/Render/WithParachute.cs
View File

@@ -32,7 +32,8 @@ namespace OpenRA.Mods.Common.Traits
[SequenceReference("Image")] public readonly string ClosingSequence = null;
[Desc("Palette used to render the parachute.")]
public readonly string Palette = "player";
[PaletteReference("IsPlayerPalette")] public readonly string Palette = "player";
public readonly bool IsPlayerPalette = true;
[Desc("Parachute position relative to the paradropped unit.")]
public readonly WVec Offset = new WVec(0, 0, 384);
@@ -44,7 +45,7 @@ namespace OpenRA.Mods.Common.Traits
[SequenceReference("ShadowImage")] public readonly string ShadowSequence = null;
[Desc("Palette used to render the paradropped unit's shadow.")]
public readonly string ShadowPalette = "shadow";
[PaletteReference(false)] public readonly string ShadowPalette = "shadow";
[Desc("Shadow position relative to the paradropped unit's intended landing position.")]
public readonly WVec ShadowOffset = new WVec(0, 128, 0);
@@ -108,7 +109,7 @@ namespace OpenRA.Mods.Common.Traits
p => RenderUtils.ZOffsetFromCenter(self, p, 1));
var rs = self.Trait<RenderSprites>();
rs.Add(anim, info.Palette);
rs.Add(anim, info.Palette, info.IsPlayerPalette);
}
protected override void UpgradeEnabled(Actor self)
@@ -147,7 +148,8 @@ namespace OpenRA.Mods.Common.Traits
shadow.Tick();
var pos = self.CenterPosition - new WVec(0, 0, self.CenterPosition.Z);
return new IRenderable[] { new SpriteRenderable(shadow.Image, pos, info.ShadowOffset, info.ShadowZOffset, wr.Palette(info.ShadowPalette), 1, true) };
var palette = wr.Palette(info.ShadowPalette);
return new IRenderable[] { new SpriteRenderable(shadow.Image, pos, info.ShadowOffset, info.ShadowZOffset, palette, 1, true) };
}
}
}