Merge remote-tracking branch 'refs/remotes/shiftos-game/master'

1 files changed, 444 insertions, 120 deletions

diff --git a/ShiftOS.WinForms/Applications/Pong.cs b/ShiftOS.WinForms/Applications/Pong.cs
index 6198cad..04c963f 100644
--- a/ShiftOS.WinForms/Applications/Pong.cs
+++ b/ShiftOS.WinForms/Applications/Pong.cs
@@ -29,6 +29,7 @@ using System.Data;
 using System.Drawing;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using Newtonsoft.Json;
@@ -81,7 +82,23 @@ namespace ShiftOS.WinForms.Applications
         private void pongMain_MouseMove(object sender, MouseEventArgs e)
         {
             var loc = this.PointToClient(MousePosition);
-            paddleHuman.Location = new Point(paddleHuman.Location.X, (loc.Y) - (paddleHuman.Height / 2));
+            if (IsMultiplayerSession)
+            {
+                if (IsLeader)
+                {
+                    paddleHuman.Location = new Point(paddleHuman.Location.X, (loc.Y) - (paddleHuman.Height / 2));
+                    ServerManager.Forward(OpponentGUID, "pong_mp_setopponenty", paddleHuman.Top.ToString());
+                }
+                else
+                {
+                    paddleComputer.Location = new Point(paddleComputer.Location.X, (loc.Y) - (paddleComputer.Height / 2));
+                    ServerManager.Forward(OpponentGUID, "pong_mp_setopponenty", paddleComputer.Top.ToString());
+                }
+            }
+            else
+            {
+                paddleHuman.Location = new Point(paddleHuman.Location.X, (loc.Y) - (paddleHuman.Height / 2));
+            }
         }
 
         private void CenterPanels()
@@ -103,7 +120,13 @@ namespace ShiftOS.WinForms.Applications
             lblstatscodepoints.Top = this.Height - lblstatscodepoints.Height - 5;
             lblstatscodepoints.Left = (this.Width - lblstatscodepoints.Width) / 2;
         }
-        
+
+        int OpponentY = 0;
+
+        bool IsLeader = false;
+
+        int LeaderX = 0;
+        int LeaderY = 0;
 
         // ERROR: Handles clauses are not supported in C#
         private void gameTimer_Tick(object sender, EventArgs e)
@@ -117,39 +140,50 @@ namespace ShiftOS.WinForms.Applications
                 //Check if paddle upgrade has been bought and change paddles accordingly
                 //if (ShiftoriumFrontend.UpgradeInstalled("pong_increased_paddle_size"))
                 //{
-                 //   paddleHuman.Height = 150;
-                  //  paddleComputer.Height = 150;
+                //   paddleHuman.Height = 150;
+                //  paddleComputer.Height = 150;
                 //}
                 //I don't know the point of this but I'm fucking 86ing it. - Michael
 
                 //Set the computer player to move according to the ball's position.
