Take out mystery gift check before applying partner details, don't ne…

…ed it.
bdawg1989 · Jun 12, 2024 · 0b02674 · 0b02674
1 parent 2e0619d
commit 0b02674
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 31 deletions.
diff --git a/SysBot.Pokemon/BDSP/BotTrade/PokeTradeBotBS.cs b/SysBot.Pokemon/BDSP/BotTrade/PokeTradeBotBS.cs
@@ -160,14 +160,6 @@ private async Task<bool> ApplyAutoOT(PB8 toSend, PB8 offered, SAV8BS sav, string
             Log("Home tracker detected.  Can't apply AutoOT.");
             return false;
         }
-        if (toSend is IFatefulEncounterReadOnly fe && fe.FatefulEncounter &&
-            (toSend.TID16 != 0 || toSend.SID16 != 0) &&
-            (toSend.TID16 != 12345 || toSend.SID16 != 54321))
-        {
-            Log("Trade is a Mystery Gift with specific TID/SID. Skipping AutoOT.");
-            return false;
-        }
-
         // Current handler cannot be past gen OT
         if (toSend.Generation != toSend.Format)
         {

diff --git a/SysBot.Pokemon/LA/BotTrade/PokeTradeBotLA.cs b/SysBot.Pokemon/LA/BotTrade/PokeTradeBotLA.cs
@@ -862,13 +862,6 @@ private async Task<bool> ApplyAutoOT(PA8 toSend, TradePartnerLA tradePartner, SA
             Log("Home tracker detected.  Can't apply AutoOT.");
             return false;
         }
-        if (toSend is IFatefulEncounterReadOnly fe && fe.FatefulEncounter &&
-            (toSend.TID16 != 0 || toSend.SID16 != 0) &&
-            (toSend.TID16 != 12345 || toSend.SID16 != 54321))
-        {
-            Log("Trade is a Mystery Gift with specific TID/SID. Skipping AutoOT.");
-            return false;
-        }
 
         // Current handler cannot be past gen OT
         if (toSend.Generation != toSend.Format)

diff --git a/SysBot.Pokemon/SV/BotTrade/PokeTradeBotSV.cs b/SysBot.Pokemon/SV/BotTrade/PokeTradeBotSV.cs
@@ -224,15 +224,6 @@ private async Task<bool> ApplyAutoOT(PK9 toSend, TradeMyStatus tradePartner, SAV
             return false;
         }
 
-        // Mystery Gifts
-        if (toSend is IFatefulEncounterReadOnly fe && fe.FatefulEncounter &&
-            (toSend.TID16 != 0 || toSend.SID16 != 0) &&
-            (toSend.TID16 != 12345 || toSend.SID16 != 54321))
-        {
-            Log("Trade is a Mystery Gift with specific TID/SID. Skipping AutoOT.");
-            return false;
-        }
-
         // Current handler cannot be past gen OT
         if (toSend.Generation != toSend.Format)
         {

diff --git a/SysBot.Pokemon/SWSH/BotTrade/PokeTradeBotSWSH.cs b/SysBot.Pokemon/SWSH/BotTrade/PokeTradeBotSWSH.cs
@@ -1151,13 +1151,6 @@ private async Task<bool> ApplyAutoOT(PK8 toSend, string trainerName, SAV8SWSH sa
             Log("Home tracker detected.  Can't apply AutoOT.");
             return false;
         }
-        if (toSend is IFatefulEncounterReadOnly fe && fe.FatefulEncounter &&
-            (toSend.TID16 != 0 || toSend.SID16 != 0) &&
-            (toSend.TID16 != 12345 || toSend.SID16 != 54321))
-        {
-            Log("Trade is a Mystery Gift with specific TID/SID. Skipping AutoOT.");
-            return false;
-        }
 
         // Current handler cannot be past gen OT
         if (toSend.Generation != toSend.Format)