Merge pull request #2414 from ZeroK-RTS/sprunk-patch-2

Extra comms: handle N vs 2N+X case

Author: Histidine91

ZkLobbyServer/SpringieInterface/StartSetup.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data.Entity;
 using System.Diagnostics;
@@ -24,11 +24,11 @@ public static LobbyHostingContext GetDedicatedServerStartSetup(LobbyHostingConte
             {
                 var mode = context.Mode;
 
-               var commProfiles = new LuaTable();
+                var commProfiles = new LuaTable();
                 var db = new ZkDataContext();
 
                 // calculate to whom to send extra comms
-                var accountIDsWithExtraComms = new List<int>();
+                var accountIDsWithExtraComms = new Dictionary<int, int>();
                 if (mode == AutohostMode.Planetwars || mode == AutohostMode.GameFFA || mode == AutohostMode.Teams)
                 {
                     var groupedByTeam = context.Players.Where(x => !x.IsSpectator).GroupBy(x => x.AllyID).OrderByDescending(x => x.Count());
@@ -40,10 +40,23 @@ public static LobbyHostingContext GetDedicatedServerStartSetup(LobbyHostingConte
                             var cnt = biggest.Count() - other.Count();
                             if (cnt > 0)
                             {
-                                foreach (var a in
-                                    other.Select(x => db.Accounts.First(y => y.AccountID == x.LobbyID))
-                                        .OrderByDescending(x => x.GetRating(RatingCategory.Casual).Elo)
-                                        .Take(cnt)) accountIDsWithExtraComms.Add(a.AccountID);
+                                // example case: 3 players on this team, 8 players on largest team
+                                // 5 bonus comms to dole out to this team
+                                // per_player = 1 (integer result of 5/3)
+                                // remainder: 2, so now cnt = 2
+                                // iterate over all players in this team
+                                //  first player: cnt == 2, >0 so we give him a second extra comm
+                                //  second player: cnt == 1, >0 so same deal
+                                //  from now on cnt <= 0 so the remaining 3 players only get the one extra comm
+                                int per_player = cnt / other.Count();
+                                cnt = cnt % other.Count();
+                                foreach (var a in other
+                                    .Select(x => db.Accounts.First(y => y.AccountID == x.LobbyID))
+                                    .OrderByDescending(x => x.GetRating(RatingCategory.Casual).Elo))
+                                {
+                                    accountIDsWithExtraComms.Add(a.AccountID, per_player + (cnt > 0 ? 1 : 0));
+                                    cnt--;
+                                }
                             }
                         }
                     }
@@ -100,7 +113,7 @@ public static LobbyHostingContext GetDedicatedServerStartSetup(LobbyHostingConte
                 // write player custom keys (level, elo, is muted, etc.)
                 foreach (var p in context.Players)
                 {
-                    var user = db.Accounts.Where(x=>x.AccountID == p.LobbyID).Include(x=>x.RelalationsByOwner).FirstOrDefault();
+                    var user = db.Accounts.Where(x => x.AccountID == p.LobbyID).Include(x => x.RelalationsByOwner).FirstOrDefault();
                     if (user != null)
                     {
                         var userParams = new Dictionary<string, string>();
@@ -125,7 +138,7 @@ public static LobbyHostingContext GetDedicatedServerStartSetup(LobbyHostingConte
                             .Where(x => x.GetRating(context.ApplicableRating).Elo > user.GetRating(context.ApplicableRating).Elo)
                             .Count()
                             .ToString();
-                        
+
                         userParams["icon"] = user.GetIconName();
                         userParams["avatar"] = user.Avatar;
                         userParams["badges"] = string.Join(",", user.GetBadges());
@@ -136,9 +149,9 @@ public static LobbyHostingContext GetDedicatedServerStartSetup(LobbyHostingConte
                         var userSpecChatBlocked = Punishment.GetActivePunishment(user.AccountID, null, null, x => x.BanSpecChat) != null; ;
                         userParams["can_spec_chat"] = userSpecChatBlocked ? "0" : "1";
 
-                        userParams["ignored"] = string.Join(",", user.RelalationsByOwner.Where(x => x.Relation == Relation.Ignore).Select(x=>x.Target.Name));
-                        userParams["friends"] = string.Join(",", user.RelalationsByOwner.Where(x => x.Relation == Relation.Friend).Select(x=>x.Target.Name));
-                        
+                        userParams["ignored"] = string.Join(",", user.RelalationsByOwner.Where(x => x.Relation == Relation.Ignore).Select(x => x.Target.Name));
+                        userParams["friends"] = string.Join(",", user.RelalationsByOwner.Where(x => x.Relation == Relation.Friend).Select(x => x.Target.Name));
+
                         if (!p.IsSpectator)
                         {
                             // set valid PW structure attackers
@@ -147,7 +160,7 @@ public static LobbyHostingContext GetDedicatedServerStartSetup(LobbyHostingConte
                                 userParams["pwRank"] = (user.AccountRolesByAccountID.Where(
                                             x =>
                                                 !x.RoleType.IsClanOnly &&
-                                                (x.RoleType.RestrictFactionID == null || x.RoleType.RestrictFactionID == user.FactionID)).OrderBy(x=>x.RoleType.DisplayOrder).Select(x => (int?)x.RoleType.DisplayOrder).FirstOrDefault() ?? 999).ToString();
+                                                (x.RoleType.RestrictFactionID == null || x.RoleType.RestrictFactionID == user.FactionID)).OrderBy(x => x.RoleType.DisplayOrder).Select(x => (int?)x.RoleType.DisplayOrder).FirstOrDefault() ?? 999).ToString();
 
 
                                 var allied = user.Faction != null && defender != null && user.Faction != defender &&
@@ -161,10 +174,10 @@ public static LobbyHostingContext GetDedicatedServerStartSetup(LobbyHostingConte
                                 userParams["pwInstructions"] = Convert.ToBase64String(Encoding.UTF8.GetBytes(GetPwInstructions(planet, user, db, attacker)));
                             }
 
-                            if (accountIDsWithExtraComms.Contains(user.AccountID)) userParams["extracomm"] = "1";
+                            if (accountIDsWithExtraComms.ContainsKey(user.AccountID)) userParams["extracomm"] = accountIDsWithExtraComms[user.AccountID].ToString();
 
                             var commProfileIDs = new LuaTable();
-                            var userCommandersBanned = Punishment.GetActivePunishment(user.AccountID, null, null, x => x.BanCommanders) != null; 
+                            var userCommandersBanned = Punishment.GetActivePunishment(user.AccountID, null, null, x => x.BanCommanders) != null;
                             if (!userCommandersBanned)
                             {
                                 // set up commander data
@@ -304,7 +317,7 @@ private static string GetPwInstructions(Planet planet, Account user, ZkDataConte
             var ipBase = GlobalConst.BaseInfluencePerBattle;
             var ipShips = planet.GetEffectiveShipIpBonus(attacker);
             var ipDefs = planet.GetEffectiveIpDefense();
-            var attackerWinLoseCc = (ipShips + ipBase - ipDefs)*GlobalConst.PlanetWarsAttackerWinLoseCcMultiplier;
+            var attackerWinLoseCc = (ipShips + ipBase - ipDefs) * GlobalConst.PlanetWarsAttackerWinLoseCcMultiplier;
             var attackerLoseKillCc = (ipShips + ipBase - ipDefs) * GlobalConst.PlanetWarsDefenderWinKillCcMultiplier;
 
             attackerWinLoseCc = Math.Max(attackerWinLoseCc, 0);
@@ -360,7 +373,7 @@ private static string GetPwInstructions(Planet planet, Account user, ZkDataConte
                     ipBase + ipShips - ipDefs,
                     ipBase,
                     ipShips,
-                    ipDefs, 
+                    ipDefs,
                     attacker?.Shortcut,
                     attackerWinLoseCc);