-                if (aiShouldIsbeEnabled)
-                    if (ball.Location.X > (this.Width - (this.Width / 3)) - xVel * 10 && xVel > 0)
-                    {
-                        if (ball.Location.Y > paddleComputer.Location.Y + 50)
-                        {
-                            paddleComputer.Location = new Point(paddleComputer.Location.X, paddleComputer.Location.Y + computerspeed);
-                        }
-                        if (ball.Location.Y < paddleComputer.Location.Y + 50)
-                        {
-                            paddleComputer.Location = new Point(paddleComputer.Location.X, paddleComputer.Location.Y - computerspeed);
-                        }
-                        casualposition = rand.Next(-150, 201);
-                    }
+                if (IsMultiplayerSession == true)
+                {
+                    //If we're multiplayer, then we want to set the computer Y to the opponent's Y.
+                    //If we're the leader, we set the AI paddle, else we set the player paddle.
+                    if (IsLeader)
+                        paddleComputer.Top = OpponentY;
                     else
-                    {
-                        //used to be me.location.y - except it's fucking C# and this comment is misleading as fuck. OH WAIT! I didn't write it! And none of the current devs did either! - Michael
-                        if (paddleComputer.Location.Y > this.Size.Height / 2 - paddleComputer.Height + casualposition)
+                        paddleHuman.Top = OpponentY;
+                }
+                else
+                {
+                    if (aiShouldIsbeEnabled)
+                        if (ball.Location.X > (this.Width - (this.Width / 3)) - xVel * 10 && xVel > 0)
                         {
-                            paddleComputer.Location = new Point(paddleComputer.Location.X, paddleComputer.Location.Y - computerspeed);
+                            if (ball.Location.Y > paddleComputer.Location.Y + 50)
+                            {
+                                paddleComputer.Location = new Point(paddleComputer.Location.X, paddleComputer.Location.Y + computerspeed);
+                            }
+                            if (ball.Location.Y < paddleComputer.Location.Y + 50)
+                            {
+                                paddleComputer.Location = new Point(paddleComputer.Location.X, paddleComputer.Location.Y - computerspeed);
+                            }
+                            casualposition = rand.Next(-150, 201);
                         }
-                        //Rylan is hot. Used to be //used to be me.location.y
-                        if (paddleComputer.Location.Y < this.Size.Height / 2 - paddleComputer.Height + casualposition)
+                        else
                         {
-                            paddleComputer.Location = new Point(paddleComputer.Location.X, paddleComputer.Location.Y + computerspeed);
+                            //used to be me.location.y - except it's fucking C# and this comment is misleading as fuck. OH WAIT! I didn't write it! And none of the current devs did either! - Michael
+                            if (paddleComputer.Location.Y > this.Size.Height / 2 - paddleComputer.Height + casualposition)
+                            {
+                                paddleComputer.Location = new Point(paddleComputer.Location.X, paddleComputer.Location.Y - computerspeed);
+                            }
+                            //Rylan is hot. Used to be //used to be me.location.y
+                            if (paddleComputer.Location.Y < this.Size.Height / 2 - paddleComputer.Height + casualposition)
+                            {
+                                paddleComputer.Location = new Point(paddleComputer.Location.X, paddleComputer.Location.Y + computerspeed);
+                            }
                         }
-                    }
-
+                }
                 //Set Xvel and Yvel speeds from decimal
                 if (xVel > 0)
                     xVel = (int)Math.Round(xveldec);
@@ -160,121 +194,355 @@ namespace ShiftOS.WinForms.Applications
                 if (yVel < 0)
                     yVel = (int)-Math.Round(yveldec);
 
-                // Move the game ball.
-                ball.Location = new Point(ball.Location.X + xVel, ball.Location.Y + yVel);
+                bool BallPhysics = true;
 
-                // Check for top wall.
-                if (ball.Location.Y < 0)
+                if (IsMultiplayerSession)
                 {
-                    ball.Location = new Point(ball.Location.X, 0);
-                    yVel = -yVel;
-                    ShiftOS.Engine.AudioManager.PlayStream(Properties.Resources.typesound);
+                    //Logic for moving the ball in Multiplayer.
+                    if (IsLeader)
+                    {
+                        ball.Location = new Point(ball.Location.X + xVel, ball.Location.Y + yVel);
+                    }
+                    else
+                    {
+                        //Move it to the leader's ball position.
+                        ball.Location = new Point(LeaderX, LeaderY);
+                        BallPhysics = false;
+                    }
                 }
