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

Merge pull request #8191 from abcdefg30/luawidget

Browse Source 
Add a custom text display to lua
This commit is contained in:
Oliver Brakmann
2015-05-26 00:03:08 +02:00
parent 8e9cab0079 d5ceb2623b
commit 641213696f
11 changed files with 131 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Game/Graphics/HSLColor.cs
View File

@@ -9,10 +9,11 @@
#endregion
using System.Drawing;
using OpenRA.Scripting;
namespace OpenRA.Graphics
{
public struct HSLColor
public struct HSLColor : IScriptBindable
{
public readonly byte H;
public readonly byte S;

6
OpenRA.Game/Scripting/ScriptTypes.cs
View File

@@ -37,6 +37,12 @@ namespace OpenRA.Scripting
{
object temp;
// Is t a nullable?
// If yes, get the underlying type
var nullable = Nullable.GetUnderlyingType(t);
if (nullable != null)
t = nullable;
// Value wraps a CLR object
if (value.TryGetClrObject(out temp))
{

2
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -176,6 +176,8 @@
<Compile Include="Orders\UnitOrderTargeter.cs" />
<Compile Include="Pathfinder\CellInfo.cs" />
<Compile Include="PlayerExtensions.cs" />
<Compile Include="Scripting\Global\HSLColorGlobal.cs" />
<Compile Include="Scripting\Global\UserInterfaceGlobal.cs" />
<Compile Include="ServerTraits\ColorValidator.cs" />
<Compile Include="ServerTraits\LobbyCommands.cs" />
<Compile Include="ServerTraits\LobbySettingsNotification.cs" />

32
OpenRA.Mods.Common/Scripting/Global/HSLColorGlobal.cs Normal file
View File

@@ -0,0 +1,32 @@
#region Copyright & License Information
/*
* Copyright 2007-2015 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. For more information,
* see COPYING.
*/
#endregion
using OpenRA.Graphics;
using OpenRA.Scripting;
namespace OpenRA.Mods.Common.Scripting.Global
{
[ScriptGlobal("HSLColor")]
public class HSLColorGlobal : ScriptGlobal
{
public HSLColorGlobal(ScriptContext context)
: base(context) { }
[Desc("Create a new HSL color with the specified hue/saturation/luminosity.")]
public HSLColor New(int hue, int saturation, int luminosity)
{
var h = (byte)hue.Clamp(0, 255);
var s = (byte)saturation.Clamp(0, 255);
var l = (byte)luminosity.Clamp(0, 255);
return new HSLColor(h, s, l);
}
}
}

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

@@ -17,6 +17,7 @@ using OpenRA.Effects;
using OpenRA.FileFormats;
using OpenRA.FileSystem;
using OpenRA.GameRules;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Effects;
using OpenRA.Scripting;
@@ -168,24 +169,24 @@ namespace OpenRA.Mods.Common.Scripting
}
[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))
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);
} // TODO: expose HSLColor to Lua and add as parameter
}
[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)))
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)));
} // TODO: expose HSLColor to Lua and add as parameter
}
public delegate VqaReader AsyncLoader(Stream s);
}

35
OpenRA.Mods.Common/Scripting/Global/UserInterfaceGlobal.cs Normal file
View File

@@ -0,0 +1,35 @@
#region Copyright & License Information
/*
* Copyright 2007-2015 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. For more information,
* see COPYING.
*/
#endregion
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Widgets;
using OpenRA.Scripting;
using OpenRA.Widgets;
namespace OpenRA.Mods.Common.Scripting.Global
{
[ScriptGlobal("UserInterface")]
public class UserInterfaceGlobal : ScriptGlobal
{
public UserInterfaceGlobal(ScriptContext context)
: base(context) { }
[Desc("Displays a text message at the top center of the screen.")]
public void SetMissionText(string text, HSLColor? color = null)
{
var luaLabel = Ui.Root.Get("INGAME_ROOT").Get<LabelWidget>("MISSION_TEXT");
luaLabel.GetText = () => text;
Color c = color.HasValue ? HSLColor.RGBFromHSL(color.Value.H / 255f, color.Value.S / 255f, color.Value.L / 255f) : Color.White;
luaLabel.GetColor = () => c;
}
}
}

