Merge pull request #3044 from ZeroK-RTS/master

Dynamic pw attack/defend timers + fix canselectbattle for defenders who attack

Author: Licho1

Shared/PlasmaShared/GlobalConst.cs

@@ -211,8 +211,6 @@ static void SetMode(ModeType newMode)
         public const int PostVoteHideThreshold = -6;
         public const bool OnlyAdminsSeePostVoters = false;
         public const int PlanetWarsMinutesToAttackIfNoOption = 2;
-        public const int PlanetWarsMinutesToAttack = 2;
-        public const int PlanetWarsMinutesToAccept = 2;
         public const int PlanetWarsDropshipsStayForMinutes = 2*60;
         public const int PlanetWarsMaxTeamsize = 4;
         public const double PlanetWarsDefenderWinKillCcMultiplier = 0.2;

ZkData/Ef/DynamicConfig.cs

@@ -58,6 +58,12 @@ public class DynamicConfig
         [Description("PlanetWars: minimum IP (0-100) below which bombers cannot push any faction. 0 disables the floor.")]
         public double PwBomberMinimumIpFloor { get; set; } = 5.0;
 
+        [Description("PlanetWars: length in minutes of the attack-collect phase (attackers pick a target).")]
+        public int PwAttackPhaseMinutes { get; set; } = 2;
+
+        [Description("PlanetWars: length in minutes of the defend-collect phase (defenders accept).")]
+        public int PwDefendPhaseMinutes { get; set; } = 2;
+
 
         public static DynamicConfig Instance;
 

ZkData/Migrations/202604290948595_AddPwPhaseMinutes.Designer.cs

@@ -0,0 +1,20 @@
+namespace ZkData.Migrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+    
+    public partial class AddPwPhaseMinutes : DbMigration
+    {
+        public override void Up()
+        {
+            AddColumn("dbo.DynamicConfigs", "PwAttackPhaseMinutes", c => c.Int(nullable: false, defaultValue: 2));
+            AddColumn("dbo.DynamicConfigs", "PwDefendPhaseMinutes", c => c.Int(nullable: false, defaultValue: 2));
+        }
+        
+        public override void Down()
+        {
+            DropColumn("dbo.DynamicConfigs", "PwDefendPhaseMinutes");
+            DropColumn("dbo.DynamicConfigs", "PwAttackPhaseMinutes");
+        }
+    }
+}

ZkData/Migrations/202604290948595_AddPwPhaseMinutes.cs

@@ -519,6 +519,10 @@
     <Compile Include="Migrations\202604271235020_AddPwAttackChargesPassiveLimit.Designer.cs">
       <DependentUpon>202604271235020_AddPwAttackChargesPassiveLimit.cs</DependentUpon>
     </Compile>
+    <Compile Include="Migrations\202604290948595_AddPwPhaseMinutes.cs" />
+    <Compile Include="Migrations\202604290948595_AddPwPhaseMinutes.Designer.cs">
+      <DependentUpon>202604290948595_AddPwPhaseMinutes.cs</DependentUpon>
+    </Compile>
     <Compile Include="SpringFilesUnitsyncAttempt.cs" />
     <Compile Include="SteamWebApi.cs" />
     <Compile Include="UserLanguageNoteAttribute.cs" />
@@ -988,6 +992,9 @@
     <EmbeddedResource Include="Migrations\202604271235020_AddPwAttackChargesPassiveLimit.resx">
       <DependentUpon>202604271235020_AddPwAttackChargesPassiveLimit.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Migrations\202604290948595_AddPwPhaseMinutes.resx">
+      <DependentUpon>202604290948595_AddPwPhaseMinutes.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="ZkDataResources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>ZkDataResources.Designer.cs</LastGenOutput>

ZkData/Migrations/202604290948595_AddPwPhaseMinutes.resx

@@ -928,6 +928,10 @@ private PwMatchCommand StampLobbyCommand(LobbySnapshot snapshot, PwPhase phase,
                 }
                 else // DefendCollect
                 {
+                    // attack/defend are mutually exclusive across the whole cycle (see JoinPlanetDefense),
+                    // so any squad's attacker list disqualifies this player from defending ANY squad.
+                    var playerIsAttackerAnywhere = playerName != null && snapshot.Options.Any(o => o.AttackerNames.Contains(playerName));
+
                     var options = snapshot.Options.Select(s =>
                     {
                         var playerIsAttacker = playerName != null && s.AttackerNames.Contains(playerName);
@@ -942,7 +946,7 @@ private PwMatchCommand StampLobbyCommand(LobbySnapshot snapshot, PwPhase phase,
                             PlanetImage = s.PlanetImage,
                             Count = s.Count,
                             Needed = s.Needed,
-                            CanSelectForBattle = canDefend && !playerIsAttacker,
+                            CanSelectForBattle = canDefend && !playerIsAttackerAnywhere,
                             PlayerIsAttacker = playerIsAttacker,
                             PlayerIsDefender = playerName != null && s.DefenderNames.Contains(playerName),
                             AttackerFaction = s.AttackerFactionShortcut,
@@ -1139,12 +1143,12 @@ private DateTime GetAttackDeadline()
             if (AttackOptions.Count == 0)
                 return PhaseStartTime.AddMinutes(GlobalConst.PlanetWarsMinutesToAttackIfNoOption);
 
-            return PhaseStartTime.AddMinutes(GlobalConst.PlanetWarsMinutesToAttack);
+            return PhaseStartTime.AddMinutes(DynamicConfig.Instance.PwAttackPhaseMinutes);
         }
 
         private DateTime GetDefendDeadline()
         {
-            return PhaseStartTime.AddMinutes(GlobalConst.PlanetWarsMinutesToAccept);
+            return PhaseStartTime.AddMinutes(DynamicConfig.Instance.PwDefendPhaseMinutes);
         }
 
         /// <summary>
@@ -1302,8 +1306,8 @@ private static PwStatus GeneratePwStatus()
                 MinLevel = GlobalConst.MinPlanetWarsLevel,
                 PlanetWarsNextMode = MiscVar.PlanetWarsNextMode,
                 PlanetWarsNextModeTime = MiscVar.PlanetWarsNextModeTime,
-                AttackerPhaseMinutes = GlobalConst.PlanetWarsMinutesToAttack,
-                DefenderPhaseMinutes = GlobalConst.PlanetWarsMinutesToAccept,
+                AttackerPhaseMinutes = DynamicConfig.Instance.PwAttackPhaseMinutes,
+                DefenderPhaseMinutes = DynamicConfig.Instance.PwDefendPhaseMinutes,
                 MaxAttackCharges = DynamicConfig.Instance.PwAttackChargesMax,
             };
         }