-
-                // Check for bottom wall.
-                if (ball.Location.Y > pgcontents.Height - ball.Height)
-                {
-                    ball.Location = new Point(ball.Location.X, pgcontents.Height - ball.Size.Height);
-                    yVel = -yVel;
-                    ShiftOS.Engine.AudioManager.PlayStream(Properties.Resources.typesound);
+                else
+                {// Move the game ball.
+                    ball.Location = new Point(ball.Location.X + xVel, ball.Location.Y + yVel);
                 }
-
-                // Check for player paddle.
-                if (ball.Bounds.IntersectsWith(paddleHuman.Bounds))
+                if (BallPhysics)
                 {
-                    ball.Location = new Point(paddleHuman.Location.X + ball.Size.Width + 1, ball.Location.Y);
-                    //randomly increase x or y speed of ball
-                    switch (rand.Next(1, 3))
+                    // Check for top wall.
+                    if (ball.Location.Y < 0)
                     {
-                        case 1:
-                            xveldec = xveldec + incrementx;
-                            break;
-                        case 2:
-                            if (yveldec > 0)
-                                yveldec = yveldec + incrementy;
-                            if (yveldec < 0)
-                                yveldec = yveldec - incrementy;
-                            break;
+                        ball.Location = new Point(ball.Location.X, 0);
+                        yVel = -yVel;
+                        ShiftOS.Engine.AudioManager.PlayStream(Properties.Resources.typesound);
                     }
-                    xVel = -xVel;
-                    ShiftOS.Engine.AudioManager.PlayStream(Properties.Resources.writesound);
 
-                }
+                    // Check for bottom wall.
+                    if (ball.Location.Y > pgcontents.Height - ball.Height)
+                    {
+                        ball.Location = new Point(ball.Location.X, pgcontents.Height - ball.Size.Height);
+                        yVel = -yVel;
+                        ShiftOS.Engine.AudioManager.PlayStream(Properties.Resources.typesound);
+                    }
 
-                // Check for computer paddle.
-                if (ball.Bounds.IntersectsWith(paddleComputer.Bounds))
-                {
-                    ball.Location = new Point(paddleComputer.Location.X - paddleComputer.Size.Width - 1, ball.Location.Y);
-                    xveldec = xveldec + incrementx;
-                    xVel = -xVel;
-                    ShiftOS.Engine.AudioManager.PlayStream(Properties.Resources.writesound);
+
+                    // Check for player paddle.
+                    if (ball.Bounds.IntersectsWith(paddleHuman.Bounds))
+                    {
+                        ball.Location = new Point(paddleHuman.Location.X + ball.Size.Width + 1, ball.Location.Y);
+                        //randomly increase x or y speed of ball
+                        switch (rand.Next(1, 3))
+                        {
+                            case 1:
+                                xveldec = xveldec + incrementx;
+                                break;
+                            case 2:
+                                if (yveldec > 0)
+                                    yveldec = yveldec + incrementy;
+                                if (yveldec < 0)
+                                    yveldec = yveldec - incrementy;
+                                break;
+                        }
+                        xVel = -xVel;
+                        ShiftOS.Engine.AudioManager.PlayStream(Properties.Resources.writesound);
+
+                    }
+
+                    // Check for computer paddle.
+                    if (ball.Bounds.IntersectsWith(paddleComputer.Bounds))
+                    {
+                        ball.Location = new Point(paddleComputer.Location.X - paddleComputer.Size.Width - 1, ball.Location.Y);
+                        xveldec = xveldec + incrementx;
+                        xVel = -xVel;
+                        ShiftOS.Engine.AudioManager.PlayStream(Properties.Resources.writesound);
+                    }
                 }
 
+
+
                 // Check for left wall.
                 if (ball.Location.X < -100)
                 {
-                    ball.Location = new Point(this.Size.Width / 2 + 200, this.Size.Height / 2);
-                    paddleComputer.Location = new Point(paddleComputer.Location.X, ball.Location.Y);
-                    if (xVel > 0)
-                        xVel = -xVel;
-                    pnllose.Show();
-                    gameTimer.Stop();
-                    counter.Stop();
-                    lblmissedout.Text = Localization.Parse("{YOU_MISSED_OUT_ON}:") + Environment.NewLine + lblstatscodepoints.Text.Replace(Localization.Parse("{CODEPOINTS}: "), "") + Localization.Parse(" {CODEPOINTS}");
-                    if (ShiftoriumFrontend.UpgradeInstalled("pong_upgrade_2"))
+                    //If we are in multiplayer, and not the leader, we won.
+                    if (IsMultiplayerSession)
                     {
-                        totalreward = levelrewards[level - 1] + beatairewardtotal;
-                        double onePercent = (totalreward / 100);
-                        lblbutyougained.Show();
-                        lblbutyougained.Text = Localization.Parse("{BUT_YOU_GAINED}:") + Environment.NewLine + onePercent.ToString("") + (Localization.Parse(" {CODEPOINTS}"));
-                        SaveSystem.TransferCodepointsFrom("pong", (totalreward / 100));
+                        if (IsLeader)
+                        {
+                            //We lost.
+                            NotifyLoseToTarget();
+                        }
+                        else
+                        {
+                            //We won.
+                            NotifyWinToTarget();
+                            Win();
+                        }
                     }
                     else
                     {
-                        lblbutyougained.Hide();
+                        ball.Location = new Point(this.Size.Width / 2 + 200, this.Size.Height / 2);
+                        paddleComputer.Location = new Point(paddleComputer.Location.X, ball.Location.Y);
+                        if (xVel > 0)
+                            xVel = -xVel;
+                        pnllose.Show();
+                        gameTimer.Stop();
+                        counter.Stop();
+                        lblmissedout.Text = Localization.Parse("{YOU_MISSED_OUT_ON}:") + Environment.NewLine + lblstatscodepoints.Text.Replace(Localization.Parse("{CODEPOINTS}: "), "") + Localization.Parse(" {CODEPOINTS}");
+                        if (ShiftoriumFrontend.UpgradeInstalled("pong_upgrade_2"))
+                        {
+                            totalreward = levelrewards[level - 1] + beatairewardtotal;
+                            double onePercent = (totalreward / 100);
+                            lblbutyougained.Show();
+                            lblbutyougained.Text = Localization.Parse("{BUT_YOU_GAINED}:") + Environment.NewLine + onePercent.ToString("") + (Localization.Parse(" {CODEPOINTS}"));
+                            SaveSystem.TransferCodepointsFrom("pong", (totalreward / 100));
+                        }
+                        else
+                        {
+                            lblbutyougained.Hide();
+                        }
                     }
                 }
 
                 // Check for right wall.
                 if (ball.Location.X > this.Width - ball.Size.Width - paddleComputer.Width + 100)
                 {
-                    ball.Location = new Point(this.Size.Width / 2 + 200, this.Size.Height / 2);
-                    paddleComputer.Location = new Point(paddleComputer.Location.X, ball.Location.Y);
-                    if (xVel > 0)
-                        xVel = -xVel;
-                    beatairewardtotal = beatairewardtotal + beataireward;
-                    lblbeatai.Show();
-                    lblbeatai.Text = Localization.Parse($"{{PONG_BEAT_AI_REWARD_SECONDARY}}: {beataireward}");
-                    tmrcountdown.Start();
-                    gameTimer.Stop();
-                    counter.Stop();
+                    if (IsMultiplayerSession)
+                    {
+                        //If we are the leader we won.
+                        if (IsLeader)
+                        {
+                            NotifyWinToTarget();
+                            Win();
+                        }
+                        else
+                        {
+                            NotifyLoseToTarget();
+                        }
+                    }
+                    else
+                    {
+                        Win();
+                    }
                 }
 
-                //lblstats.Text = "Xspeed: " & Math.Abs(xVel) & " Yspeed: " & Math.Abs(yVel) & " Human Location: " & paddleHuman.Location.ToString & " Computer Location: " & paddleComputer.Location.ToString & Environment.NewLine & " Ball Location: " & ball.Location.ToString & " Xdec: " & xveldec & " Ydec: " & yveldec & " Xinc: " & incrementx & " Yinc: " & incrementy
-                lblstatsX.Text = Localization.Parse("{H_VEL}: ") + xveldec;
-                lblstatsY.Text = Localization.Parse("{V_VEL}: ") + yveldec;
-                lblstatscodepoints.Text = Localization.Parse("{CODEPOINTS}: ") + (levelrewards[level - 1] + beatairewardtotal).ToString();
-                lbllevelandtime.Text = Localization.Parse("{LEVEL}: " + level + " - " + secondsleft + " {SECONDS_LEFT}");
+                if (IsMultiplayerSession)
+                {
+                    if (IsLeader)
+                    {
+                        ServerManager.Forward(OpponentGUID, "pong_mp_setballpos", JsonConvert.SerializeObject(ball.Location));
+                    }
+                }
 
-                if (xVel > 20 || xVel < -20)
+                if (IsLeader)
                 {
-                    paddleHuman.Width = Math.Abs(xVel);
-                    paddleComputer.Width = Math.Abs(xVel);
+                    //lblstats.Text = "Xspeed: " & Math.Abs(xVel) & " Yspeed: " & Math.Abs(yVel) & " Human Location: " & paddleHuman.Location.ToString & " Computer Location: " & paddleComputer.Location.ToString & Environment.NewLine & " Ball Location: " & ball.Location.ToString & " Xdec: " & xveldec & " Ydec: " & yveldec & " Xinc: " & incrementx & " Yinc: " & incrementy
+                    lblstatsX.Text = Localization.Parse("{H_VEL}: ") + xveldec;
+                    lblstatsY.Text = Localization.Parse("{V_VEL}: ") + yveldec;
+                    lblstatscodepoints.Text = Localization.Parse("{CODEPOINTS}: ") + (levelrewards[level - 1] + beatairewardtotal).ToString();
+                    lbllevelandtime.Text = Localization.Parse("{LEVEL}: " + level + " - " + secondsleft + " {SECONDS_LEFT}");
+
+                    if (xVel > 20 || xVel < -20)
+                    {
+                        paddleHuman.Width = Math.Abs(xVel);
+                        paddleComputer.Width = Math.Abs(xVel);
+                    }
+                    else
+                    {
+                        paddleHuman.Width = 20;
+                        paddleComputer.Width = 20;
+                    }
                 }
-                else
+                if (!IsMultiplayerSession)
                 {
-                    paddleHuman.Width = 20;
-                    paddleComputer.Width = 20;
+                    computerspeed = Math.Abs(yVel);
                 }
+            }
+        }
+
+        public void ServerMessageReceivedHandler(ServerMessage msg)
+        {
+            if (msg.Name == "pong_mp_setballpos")
+            {
+                var pt = JsonConvert.DeserializeObject<Point>(msg.Contents);
+                LeaderX = pt.X;
+                LeaderY = pt.Y;
+            }
+            else if(msg.Name == "pong_mp_left")
+            {
+                this.Invoke(new Action(() =>
+                {
+                    AppearanceManager.Close(this);
+                }));
+                Infobox.Show("Opponent has closed Pong.", "The opponent has closed Pong, therefore the connection between you two has dropped.");
+            }
+            else if (msg.Name == "pong_mp_youlose")
+            {
+                this.Invoke(new Action(LoseMP));
+            }
+            else if (msg.Name == "pong_mp_setopponenty")
+            {
+                int y = Convert.ToInt32(msg.Contents);
+                OpponentY = y;
+            }
+            else if (msg.Name == "pong_handshake_matchmake")
+            {
+                if (!PossibleMatchmakes.Contains(msg.Contents))
+                    PossibleMatchmakes.Add(msg.Contents);
+                this.Invoke(new Action(ListMatchmakes));
+            }
+            else if (msg.Name == "pong_handshake_resendid")
+            {
+                ServerManager.Forward("all", "pong_handshake_matchmake", YouGUID);
+            }
+            else if (msg.Name == "pong_handshake_complete")
+            {
+                IsLeader = true;
 
-                computerspeed = Math.Abs(yVel);
+                OpponentGUID = msg.Contents;
+                LeaveMatchmake();
+                this.Invoke(new Action(() =>
+                {
+                    pnlmultiplayerhandshake.Hide();
+                    StartLevel();
+                }));
+            }
+            else if (msg.Name == "pong_handshake_chosen")
+            {
+                IsLeader = false;
+                LeaveMatchmake();
+                OpponentGUID = msg.Contents;
+                YouGUID = ServerManager.thisGuid.ToString();
+                SendFollowerGUID();
+                this.Invoke(new Action(() =>
+                {
+                    pnlmultiplayerhandshake.Hide();
+                }));
+            }
+            else if (msg.Name == "pong_handshake_left")
+            {
+                if (this.PossibleMatchmakes.Contains(msg.Contents))
+                    this.PossibleMatchmakes.Remove(msg.Contents);
+                this.Invoke(new Action(ListMatchmakes));
+            }
+            else if (msg.Name == "pong_mp_youwin")
+            {
+                this.Invoke(new Action(Win));
+            }
+        }
 
