Properly exit a trade after user fails to complete cloning.

bdawg1989 · Jun 15, 2024 · 1e0a8ad · 1e0a8ad
1 parent 3c66622
commit 1e0a8ad
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/SysBot.Pokemon.Discord/Helpers/DetailsExtractor.cs b/SysBot.Pokemon.Discord/Helpers/DetailsExtractor.cs
@@ -242,16 +242,19 @@ private static string GetSpecialSymbols(T pk)
 
     private static string GetTeraTypeString(PK9 pk9)
     {
+        var isStellar = pk9.TeraTypeOverride == (MoveType)TeraTypeUtil.Stellar || (int)pk9.TeraType == 99;
+        var teraType = isStellar ? TradeSettings.MoveType.Stellar : (TradeSettings.MoveType)pk9.TeraType;
+
         if (SysCord<T>.Runner.Config.Trade.TradeEmbedSettings.UseTeraEmojis)
         {
-            var teraType = pk9.TeraTypeOverride == (PKHeX.Core.MoveType)TeraTypeUtil.Stellar || (int)pk9.TeraType == 99 ? TradeSettings.MoveType.Stellar : (TradeSettings.MoveType)pk9.TeraType;
             var emojiInfo = SysCord<T>.Runner.Config.Trade.TradeEmbedSettings.TeraTypeEmojis.Find(e => e.MoveType == teraType);
             if (emojiInfo != null && !string.IsNullOrEmpty(emojiInfo.EmojiCode))
             {
                 return emojiInfo.EmojiCode;
             }
         }
-        return pk9.TeraType.ToString();
+
+        return teraType.ToString();
     }
 
     private static string GetTradeTitle(bool isMysteryEgg, bool isCloneRequest, bool isDumpRequest, bool isFixOTRequest, bool isSpecialRequest, bool isBatchTrade, int batchTradeNumber, string pokemonDisplayName, bool isShiny)

diff --git a/SysBot.Pokemon/SV/BotTrade/PokeTradeBotSV.cs b/SysBot.Pokemon/SV/BotTrade/PokeTradeBotSV.cs
@@ -535,11 +535,18 @@ private void HandleAbortedTrade(PokeTradeDetail<PK9> detail, PokeRoutineType typ
             // They get one more chance.
             partnerFound = await ReadUntilChanged(TradePartnerOfferedOffset, oldEC, 15_000, 0_200, false, true, token).ConfigureAwait(false);
         }
-
+        // Check if the user has cancelled the trade
+        if (!await IsInBox(PortalOffset, token).ConfigureAwait(false))
+        {
+            Log("User cancelled the trade. Exiting...");
+            await ExitTradeToPortal(false, token).ConfigureAwait(false);
+            return (offered, PokeTradeResult.TrainerTooSlow);
+        }
         var pk2 = await ReadUntilPresent(TradePartnerOfferedOffset, 25_000, 1_000, BoxFormatSlotSize, token).ConfigureAwait(false);
         if (!partnerFound || pk2 is null || SearchUtil.HashByDetails(pk2) == SearchUtil.HashByDetails(offered))
         {
             Log("Trade partner did not change their Pokémon.");
+            await ExitTradeToPortal(false, token).ConfigureAwait(false);
             return (offered, PokeTradeResult.TrainerTooSlow);
         }
 
@@ -878,6 +885,7 @@ private async Task<PokeTradeResult> PerformBatchTrade(SAV9SV sav, PokeTradeDetai
             (toSend, update) = await GetEntityToSend(sav, poke, offered, oldEC, toSend, trainer, null, token).ConfigureAwait(false);
             if (update != PokeTradeResult.Success)
             {
+                await ExitTradeToPortal(false, token).ConfigureAwait(false);
                 return update;
             }