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

Expose an HSL color parameter to lua

Browse Source
This commit is contained in:
abcdefg30
2015-05-16 01:28:10 +02:00
parent 35374d168f
commit a5c9bc9a2c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Mods.Common/Scripting/Global/MediaGlobal.cs
View File

@@ -17,6 +17,7 @@ using OpenRA.Effects;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using OpenRA.FileSystem; using OpenRA.FileSystem;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Effects; using OpenRA.Mods.Common.Effects;
using OpenRA.Scripting; using OpenRA.Scripting;
@@ -168,24 +169,24 @@ namespace OpenRA.Mods.Common.Scripting
} }
[Desc("Display a text message to the player.")] [Desc("Display a text message to the player.")]
public void DisplayMessage(string text, string prefix = "Mission") public void DisplayMessage(string text, string prefix = "Mission", HSLColor? color = null)
{ {
if (string.IsNullOrEmpty(text)) if (string.IsNullOrEmpty(text))
return; return;
Color c = Color.White; Color c = color.HasValue ? HSLColor.RGBFromHSL(color.Value.H / 255f, color.Value.S / 255f, color.Value.L / 255f) : Color.White;
Game.AddChatLine(c, prefix, text); Game.AddChatLine(c, prefix, text);
} // TODO: expose HSLColor to Lua and add as parameter }
[Desc("Display a text message at the specified location.")] [Desc("Display a text message at the specified location.")]
public void FloatingText(string text, WPos position, int duration = 30) public void FloatingText(string text, WPos position, int duration = 30, HSLColor? color = null)
{ {
if (string.IsNullOrEmpty(text) || !world.Map.Contains(world.Map.CellContaining(position))) if (string.IsNullOrEmpty(text) || !world.Map.Contains(world.Map.CellContaining(position)))
return; return;
Color c = Color.White; Color c = color.HasValue ? HSLColor.RGBFromHSL(color.Value.H / 255f, color.Value.S / 255f, color.Value.L / 255f) : Color.White;
world.AddFrameEndTask(w => w.Add(new FloatingText(position, c, text, duration))); world.AddFrameEndTask(w => w.Add(new FloatingText(position, c, text, duration)));
} // TODO: expose HSLColor to Lua and add as parameter }
public delegate VqaReader AsyncLoader(Stream s); public delegate VqaReader AsyncLoader(Stream s);
} }