timer based PW charges

Author: Licho1

Shared/LobbyClient/Protocol/Messages.cs

@@ -788,8 +788,8 @@ public class PwStatus
     public class PwAttackCharges
     {
         public int Current { get; set; }
-        /// <summary>Absolute galaxy turn on which the next charge will be granted. Null when at max or charges are disabled.</summary>
-        public int? NextRechargeTurn { get; set; }
+        /// <summary>UTC time at which the next charge will be granted, rounded up to a full minute. Null when at max or charges are disabled.</summary>
+        public DateTime? NextRechargeTime { get; set; }
     }
 
 

Shared/PlasmaShared/Utils.cs

@@ -34,6 +34,12 @@ public static void SafeDispose(this IDisposable o)
             if (o != null) o.Dispose();
         }
 
+        public static DateTime CeilingToMinute(this DateTime d)
+        {
+            var floored = new DateTime(d.Year, d.Month, d.Day, d.Hour, d.Minute, 0, d.Kind);
+            return d == floored ? d : floored.AddMinutes(1);
+        }
+
         public static IEnumerable<Indexed<T>> ToIndexedList<T>(this IEnumerable<T> enumeration)
         {
             return enumeration.Select((x, i) => new Indexed<T>(x, i));

Zero-K.info/Controllers/PlanetwarsAdminController.cs

@@ -370,7 +370,7 @@ public ActionResult StartGalaxy(int galaxyID)
                 db.Accounts.Where(x => x.FactionID != null).Update(x => new Account()
                 {
                     PwAttackCharges = maxCharges,
-                    PwLastChargeChangeTurn = null,
+                    PwLastChargeChange = null,
                 });
             }
 

ZkData/Ef/Account.cs

@@ -154,7 +154,7 @@ public static double AdjustEloWeight(double currentWeight, double sumWeight, int
         public double PwWarpUsed { get; set; }
         public double PwAttackPoints { get; set; }
         public int PwAttackCharges { get; set; }
-        public int? PwLastChargeChangeTurn { get; set; }
+        public DateTime? PwLastChargeChange { get; set; }
         public bool HasVpnException { get; set; }
         public bool HasKudos { get; set; }
         public int ForumTotalUpvotes { get; set; }
@@ -532,18 +532,18 @@ public void ResetQuotas()
 
 
 
-        public void SpendPwAttackCharge(int currentTurn)
+        public void SpendPwAttackCharge()
         {
             if (PwAttackCharges > 0) PwAttackCharges--;
-            PwLastChargeChangeTurn = currentTurn;
+            PwLastChargeChange = DateTime.UtcNow;
         }
 
-        public void GrantPwAttackCharge(int maxCharges, int currentTurn)
+        public void GrantPwAttackCharge(int maxCharges)
         {
             if (maxCharges <= 0) return;
             if (PwAttackCharges >= maxCharges) return;
             PwAttackCharges++;
-            PwLastChargeChangeTurn = currentTurn;
+            PwLastChargeChange = DateTime.UtcNow;
         }
 
 

ZkData/Ef/DynamicConfig.cs

@@ -46,8 +46,8 @@ public class DynamicConfig
         [Description("PlanetWars: maximum attack charges a player can hold. 0 disables the charge system.")]
         public int PwAttackChargesMax { get; set; } = 2;
 
-        [Description("PlanetWars: turns a player must be idle (no spend/gain) before their next +1 passive charge, up to max. Every charge gain or loss resets this clock, so the average regen rate is at most 1 charge per this many turns.")]
-        public int PwAttackChargesCooldownTurns { get; set; } = 4;
+        [Description("PlanetWars: minutes a player must be idle (no spend/gain) before their next +1 passive charge, up to max. Every charge gain or loss resets this clock, so the average regen rate is at most 1 charge per this many minutes.")]
+        public int PwAttackChargesCooldownMinutes { get; set; } = 60;
 
         [Description("PlanetWars: fraction of enemy bomber IP damage also applied to the bomber's own faction. 0 disables self-damage.")]
         public double PwBomberSelfIpRate { get; set; } = 0.5;

ZkData/Migrations/202604251056090_AddPwChargesWallclock.Designer.cs

@@ -0,0 +1,24 @@
+namespace ZkData.Migrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+
+    public partial class AddPwChargesWallclock : DbMigration
+    {
+        public override void Up()
+        {
+            DropColumn("dbo.Accounts", "PwLastChargeChangeTurn");
+            AddColumn("dbo.Accounts", "PwLastChargeChange", c => c.DateTime());
+            DropColumn("dbo.DynamicConfigs", "PwAttackChargesCooldownTurns");
+            AddColumn("dbo.DynamicConfigs", "PwAttackChargesCooldownMinutes", c => c.Int(nullable: false, defaultValue: 60));
+        }
+
+        public override void Down()
+        {
+            DropColumn("dbo.DynamicConfigs", "PwAttackChargesCooldownMinutes");
+            AddColumn("dbo.DynamicConfigs", "PwAttackChargesCooldownTurns", c => c.Int(nullable: false, defaultValue: 4));
+            DropColumn("dbo.Accounts", "PwLastChargeChange");
+            AddColumn("dbo.Accounts", "PwLastChargeChangeTurn", c => c.Int());
+        }
+    }
+}