8
mods/cnc/chrome/ingame.yaml
View File

@@ -39,6 +39,14 @@ Container@INGAME_ROOT:
Container@PLAYER_ROOT:
Container@MENU_ROOT:
TooltipContainer@TOOLTIP_CONTAINER:
Label@MISSION_TEXT:
X: WINDOW_RIGHT/2 - 256
Y: 22
Width: 512
Height: 25
Font: Bold
Align: Center
Contrast: true
Container@PERF_WIDGETS:
Logic: PerfDebugLogic

8
mods/d2k/chrome/ingame.yaml
View File

@@ -46,3 +46,11 @@ Container@INGAME_ROOT:
Contrast: true
Container@MENU_ROOT:
TooltipContainer@TOOLTIP_CONTAINER:
Label@MISSION_TEXT:
X: WINDOW_RIGHT/2 - 256
Y: 22
Width: 512
Height: 25
Font: Bold
Align: Center
Contrast: true

8
mods/ra/chrome/ingame.yaml
View File

@@ -27,3 +27,11 @@ Container@INGAME_ROOT:
Container@PERF_ROOT:
Container@MENU_ROOT:
TooltipContainer@TOOLTIP_CONTAINER:
Label@MISSION_TEXT:
X: WINDOW_RIGHT/2 - 256
Y: 22
Width: 512
Height: 25
Font: Bold
Align: Center
Contrast: true

8
mods/ra/maps/survival02/map.yaml
View File

@@ -1017,9 +1017,6 @@ Actors:
AlliesBase: waypoint
Location: 39,37
Owner: Neutral
Timer: MissionTimer
Location: 5,5
Owner: Soviets
Smudges:
@@ -1070,11 +1067,6 @@ Rules:
DropItems: E1,E1,E2,E4,E4,E1,E1,E2,E4,E4
QuantizedFacings: 8
DisplayBeacon: false
MissionTimer:
ParatroopersPower:
ChargeTime: 600
Description: Soviet reinforcements arrive in
DisplayTimer: True
MINV:
Mine:
AvoidFriendly: yes

25
mods/ra/maps/survival02/survival02.lua
View File

@@ -62,6 +62,7 @@ GuardHarvester = function(unit, harvester)
end
end
ticked = TimerTicks
Tick = function()
if soviets.HasNoRequiredUnits() then
if DestroyObj then
@@ -98,10 +99,18 @@ Tick = function()
end
end
if DateTime.Minutes(5) == TimerTicks - DateTime.GameTime then
if DateTime.Minutes(5) == ticked then
Media.PlaySpeechNotification(allies, "WarningFiveMinutesRemaining")
InitCountDown()
end
if 0 < ticked then
UserInterface.SetMissionText("Soviet reinforcements arrive in " .. Utils.FormatTime(ticked), TimerColor)
ticked = ticked - 1
elseif 0 == ticked then
FinishTimer()
ticked = ticked - 1
end
end
SendSovietParadrops = function(table)
@@ -195,6 +204,18 @@ FinalAttack = function()
end)
end
FinishTimer = function()
for i = 0, 9, 1 do
local c = TimerColor
if i % 2 == 0 then
c = HSLColor.New(255, 255, 255)
end
Trigger.AfterDelay(DateTime.Seconds(i), function() UserInterface.SetMissionText("Soviet reinforcements have arrived!", c) end)
end
Trigger.AfterDelay(DateTime.Seconds(10), function() UserInterface.SetMissionText("") end)
end
wave = 1
SendParadrops = function()
SendSovietParadrops(ParaWaves[wave][2])
@@ -277,6 +298,7 @@ end
InitMission = function()
Camera.Position = AlliesBase.CenterPosition
TimerColor = HSLColor.New(0, 255, 128)
Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlaySpeechNotification(allies, "MissionTimerInitialised") end)
@@ -286,7 +308,6 @@ InitMission = function()
SpawnSovietVehicle(NewSovietEntryPoints, NewSovietRallyPoints)
FinalAttack()
Producing = false
Timer.Destroy()
end)
Trigger.AfterDelay(AttackTicks, SendParadrops)