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

Use real (milli)seconds for notifications

Browse Source 
Allows for more fine-grained control, while
adding independence from gamespeed and getting
rid of magic * 25 multiplications.
This commit is contained in:
reaperrr
2021-03-21 00:51:43 +01:00
committed by teinarss
parent bb8a634ba8
commit f1a9a5180d
9 changed files with 133 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,8 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Attach this to the player actor.")]
public class PowerManagerInfo : TraitInfo, Requires<DeveloperModeInfo>
{
public readonly int AdviceInterval = 250;
[Desc("Interval (in milliseconds) at which to warn the player of low power.")]
public readonly int AdviceInterval = 10000;
[NotificationReference("Speech")]
public readonly string SpeechNotification = null;
@@ -50,7 +51,7 @@ namespace OpenRA.Mods.Common.Traits
public int PowerOutageRemainingTicks { get; private set; }
public int PowerOutageTotalTicks { get; private set; }
int nextPowerAdviceTime = 0;
long lastPowerAdviceTime;
bool isLowPower = false;
bool wasLowPower = false;
bool wasHackEnabled;
@@ -128,8 +129,9 @@ namespace OpenRA.Mods.Common.Traits
if (isLowPower != wasLowPower)
UpdatePowerRequiringActors();
// Force the notification to play immediately
if (isLowPower && !wasLowPower)
nextPowerAdviceTime = 0;
lastPowerAdviceTime = -info.AdviceInterval;
wasLowPower = isLowPower;
}
@@ -156,10 +158,10 @@ namespace OpenRA.Mods.Common.Traits
UpdatePowerState();
}
if (isLowPower && --nextPowerAdviceTime <= 0)
if (isLowPower && Game.RunTime > lastPowerAdviceTime + info.AdviceInterval)
{
Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", info.SpeechNotification, self.Owner.Faction.InternalName);
nextPowerAdviceTime = info.AdviceInterval;
lastPowerAdviceTime = Game.RunTime;
}
if (PowerOutageRemainingTicks > 0 && --PowerOutageRemainingTicks == 0)