diff --git a/DataCollection/gamedata.json b/DataCollection/gamedata.json index 8449573..bef13c4 100644 --- a/DataCollection/gamedata.json +++ b/DataCollection/gamedata.json @@ -161,9 +161,13 @@ "pet_button":"^B3P%ID%", "profile_button":"^B3E%ID%", - "auto_sell":"^R1^T2[NO Auto-Sell]^D25|SET AUTO-SELL PRICE", + + "no_auto_sell":"NO Auto-Sell", + "auto_sell_format":"Auto-Selling: $%MONEY%", + "auto_sell":"^R1^T2[%AUTOSELL%]^D25|SET AUTO-SELL PRICE", "cannot_auto_sell_tacked":"^R1^T8Cannot set Auto-Sell on a Horse with Tack", - "marked_as":"^R1^LHorse currently marked [KEEPER]. Mark:^R1^D52c1|KEEPER^D52c2|TRAINING^D52c3|TRADING^D52c4|RETIRED^R1", + + "marked_as":"^R1^LHorse currently marked [%CATEGORY%]. Mark:^R1^D52c1|KEEPER^D52c2|TRAINING^D52c3|TRADING^D52c4|RETIRED^R1", "horse_stats":"^HHORSE STATS:
", "wearing_tacked":"^HWEARING/TACKED:
", "tacked_format":"^I%ICON%^T5%NAME%^B4LN%ITEMID%^R1", @@ -174,9 +178,9 @@ "advanced_stats":"^HADVANCED STATS:
Special treats:%SPOILED% Magic residue:%MAGICUSED%
", "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
", + "possible_colors":"
Possible Colors: %COLORS%
", "release_horse":"^D8|RELEASE HORSE^R1", - "other_horses":"^LOther Horses Owned:^R1", + "other_horses":"^LOther Horses Owned:^R1" }, }, diff --git a/Horse Isle Server/Horse Isle Server/Game/Messages.cs b/Horse Isle Server/Horse Isle Server/Game/Messages.cs index ca2bddb..8ace7e5 100644 --- a/Horse Isle Server/Horse Isle Server/Game/Messages.cs +++ b/Horse Isle Server/Horse Isle Server/Game/Messages.cs @@ -178,7 +178,38 @@ namespace HISP.Game public static string ViewAdvancedStats; + public static string HorseNameFormat; + public static string HorseReleasedByFormat; + public static string HorseHandsHightFormat; + public static string HorseExperienceEarnedFormat; + public static string HorseTrainableInFormat; + public static string HorseIsTrainable; + + public static string HorseMountButtonFormat; + public static string HorseFeedButtonFormat; + public static string HorseTackButtonFormat; + public static string HorsePetButtonFormat; + public static string HorseProfileButtonFormat; + + public static string HorseNoAutoSell; + public static string HorseAutoSellPriceFormat; + public static string HorseAutoSellFormat; + public static string HorseCantAutoSellTacked; + public static string HorseCurrentlyCategoryFormat; + public static string HorseStats; + public static string HorseTacked; + public static string HorseTackFormat; + public static string HorseCompanion; + public static string HorseCompanionFormat; + public static string HorseNoCompanion; + + public static string HorseAdvancedStatsFormat; + public static string HorseBreedDetailsFormat; + public static string HorseHeightRangeFormat; + public static string HorsePossibleColorsFormat; + public static string HorseReleaseButton; + public static string HorseOthers; // Consume diff --git a/Horse Isle Server/Horse Isle Server/Server/GameDataJson.cs b/Horse Isle Server/Horse Isle Server/Server/GameDataJson.cs index 32ba80f..50b04ad 100644 --- a/Horse Isle Server/Horse Isle Server/Server/GameDataJson.cs +++ b/Horse Isle Server/Horse Isle Server/Server/GameDataJson.cs @@ -611,6 +611,43 @@ namespace HISP.Server Messages.ViewBaiscStats = gameData.messages.meta.horse.view_basic_stats; Messages.ViewAdvancedStats = gameData.messages.meta.horse.view_advanced_stats; + + Messages.HorseNameFormat = gameData.messages.meta.horse.horse_inventory.your_horse_format; + Messages.HorseReleasedByFormat = gameData.messages.meta.horse.horse_inventory.released_by_format; + Messages.HorseHandsHightFormat = gameData.messages.meta.horse.horse_inventory.hands_high; + Messages.HorseExperienceEarnedFormat = gameData.messages.meta.horse.horse_inventory.experience; + + Messages.HorseTrainableInFormat = gameData.messages.meta.horse.horse_inventory.trainable_in; + Messages.HorseIsTrainable = gameData.messages.meta.horse.horse_inventory.currently_trainable; + + Messages.HorseMountButtonFormat = gameData.messages.meta.horse.horse_inventory.mount_button; + Messages.HorseFeedButtonFormat = gameData.messages.meta.horse.horse_inventory.feed_button; + Messages.HorseTackButtonFormat = gameData.messages.meta.horse.horse_inventory.tack_button; + Messages.HorsePetButtonFormat = gameData.messages.meta.horse.horse_inventory.pet_button; + Messages.HorseProfileButtonFormat = gameData.messages.meta.horse.horse_inventory.profile_button; + + Messages.HorseNoAutoSell = gameData.messages.meta.horse.horse_inventory.no_auto_sell; + Messages.HorseAutoSellFormat = gameData.messages.meta.horse.horse_inventory.auto_sell_format; + Messages.HorseAutoSellPriceFormat = gameData.messages.meta.horse.horse_inventory.auto_sell; + Messages.HorseCantAutoSellTacked = gameData.messages.meta.horse.horse_inventory.cannot_auto_sell_tacked; + + Messages.HorseCurrentlyCategoryFormat = gameData.messages.meta.horse.horse_inventory.marked_as; + Messages.HorseStats = gameData.messages.meta.horse.horse_inventory.horse_stats; + Messages.HorseTacked = gameData.messages.meta.horse.horse_inventory.wearing_tacked; + Messages.HorseTackFormat = gameData.messages.meta.horse.horse_inventory.tacked_format; + + Messages.HorseCompanion = gameData.messages.meta.horse.horse_inventory.companion; + Messages.HorseCompanionFormat = gameData.messages.meta.horse.horse_inventory.companion_selected; + Messages.HorseNoCompanion = gameData.messages.meta.horse.horse_inventory.no_companion; + + Messages.HorseAdvancedStatsFormat = gameData.messages.meta.horse.horse_inventory.advanced_stats; + Messages.HorseBreedDetailsFormat = gameData.messages.meta.horse.horse_inventory.breed_details; + Messages.HorseHeightRangeFormat = gameData.messages.meta.horse.horse_inventory.height_range; + Messages.HorsePossibleColorsFormat = gameData.messages.meta.horse.horse_inventory.possible_colors; + Messages.HorseReleaseButton = gameData.messages.meta.horse.horse_inventory.release_horse; + Messages.HorseOthers = gameData.messages.meta.horse.horse_inventory.other_horses; + + // Libary Messages.LibaryMainMenu = gameData.messages.meta.libary.main_menu; Messages.LibaryFindNpc = gameData.messages.meta.libary.find_npc;