From 6795f3143a6a985044eecc4bd0000bf7ddea5abd Mon Sep 17 00:00:00 2001
From: SilicaAndPina <earsyum@gmail.com>
Date: Fri, 5 Feb 2021 21:46:26 +1300
Subject: [PATCH] fix quest unlocking

---
 .../HorseIsleServer/Game/Horse/WildHorse.cs   |  6 ++--
 .../HorseIsleServer/Game/Quest.cs             |  4 +--
 .../HorseIsleServer/Server/GameServer.cs      | 29 +++++++++++--------
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/Horse Isle Server/HorseIsleServer/Game/Horse/WildHorse.cs b/Horse Isle Server/HorseIsleServer/Game/Horse/WildHorse.cs
index 4cceb2c..afc47b1 100755
--- a/Horse Isle Server/HorseIsleServer/Game/Horse/WildHorse.cs	
+++ b/Horse Isle Server/HorseIsleServer/Game/Horse/WildHorse.cs	
@@ -124,7 +124,6 @@ namespace HISP.Game.Horse
 
                 if (Map.CheckPassable(tryX, tryY)) // Can the player stand here?
                 {
-                    Logger.DebugPrint(this.Instance.Breed.Name + " Randomly wandered to: " + tryX.ToString() + ", " + tryY.ToString());
                     X = tryX;
                     Y = tryY;
                     break;
@@ -232,7 +231,8 @@ namespace HISP.Game.Horse
 
         public static void Update()
         {
-            foreach(WildHorse wildHorse in WildHorses)
+            Logger.DebugPrint("Making horses wander.");
+            foreach (WildHorse wildHorse in WildHorses)
             {
                 wildHorse.Timeout -= 1;
 
@@ -242,7 +242,7 @@ namespace HISP.Game.Horse
                 if (wildHorse.Timeout <= 0)
                     Despawn(wildHorse);
 
-                if (GameServer.RandomNumberGenerator.Next(0, 100) >= 50)
+                if (GameServer.RandomNumberGenerator.Next(0, 100) >= 25)
                     wildHorse.RandomWander();
             }
             if(WildHorses.Length < 40)
diff --git a/Horse Isle Server/HorseIsleServer/Game/Quest.cs b/Horse Isle Server/HorseIsleServer/Game/Quest.cs
index 4a5b01c..19104d1 100755
--- a/Horse Isle Server/HorseIsleServer/Game/Quest.cs	
+++ b/Horse Isle Server/HorseIsleServer/Game/Quest.cs	
@@ -109,12 +109,12 @@ namespace HISP.Game
 
                 // Has completed other required quests?
                 foreach (int questId in quest.RequiresQuestIdCompleted)
-                    if (user.Quests.GetTrackedQuestAmount(quest.Id) < 1)
+                    if (user.Quests.GetTrackedQuestAmount(questId) < 1)
                         return false;
 
                 // Has NOT competed other MUST NOT BE required quests
                 foreach (int questId in quest.RequiresQuestIdNotCompleted)
-                    if (user.Quests.GetTrackedQuestAmount(quest.Id) > 1)
+                    if (user.Quests.GetTrackedQuestAmount(questId) > 1)
                         return false;
 
                 // Has allready tracked this quest?
diff --git a/Horse Isle Server/HorseIsleServer/Server/GameServer.cs b/Horse Isle Server/HorseIsleServer/Server/GameServer.cs
index b46417d..84290a2 100755
--- a/Horse Isle Server/HorseIsleServer/Server/GameServer.cs	
+++ b/Horse Isle Server/HorseIsleServer/Server/GameServer.cs	
@@ -64,23 +64,28 @@ namespace HISP.Server
             if(totalMinutesElapsed % 24 == 0)
                 Database.DoIntrestPayments(ConfigReader.IntrestRate);
 
-            foreach (World.Town town in World.Towns)
+
+            if (totalMinutesElapsed % 25 == 0)
             {
-                if (RandomNumberGenerator.Next(0, 100) < 25)
+
+                Logger.DebugPrint("Randomizing Weather...");
+                foreach (World.Town town in World.Towns)
                 {
-                    town.Weather = town.SelectRandomWeather();
-                    Logger.DebugPrint("Changing the weather in " + town.Name + " to " + town.Weather);
+                    if (RandomNumberGenerator.Next(0, 100) < 25)
+                    {
+                        town.Weather = town.SelectRandomWeather();
+                    }
+                }
+
+                foreach (World.Isle isle in World.Isles)
+                {
+                    if (RandomNumberGenerator.Next(0, 100) < 25)
+                    {
+                        isle.Weather = isle.SelectRandomWeather();
+                    }
                 }
             }
 
-            foreach (World.Isle isle in World.Isles)
-            {
-                if(RandomNumberGenerator.Next(0,100) < 25)
-                {
-                    isle.Weather = isle.SelectRandomWeather();
-                    Logger.DebugPrint("Changing the weather in " + isle.Name + " to " + isle.Weather);
-                }
-            }
 
 
             Database.IncPlayerTirednessForOfflineUsers();