Make "Ready" text alternate between red and white
Make color of "Ready" text alternate between red and white. Made the code cleaner. Whitespace correction. Whitespace correction again. Change color from red to green and make it moddable Use enum for ReadyTextStyle Use enum for cnc Made variables public and simplified if statements fix enum fix enum and ) ReadyText settings in ra yaml ReadyText settings in cnc yaml Move values from code to ra yaml Move values from code to cnc yaml revert code changes cnc revert code changes ra move around a bit in ra yaml move around a bit in cnc yaml Add values to d2k yaml
This commit is contained in:
@@ -24,6 +24,9 @@ namespace OpenRA.Mods.RA.Widgets
|
||||
{
|
||||
class BuildPaletteWidget : Widget
|
||||
{
|
||||
public enum ReadyTextStyleOptions { Solid, AlternatingColor, Blinking }
|
||||
public readonly ReadyTextStyleOptions ReadyTextStyle = ReadyTextStyleOptions.AlternatingColor;
|
||||
public readonly Color ReadyTextAltColor = Color.LimeGreen;
|
||||
public int Columns = 3;
|
||||
public int Rows = 5;
|
||||
|
||||
@@ -275,8 +278,12 @@ namespace OpenRA.Mods.RA.Widgets
|
||||
foreach (var tb in textBits)
|
||||
{
|
||||
var size = font.Measure(tb.Second);
|
||||
font.DrawTextWithContrast(tb.Second, tb.First - new float2(size.X / 2, 0),
|
||||
Color.White, Color.Black, 1);
|
||||
if (ReadyTextStyle == ReadyTextStyleOptions.Solid || orderManager.LocalFrameNumber / 9 % 2 == 0 || tb.Second != ReadyText)
|
||||
font.DrawTextWithContrast(tb.Second, tb.First - new float2(size.X / 2, 0),
|
||||
Color.White, Color.Black, 1);
|
||||
else if (ReadyTextStyle == ReadyTextStyleOptions.AlternatingColor)
|
||||
font.DrawTextWithContrast(tb.Second, tb.First - new float2(size.X / 2, 0),
|
||||
ReadyTextAltColor, Color.Black, 1);
|
||||
}
|
||||
|
||||
// Tooltip
|
||||
@@ -305,7 +312,7 @@ namespace OpenRA.Mods.RA.Widgets
|
||||
return HoldText;
|
||||
|
||||
if (item.Done)
|
||||
return orderManager.LocalFrameNumber / 9 % 2 == 0 ? ReadyText : "";
|
||||
return ReadyText;
|
||||
|
||||
return WidgetUtils.FormatTime(item.RemainingTimeActual);
|
||||
}
|
||||
@@ -545,4 +552,4 @@ namespace OpenRA.Mods.RA.Widgets
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user