Change WithColoredOverlay to use a color instead of a palette.
This commit is contained in:
@@ -19,17 +19,23 @@ namespace OpenRA.Mods.Common.Traits
|
||||
[Desc("Display a colored overlay when a timed condition is active.")]
|
||||
public class WithColoredOverlayInfo : ConditionalTraitInfo
|
||||
{
|
||||
[PaletteReference]
|
||||
[Desc("Palette to use when rendering the overlay")]
|
||||
public readonly string Palette = "invuln";
|
||||
[Desc("Color to overlay.")]
|
||||
public readonly Color Color = Color.FromArgb(128, 128, 0, 0);
|
||||
|
||||
public override object Create(ActorInitializer init) { return new WithColoredOverlay(this); }
|
||||
}
|
||||
|
||||
public class WithColoredOverlay : ConditionalTrait<WithColoredOverlayInfo>, IRenderModifier
|
||||
{
|
||||
readonly float3 tint;
|
||||
readonly float alpha;
|
||||
|
||||
public WithColoredOverlay(WithColoredOverlayInfo info)
|
||||
: base(info) { }
|
||||
: base(info)
|
||||
{
|
||||
tint = new float3(info.Color.R, info.Color.G, info.Color.B) / 255f;
|
||||
alpha = info.Color.A / 255f;
|
||||
}
|
||||
|
||||
IEnumerable<IRenderable> IRenderModifier.ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r)
|
||||
{
|
||||
@@ -45,10 +51,8 @@ namespace OpenRA.Mods.Common.Traits
|
||||
{
|
||||
yield return a;
|
||||
|
||||
if (!a.IsDecoration && a is IPalettedRenderable)
|
||||
yield return ((IPalettedRenderable)a).WithPalette(wr.Palette(Info.Palette))
|
||||
.WithZOffset(a.ZOffset + 1)
|
||||
.AsDecoration();
|
||||
if (!a.IsDecoration && a is IModifyableRenderable ma)
|
||||
yield return ma.WithTint(tint, ma.TintModifiers | TintModifiers.ReplaceColor).WithAlpha(alpha);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
#region Copyright & License Information
|
||||
/*
|
||||
* Copyright 2007-2020 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, either version 3 of
|
||||
* the License, or (at your option) any later version. For more
|
||||
* information, see COPYING.
|
||||
*/
|
||||
#endregion
|
||||
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace OpenRA.Mods.Common.UpdateRules.Rules
|
||||
{
|
||||
public class ReplaceWithColoredOverlayPalette : UpdateRule
|
||||
{
|
||||
public override string Name { get { return "WithColoredOverlay Palette changed to Color."; } }
|
||||
|
||||
public override string Description
|
||||
{
|
||||
get
|
||||
{
|
||||
return "The Palette field has been removed from WithColoredOverlay. You must now specify the Color directly.";
|
||||
}
|
||||
}
|
||||
|
||||
readonly List<string> locations = new List<string>();
|
||||
|
||||
public override IEnumerable<string> AfterUpdate(ModData modData)
|
||||
{
|
||||
if (locations.Any())
|
||||
yield return "You must define new Color fields on the following traits:\n" +
|
||||
UpdateUtils.FormatMessageList(locations);
|
||||
|
||||
locations.Clear();
|
||||
}
|
||||
|
||||
public override IEnumerable<string> UpdateActorNode(ModData modData, MiniYamlNode actorNode)
|
||||
{
|
||||
foreach (var node in actorNode.ChildrenMatching("WithColoredOverlay"))
|
||||
if (node.RemoveNodes("Palette") > 0)
|
||||
locations.Add("{0}: {1} ({2})".F(actorNode.Key, node.Key, actorNode.Location.Filename));
|
||||
|
||||
yield break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -86,6 +86,7 @@ namespace OpenRA.Mods.Common.UpdateRules
|
||||
// Bleed only changes here
|
||||
new RenameMPTraits(),
|
||||
new RemovePlayerHighlightPalette(),
|
||||
new ReplaceWithColoredOverlayPalette(),
|
||||
})
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user