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

Support enabling and disabling the low power notification via Lua

Browse Source
This commit is contained in:
abcdefg30
2023-05-19 19:05:57 +02:00
committed by Gustas
parent 300281695a
commit 74ed202b29
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Scripting/Properties/PowerProperties.cs
View File

@@ -43,6 +43,13 @@ namespace OpenRA.Mods.Common.Scripting
{ {
pm.TriggerPowerOutage(ticks); pm.TriggerPowerOutage(ticks);
} }
[Desc("Whether the player should receive a notification when low on power.")]
public bool PlayLowPowerNotification
{
get => pm.PlayLowPowerNotification;
set => pm.PlayLowPowerNotification = value;
}
} }
[ScriptPropertyGroup("Power")] [ScriptPropertyGroup("Power")]

11
OpenRA.Mods.Common/Traits/Power/Player/PowerManager.cs
View File

@@ -22,9 +22,11 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Interval (in milliseconds) at which to warn the player of low power.")] [Desc("Interval (in milliseconds) at which to warn the player of low power.")]
public readonly int AdviceInterval = 10000; public readonly int AdviceInterval = 10000;
[Desc("The speech notification to play when the player is low power.")]
[NotificationReference("Speech")] [NotificationReference("Speech")]
public readonly string SpeechNotification = null; public readonly string SpeechNotification = null;
[Desc("The text notification to display when the player is low power.")]
public readonly string TextNotification = null; public readonly string TextNotification = null;
public override object Create(ActorInitializer init) { return new PowerManager(init.Self, this); } public override object Create(ActorInitializer init) { return new PowerManager(init.Self, this); }
@@ -52,10 +54,11 @@ namespace OpenRA.Mods.Common.Traits
public int PowerOutageRemainingTicks { get; private set; } public int PowerOutageRemainingTicks { get; private set; }
public int PowerOutageTotalTicks { get; private set; } public int PowerOutageTotalTicks { get; private set; }
public bool PlayLowPowerNotification { get; set; }
long lastPowerAdviceTime; long lastPowerAdviceTime;
bool isLowPower = false; bool isLowPower;
bool wasLowPower = false; bool wasLowPower;
bool wasHackEnabled; bool wasHackEnabled;
public PowerManager(Actor self, PowerManagerInfo info) public PowerManager(Actor self, PowerManagerInfo info)
@@ -72,7 +75,7 @@ namespace OpenRA.Mods.Common.Traits
// Map placed actors will query an inconsistent power state when they are created // Map placed actors will query an inconsistent power state when they are created
// (it will depend on the order that they are spawned by the world) // (it will depend on the order that they are spawned by the world)
// Tell them to query the correct state once the world has been fully created // Tell them to query the correct state once the world has been fully created
self.World.AddFrameEndTask(w => UpdatePowerRequiringActors()); self.World.AddFrameEndTask(_ => UpdatePowerRequiringActors());
} }
public void UpdateActor(Actor a) public void UpdateActor(Actor a)
@@ -160,7 +163,7 @@ namespace OpenRA.Mods.Common.Traits
UpdatePowerState(); UpdatePowerState();
} }
if (isLowPower && Game.RunTime > lastPowerAdviceTime + info.AdviceInterval) if (PlayLowPowerNotification && isLowPower && Game.RunTime > lastPowerAdviceTime + info.AdviceInterval)
{ {
Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", info.SpeechNotification, self.Owner.Faction.InternalName); Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", info.SpeechNotification, self.Owner.Faction.InternalName);
TextNotificationsManager.AddTransientLine(info.TextNotification, self.Owner); TextNotificationsManager.AddTransientLine(info.TextNotification, self.Owner);