From 7815ffc630ea55c5cae319d0b9f0de9f31c88c16 Mon Sep 17 00:00:00 2001
From: Bluzume <39113159+KuromeSan@users.noreply.github.com>
Date: Mon, 8 Nov 2021 00:15:31 -0500
Subject: [PATCH] Fix some issues

---
 HorseIsleServer/HorseIsleServer/Game/Meta.cs  | 27 +++++++++++++------
 .../HorseIsleServer/Server/Database.cs        |  7 +++--
 .../HorseIsleServer/Server/GameServer.cs      |  2 +-
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/HorseIsleServer/HorseIsleServer/Game/Meta.cs b/HorseIsleServer/HorseIsleServer/Game/Meta.cs
index 4bcff3c..24a590a 100644
--- a/HorseIsleServer/HorseIsleServer/Game/Meta.cs
+++ b/HorseIsleServer/HorseIsleServer/Game/Meta.cs
@@ -258,13 +258,18 @@ namespace HISP.Game
             // Insert LGBT Patch here
 
             string pronoun = "";
+
             if (other)
             {
                 if (user.Gender == "FEMALE")
+                {
                     pronoun = Messages.PronounFemaleShe;
+                }
 
                 if (user.Gender == "MALE")
+                {
                     pronoun = Messages.PronounMaleHe;
+                }
             }
 
             if (!other)
@@ -363,13 +368,19 @@ namespace HISP.Game
             // Insert LGBT Patch Here
 
             string pronoun = Messages.PronounYouYour;
-            if(other)
+            string pronoun2 = Messages.PronounYouYour;
+            if (other)
             {
                 if (user.Gender == "FEMALE")
+                {
                     pronoun = Messages.PronounFemaleShe;
-
-                if (user.Gender == "MALE")
+                    pronoun2 = Messages.PronounFemaleHer;
+                }
+                else if (user.Gender == "MALE")
+                {
                     pronoun = Messages.PronounMaleHe;
+                    pronoun2 = Messages.PronounMaleHis;
+                }
 
                 message = Messages.FormatOtherCompetitionGear(pronoun);
             }
@@ -378,22 +389,22 @@ namespace HISP.Game
 
             if (user.EquipedCompetitionGear.Head != null)
             {
-                message += Messages.FormatCompetitionGearHead(user.EquipedCompetitionGear.Head.Name, pronoun, user.EquipedCompetitionGear.Head.IconId, other);
+                message += Messages.FormatCompetitionGearHead(user.EquipedCompetitionGear.Head.Name, pronoun2, user.EquipedCompetitionGear.Head.IconId, other);
                 hasMsg = true;
             }
             if (user.EquipedCompetitionGear.Body != null)
             {
-                message += Messages.FormatCompetitionGearBody(user.EquipedCompetitionGear.Body.Name, pronoun, user.EquipedCompetitionGear.Body.IconId, other);
+                message += Messages.FormatCompetitionGearBody(user.EquipedCompetitionGear.Body.Name, pronoun2, user.EquipedCompetitionGear.Body.IconId, other);
                 hasMsg = true;
             }
             if (user.EquipedCompetitionGear.Legs != null)
             {
-                message += Messages.FormatCompetitionGearLegs(user.EquipedCompetitionGear.Legs.Name, pronoun, user.EquipedCompetitionGear.Legs.IconId, other);
+                message += Messages.FormatCompetitionGearLegs(user.EquipedCompetitionGear.Legs.Name, pronoun2, user.EquipedCompetitionGear.Legs.IconId, other);
                 hasMsg = true;
             }
             if (user.EquipedCompetitionGear.Feet != null)
             {
-                message += Messages.FormatCompetitionGearFeet(user.EquipedCompetitionGear.Feet.Name, pronoun, user.EquipedCompetitionGear.Feet.IconId, other);
+                message += Messages.FormatCompetitionGearFeet(user.EquipedCompetitionGear.Feet.Name, pronoun2, user.EquipedCompetitionGear.Feet.IconId, other);
                 hasMsg = true;
             }
 
@@ -919,7 +930,7 @@ namespace HISP.Game
                 if (highscore.Type == "SCORE")
                     message += Messages.FormatHighscoreStat(highscore.GameName, Database.GetRanking(highscore.Score, highscore.GameName), highscore.Score, highscore.TimesPlayed);
                 else if (highscore.Type == "TIME")
-                    message += Messages.FormatBestTimeStat(highscore.GameName, Database.GetRanking(highscore.Score, highscore.GameName), highscore.Score, highscore.TimesPlayed);
+                    message += Messages.FormatBestTimeStat(highscore.GameName, Database.GetRanking(highscore.Score, highscore.GameName, true), highscore.Score, highscore.TimesPlayed);
             }
             message += Messages.BackToMap;
             message += Messages.MetaTerminator;
diff --git a/HorseIsleServer/HorseIsleServer/Server/Database.cs b/HorseIsleServer/HorseIsleServer/Server/Database.cs
index 0b39bf5..214fdfe 100644
--- a/HorseIsleServer/HorseIsleServer/Server/Database.cs
+++ b/HorseIsleServer/HorseIsleServer/Server/Database.cs
@@ -5482,14 +5482,17 @@ namespace HISP.Server
             }
         }
 
-        public static int GetRanking(int score, string gameTitle)
+        public static int GetRanking(int score, string gameTitle, bool time=false)
         {
             using (MySqlConnection db = new MySqlConnection(ConnectionString))
             {
 
                 db.Open();
                 MySqlCommand sqlCommand = db.CreateCommand();
-                sqlCommand.CommandText = "SELECT DISTINCT score FROM Leaderboards WHERE minigame=@gameTitle ORDER BY score DESC";
+                if(time)
+                    sqlCommand.CommandText = "SELECT DISTINCT score FROM Leaderboards WHERE minigame=@gameTitle ORDER BY score ASC";
+                else
+                    sqlCommand.CommandText = "SELECT DISTINCT score FROM Leaderboards WHERE minigame=@gameTitle ORDER BY score DESC";
                 sqlCommand.Parameters.AddWithValue("@gameTitle", gameTitle);
                 sqlCommand.Prepare();
                 MySqlDataReader reader = sqlCommand.ExecuteReader();
diff --git a/HorseIsleServer/HorseIsleServer/Server/GameServer.cs b/HorseIsleServer/HorseIsleServer/Server/GameServer.cs
index 8511384..f4b0a35 100644
--- a/HorseIsleServer/HorseIsleServer/Server/GameServer.cs
+++ b/HorseIsleServer/HorseIsleServer/Server/GameServer.cs
@@ -4594,7 +4594,7 @@ namespace HISP.Server
                             Logger.ErrorPrint(sender.LoggedinUser.Username + " Sent correct sec code, but invalid score value");
                             return;
                         }
-                        Highscore.HighscoreTableEntry[] scores = Database.GetTopScores(gameTitle, 5);
+                        Highscore.HighscoreTableEntry[] scores = Database.GetTopScores(gameTitle, 5, !time);
                         bool bestScoreEver = false;
                         if (scores.Length >= 1)
                             bestScoreEver = scores[0].Score <= value;