-                //  pgcontents.Refresh()
-                // pgcontents.CreateGraphics.FillRectangle(Brushes.Black, ball.Location.X, ball.Location.Y, ball.Width, ball.Height)
+        public void ListMatchmakes()
+        {
+            lvotherplayers.Items.Clear();
+            var c = new ColumnHeader();
+            c.Width = lvotherplayers.Width;
+            c.Text = "Player";
+            lvotherplayers.Columns.Clear();
+            lvotherplayers.Columns.Add(c);
+
+            lvotherplayers.FullRowSelect = true;
+            foreach (var itm in PossibleMatchmakes)
+            {
+                if (itm != YouGUID)
+                {
+                    var l = new ListViewItem();
+                    l.Text = itm;
+                    lvotherplayers.Items.Add(l);
+                }
+            }
 
+            if (PossibleMatchmakes.Count > 0)
+            {
+                lbmpstatus.Text = "Select a player.";
+            }
+            else
+            {
+                lbmpstatus.Text = "Waiting for players...";
             }
         }
 
+        public void NotifyLoseToTarget()
+        {
+            ServerManager.Forward(OpponentGUID, "pong_mp_youwin", null);
+        }
+
+        public void NotifyWinToTarget()
+        {
+            ServerManager.Forward(OpponentGUID, "pong_mp_youlose", null);
+        }
+
+        public void LeaveMatchmake()
+        {
+            ServerManager.Forward("all", "pong_handshake_left", YouGUID);
+        }
+
+        List<string> PossibleMatchmakes = new List<string>();
+
+        public void SendLeaderGUID(string target)
+        {
+            ServerManager.Forward(target, "pong_handshake_chosen", YouGUID);
+        }
+
+
+        public void StartMultiplayer()
+        {
+            IsMultiplayerSession = true;
+            YouGUID = ServerManager.thisGuid.ToString();
+            ServerManager.SendMessage("pong_handshake_matchmake", YouGUID);
+            StartMatchmake();
+        }
+
+        public void StartMatchmake()
+        {
+            pnlmultiplayerhandshake.Show();
+            pnlmultiplayerhandshake.CenterParent();
+            pnlmultiplayerhandshake.BringToFront();
+
+            ServerManager.Forward("all", "pong_handshake_resendid", null);
+
+        }
+
+
+        public void SendFollowerGUID()
+        {
+            ServerManager.Forward(OpponentGUID, "pong_handshake_complete", YouGUID);
+        }
+
+        public void LoseMP()
+        {
+            ball.Location = new Point(this.Size.Width / 2 + 200, this.Size.Height / 2);
+            if(IsLeader)
+                if (xVel > 0)
+                    xVel = -xVel;
+            lblbeatai.Show();
+            lblbeatai.Text = "The opponent has beaten you!";
+            tmrcountdown.Start();
+            gameTimer.Stop();
+            counter.Stop();
+
+        }
+
+        public void Win()
+        {
+            ball.Location = new Point(this.Size.Width / 2 + 200, this.Size.Height / 2);
+            paddleComputer.Location = new Point(paddleComputer.Location.X, ball.Location.Y);
+            if (xVel > 0)
+                xVel = -xVel;
+            beatairewardtotal = beatairewardtotal + beataireward;
+            lblbeatai.Show();
+            lblbeatai.Text = Localization.Parse($"{{PONG_BEAT_AI_REWARD_SECONDARY}}: {beataireward}");
+            tmrcountdown.Start();
+            gameTimer.Stop();
+            counter.Stop();
+
+        }
+
         // ERROR: Handles clauses are not supported in C#
         private void counter_Tick(object sender, EventArgs e)
         {
@@ -310,15 +578,9 @@ namespace ShiftOS.WinForms.Applications
             SetupStats();
         }
 
