From 84250eb17e19c34905096e7afbb9702407cd8341 Mon Sep 17 00:00:00 2001
From: Bluzume <39113159+KuromeSan@users.noreply.github.com>
Date: Sun, 7 Nov 2021 18:42:36 -0500
Subject: [PATCH] Fix awards and icons

---
 HorseIsleData                                          | 2 +-
 HorseIsleServer/HorseIsleServer/Game/Chat/Command.cs   | 6 ++++++
 HorseIsleServer/HorseIsleServer/Game/Messages.cs       | 5 +++++
 HorseIsleServer/HorseIsleServer/Game/Meta.cs           | 8 +++++---
 HorseIsleServer/HorseIsleServer/Player/User.cs         | 4 ++--
 HorseIsleServer/HorseIsleServer/Server/GameDataJson.cs | 1 +
 6 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/HorseIsleData b/HorseIsleData
index 0f92689..a044032 160000
--- a/HorseIsleData
+++ b/HorseIsleData
@@ -1 +1 @@
-Subproject commit 0f9268907fb3cd9d0da9c8ab1cba8308de0e5656
+Subproject commit a044032daca22e2d76d54d1e5e073e6527eb43de
diff --git a/HorseIsleServer/HorseIsleServer/Game/Chat/Command.cs b/HorseIsleServer/HorseIsleServer/Game/Chat/Command.cs
index 11a5a85..f8d54b1 100644
--- a/HorseIsleServer/HorseIsleServer/Game/Chat/Command.cs
+++ b/HorseIsleServer/HorseIsleServer/Game/Chat/Command.cs
@@ -511,6 +511,12 @@ namespace HISP.Game.Chat
                                 case "PERSONALITY":
                                     instance.AdvancedStats.Personality = amount;
                                     break;
+                                case "HEIGHT":
+                                    instance.AdvancedStats.Height = amount;
+                                    break;
+                                case "COLOR":
+                                    instance.Color = args[2].ToLower();
+                                    break;
                                 case "EXPERIENCE":
                                     instance.BasicStats.Experience = amount;
                                     break;
diff --git a/HorseIsleServer/HorseIsleServer/Game/Messages.cs b/HorseIsleServer/HorseIsleServer/Game/Messages.cs
index 52b9520..1137099 100644
--- a/HorseIsleServer/HorseIsleServer/Game/Messages.cs
+++ b/HorseIsleServer/HorseIsleServer/Game/Messages.cs
@@ -997,6 +997,7 @@ namespace HISP.Game
 
         // Awards
 
+        public static string AwardOthersFormat;
         public static string AwardHeader;
         public static string NoAwards;
         public static string AwardFormat;
@@ -2514,6 +2515,10 @@ namespace HISP.Game
         {
             return ConsumeItemFormat.Replace("%ITEM%", itemName);
         }
+        public static string FormatAwardHeaderOthers(string username)
+        {
+            return AwardOthersFormat.Replace("%USERNAME%", username);
+        }
         public static string FormatAwardEntry(int iconId, string title, int moneyBonus)
         {
             return AwardFormat.Replace("%ICON%", iconId.ToString()).Replace("%NAME%", title).Replace("%BONUS%", moneyBonus.ToString("N0", CultureInfo.InvariantCulture));
diff --git a/HorseIsleServer/HorseIsleServer/Game/Meta.cs b/HorseIsleServer/HorseIsleServer/Game/Meta.cs
index 70cd8aa..d014830 100644
--- a/HorseIsleServer/HorseIsleServer/Game/Meta.cs
+++ b/HorseIsleServer/HorseIsleServer/Game/Meta.cs
@@ -1056,6 +1056,11 @@ namespace HISP.Game
                 message += Messages.FormatOtherHorsesMeta(pronoun);
 
                 message += buildHorseList(user, false);
+
+                message += Messages.FormatAwardHeaderOthers(user.Username);
+                foreach (Award.AwardEntry award in user.Awards.AwardsEarned)
+                    message += Messages.FormatAwardEntry(award.IconId, award.Title, award.MoneyBonus);
+
             }
 
 
@@ -1089,9 +1094,6 @@ namespace HISP.Game
                 foreach (Award.AwardEntry award in user.Awards.AwardsEarned)
                     message += Messages.FormatAwardEntry(award.IconId, award.Title, award.MoneyBonus);
 
-
-
-
             message += Messages.BackToMap;
             message += Messages.MetaTerminator;
             return message;
diff --git a/HorseIsleServer/HorseIsleServer/Player/User.cs b/HorseIsleServer/HorseIsleServer/Player/User.cs
index adfb16e..a31df82 100644
--- a/HorseIsleServer/HorseIsleServer/Player/User.cs
+++ b/HorseIsleServer/HorseIsleServer/Player/User.cs
@@ -525,12 +525,12 @@ namespace HISP.Player
                 icon = Messages.NewUserIcon;
             if (Subscribed)
             {
-                int months = (DateTime.UtcNow.Month - SubscribedUntil.Month) + 12 * (DateTime.UtcNow.Year - SubscribedUntil.Year);
+                int months = (SubscribedUntil.Month - DateTime.UtcNow.Month) + ((SubscribedUntil.Year - DateTime.UtcNow.Year) * 12);
                 if (months <= 1)
                     icon = Messages.MonthSubscriptionIcon;
                 else if (months <= 3)
                     icon = Messages.ThreeMonthSubscripitionIcon;
-                else
+                else if(months <= (12+3))
                     icon = Messages.YearSubscriptionIcon;
             }
             if (Moderator)
diff --git a/HorseIsleServer/HorseIsleServer/Server/GameDataJson.cs b/HorseIsleServer/HorseIsleServer/Server/GameDataJson.cs
index adb74fe..47c8008 100644
--- a/HorseIsleServer/HorseIsleServer/Server/GameDataJson.cs
+++ b/HorseIsleServer/HorseIsleServer/Server/GameDataJson.cs
@@ -2042,6 +2042,7 @@ namespace HISP.Server
             // Awards
 
             Messages.AwardHeader = gameData.messages.meta.awards_page.awards_header;
+            Messages.AwardOthersFormat = gameData.messages.meta.awards_page.awards_head;
             Messages.NoAwards = gameData.messages.meta.awards_page.no_awards;
             Messages.AwardFormat = gameData.messages.meta.awards_page.award_format;