Merge pull request #3029 from ZeroK-RTS/turnSwap

Turn swap PW

Author: Licho1

.idea/.idea.Zero-K/.idea/projectSettingsUpdater.xml

@@ -431,17 +431,22 @@ private static void TestPwMatchMaker()
         {
             var server = new global::ZkLobbyServer.ZkLobbyServer("", new PlanetwarsEventCreator());
             var mm = server.PlanetWarsMatchMaker;
-            mm.ChallengeTime = DateTime.Now;
             mm.AttackerSideCounter = 1;
-            //mm.ResetAttackOptions();
-            mm.GenerateLobbyCommand();
-            mm.Challenge = mm.AttackOptions[3];
-            mm.Challenge.OwnerFactionID = 2;
-            mm.Challenge.PlanetID = 4375;
-            mm.GetDefendingFactions(mm.Challenge);
             mm.GenerateLobbyCommand();
 
-            //mm.Challenge = 
+            // simulate defend phase with a formed squad
+            if (mm.AttackOptions.Count > 3)
+            {
+                var opt = mm.AttackOptions[3];
+                opt.OwnerFactionID = 2;
+                opt.PlanetID = 4375;
+                mm.FormedSquads.Add(opt);
+                mm.Phase = PwPhase.DefendCollect;
+                mm.PhaseStartTime = DateTime.UtcNow;
+                mm.GetDefendingFactions(opt);
+                mm.GenerateLobbyCommand();
+            }
+
             Global.Server.PlanetWarsMatchMaker.GenerateLobbyCommand();
         }
 

Fixer/Program.cs

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

Shared/PlasmaShared/GlobalConst.cs

@@ -537,12 +537,18 @@ public static Thread SafeThread(Action action)
 
 
         public static U Get<T, U>(this IDictionary<T, U> dict, T key)
-    where U : class
         {
             U val = default(U);
             if (key != null) dict.TryGetValue(key, out val);
             return val;
         }
+        
+        public static U GetOrDefault<T, U>(this IDictionary<T, U> dict, T key, U defaultValue)
+        {
+            U val = defaultValue;
+            if (key != null) dict.TryGetValue(key, out val);
+            return val;
+        }
 
 
         public static List<T> Shuffle<T>(this IEnumerable<T> source)

Shared/PlasmaShared/Utils.cs

@@ -184,7 +184,7 @@ private static void ProcessPlanetWars(SpringBattleContext result, ZkLobbyServer.
                 if (winNum > 1) winNum = null;
             }
 
-            PlanetWarsTurnHandler.EndTurn(result.LobbyStartContext.Map,
+            PlanetWarsTurnHandler.ProcessBattleResult(result.LobbyStartContext.Map,
                 result.OutputExtras,
                 db,
                 winNum,