+        [Obsolete("This method does nothing. Use UniteClient for highscore queries.")]
         public void SendHighscores()
         {
-            var highscore = new PongHighscore
-            {
-                UserName = $"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}",
-                HighestLevel = level,
-                HighestCodepoints = totalreward
-            };
-            ServerManager.SendMessage("pong_sethighscore", JsonConvert.SerializeObject(highscore));
         }
 
         // ERROR: Handles clauses are not supported in C#
@@ -611,27 +873,58 @@ namespace ShiftOS.WinForms.Applications
             SetupHighScores();
         }
 
+        bool IsMultiplayerSession = false;
+
+        string YouGUID = "";
+        string OpponentGUID = "";
+
         public void SetupHighScores()
         {
             lbhighscore.Items.Clear();
-            ServerManager.MessageReceived += (msg) =>
+            lbhighscore.View = View.Details;
+            lbhighscore.FullRowSelect = true;
+            lbhighscore.Columns.Clear();
+            var n = new ColumnHeader();
+            n.Text = "Player";
+            n.Width = lbhighscore.Width / 3;
+            var l = new ColumnHeader();
+            l.Text = "Level";
+            l.Width = n.Width;
+            var c = new ColumnHeader();
+            c.Text = "Codepoints";
+            c.Width = n.Width;
+            lbhighscore.Columns.Add(n);
+            lbhighscore.Columns.Add(l);
+            lbhighscore.Columns.Add(c);
+
+            var t = new Thread(() =>
             {
-                if(msg.Name == "pong_highscores")
+                try
                 {
-                    var hs = JsonConvert.DeserializeObject<List<PongHighscore>>(msg.Contents);
-
-                    var orderedhs = hs.OrderByDescending(i => i.HighestLevel);
 
-                    foreach(var score in orderedhs)
+                    var unite = new ShiftOS.Unite.UniteClient("http://getshiftos.ml", SaveSystem.CurrentSave.UniteAuthToken);
+                    var hs = unite.GetPongHighscores();
+                    foreach (var score in hs.Highscores)
                     {
+                        string username = unite.GetDisplayNameId(score.UserId);
                         this.Invoke(new Action(() =>
                         {
-                            lbhighscore.Items.Add($"{score.UserName}\t\t\t{score.HighestLevel}\t\t{score.HighestCodepoints} CP");
+                            var name_item = new ListViewItem();
+                            name_item.Text = username;
+                            lbhighscore.Items.Add(name_item);
+                            name_item.SubItems.Add(score.Level.ToString());
+                            name_item.SubItems.Add(score.CodepointsCashout.ToString());
                         }));
                     }
                 }
-            };
-            ServerManager.SendMessage("pong_gethighscores", null);
+                catch
+                {
+                    Infobox.Show("Service unavailable.", "The Pong Highscore service is unavailable at this time.");
+                    this.Invoke(new Action(pnlgamestats.BringToFront));
+                    return;
+                }
+            });
+            t.Start();
             pnlhighscore.Show();
         }
 