ZkData/Migrations/202604251056090_AddPwChargesWallclock.cs

@@ -511,6 +511,10 @@
     <Compile Include="Migrations\202604241242120_AddPwAttackCharges.Designer.cs">
       <DependentUpon>202604241242120_AddPwAttackCharges.cs</DependentUpon>
     </Compile>
+    <Compile Include="Migrations\202604251056090_AddPwChargesWallclock.cs" />
+    <Compile Include="Migrations\202604251056090_AddPwChargesWallclock.Designer.cs">
+      <DependentUpon>202604251056090_AddPwChargesWallclock.cs</DependentUpon>
+    </Compile>
     <Compile Include="SpringFilesUnitsyncAttempt.cs" />
     <Compile Include="SteamWebApi.cs" />
     <Compile Include="UserLanguageNoteAttribute.cs" />
@@ -974,6 +978,9 @@
     <EmbeddedResource Include="Migrations\202604241242120_AddPwAttackCharges.resx">
       <DependentUpon>202604241242120_AddPwAttackCharges.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Migrations\202604251056090_AddPwChargesWallclock.resx">
+      <DependentUpon>202604251056090_AddPwChargesWallclock.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="ZkDataResources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>ZkDataResources.Designer.cs</LastGenOutput>

ZkData/Migrations/202604251056090_AddPwChargesWallclock.resx

@@ -28,6 +28,7 @@ public class PlanetWarsMatchMaker : PlanetWarsMatchMakerState
         private DateTime? defendersFullTime; // set when every formed squad has enough defender volunteers
 
         private Timer timer;
