Merge pull request #3032 from ZeroK-RTS/master

PW battles on same planet are merged up to attacker size

Author: Licho1

Shared/PlasmaShared/GlobalConst.cs

@@ -163,7 +163,8 @@ static void SetMode(ModeType newMode)
         public const double PlanetWarsMaximumIP = 100.0; //maximum IP on each planet
         public const int PlanetWarsVictoryPointsToWin = 100;
         public const int VictoryPointDecay = 1;
-        public const int BaseInfluencePerBattle = 35;
+        public const int BaseInfluencePerBattle = 32;
+        public const int InfluencePerAttacker = 1;
         public const double PlanetWarsAttackerMetal = 100;
         public const double PlanetWarsDefenderMetal = 100;
         public const int InfluencePerShip = 1;

ZkLobbyServer/SpringieInterface/PlanetWarsMatchMaker.cs

@@ -406,27 +406,36 @@ private double GetPlayerWhr(string name)
 
         private async Task LaunchAllBattles()
         {
-            foreach (var squad in FormedSquads)
+            // merge squads on the same planet into one battle per planet
+            foreach (var planetId in FormedSquads.Select(s => s.PlanetID).Distinct().ToList())
             {
-                // filter to still-connected
-                squad.Attackers = squad.Attackers.Where(x => server.ConnectedUsers.ContainsKey(x)).ToList();
-                squad.Defenders = squad.Defenders.Where(x => server.ConnectedUsers.ContainsKey(x)).ToList();
+                var squads = FormedSquads.Where(s => s.PlanetID == planetId).ToList();
+                var first = squads.First();
+
+                // merge all squads into one AttackOption
+                var merged = CreateSquadFromOption(first);
+                foreach (var squad in squads)
+                {
+                    merged.Attackers.AddRange(squad.Attackers.Where(x => server.ConnectedUsers.ContainsKey(x)));
+                    merged.Defenders.AddRange(squad.Defenders.Where(x => server.ConnectedUsers.ContainsKey(x)));
+                }
 
-                if (squad.Defenders.Count > 0 && squad.Attackers.Count > 0)
+                if (merged.Defenders.Count > 0 && merged.Attackers.Count > 0)
                 {
                     // battle (may be uneven)
                     try
                     {
-                        var battle = new PlanetWarsServerBattle(server, squad);
+                        merged.TeamSize = Math.Max(merged.Attackers.Count, merged.Defenders.Count);
+                        var battle = new PlanetWarsServerBattle(server, merged);
                         await server.AddBattle(battle);
-                        RunningBattles[battle.BattleID] = squad;
+                        RunningBattles[battle.BattleID] = merged;
 
-                        foreach (var usr in squad.Attackers.Union(squad.Defenders))
+                        foreach (var usr in merged.Attackers.Union(merged.Defenders))
                             await server.ForceJoinBattle(usr, battle);
 
                         if (await battle.StartGame())
                         {
-                            var text = $"Battle for planet {squad.Name} starts on zk://@join_player:{squad.Attackers.FirstOrDefault()}  Roster: {string.Join(",", squad.Attackers)} vs {string.Join(",", squad.Defenders)}";
+                            var text = $"Battle for planet {merged.Name} starts on zk://@join_player:{merged.Attackers.FirstOrDefault()}  Roster: {string.Join(",", merged.Attackers)} vs {string.Join(",", merged.Defenders)}";
                             foreach (var fac in factions) await server.GhostChanSay(fac.Shortcut, text);
                         }
                         else
@@ -440,10 +449,10 @@ private async Task LaunchAllBattles()
                         Trace.TraceError("PlanetWars LaunchBattle error: {0}", ex);
                     }
                 }
-                else if (squad.Attackers.Count > 0)
+                else if (merged.Attackers.Count > 0)
                 {
                     // concede - zero defenders
-                    RecordPlanetwarsLoss(squad);
+                    RecordPlanetwarsLoss(merged);
                 }
                 // else: no attackers left, skip entirely
             }

ZkLobbyServer/SpringieInterface/PlanetWarsTurnHandler.cs

@@ -62,7 +62,7 @@ public static void ProcessBattleResult(string mapName, List<string> extraData, Z
         double planetIpDefs = planet.GetEffectiveIpDefense();
 
         double baseInfluence = GlobalConst.BaseInfluencePerBattle;
-        double influence = baseInfluence;
+        double attackerBonus = attackers.Count * GlobalConst.InfluencePerAttacker;
 
         double shipBonus = planet.GetEffectiveShipIpBonus(attacker);
 
@@ -96,7 +96,7 @@ public static void ProcessBattleResult(string mapName, List<string> extraData, Z
             }
         }
 
-        influence = (influence + shipBonus + techBonus + defenseBonus) * ipMultiplier;
+        double influence = (baseInfluence + attackerBonus + shipBonus + techBonus + defenseBonus) * ipMultiplier;
         if (influence < 0) influence = 0;
         influence = Math.Floor(influence * 100) / 100;
 
@@ -128,12 +128,13 @@ public static void ProcessBattleResult(string mapName, List<string> extraData, Z
         }
         try
         {
-            influenceReport = String.Format("{0} gained {1} influence ({2}% {3} of {4}{5}{6}{7})",
+            influenceReport = String.Format("{0} gained {1} influence ({2}% {3} of {4}{5}{6}{7}{8})",
                 attacker.Shortcut,
                 influence,
                 (int)(ipMultiplier * 100.0),
                 ipReason,
                 baseInfluence + " base",
+                attackerBonus > 0 ? " +" + attackerBonus + " from " + attackers.Count + " attackers" : "",
                 techBonus > 0 ? " +" + techBonus + " from techs" : "",
                 shipBonus > 0 ? " +" + shipBonus + " from dropships" : "",
                 defenseBonus != 0 ? " -" + -defenseBonus + " from defenses" : "");