Revert "Revert to 14/01/2020 stable."

This reverts commit 432ac31.

Author: DeinFreund

ChobbyLauncher/ChobbyLauncher.csproj

@@ -42,12 +42,6 @@
     <Reference Include="GameAnalytics.Mono, Version=1.0.6235.22073, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\GameAnalytics.Mono.SDK.1.1.6\lib\net45\GameAnalytics.Mono.dll</HintPath>
     </Reference>
-    <Reference Include="Neo.Lua, Version=5.3.0.0, Culture=neutral, PublicKeyToken=fdb0cd4fe8a6e3b2, processorArchitecture=MSIL">
-      <HintPath>..\packages\NeoLua.1.1.5\lib\net45\Neo.Lua.dll</HintPath>
-    </Reference>
-    <Reference Include="Neo.Lua.Desktop, Version=5.3.0.0, Culture=neutral, PublicKeyToken=fdb0cd4fe8a6e3b2, processorArchitecture=MSIL">
-      <HintPath>..\packages\NeoLua.1.1.5\lib\net45\Neo.Lua.Desktop.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>

ChobbyLauncher/Chobbyla.cs

@@ -6,7 +6,6 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using GameAnalyticsSDK.Net;
-using Neo.IronLua;
 using Newtonsoft.Json;
 using PlasmaDownloader;
 using PlasmaDownloader.Packages;
@@ -108,7 +107,7 @@ public async Task<bool> Prepare()
                 else internalName = "Chobby $VERSION";
 
 
-                engine = engine ?? GetSteamEngine() ?? QueryDefaultEngine() ?? ExtractEngineFromLua(ver) ?? GlobalConst.DefaultEngineOverride;
+                engine = engine ?? GetSteamEngine() ?? QueryDefaultEngine() ?? GlobalConst.DefaultEngineOverride;
 
                 try
                 {
@@ -197,21 +196,7 @@ public bool Run(ulong initialConnectLobbyID, TextWriter writer)
                 return ret;
             }
         }
-
-
-        private dynamic ExtractEngineFromLua(PackageDownloader.Version ver)
-        {
-            if (ver != null)
-            {
-                var mi = ver.ReadFile(paths, "modinfo.lua");
-                var lua = new Lua();
-                var luaEnv = lua.CreateEnvironment();
-                dynamic result = luaEnv.DoChunk(new StreamReader(mi), "dummy.lua");
-                var engineVersion = result.engine;
-                return engineVersion;
-            }
-            return null;
-        }
+        
 
         private string GetSteamEngine()
         {

Shared/PlasmaShared/GlobalConst.cs

@@ -131,8 +131,6 @@ public static BasicHttpBinding CreateBasicHttpBinding()
         public const int CommanderProfileCount = 6;
         public const int NumCommanderLevels = 5;
         public const int MaxCommanderNameLength = 20;
-        public const int MillisecondsPerCharacter = 50; //Maximum allowed chat messaging rate before it is considered spam, 80ms is equivalent to 120 WPM, which covers typing speeds of anyone short of a stenographer.
-        public const int MinMillisecondsBetweenMessages = 1000; //Disallow sending more than one message per this interval
 
         public const string DefaultEngineOverride = "104.0.1-287-gf7b0fcc"; // hack for ZKL using tasclient's engine - override here for missions etc
 
@@ -244,6 +242,8 @@ public static BasicHttpBinding CreateBasicHttpBinding()
 
         public const int LobbyThrottleBytesPerSecond = 2000;
         public const int LobbyMaxMessageSize = 2000;
+        public const int MillisecondsPerCharacter = 50; //Maximum allowed chat messaging rate before it is considered spam, 80ms is equivalent to 120 WPM, which covers typing speeds of anyone short of a stenographer.
+        public const int MinMillisecondsBetweenMessages = 1000; //Disallow sending more than one message per this interval
 
 
         public static int UdpHostingPortStart;

SteamRoot/Zero-K_linux32.sh

@@ -0,0 +1,5 @@
+/* GNU ld script
+   Use the shared library, but some functions are only in
+   the static library, so try that secondarily.  */
+OUTPUT_FORMAT(elf64-x86-64)
+GROUP ( /lib/x86_64-linux-gnu/libc.so.6 /usr/lib/x86_64-linux-gnu/libc_nonshared.a  AS_NEEDED ( /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 ) )

SteamRoot/linux64/libSystem.Native.so

@@ -5,14 +5,25 @@
 }
 
 @if (m.MapIsFfa == true) {
-  <img src='/img/map_tags/ffa.png' style="width: 32px; height: 32px" title="Free For All" />
+  <img src='/img/map_tags/ffa.png' style="width: 32px; height: 32px" title="Suitable for Free For All" />
 }