@@ -647,6 +940,11 @@ namespace ShiftOS.WinForms.Applications
             newgame();
         }
 
+        public void StartLevel()
+        {
+            newgame();
+        }
+        
         // ERROR: Handles clauses are not supported in C#
         private void btnstartgame_Click(object sender, EventArgs e)
         {
@@ -704,6 +1002,7 @@ namespace ShiftOS.WinForms.Applications
             pnlfinalstats.Hide();
             CenterPanels();
             lblbeatai.Hide();
+            ServerManager.MessageReceived += this.ServerMessageReceivedHandler;
         }
 
         public void OnSkinLoad()
@@ -717,6 +1016,14 @@ namespace ShiftOS.WinForms.Applications
 
         public bool OnUnload()
         {
+            if(IsMultiplayerSession == true)
+            {
+                if(!string.IsNullOrWhiteSpace(OpponentGUID))
+                    ServerManager.Forward(OpponentGUID, "pong_mp_left", null);
+            }
+            LeaveMatchmake();
+            ServerManager.MessageReceived -= this.ServerMessageReceivedHandler;
+
             return true;
         }
 
@@ -729,5 +1036,22 @@ namespace ShiftOS.WinForms.Applications
         {
             pnlhighscore.Hide();
         }
+
+        private void btnmatchmake_Click(object sender, EventArgs e)
+        {
+            this.StartMultiplayer();
+            pnlintro.Hide();
+            lblbeatai.Text = "Beat the other player to earn Codepoints.";
+            lblcountdown.Text = "Waiting for another player...";
+            lblcountdown.Left = (this.Width - lblcountdown.Width) / 2;
+        }
+
+        private void lvotherplayers_DoubleClick(object sender, EventArgs e)
+        {
+            if(lvotherplayers.SelectedItems.Count > 0)
+            {
+                SendLeaderGUID(lvotherplayers.SelectedItems[0].Text);
+            }
+        }
     }
 }