From e5fa0caccdbc1e9159ff718b3f0a59e42dfdf84b Mon Sep 17 00:00:00 2001 From: SilicaAndPina Date: Mon, 28 Jun 2021 02:09:01 +1200 Subject: [PATCH] fix UTs. --- .../HorseIsleServer/Game/Horse/HorseInstance.cs | 5 +++-- Horse Isle Server/HorseIsleServer/Game/Meta.cs | 9 ++++++++- Horse Isle Server/HorseIsleServer/Game/Riddler.cs | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Horse Isle Server/HorseIsleServer/Game/Horse/HorseInstance.cs b/Horse Isle Server/HorseIsleServer/Game/Horse/HorseInstance.cs index 7a762a1..7e3530f 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Horse/HorseInstance.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Horse/HorseInstance.cs @@ -45,8 +45,9 @@ namespace HISP.Game.Horse BasicStats = new HorseInfo.BasicStats(this, 1000, 0, 1000, 1000, 500, 200, 1000, 0); - int inteligence = (GameServer.RandomNumberGenerator.Next(breed.BaseStats.Inteligence, ((breed.BaseStats.Inteligence * 2)) - breed.BaseStats.Inteligence) + 1); - int personality = (GameServer.RandomNumberGenerator.Next(breed.BaseStats.Personality, ((breed.BaseStats.Personality * 2)) - breed.BaseStats.Personality) + 1); + + int inteligence = (GameServer.RandomNumberGenerator.Next(breed.BaseStats.Inteligence, (breed.BaseStats.Inteligence * 2)) - breed.BaseStats.Inteligence); + int personality = (GameServer.RandomNumberGenerator.Next(breed.BaseStats.Personality, (breed.BaseStats.Personality * 2)) - breed.BaseStats.Personality); int height = GameServer.RandomNumberGenerator.Next(breed.BaseStats.MinHeight, breed.BaseStats.MaxHeight + 1); AdvancedStats = new HorseInfo.AdvancedStats(this, 0, 0, 0, 0, inteligence, 0, personality, height); diff --git a/Horse Isle Server/HorseIsleServer/Game/Meta.cs b/Horse Isle Server/HorseIsleServer/Game/Meta.cs index ad3cfc6..f961a1e 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Meta.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Meta.cs @@ -2009,9 +2009,16 @@ namespace HISP.Game } private static string buildRiddlerRiddle(User user) { + string message = ""; + if (Riddler.HasCompletedAllRiddles(user)) { + message = Messages.RiddlerAnsweredAll; + message += Messages.ExitThisPlace; + message += Messages.MetaTerminator; + return message; + } Riddler riddle = Riddler.GetRandomRiddle(user); user.LastRiddle = riddle; - string message = ""; + message += Messages.FormatRiddlerRiddle(riddle.Riddle); message += Messages.ExitThisPlace; message += Messages.MetaTerminator; diff --git a/Horse Isle Server/HorseIsleServer/Game/Riddler.cs b/Horse Isle Server/HorseIsleServer/Game/Riddler.cs index 29b7108..19bdbc8 100644 --- a/Horse Isle Server/HorseIsleServer/Game/Riddler.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Riddler.cs @@ -35,7 +35,7 @@ namespace HISP.Game user.LoggedinClient.SendPacket(riddleAnswerCorrectPacket); user.AddMoney(10000); - if(Database.TotalRiddlesCompletedByPlayer(user.Id) >= riddlerRiddles.Count) + if(HasCompletedAllRiddles(user)) user.Awards.AddAward(Award.GetAwardById(11)); // Riddlers Riddles }