-@if (m.MapWaterLevel > 0) {
-  <img src='/img/map_tags/sea@(m.MapWaterLevel).png' style="width:32px; height: 32px" title="Sea coverage"/>
+
+@if (m.MapWaterLevel == 1) {
+  <img src='/img/map_tags/sea1.png' style="width:32px; height: 32px" title="Land map, little to no water"/>
+} else if (m.MapWaterLevel == 2) {
+  <img src='/img/map_tags/sea2.png' style="width:32px; height: 32px" title="Mixed sea/land map, decent amounts of water"/>
+} else if (m.MapWaterLevel == 3) {
+  <img src='/img/map_tags/sea3.png' style="width:32px; height: 32px" title="Sea map, lots of water"/>
 }
-@if (m.MapHills > 0) {
-  <img src='/img/map_tags/hill@(m.MapHills).png' style="width:32px; height: 32px" title="Terrain"/>
+
+@if (m.MapHills == 1) {
+  <img src='/img/map_tags/hill1.png' style="width:32px; height: 32px" title="Flat map, little height variation"/>
+} else if (m.MapHills == 2) {
+  <img src='/img/map_tags/hill2.png' style="width:32px; height: 32px" title="Hilly map, decent height variation"/>
+} else if (m.MapHills == 3) {
+  <img src='/img/map_tags/hill3.png' style="width:32px; height: 32px" title="Mountainous map, high height variation"/>
 }
+
 @if (m.MapIsSpecial == true) {
   <img src='/img/map_tags/special.png' style="width: 32px; height: 32px" title="Map has special features" />
 }

SteamRoot/linux64/libc.so

@@ -130,12 +130,14 @@
 
     @if (Model.SteamID != null)
     {
-        <span>Unlink from Steam:</span>
+        <span>User IS linked with Steam. Unlink from Steam:</span>
         <form method="post" action="@Url.Action("UnlinkSteamID", "Users", new { accountID = Model.AccountID })">
             @Html.AntiForgeryToken()
             Delete this account's Steam name and ID, allowing the user to link their Steam account to another ZK account.'
             <input type="submit" class="js_confirm" />
         </form>
+    } else {
+        <span>User IS NOT linked with Steam. </span>
     }
 
     <br />

Zero-K.info/Views/Maps/MapTags.cshtml

@@ -631,7 +631,7 @@ public enum BadgeType
             donator_2 = 4,
             [Description("Diamond donator")]
             donator_3 = 8,
-            [Description("External developer")]
+            [Description("Content contributor")]
             dev_content =  5,
             [Description("Game developer")]
             dev_game = 6,

Zero-K.info/Views/Users/AdminUserDetail.cshtml

@@ -11,99 +11,97 @@ public class Game
     {
         public readonly int day;
         public readonly int id;
-        public ICollection<Player> whitePlayers;
-        public ICollection<Player> blackPlayers;
-        public bool blackWins;
-        public Dictionary<Player, PlayerDay> whiteDays = new Dictionary<Player, PlayerDay>();
-        public Dictionary<Player, PlayerDay> blackDays = new Dictionary<Player, PlayerDay>();
+        public List<ICollection<Player>> loserPlayers;
+        public ICollection<Player> winnerPlayers;
+        public Dictionary<Player, PlayerDay> loserDays = new Dictionary<Player, PlayerDay>();
+        public Dictionary<Player, PlayerDay> winnerDays = new Dictionary<Player, PlayerDay>();
+        public Dictionary<Player, int> playerFinder = new Dictionary<Player, int>();
 
-        public Game(ICollection<Player> black, ICollection<Player> white, bool blackWins, int time_step, int id)
+        public Game(ICollection<Player> winner, List<ICollection<Player>> loser, int time_step, int id)
         {
             this.id = id;
             day = time_step;
-            whitePlayers = white;
-            blackPlayers = black;
-            this.blackWins = blackWins;
+            loserPlayers = loser;
+            winnerPlayers = winner;
+            for (int i = 0; i < loser.Count; i++)
+            {
+                loser[i].ForEach(p => playerFinder.Add(p, i));
+            }
         }
 
-        private float GetWhiteNaturalRating()
+        private float GetLoserNaturalRating(int team)
         {
             float ret = 0;
             float w;
-            float totWeight = 0;
-            foreach (PlayerDay pd in whiteDays.Values)
+            foreach (Player p in loserPlayers[team])
             {
+                PlayerDay pd = loserDays[p];
                 w = GetPlayerWeight(pd.player);
-                totWeight += w;
                 ret += pd.GetNaturalRating() * w;
             }
-            return ret / totWeight;
+            return ret;
         }
 
         private float GetBlackNaturalRating()
         {
             float ret = 0;
             float w;
-            float totWeight = 0;
-            foreach (PlayerDay pd in blackDays.Values)
+            foreach (PlayerDay pd in winnerDays.Values)
             {
                 w = GetPlayerWeight(pd.player);
-                totWeight += w;
                 ret += pd.GetNaturalRating() * w;
             }
-            return ret / totWeight;
+            return ret;
         }
 
         public float GetPlayerWeight(Player p)
         {
-            return 1.0f / GetPlayerTeammates(p).Count;
+            int size = playerFinder.ContainsKey(p) ? loserPlayers[playerFinder[p]].Count : winnerPlayers.Count;
+            return 1.0f / size;
         }
 
-        private float GetWhiteGamma()
+        private float GetLoserGamma(int team)
         {
-            return (float)Math.Exp(GetWhiteNaturalRating());
+            return (float)Math.Exp(GetLoserNaturalRating(team));
+        }
+        private float GetLosersGamma()
+        {
+            float sum = 0;
+            for (int i = 0; i < loserPlayers.Count; i++) sum += GetLoserGamma(i);
+            return sum;
         }
 
-        private float GetBlackGamma()
+        private float GetWinnerGamma()
         {
             return (float)Math.Exp(GetBlackNaturalRating());
         }
 
         public float GetOpponentsAdjustedGamma(Player player)
         {
-
-            float opponent_naturalrating = 0;
-            float blackNaturalRating = GetBlackNaturalRating();
-            float whiteNaturalRating = GetWhiteNaturalRating();
-            if ((whitePlayers.Contains(player)))
-            {
-                opponent_naturalrating = blackNaturalRating + 0 * (-whiteNaturalRating + whiteDays[player].GetNaturalRating())/* / (float)Math.sqrt(whiteDays.Count)*/;
-            }
-            else
-            {
-                opponent_naturalrating = whiteNaturalRating + 0 * (-blackNaturalRating + blackDays[player].GetNaturalRating())/* / (float)Math.sqrt(blackDays.Count)*/;
-            }
-            float rval = (float)Math.Exp(opponent_naturalrating);
+            
+            float rval = GetWinnerGamma() + GetLosersGamma() - GetAlliesAdjustedGamma(player, false);
             if (rval == 0 || float.IsInfinity(rval) || float.IsNaN(rval))
             {
                 Trace.TraceError("WHR: Gamma out of bounds");
             }
             return rval;
         }
 
-        public float GetAlliesAdjustedGamma(Player player)
+        public float GetAlliesAdjustedGamma(Player player, bool excludeMe = true)
         {
 
             float ally_naturalrating = 0;
             float blackNaturalRating = GetBlackNaturalRating();
-            float whiteNaturalRating = GetWhiteNaturalRating();
-            if ((whitePlayers.Contains(player)))
+            if ((playerFinder.ContainsKey(player)))
             {
-                ally_naturalrating = whiteNaturalRating - whiteDays[player].GetNaturalRating() * GetPlayerWeight(player);
+                float whiteNaturalRating = GetLoserNaturalRating(playerFinder[player]);
+                ally_naturalrating = whiteNaturalRating ;
+                if (excludeMe) ally_naturalrating -= loserDays[player].GetNaturalRating() * GetPlayerWeight(player);
             }
             else
             {
-                ally_naturalrating = blackNaturalRating - blackDays[player].GetNaturalRating() * GetPlayerWeight(player);
+                ally_naturalrating = blackNaturalRating;
+                if (excludeMe) ally_naturalrating -= winnerDays[player].GetNaturalRating() * GetPlayerWeight(player);
             }
             float rval = (float)Math.Exp(ally_naturalrating);
             if (rval == 0 || float.IsInfinity(rval) || float.IsNaN(rval))
@@ -117,13 +115,13 @@ public float GetMyAdjustedGamma(Player player)
         {
 
             float my_naturalrating = 0;
-            if ((whitePlayers.Contains(player)))
+            if ((playerFinder.ContainsKey(player)))
             {
-                my_naturalrating = whiteDays[player].GetNaturalRating() * GetPlayerWeight(player);
+                my_naturalrating = loserDays[player].GetNaturalRating() * GetPlayerWeight(player);
             }
             else
             {
-                my_naturalrating = blackDays[player].GetNaturalRating() * GetPlayerWeight(player);
+                my_naturalrating = winnerDays[player].GetNaturalRating() * GetPlayerWeight(player);
             }
             float rval = (float)Math.Exp(my_naturalrating);
             if (rval == 0 || float.IsInfinity(rval) || float.IsNaN(rval))
@@ -133,26 +131,14 @@ public float GetMyAdjustedGamma(Player player)
             return rval;
         }
 
-        public ICollection<Player> GetPlayerTeammates(Player player)
-        {
-            if ((whitePlayers.Contains(player)))
-            {
-                return whitePlayers;
-            }
-            else
-            {
-                return blackPlayers;
-            }
-        }
-
-        public float GetBlackWinProbability()
+        public float GetWinProbability()
         {
-            if (whiteDays.Count == 0 || blackDays.Count == 0)
+            if (loserDays.Count == 0 || winnerDays.Count == 0)
             {
-                whitePlayers.ForEach(p => p.FakeGame(this));
-                blackPlayers.ForEach(p => p.FakeGame(this));
+                loserPlayers.ForEach(t => t.ForEach(p => p.FakeGame(this)));
+                winnerPlayers.ForEach(p => p.FakeGame(this));
             }
-            return GetBlackGamma() / (GetWhiteGamma() + GetBlackGamma());
+            return GetWinnerGamma() / (GetLosersGamma() + GetWinnerGamma());
         }
 
         public override int GetHashCode()