Willis clean up, Tai and Kari

Assets/CardEffect/BT17/Green/Willis_BT17_088.cs

@@ -272,35 +272,6 @@ namespace DCGO.CardEffects.BT17
                                         activateClass: activateClass,
                                         successProcess: null));
 
-                            /*int maxCount = Math.Min(1, card.Owner.HandCards.Count(DigivolvePermanentCondition));
-
-                            SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();
-
-                            selectHandEffect.SetUp(
-                                selectPlayer: card.Owner,
-                                canTargetCondition: DigivolvePermanentCondition,
-                                canTargetCondition_ByPreSelecetedList: null,
-                                canEndSelectCondition: null,
-                                maxCount: maxCount,
-                                canNoSelect: true,
-                                canEndNotMax: false,
-                                isShowOpponent: true,
-                                selectCardCoroutine: SelectCardCoroutine,
-                                afterSelectCardCoroutine: null,
-                                mode: SelectHandEffect.Mode.Custom,
-                                cardEffect: activateClass);
-
-                            selectHandEffect.SetUpCustomMessage("Select 1 card to digivolve into.", "The opponent is selecting 1 card to digivolve into.");
-
-                            yield return ContinuousController.instance.StartCoroutine(selectHandEffect.Activate());
-
-                            IEnumerator SelectCardCoroutine(CardSource cardSource)
-                            {
-                                if(cardSource != null)
-                                {
-                                    
-                                }
-                            }*/
                         }
                     }
                 }

Assets/CardEffect/BT17/White/TaiKamiyaAndKariKamiya_BT17_093.cs

@@ -124,46 +124,46 @@ namespace DCGO.CardEffects.BT17
 
                     if (willReturn)
                     {
-                        yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddLibraryBottomCards(new List<CardSource> { card }));
+                        yield return ContinuousController.instance.StartCoroutine(new DeckBottomBounceClass(new List<Permanent> { card.PermanentOfThisCard() }, hashtable).DeckBounce());
 
                         yield return ContinuousController.instance.StartCoroutine(new DrawClass(card.Owner, 1, activateClass).Draw());
-                    }
 
-                    if(CardEffectCommons.HasMatchConditionOwnersHand(card, HasProperTamer))
-                    {
-                        int maxCount = Math.Min(1, card.Owner.HandCards.Count(HasProperTamer));
+                        if (CardEffectCommons.HasMatchConditionOwnersHand(card, HasProperTamer))
+                        {
+                            int maxCount = Math.Min(1, card.Owner.HandCards.Count(HasProperTamer));
 
-                        SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();
+                            SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();
 
-                        selectHandEffect.SetUp(
-                            selectPlayer: card.Owner,
-                            canTargetCondition: HasProperTamer,
-                            canTargetCondition_ByPreSelecetedList: null,
-                            canEndSelectCondition: null,
-                            maxCount: maxCount,
-                            canNoSelect: true,
-                            canEndNotMax: false,
-                            isShowOpponent: false,
-                            selectCardCoroutine: null,
-                            afterSelectCardCoroutine: SelectCardCoroutine,
-                            mode: SelectHandEffect.Mode.Custom,
-                            cardEffect: activateClass);
+                            selectHandEffect.SetUp(
+                                selectPlayer: card.Owner,
+                                canTargetCondition: HasProperTamer,
+                                canTargetCondition_ByPreSelecetedList: null,
+                                canEndSelectCondition: null,
+                                maxCount: maxCount,
+                                canNoSelect: true,
+                                canEndNotMax: false,
+                                isShowOpponent: false,
+                                selectCardCoroutine: null,
+                                afterSelectCardCoroutine: SelectCardCoroutine,
+                                mode: SelectHandEffect.Mode.Custom,
+                                cardEffect: activateClass);
 
-                        selectHandEffect.SetUpCustomMessage("Select Tamer to play.", "The opponent is selecting a Tamer to play.");
+                            selectHandEffect.SetUpCustomMessage("Select Tamer to play.", "The opponent is selecting a Tamer to play.");
 
-                        yield return StartCoroutine(selectHandEffect.Activate());
+                            yield return StartCoroutine(selectHandEffect.Activate());
 
-                        IEnumerator SelectCardCoroutine(List<CardSource> selectedCards)
-                        {
-                            if(selectedCards.Count > 0)
+                            IEnumerator SelectCardCoroutine(List<CardSource> selectedCards)
                             {
-                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlayPermanentCards(
-                                    cardSources: selectedCards, 
-                                    activateClass: activateClass, 
-                                    payCost: false, 
-                                    isTapped: false, 
-                                    root: SelectCardEffect.Root.Hand, 
-                                    activateETB: true));
+                                if (selectedCards.Count > 0)
+                                {
+                                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlayPermanentCards(
+                                        cardSources: selectedCards,
+                                        activateClass: activateClass,
+                                        payCost: false,
+                                        isTapped: false,
+                                        root: SelectCardEffect.Root.Hand,
+                                        activateETB: true));
+                                }
                             }
                         }
                     }