diff --git a/SysBot.Pokemon.Discord/Commands/Bots/TradeModule.cs b/SysBot.Pokemon.Discord/Commands/Bots/TradeModule.cs index 6a2c0e35d..4931dad65 100644 --- a/SysBot.Pokemon.Discord/Commands/Bots/TradeModule.cs +++ b/SysBot.Pokemon.Discord/Commands/Bots/TradeModule.cs @@ -339,6 +339,7 @@ public async Task HideTradeAsync([Summary("Trade Code")] int code, [Summary("Sho } var ignoreAutoOT = content.Contains("OT:") || content.Contains("TID:") || content.Contains("SID:"); content = ReusableActions.StripCodeBlock(content); + content = ConvertMasterBall(content); // Temp fix for Ball: Master being unrecognized by the bot var set = new ShowdownSet(content); var template = AutoLegalityWrapper.GetTemplate(set); @@ -517,6 +518,7 @@ public async Task TradeAsync([Summary("Trade Code")] int code, [Summary("Showdow var ignoreAutoOT = content.Contains("OT:") || content.Contains("TID:") || content.Contains("SID:"); content = ReusableActions.StripCodeBlock(content); + content = ConvertMasterBall(content); // Temp fix for Ball: Master not being recognized by the bot var set = new ShowdownSet(content); var template = AutoLegalityWrapper.GetTemplate(set); @@ -1382,6 +1384,19 @@ private async Task HideTradeAsyncAttach(int code, RequestSignificance sig, Socke }; } + private string ConvertMasterBall(string content) + { + var lines = content.Split('\n'); + for (int i = 0; i < lines.Length; i++) + { + if (lines[i].StartsWith("Ball:") && lines[i].Contains("Master")) + { + lines[i] = ".Ball=1"; + } + } + return string.Join('\n', lines); + } + private async Task AddTradeToQueueAsync(int code, string trainerName, T? pk, RequestSignificance sig, SocketUser usr, bool isBatchTrade = false, int batchTradeNumber = 1, int totalBatchTrades = 1, bool isHiddenTrade = false, bool isMysteryEgg = false, List? lgcode = null, PokeTradeType tradeType = PokeTradeType.Specific, bool ignoreAutoOT = false, bool setEdited = false) { lgcode ??= TradeModule.GenerateRandomPictocodes(3); diff --git a/SysBot.Pokemon/Helpers/TradeBot.cs b/SysBot.Pokemon/Helpers/TradeBot.cs index 3d6f54929..ac4ba4477 100644 --- a/SysBot.Pokemon/Helpers/TradeBot.cs +++ b/SysBot.Pokemon/Helpers/TradeBot.cs @@ -6,6 +6,6 @@ public static class TradeBot public const string ConfigPath = "config.json"; - public const string Version = "v2.8.8"; + public const string Version = "v2.8.9"; } } diff --git a/SysBot.Pokemon/deps/PKHeX.Core.dll b/SysBot.Pokemon/deps/PKHeX.Core.dll index 609849527..ba42a5b14 100644 Binary files a/SysBot.Pokemon/deps/PKHeX.Core.dll and b/SysBot.Pokemon/deps/PKHeX.Core.dll differ