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

10
OpenRA.Mods.Common/Traits/Player/PlayerResources.cs
View File

@@ -45,7 +45,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly string InsufficientFundsNotification = null;
[Desc("Delay (in ticks) during which warnings will be muted.")]
public readonly int InsufficientFundsNotificationDelay = 750;
public readonly int InsufficientFundsNotificationInterval = 30000;
[NotificationReference("Sounds")]
public readonly string CashTickUpNotification = null;
@@ -83,6 +83,8 @@ namespace OpenRA.Mods.Common.Traits
if (!int.TryParse(startingCash, out Cash))
Cash = info.DefaultCash;
lastNotificationTime = -Info.InsufficientFundsNotificationInterval;
}
[Sync]
@@ -97,7 +99,7 @@ namespace OpenRA.Mods.Common.Traits
public int Earned;
public int Spent;
int lastNotificationTick;
long lastNotificationTime;
public int ChangeCash(int amount)
{
@@ -178,9 +180,9 @@ namespace OpenRA.Mods.Common.Traits
if (Cash + Resources < num)
{
if (notifyLowFunds && !string.IsNullOrEmpty(Info.InsufficientFundsNotification) &&
owner.World.WorldTick - lastNotificationTick >= Info.InsufficientFundsNotificationDelay)
Game.RunTime > lastNotificationTime + Info.InsufficientFundsNotificationInterval)
{
lastNotificationTick = owner.World.WorldTick;
lastNotificationTime = Game.RunTime;
Game.Sound.PlayNotification(owner.World.Map.Rules, owner, "Speech", Info.InsufficientFundsNotification, owner.Faction.InternalName);
}