+        private DateTime lastChargeRechargeCheck = DateTime.MinValue;
 
         public PlanetWarsMatchMaker(ZkLobbyServer.ZkLobbyServer server)
         {
@@ -108,6 +109,12 @@ private async void TimerOnElapsed(object sender, ElapsedEventArgs elapsedEventAr
                     lastPlanetWarsMode = MiscVar.PlanetWarsMode;
                 }
 
+                if (DateTime.UtcNow - lastChargeRechargeCheck >= TimeSpan.FromMinutes(1))
+                {
+                    lastChargeRechargeCheck = DateTime.UtcNow;
+                    await ProcessChargeRecharge();
+                }
+
                 if (MiscVar.PlanetWarsMode != PlanetWarsModes.Running) return;
 
                 // clean up stale running battles (e.g. if Spring process crashed)
@@ -119,7 +126,6 @@ private async void TimerOnElapsed(object sender, ElapsedEventArgs elapsedEventAr
                     case PwPhase.AttackCollect:
                         if (DateTime.UtcNow > GetAttackDeadline())
                         {
-                            await ApplyTurnEndChargeBump();
                             RunSquadFormation();
                             if (FormedSquads.Any())
                             {
@@ -506,9 +512,8 @@ private async Task SpendAttackCharges(List<string> playerNames)
                 List<Account> accounts;
                 using (var db = new ZkDataContext())
                 {
-                    var turn = db.Galaxies.First(g => g.IsDefault).Turn;
                     accounts = db.Accounts.Where(a => playerNames.Contains(a.Name)).ToList();
-                    foreach (var acc in accounts) acc.SpendPwAttackCharge(turn);
+                    foreach (var acc in accounts) acc.SpendPwAttackCharge();
                     db.SaveChanges();
                 }
                 await Task.WhenAll(accounts.Select(acc => SendPwAttackCharges(server, acc.Name, acc)));
@@ -1179,13 +1184,13 @@ public void RemoveFromRunningBattles(int battleID)
         public static PwAttackCharges BuildPwAttackCharges(Account account)
         {
             var max = DynamicConfig.Instance.PwAttackChargesMax;
-            int? nextRechargeTurn = null;
-            if (max > 0 && account.PwAttackCharges < max && account.PwLastChargeChangeTurn != null)
-                nextRechargeTurn = account.PwLastChargeChangeTurn.Value + DynamicConfig.Instance.PwAttackChargesCooldownTurns;
+            DateTime? nextRechargeTime = null;
+            if (max > 0 && account.PwAttackCharges < max && account.PwLastChargeChange != null)
+                nextRechargeTime = account.PwLastChargeChange.Value.AddMinutes(DynamicConfig.Instance.PwAttackChargesCooldownMinutes).CeilingToMinute();
             return new PwAttackCharges
             {
                 Current = account.PwAttackCharges,
-                NextRechargeTurn = nextRechargeTurn,
+                NextRechargeTime = nextRechargeTime,
             };
         }
 
@@ -1208,28 +1213,28 @@ private async Task SendPwAttackChargesForUser(string userName)
             }
         }
 
-        private async Task ApplyTurnEndChargeBump()
+        private async Task ProcessChargeRecharge()
         {
             try
             {
                 var max = DynamicConfig.Instance.PwAttackChargesMax;
                 if (max <= 0) return;
-                var cooldown = DynamicConfig.Instance.PwAttackChargesCooldownTurns;
+                var cooldownMinutes = DynamicConfig.Instance.PwAttackChargesCooldownMinutes;
+                // +35s offset: displayed nextRechargeTime is rounded up to a full minute. Bumping the
+                // eligibility window forward absorbs ≤1min jitter between the recharge check and the
+                // displayed minute boundary, so the user never sees the time pass without the grant.
+                var threshold = DateTime.UtcNow.AddSeconds(35).AddMinutes(-cooldownMinutes);
 
                 List<Account> bumped;
                 using (var db = new ZkDataContext())
                 {
-                    var turn = db.Galaxies.First(g => g.IsDefault).Turn;
                     bumped = db.Accounts.Where(a =>
                         a.FactionID != null &&
                         a.PwAttackCharges < max &&
-                        (a.PwLastChargeChangeTurn == null || turn - a.PwLastChargeChangeTurn >= cooldown)).ToList();
+                        a.PwLastChargeChange != null &&
+                        a.PwLastChargeChange <= threshold).ToList();
 
-                    foreach (var acc in bumped)
-                    {
-                        acc.PwAttackCharges++;
-                        acc.PwLastChargeChangeTurn = turn;
-                    }
+                    foreach (var acc in bumped) acc.GrantPwAttackCharge(max);
 
                     if (bumped.Count > 0) db.SaveChanges();
                 }
@@ -1238,7 +1243,7 @@ private async Task ApplyTurnEndChargeBump()
             }
             catch (Exception ex)
             {
-                Trace.TraceError("PlanetWars turn-end charge bump error: {0}", ex);
+                Trace.TraceError("PlanetWars charge recharge tick error: {0}", ex);
             }
         }