offer some popular maps in multipoll

Author: DeinFreund

ZkLobbyServer/ServerBattle.cs

@@ -908,9 +908,9 @@ private void discussionTimer_Elapsed(object sender, ElapsedEventArgs e)
             for (int i = 0; i < NumberOfMapChoices; i++)
             {
                 Resource map;
-                if (i < NumberOfMapChoices / 2 && MinimalMapSupportLevel < MapSupportLevel.Featured)
+                if (i < NumberOfMapChoices / 2)
                 {
-                    map = MapPicker.GetRecommendedMap(GetContext(), MapSupportLevel.Featured); //choose at least 50% featured maps
+                    map = MapPicker.GetRecommendedMap(GetContext(), MinimalMapSupportLevel, MapRatings.GetMapRanking().TakeWhile(x => x.Percentile < 0.2).Select(x => x.Map).AsQueryable()); //choose at least 50% popular maps
                 }
                 else
                 {

ZkLobbyServer/autohost/MapPicker.cs

@@ -29,7 +29,7 @@ public static class MapPicker
         ///         a multiple of player count
         ///     </para>
         /// </remarks>
-        public static Resource GetRecommendedMap(LobbyHostingContext context, MapSupportLevel minimumSupportLevel = MapSupportLevel.Featured)
+        public static Resource GetRecommendedMap(LobbyHostingContext context, MapSupportLevel minimumSupportLevel = MapSupportLevel.Featured, IQueryable<Resource> candidates = null)
         {
             var mode = context.Mode;
             using (var db = new ZkDataContext())
@@ -57,12 +57,13 @@ public static Resource GetRecommendedMap(LobbyHostingContext context, MapSupport
                         if (humanPlayers == 2 && botPlayers == 0 && allyteams == 2) mode = AutohostMode.Game1v1;
                         break;
                 }
+                var ret = candidates ?? db.Resources.AsQueryable();
                 switch (mode)
                 {
                     case AutohostMode.Teams:
                     case AutohostMode.None:
-                        var ret =
-                            db.Resources.Where(
+
+                        ret = ret.Where(
                                 x => x.TypeID == ResourceType.Map && x.MapSupportLevel >= level && x.MapIsTeams != false && x.MapIsSpecial != true);
                         if (humanPlayers > 11) ret = ret.Where(x => x.MapHeight*x.MapHeight + x.MapWidth*x.MapWidth > 16*16);
                         else if (humanPlayers > 8)
@@ -78,14 +79,13 @@ public static Resource GetRecommendedMap(LobbyHostingContext context, MapSupport
                         break;
                     case AutohostMode.Game1v1:
                         list =
-                            db.Resources.Where(
+                            ret.Where(
                                 x => x.TypeID == ResourceType.Map && x.MapSupportLevel >= level && x.MapIs1v1 == true && x.MapIsSpecial != true).ToList();
                         break;
                     case AutohostMode.GameChickens:
                         if (UseNormalMapForChickens)
                         {
-                            ret =
-                            db.Resources.Where(
+                            ret = ret.Where(
                                 x =>
                                     x.TypeID == ResourceType.Map && x.MapSupportLevel >= level && x.MapIsSpecial != true &&
                                     (x.MapWaterLevel == 1));
@@ -101,7 +101,7 @@ public static Resource GetRecommendedMap(LobbyHostingContext context, MapSupport
                         }else
                         {
                             ret =
-                            db.Resources.Where(
+                            ret.Where(
                                 x =>
                                     x.TypeID == ResourceType.Map && x.MapSupportLevel >= level && x.MapIsSpecial != true && x.MapIsChickens == true);
                         }
@@ -111,21 +111,22 @@ public static Resource GetRecommendedMap(LobbyHostingContext context, MapSupport
                         break;
                     case AutohostMode.GameFFA:
                         list =
-                            db.Resources.Where(
+                            ret.Where(
                                 x => x.TypeID == ResourceType.Map && x.MapSupportLevel >= level && x.MapIsFfa == true && x.MapFFAMaxTeams == allyteams)
                                 .ToList();
                         if (!list.Any())
                             list =
-                                db.Resources.Where(
+                                ret.Where(
                                     x =>
                                         x.TypeID == ResourceType.Map && x.MapSupportLevel>=level && x.MapIsFfa == true &&
                                         (humanPlayers%x.MapFFAMaxTeams == 0)).ToList();
-                        if (!list.Any()) list = db.Resources.Where(x => x.TypeID == ResourceType.Map && x.MapSupportLevel>=level && x.MapIsFfa == true).ToList();
+                        if (!list.Any()) list = ret.Where(x => x.TypeID == ResourceType.Map && x.MapSupportLevel>=level && x.MapIsFfa == true).ToList();
 
                         break;
                 }
                 if (list != null)
                 {
+                    if (!list.Any() && candidates != null) list = candidates.ToList();
                     var r = new Random();
                     if (list.Count > 0)
                     {