update SuperheavySamuraiExecutor

merge #197
IceYGO · Jul 9, 2024 · 4a0dc09 · 4a0dc09
1 parent eb5d8f4
commit 4a0dc09
Showing 1 changed file with 44 additions and 22 deletions.
diff --git a/Game/AI/Decks/SuperheavySamuraiExecutor.cs b/Game/AI/Decks/SuperheavySamuraiExecutor.cs
@@ -80,7 +80,8 @@ public class CardId
         public SuperheavySamuraiExecutor(GameAI ai, Duel duel)
             : base(ai, duel)
         {
-            AddExecutor(ExecutorType.Activate, CardId.PSYFramelordOmega);
+            AddExecutor(ExecutorType.Repos, MonsterRepos);
+            AddExecutor(ExecutorType.Activate, CardId.PSYFramelordOmega,PSYFunction);
             AddExecutor(ExecutorType.Activate, CardId.IP,IPFunction);
             AddExecutor(ExecutorType.Activate, CardId.Sarutobi,SarutobiFunction);
             AddExecutor(ExecutorType.Activate, CardId.Unicorn,UnicornFunction);
@@ -101,9 +102,8 @@ public SuperheavySamuraiExecutor(GameAI ai, Duel duel)
             AddExecutor(ExecutorType.SpSummon, CardId.Scales);
             AddExecutor(ExecutorType.Activate, CardId.Scales,ScalesFunction);
 
-        //Synchron
-            AddExecutor(ExecutorType.SpSummon, CardId.ASStardustDragon,ASStardustDragonSynchronFunction2);
-            AddExecutor(ExecutorType.SpSummon, CardId.Fleur,FleurSynchronFunction2);
+            //Synchron
+            AddExecutor(ExecutorType.SpSummon, CardId.PSYFramelordOmega,PSYFramelordOmegaSynchronFunction);
 
         //Pendulum
             AddExecutor(ExecutorType.Activate, CardId.Wakaushi,WakaushiFunction);
@@ -183,7 +183,6 @@ public SuperheavySamuraiExecutor(GameAI ai, Duel duel)
         //Synchron
             AddExecutor(ExecutorType.SpSummon, CardId.Masurawo,MasurawoSynchronFunction);
             AddExecutor(ExecutorType.SpSummon, CardId.Sarutobi,DeSynchronFunction);
-            AddExecutor(ExecutorType.SpSummon, CardId.PSYFramelordOmega);
 
         //equip Soulhorns
             AddExecutor(ExecutorType.Activate, CardId.Soulhorns,SoulhornsEquipFunction);
@@ -213,12 +212,29 @@ public override void OnNewTurn()
             activate_Genius = false;
             activate_Sarutobi = false;
             to_deck = false;
-            base.OnNewTurn();
         }
         public override bool OnSelectHand()
         {
             return true;
         }
+        private bool MonsterRepos()
+        {
+            if (Card.IsFacedown())
+                return true;
+            if (Card.IsFaceup() && Card.IsAttack() && (Card.Id == CardId.Masurawo || Card.Id == CardId.Sarutobi))
+                return true;
+            return false;
+        }
+        public override CardPosition OnSelectPosition(int cardId, IList<CardPosition> positions)
+        {
+            YGOSharp.OCGWrapper.NamedCard cardData = YGOSharp.OCGWrapper.NamedCard.Get(cardId);
+            if (cardData != null)
+            {
+                if (cardId == CardId.Masurawo || cardId == CardId.Sarutobi)
+                    return CardPosition.FaceUpDefence;
+            }
+            return 0;
+        }
         public override int OnSelectPlace(int cardId, int player, CardLocation location, int available)
         {
             if (player == 0 && location == CardLocation.MonsterZone)
@@ -597,14 +613,6 @@ private bool FleurSynchronFunction()
             AI.SelectMaterials(materials_lists[0]);
             return true;
         }
-        private bool FleurSynchronFunction2()
-        {
-            var materials_lists = Util.GetSynchroMaterials(Bot.MonsterZone,10,1,1,false,false,null,
-                card => { return !FinalCards(card.Id); });
-            if (materials_lists.Count <= 0) return false;
-            AI.SelectMaterials(materials_lists[0]);
-            return true;
-        }
         private bool DeSynchronFunction()
         {
             AI.SelectPosition(CardPosition.FaceUpDefence);
@@ -630,17 +638,26 @@ private bool ASStardustDragonSynchronFunction()
             {
                 return (Bot.HasInExtra(CardId.Fleur) || Bot.HasInExtra(CardId.Masurawo));
             }
-            return false;
-        }
-        private bool ASStardustDragonSynchronFunction2()
-        {
-            if (!activate_Scales || !activate_PSY) return false;
-            if (Bot.HasInGraveyard(CardId.Motorbike) || Bot.HasInGraveyard(CardId.PsyFramegearGamma))
+            else if (Bot.HasInMonstersZone(CardId.Motorbike))
             {
-                return (Bot.HasInExtra(CardId.Fleur) || Bot.HasInExtra(CardId.Masurawo));
+                AI.SelectMaterials(CardId.Motorbike);
+                return true;
+            }
+            else if (Bot.HasInMonstersZone(CardId.PsyFramegearGamma))
+            {
+                AI.SelectMaterials(CardId.PsyFramegearGamma);
+                return true;
             }
             return false;
         }
+        private bool PSYFramelordOmegaSynchronFunction()
+        {
+            if (Bot.HasInMonstersZone(CardId.Motorbike))
+                AI.SelectMaterials(CardId.Motorbike);
+            else if (Bot.HasInMonstersZone(CardId.PsyFramegearGamma))
+                AI.SelectMaterials(CardId.PsyFramegearGamma);
+            return activate_PSY || activate_Scales;
+        }
         private bool SavageDragonFunction()
         {
             if (Duel.LastChainPlayer == 1)
@@ -1156,6 +1173,11 @@ private bool IPLinkFunction()
             AI.SelectMaterials(materials);
             return true;
         }
+        private bool PSYFunction()
+        {
+            activate_PSY = true;
+            return true;
+        }
         private bool IPFunction()
         {
             if (Duel.LastChainPlayer == 0) return false;
@@ -1193,4 +1215,4 @@ private bool SarutobiFunction()
             return true;
         }
     }
-}
+}