paralell attacks

Author: Licho1

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

@@ -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,