From 3ccbf19244508cf9e905bed20bc4c881f490c5ea Mon Sep 17 00:00:00 2001 From: SilicaPi Date: Fri, 29 Jan 2021 21:14:23 +1300 Subject: [PATCH] Intergrate whisperer messages into code --- DataCollection/gamedata.json | 4 +-- .../HorseIsleServer/Game/Messages.cs | 26 +++++++++++++++++++ .../HorseIsleServer/Server/GameDataJson.cs | 8 ++++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/DataCollection/gamedata.json b/DataCollection/gamedata.json index da8fa85..a7ae6b3 100755 --- a/DataCollection/gamedata.json +++ b/DataCollection/gamedata.json @@ -162,12 +162,12 @@ "ruined_groom":"Big muddy area here....OH NO! Your horse '%HORSENAME%' rolled around in the mud, ruining its groom completely..", }, "whisperer":{ - "horse_locate_meta":"^T6%HORSENAME%^D32c%BREEDID%|LOCATE^R1", + "horse_locate_meta":"^T6%BREEDNAME%^D32c%BREEDID%|LOCATE^R1", "service_cost":"The horse location service cost you $%MONEY%.", "cant_afford":"You cannot afford this service.", "searching_amoung_horses":"Searching for breed type among wild horses:
", "none_found_meta":"There are no horses of that breed roaming around that I can locate. Try another breed or come back again later. I'll only charge you a portion of my normal rate.", - "horse_found_meta":"I have managed to locate horses of the breed you requested! You will have to hurry though, horses like to wander.^T7Location of horse(s):^B1M" + "horse_found_meta":"I have managed to locate horses of the breed you requested! You will have to hurry though, horses like to wander.^T7Location of horse(s):^B1M%MAPXY%" }, "horse":{ "stat_format":"%BASE%;%COMPAINON%;%TACK%;%MAX%;", diff --git a/Horse Isle Server/HorseIsleServer/Game/Messages.cs b/Horse Isle Server/HorseIsleServer/Game/Messages.cs index 95fb27b..6448edb 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Messages.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Messages.cs @@ -308,6 +308,16 @@ namespace HISP.Game public static string VetAllFullHealthRecoveredMessage; public static string VetCannotAffordMessage; + // Horse Whisperer + + public static string WhispererHorseLocateButtonFormat; + public static string WhispererServiceCostYouFormat; + + public static string WhispererServiceCannotAfford; + public static string WhispererSearchingAmoungHorses; + public static string WhispererNoneFound; + public static string WhispererHorsesFoundFormat; + // Consume public static string ConsumeItemFormat; @@ -502,6 +512,22 @@ namespace HISP.Game // Click public static string NothingInterestingHere; + + public static string FormatWhispererHorseFoundMeta(string mapXys) + { + return WhispererHorsesFoundFormat.Replace("%MAPXYS%",mapXys); + } + + public static string FormatWhispererPrice(int price) + { + return WhispererServiceCostYouFormat.Replace("%MONEY%",price.ToString("N0")); + } + + public static string FormatWhispererHorseBreedButton(string breedName, int breedId) + { + return WhispererHorseLocateButtonFormat.Replace("%BREEDNAME%",breedName).Replace("%BREEDID%",breedId.ToString()); + } + public static string FormatVetServiceHorseMeta(string horseName, int currentHealth, int maxHealth) { return VetServiceHorseFormat.Replace("%HORSENAME%", horseName).Replace("%CURHEALTH%", currentHealth.ToString()).Replace("%MAXHEALTH%", maxHealth.ToString()); diff --git a/Horse Isle Server/HorseIsleServer/Server/GameDataJson.cs b/Horse Isle Server/HorseIsleServer/Server/GameDataJson.cs index e869a3a..e681dde 100755 --- a/Horse Isle Server/HorseIsleServer/Server/GameDataJson.cs +++ b/Horse Isle Server/HorseIsleServer/Server/GameDataJson.cs @@ -611,6 +611,14 @@ namespace HISP.Server Messages.PondDrinkOhNoesFormat = gameData.messages.meta.pond.drank_something_bad; Messages.PondNotThirstyFormat = gameData.messages.meta.pond.not_thirsty; + // Horse Whisperer + Messages.WhispererHorseLocateButtonFormat = gameData.messages.meta.whisperer.horse_locate_meta; + Messages.WhispererServiceCostYouFormat = gameData.messages.meta.whisperer.service_cost; + Messages.WhispererServiceCannotAfford = gameData.messages.meta.whisperer.cant_afford; + Messages.WhispererSearchingAmoungHorses = gameData.messages.meta.whisperer.searching_amoung_horses; + Messages.WhispererNoneFound = gameData.messages.meta.whisperer.none_found_meta; + Messages.WhispererHorsesFoundFormat = gameData.messages.meta.whisperer.horse_found_meta; + // Mud Hole Messages.MudHoleNoHorses = gameData.messages.meta.mud_hole.no_horses; Messages.MudHoleRuinedGroomFormat = gameData.messages.meta.mud_hole.ruined_groom;