From 3d625459b215bc0b2d26fc076f34b574d10a790f Mon Sep 17 00:00:00 2001 From: SilicaAndPina Date: Thu, 7 Jan 2021 02:35:48 +1300 Subject: [PATCH] Add BasicStatFormat --- DataCollection/gamedata.json | 6 +++--- .../Horse Isle Server/Game/Messages.cs | 15 ++++++++++++--- Horse Isle Server/Horse Isle Server/Game/Meta.cs | 14 +++++++------- .../Horse Isle Server/Server/GameDataJson.cs | 3 ++- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/DataCollection/gamedata.json b/DataCollection/gamedata.json index 481bb9c..8449573 100644 --- a/DataCollection/gamedata.json +++ b/DataCollection/gamedata.json @@ -132,7 +132,7 @@ "password_input":"
^PLReply:|^PS14|ANSWER^R1", "last_poet":"^R1^LLast Player Poet:%USERNAME% ^R1", "horse":{ - "stat_format":"%BASE%;%COMPAINON%;%TACK%;%MAX%;", + "stat_format":"^AA%BASE%;%COMPAINON%;%TACK%;%MAX%;", "basic_stat_format":"^AB%HEALTH%;%HUNGER%;%THIRST%;%MOOD%;%ENERGY%;%GROOM%;%SHOES%;^H", "horses_here":"HORSES HERE:
", "wild_horse":"^I252^T6%NAME%, It's a %BREED%^B3U%RANDOMID%^R1", @@ -172,7 +172,7 @@ "no_companion":"^T5Horse has no companion^D6|SELECT^R1", "advanced_stats":"^HADVANCED STATS:
Special treats:%SPOILED% Magic residue:%MAGICUSED%
", - "breed_details":"BREED DETAILS:
Name: %BREED%
Description: %DESCRIPTION%", + "breed_details":"^HBREED DETAILS:
Name: %BREED%
Description: %DESCRIPTION%", "height_range":"
Average Height Range: %MIN%-%MAX% hands
", "possible_colors":"
Possible Colors: black,brown,chestnut,bay,grey,roan
", "release_horse":"^D8|RELEASE HORSE^R1", @@ -189,7 +189,7 @@ "find_npc_limit5":"^L- Limited to 5 results. Try narrowing the search.^R1", "horse_breed_format":"^I252^T7Horse Breed %NAME%:^D4c%ID%|VIEW^R1", "horse_relative_format":"^I252^T7A Horse Relative, the %NAME%:^D4c%ID%|VIEW^R1", - "maximum_stats":"MAXIMUM STATS:
^AA", + "maximum_stats":"MAXIMUM STATS:
", "breed_preview_format":"Viewing %NAME%:
%DESCRIPTION%^D4|RETURN TO BREED LIST^R2^H" }, "multiroom":{ diff --git a/Horse Isle Server/Horse Isle Server/Game/Messages.cs b/Horse Isle Server/Horse Isle Server/Game/Messages.cs index f366f62..ca2bddb 100644 --- a/Horse Isle Server/Horse Isle Server/Game/Messages.cs +++ b/Horse Isle Server/Horse Isle Server/Game/Messages.cs @@ -163,7 +163,8 @@ namespace HISP.Game // Horse public static string BreedViewerMaximumStats; - public static string StatFormat; + public static string AdvancedStatFormat; + public static string BasicStatFormat; public static string HorsesHere; public static string WildHorseFormat; public static string HorseCaptureTimer; @@ -176,6 +177,9 @@ namespace HISP.Game public static string ViewBaiscStats; public static string ViewAdvancedStats; + + + // Consume public static string ConsumeItemFormat; @@ -388,10 +392,15 @@ namespace HISP.Game { return BreedViewerFormat.Replace("%NAME%", name).Replace("%DESCRIPTION%", description); } - public static string FormatHorseStat(int baseStat, int companionBoost, int tackBoost, int maxStat) + public static string FormatHorseAdvancedStat(int baseStat, int companionBoost, int tackBoost, int maxStat) { - return StatFormat.Replace("%BASE%", baseStat.ToString()).Replace("%COMPAINON%", companionBoost.ToString()).Replace("%TACK%", tackBoost.ToString()).Replace("%MAX%", maxStat.ToString()); + return AdvancedStatFormat.Replace("%BASE%", baseStat.ToString()).Replace("%COMPAINON%", companionBoost.ToString()).Replace("%TACK%", tackBoost.ToString()).Replace("%MAX%", maxStat.ToString()); } + public static string FormatHorseBasicStat(int health, int hunger, int thirst, int mood, int energy, int groom, int shoes) + { + return BasicStatFormat.Replace("%HEALTH%", health.ToString()).Replace("%HUNGER%", hunger.ToString()).Replace("%THIRST%", thirst.ToString()).Replace("%MOOD%", mood.ToString()).Replace("%ENERGY%", energy.ToString()).Replace("%GROOM%", groom.ToString()).Replace("%SHOES%", shoes.ToString()); + } + public static string FormatHorseRelative(string name, int id) { return HorseRelativeFormat.Replace("%NAME%", name).Replace("%ID%", id.ToString()); diff --git a/Horse Isle Server/Horse Isle Server/Game/Meta.cs b/Horse Isle Server/Horse Isle Server/Game/Meta.cs index 2ed5695..18c8939 100644 --- a/Horse Isle Server/Horse Isle Server/Game/Meta.cs +++ b/Horse Isle Server/Horse Isle Server/Game/Meta.cs @@ -638,13 +638,13 @@ namespace HISP.Game { string message = Messages.FormatHorseBreedPreview(breed.Name, breed.Description); message += Messages.BreedViewerMaximumStats; - message += Messages.FormatHorseStat(breed.BaseStats.Speed * 2, 0, 0, breed.BaseStats.Speed * 2); - message += Messages.FormatHorseStat(breed.BaseStats.Strength * 2, 0, 0, breed.BaseStats.Strength * 2); - message += Messages.FormatHorseStat(breed.BaseStats.Conformation * 2, 0, 0, breed.BaseStats.Conformation * 2); - message += Messages.FormatHorseStat(breed.BaseStats.Agility * 2, 0, 0, breed.BaseStats.Agility * 2); - message += Messages.FormatHorseStat(breed.BaseStats.Endurance * 2, 0, 0, breed.BaseStats.Endurance * 2); - message += Messages.FormatHorseStat(breed.BaseStats.Inteligence * 2, 0, 0, breed.BaseStats.Inteligence * 2); - message += Messages.FormatHorseStat(breed.BaseStats.Personality * 2, 0, 0, breed.BaseStats.Personality * 2); + message += Messages.FormatHorseAdvancedStat(breed.BaseStats.Speed * 2, 0, 0, breed.BaseStats.Speed * 2); + message += Messages.FormatHorseAdvancedStat(breed.BaseStats.Strength * 2, 0, 0, breed.BaseStats.Strength * 2); + message += Messages.FormatHorseAdvancedStat(breed.BaseStats.Conformation * 2, 0, 0, breed.BaseStats.Conformation * 2); + message += Messages.FormatHorseAdvancedStat(breed.BaseStats.Agility * 2, 0, 0, breed.BaseStats.Agility * 2); + message += Messages.FormatHorseAdvancedStat(breed.BaseStats.Endurance * 2, 0, 0, breed.BaseStats.Endurance * 2); + message += Messages.FormatHorseAdvancedStat(breed.BaseStats.Inteligence * 2, 0, 0, breed.BaseStats.Inteligence * 2); + message += Messages.FormatHorseAdvancedStat(breed.BaseStats.Personality * 2, 0, 0, breed.BaseStats.Personality * 2); message += Messages.BackToMap; message += Messages.MetaTerminator; return message; diff --git a/Horse Isle Server/Horse Isle Server/Server/GameDataJson.cs b/Horse Isle Server/Horse Isle Server/Server/GameDataJson.cs index 2fbbd77..32ba80f 100644 --- a/Horse Isle Server/Horse Isle Server/Server/GameDataJson.cs +++ b/Horse Isle Server/Horse Isle Server/Server/GameDataJson.cs @@ -596,7 +596,8 @@ namespace HISP.Server Messages.BankWithdrewMoneyFormat = gameData.messages.bank.withdraw_format; // Horses - Messages.StatFormat = gameData.messages.meta.horse.stat_format; + Messages.AdvancedStatFormat = gameData.messages.meta.horse.stat_format; + Messages.BasicStatFormat = gameData.messages.meta.horse.basic_stat_format; Messages.HorsesHere = gameData.messages.meta.horse.horses_here; Messages.WildHorseFormat = gameData.messages.meta.horse.wild_horse; Messages.HorseCaptureTimer = gameData.messages.meta.horse.horse_timer;