Merge pull request #8684 from Mailaender/globalpalette-effect-lua

Exposed GlobalPaletteEffect to the Lua API for day/night cycles

OpenRA.Mods.Common/Scripting/Global/EffectGlobal.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using System.Collections.Generic;
+using Eluant;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Scripting;
 
@@ -18,11 +19,13 @@ namespace OpenRA.Mods.Common.Scripting
 	public class EffectGlobal : ScriptGlobal
 	{
 		readonly IEnumerable<FlashPaletteEffect> fpes;
+		readonly GlobalLightingPaletteEffect lighting;
 
 		public EffectGlobal(ScriptContext context)
 			: base(context)
 		{
 			fpes = context.World.WorldActor.TraitsImplementing<FlashPaletteEffect>();
+			lighting = context.World.WorldActor.TraitOrDefault<GlobalLightingPaletteEffect>();
 		}
 
 		[Desc("Controls the `FlashPaletteEffect` trait.")]
@@ -32,5 +35,17 @@ namespace OpenRA.Mods.Common.Scripting
 				if (fpe.Info.Type == type)
 					fpe.Enable(ticks);
 		}
+
+		[Desc("Dynamically adjusts the `GlobalLightingPaletteEffect` trait.")]
+		public void ChangeLighting(double red, double green, double blue, double ambient)
+		{
+			if (lighting == null)
+				throw new LuaException("GlobalLightingPaletteEffect needs to be added to the World actor first.");
+
+			lighting.Red = (float)red;
+			lighting.Green = (float)green;
+			lighting.Blue = (float)blue;
+			lighting.Ambient = (float)ambient;
+		}
 	}
 }

OpenRA.Mods.Common/Traits/PaletteEffects/GlobalLightingPaletteEffect.cs

@@ -36,9 +36,19 @@ namespace OpenRA.Mods.Common.Traits
 	{
 		readonly GlobalLightingPaletteEffectInfo info;
 
+		public float Red;
+		public float Green;
+		public float Blue;
+		public float Ambient;
+
 		public GlobalLightingPaletteEffect(GlobalLightingPaletteEffectInfo info)
 		{
 			this.info = info;
+
+			Red = info.Red;
+			Green = info.Green;
+			Blue = info.Blue;
+			Ambient = info.Ambient;
 		}
 
 		public void AdjustPalette(IReadOnlyDictionary<string, MutablePalette> palettes)
@@ -56,9 +66,9 @@ namespace OpenRA.Mods.Common.Traits
 				for (var x = 0; x < Palette.Size; x++)
 				{
 					var from = palette.GetColor(x);
-					var red = (int)(from.R * info.Ambient * info.Red).Clamp(0, 255);
-					var green = (int)(from.G * info.Ambient * info.Green).Clamp(0, 255);
-					var blue = (int)(from.B * info.Ambient * info.Blue).Clamp(0, 255);
+					var red = (int)(from.R * Ambient * Red).Clamp(0, 255);
+					var green = (int)(from.G * Ambient * Green).Clamp(0, 255);
+					var blue = (int)(from.B * Ambient * Blue).Clamp(0, 255);
 					palette.SetColor(x, Color.FromArgb(from.A, red, green, blue));
 				}
 			}

mods/d2k/maps/shellmap/map.yaml

@@ -127,6 +127,7 @@ Rules:
 			Scripts: shellmap.lua
 		MusicPlaylist:
 			StartingMusic: score
+		GlobalLightingPaletteEffect:
 	rockettower:
 		Power:
 			Amount: 100

mods/d2k/maps/shellmap/shellmap.lua

@@ -0,0 +1,26 @@
+WorldLoaded = function()
+	red = 0.95
+	green = 0.85
+	blue = 1.25
+	ambient = 0.5
+end
+
+Tick = function()
+	if (red < 1.0) then
+		red = red + 0.001
+	end
+
+	if (green < 1.0) then
+		green = green + 0.001
+	end
+
+	if (blue > 1.0) then
+		blue = blue - 0.001
+	end
+
+	if (ambient < 1.0) then
+		ambient = ambient + 0.001
+	end
+
+	Effect.ChangeLighting(red, green, blue, ambient)
+end