build 1.9.1

Assets/CardEffect/BT16/White/BT16_090.cs

@@ -78,10 +78,7 @@ namespace DCGO.CardEffects.BT16
                         if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, CanSelectPermanentCondition) &&
                             card.Owner.GetBreedingAreaPermanents().Count(CanSelectBreedingAreaDigimon) >= 1)
                         {
-                            if (card.Owner.HandCards.Count(CanSelectCardCondition) >= 1)
-                            {
-                                return true;
-                            }
+                            return true;
                         }
                     }
 

Assets/CardEffect/EX9/Black/EX9_049.cs

@@ -32,7 +32,7 @@ namespace DCGO.CardEffects.EX9
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("By placing 3 Ver3 digimon flipped in source, digivolve into a ver3", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDiscription());
-                activateClass.SetHashString("Digivolve~EX9_049");
+                activateClass.SetHashString("Digivolve_EX9-049");
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -40,177 +40,115 @@ namespace DCGO.CardEffects.EX9
                     return "[End of Your Turn] [Once Per Turn] By placing 3 Digimon cards with the [Ver.3] trait from your trash face down as this Digimon's bottom digivolution cards, it may digivolve into a Digimon card with the [Ver.3] trait in the hand or trash.";
                 }
 
-                bool CanSelectCardCondition(CardSource cardSource)
+                bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (cardSource.IsDigimon)
-                    {
-                        if (cardSource.EqualsTraits("Ver.3"))
-                        {
-                            return true;
-                        }
-                    }
-                    return false;
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
+                           CardEffectCommons.IsOwnerTurn(card);
                 }
 
-                bool CanSelectCardCondition1(CardSource cardSource)
+                bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (cardSource.EqualsTraits("Ver.3"))
-                    {
-                        if (cardSource.CanPlayCardTargetFrame(card.PermanentOfThisCard().PermanentFrame, false, activateClass))
-                        {
-                            return true;
-                        }
-                    }
-                    return false;
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
+                           CardEffectCommons.MatchConditionOwnersCardCountInTrash(card, CanSelectCardCondition) >= 3;
                 }
 
-                bool ValidDigivolveIntoHand(CardSource source)
+                bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    return source.EqualsTraits("Ver.3");
+                    return cardSource.IsDigimon &&
+                           cardSource.EqualsTraits("Ver.3");
                 }
 
-                bool CanUseCondition(Hashtable hashtable)
+                bool CanSelectCardCondition1(CardSource cardSource)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                    if (cardSource.EqualsTraits("Ver.3"))
                     {
-                        if (CardEffectCommons.IsOwnerTurn(card))
+                        if (cardSource.CanPlayCardTargetFrame(card.PermanentOfThisCard().PermanentFrame, false, activateClass))
                         {
                             return true;
                         }
                     }
-
                     return false;
                 }
 
-                bool CanActivateCondition(Hashtable hashtable)
+                IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                    List<CardSource> selectedCards = new List<CardSource>();
+
+                    SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
+                    selectCardEffect.SetUp(
+                        canTargetCondition: CanSelectCardCondition,
+                        canTargetCondition_ByPreSelecetedList: null,
+                        canEndSelectCondition: null,
+                        canNoSelect: () => true,
+                        selectCardCoroutine: null,
+                        afterSelectCardCoroutine: AfterSelectCardCoroutine,
+                        message: "Select 3 cards to add as source",
+                        maxCount: 3,
+                        canEndNotMax: true,
+                        isShowOpponent: true,
+                        mode: SelectCardEffect.Mode.Custom,
+                        root: SelectCardEffect.Root.Trash,
+                        customRootCardList: null,
+                        canLookReverseCard: true,
+                        selectPlayer: card.Owner,
+                        cardEffect: activateClass);
+
+                    selectCardEffect.SetUpCustomMessage("Select 3 cards to add as source.", "The opponent is selecting 3 cards to add as source.");
+                    selectCardEffect.SetUpCustomMessage_ShowCard("Selected Cards");
+                    yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
+
+                    IEnumerator AfterSelectCardCoroutine(List<CardSource> cardSources)
                     {
-                        if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
-                        {
-                            return true;
-                        }
+                        selectedCards.AddRange(cardSources);
+                        yield return null;
                     }
-                    return false;
-                }
 
-                IEnumerator ActivateCoroutine(Hashtable hashtable)
-                {
-                    if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
+                    if (selectedCards.Count == 3)
                     {
-                        List<CardSource> selectedCards = new List<CardSource>();
-                        SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
-                        selectCardEffect.SetUp(
-                            canTargetCondition: CanSelectCardCondition,
-                            canTargetCondition_ByPreSelecetedList: null,
-                            canEndSelectCondition: null,
-                            canNoSelect: () => true,
-                            selectCardCoroutine: SelectCardCoroutine,
-                            afterSelectCardCoroutine: null,
-                            message: "Select 3 Ver.3 digimon to add as bottom digivolution card",
-                            maxCount: 3,
-                            canEndNotMax: true,
-                            isShowOpponent: false,
-                            mode: SelectCardEffect.Mode.Custom,
-                            root: SelectCardEffect.Root.Trash,
-                            customRootCardList: card.Owner.TrashCards,
-                            canLookReverseCard: true,
-                            selectPlayer: card.Owner,
-                            cardEffect: activateClass
-                        );
-
-                        selectCardEffect.SetUpCustomMessage("Select 3 cards to add as bottom digivolution card.", "The opponent is selecting 3 cards to add as bottom digivolution card.");
-                        yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
-
-                        IEnumerator SelectCardCoroutine(CardSource cardSource)
+                        foreach (var selectedCard in selectedCards)
                         {
-                            selectedCards.Add(cardSource);
-                            yield return null;
+                            yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddExecutingCard(selectedCard));
+                            yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass, isFacedown: true));
                         }
 
-                        if (selectedCards.Count == 3)
-                        {
-                            foreach (var selectedCard in selectedCards)
-                            {
-                                yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddExecutingCard(selectedCard));
-                                yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass, isFacedown: true));
-                            }
-
-                            bool canSelectHand = CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardCondition1);
-                            bool canSelectTrash = CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition1);
+                        bool canSelectHand = CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardCondition1);
+                        bool canSelectTrash = CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition1);
 
-                            if (canSelectHand || canSelectTrash)
+                        if (canSelectHand || canSelectTrash)
+                        {
+                            if (canSelectHand && canSelectTrash)
                             {
-                                List<SelectionElement<bool>> selectionElements = new List<SelectionElement<bool>>()
-                                {
-                                    new SelectionElement<bool>(message: $"Yes", value : true, spriteIndex: 0),
-                                    new SelectionElement<bool>(message: $"No ", value : false, spriteIndex: 1),
-                                };
-
-                                string selectPlayerMessage = "Will you digivolve?";
-                                string notSelectPlayerMessage = "The opponent is choosing to digivolve";
-                                GManager.instance.userSelectionManager.SetBoolSelection(selectionElements: selectionElements, selectPlayer: card.Owner, selectPlayerMessage: selectPlayerMessage, notSelectPlayerMessage: notSelectPlayerMessage);
-                                yield return ContinuousController.instance.StartCoroutine(GManager.instance.userSelectionManager.WaitForEndSelect());
-                                bool isDigivolving = GManager.instance.userSelectionManager.SelectedBoolValue;
-
-                                if (isDigivolving)
-                                {
-                                    if (canSelectHand && canSelectTrash)
-                                    {
-                                        List<SelectionElement<bool>> selectionElements1 = new List<SelectionElement<bool>>()
+                                List<SelectionElement<bool>> selectionElements1 = new List<SelectionElement<bool>>()
                                         {
                                             new SelectionElement<bool>(message: $"From hand", value : true, spriteIndex: 0),
                                             new SelectionElement<bool>(message: $"From trash", value : false, spriteIndex: 1),
                                         };
 
-                                        string selectPlayerMessage1 = "From which area do you select a card?";
-                                        string notSelectPlayerMessage1 = "The opponent is choosing from which area to select a card.";
-
-                                        GManager.instance.userSelectionManager.SetBoolSelection(selectionElements: selectionElements1, selectPlayer: card.Owner, selectPlayerMessage: selectPlayerMessage1, notSelectPlayerMessage: notSelectPlayerMessage1);
-                                    }
-                                    else
-                                    {
-                                        GManager.instance.userSelectionManager.SetBool(canSelectHand);
-                                    }
-
-                                    yield return ContinuousController.instance.StartCoroutine(GManager.instance.userSelectionManager.WaitForEndSelect());
-                                    bool fromHand = GManager.instance.userSelectionManager.SelectedBoolValue;
-                                    CardSource selectedCard = null;
-
-                                    IEnumerator SelectCardCoroutine1(CardSource cardSource)
-                                    {
-                                        selectedCard = cardSource;
-                                        yield return null;
-                                    }
-
-                                    if (fromHand)
-                                    {
-                                        yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DigivolveIntoHandOrTrashCard(
-                                            targetPermanent: card.PermanentOfThisCard(),
-                                            cardCondition: ValidDigivolveIntoHand,
-                                            payCost: true,
-                                            reduceCostTuple: null,
-                                            fixedCostTuple: null,
-                                            ignoreDigivolutionRequirementFixedCost: -1,
-                                            isHand: fromHand,
-                                            activateClass: activateClass,
-                                            successProcess: null));
-                                    }
-                                    else
-                                    {
-                                        yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DigivolveIntoHandOrTrashCard(
-                                            targetPermanent: card.PermanentOfThisCard(),
-                                            cardCondition: ValidDigivolveIntoHand,
-                                            payCost: true,
-                                            reduceCostTuple: null,
-                                            fixedCostTuple: null,
-                                            ignoreDigivolutionRequirementFixedCost: -1,
-                                            isHand: fromHand,
-                                            activateClass: activateClass,
-                                            successProcess: null));
-                                    }
-                                }
+                                string selectPlayerMessage1 = "From which area do you select a card?";
+                                string notSelectPlayerMessage1 = "The opponent is choosing from which area to select a card.";
+
+                                GManager.instance.userSelectionManager.SetBoolSelection(selectionElements: selectionElements1, selectPlayer: card.Owner, selectPlayerMessage: selectPlayerMessage1, notSelectPlayerMessage: notSelectPlayerMessage1);
                             }
+                            else
+                            {
+                                GManager.instance.userSelectionManager.SetBool(canSelectHand);
+                            }
+
+                            yield return ContinuousController.instance.StartCoroutine(GManager.instance.userSelectionManager.WaitForEndSelect());
+                            bool fromHand = GManager.instance.userSelectionManager.SelectedBoolValue;
+
+
+                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DigivolveIntoHandOrTrashCard(
+                                    targetPermanent: card.PermanentOfThisCard(),
+                                    cardCondition: CanSelectCardCondition1,
+                                    payCost: true,
+                                    reduceCostTuple: null,
+                                    fixedCostTuple: null,
+                                    ignoreDigivolutionRequirementFixedCost: -1,
+                                    isHand: fromHand,
+                                    activateClass: activateClass,
+                                    successProcess: null));
+
                         }
                     }
                 }

Assets/CardEffect/EX9/Black/EX9_050.cs

@@ -25,11 +25,13 @@ namespace DCGO.CardEffects.EX9
             #endregion
 
             #region End of Turn
+
             if (timing == EffectTiming.OnEndTurn)
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Digivolve into a [Ver.1]", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDiscription());
+                activateClass.SetHashString("Digivolve_EX9-050");
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -37,13 +39,25 @@ namespace DCGO.CardEffects.EX9
                     return "[End of Your Turn] [Once Per Turn] By placing 3 Digimon cards with the [Ver.1] trait from your trash face down as this Digimon's bottom digivolution cards, it may digivolve into a Digimon card with the [Ver.1] trait in the hand or trash.";
                 }
 
-                bool IsVer1Trait(CardSource source)
+                bool CanUseCondition(Hashtable hashtable)
+                {
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
+                           CardEffectCommons.IsOwnerTurn(card);
+                }
+
+                bool CanActivateCondition(Hashtable hashtable)
+                {
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
+                           CardEffectCommons.MatchConditionOwnersCardCountInTrash(card, CanSelectCardCondition) >= 3;
+                }
+
+                bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    return source.IsDigimon &&
-                           source.EqualsTraits("Ver.1");
+                    return cardSource.IsDigimon &&
+                           cardSource.EqualsTraits("Ver.1");
                 }
 
-                bool CanSelectEvoCondition(CardSource cardSource)
+                bool CanSelectCardCondition1(CardSource cardSource)
                 {
                     if (cardSource.EqualsTraits("Ver.1"))
                     {
@@ -55,47 +69,36 @@ namespace DCGO.CardEffects.EX9
                     return false;
                 }
 
-                bool CanUseCondition(Hashtable hashtable)
-                {
-                    return CardEffectCommons.IsOwnerTurn(card) &&
-                           CardEffectCommons.IsExistOnBattleAreaDigimon(card);
-                }
-
-                bool CanActivateCondition(Hashtable hashtable)
-                {
-                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
-                           CardEffectCommons.MatchConditionOwnersCardCountInTrash(card, IsVer1Trait) >= 3;
-                }
-
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
                     List<CardSource> selectedCards = new List<CardSource>();
+
                     SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
                     selectCardEffect.SetUp(
-                        canTargetCondition: IsVer1Trait,
+                        canTargetCondition: CanSelectCardCondition,
                         canTargetCondition_ByPreSelecetedList: null,
                         canEndSelectCondition: null,
                         canNoSelect: () => true,
-                        selectCardCoroutine: SelectCardCoroutine,
-                        afterSelectCardCoroutine: null,
-                        message: "Select 3 Ver.1 digimon to add as bottom digivolution card",
+                        selectCardCoroutine: null,
+                        afterSelectCardCoroutine: AfterSelectCardCoroutine,
+                        message: "Select 3 cards to add as source",
                         maxCount: 3,
                         canEndNotMax: true,
-                        isShowOpponent: false,
+                        isShowOpponent: true,
                         mode: SelectCardEffect.Mode.Custom,
                         root: SelectCardEffect.Root.Trash,
-                        customRootCardList: card.Owner.TrashCards,
+                        customRootCardList: null,
                         canLookReverseCard: true,
                         selectPlayer: card.Owner,
-                        cardEffect: activateClass
-                    );
+                        cardEffect: activateClass);
 
-                    selectCardEffect.SetUpCustomMessage("Select 3 cards to add as bottom digivolution card.", "The opponent is selecting 3 cards to add as bottom digivolution card.");
+                    selectCardEffect.SetUpCustomMessage("Select 3 cards to add as source.", "The opponent is selecting 3 cards to add as source.");
+                    selectCardEffect.SetUpCustomMessage_ShowCard("Selected Cards");
                     yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
 
-                    IEnumerator SelectCardCoroutine(CardSource cardSource)
+                    IEnumerator AfterSelectCardCoroutine(List<CardSource> cardSources)
                     {
-                        selectedCards.Add(cardSource);
+                        selectedCards.AddRange(cardSources);
                         yield return null;
                     }
 
@@ -107,57 +110,44 @@ namespace DCGO.CardEffects.EX9
                             yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass, isFacedown: true));
                         }
 
-                        bool canSelectHand = CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectEvoCondition);
-                        bool canSelectTrash = CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectEvoCondition);
+                        bool canSelectHand = CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardCondition1);
+                        bool canSelectTrash = CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition1);
 
                         if (canSelectHand || canSelectTrash)
                         {
-                            List<SelectionElement<bool>> selectionElements = new List<SelectionElement<bool>>()
-                                {
-                                    new SelectionElement<bool>(message: $"Yes", value : true, spriteIndex: 0),
-                                    new SelectionElement<bool>(message: $"No ", value : false, spriteIndex: 1),
-                                };
-
-                            string selectPlayerMessage = "Will you digivolve?";
-                            string notSelectPlayerMessage = "The opponent is choosing to digivolve";
-                            GManager.instance.userSelectionManager.SetBoolSelection(selectionElements: selectionElements, selectPlayer: card.Owner, selectPlayerMessage: selectPlayerMessage, notSelectPlayerMessage: notSelectPlayerMessage);
-                            yield return ContinuousController.instance.StartCoroutine(GManager.instance.userSelectionManager.WaitForEndSelect());
-                            bool isDigivolving = GManager.instance.userSelectionManager.SelectedBoolValue;
-
-                            if (isDigivolving)
+                            if (canSelectHand && canSelectTrash)
                             {
-                                if (canSelectHand && canSelectTrash)
-                                {
-                                    List<SelectionElement<bool>> selectionElements1 = new List<SelectionElement<bool>>()
+                                List<SelectionElement<bool>> selectionElements1 = new List<SelectionElement<bool>>()
                                         {
                                             new SelectionElement<bool>(message: $"From hand", value : true, spriteIndex: 0),
                                             new SelectionElement<bool>(message: $"From trash", value : false, spriteIndex: 1),
                                         };
 
-                                    string selectPlayerMessage1 = "From which area do you select a card?";
-                                    string notSelectPlayerMessage1 = "The opponent is choosing from which area to select a card.";
-
-                                    GManager.instance.userSelectionManager.SetBoolSelection(selectionElements: selectionElements1, selectPlayer: card.Owner, selectPlayerMessage: selectPlayerMessage1, notSelectPlayerMessage: notSelectPlayerMessage1);
-                                }
-                                else
-                                {
-                                    GManager.instance.userSelectionManager.SetBool(canSelectHand);
-                                }
-
-                                yield return ContinuousController.instance.StartCoroutine(GManager.instance.userSelectionManager.WaitForEndSelect());
-                                bool fromHand = GManager.instance.userSelectionManager.SelectedBoolValue;
-
-                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DigivolveIntoHandOrTrashCard(
-                                        targetPermanent: card.PermanentOfThisCard(),
-                                        cardCondition: CanSelectEvoCondition,
-                                        payCost: true,
-                                        reduceCostTuple: null,
-                                        fixedCostTuple: null,
-                                        ignoreDigivolutionRequirementFixedCost: -1,
-                                        isHand: fromHand,
-                                        activateClass: activateClass,
-                                        successProcess: null));
+                                string selectPlayerMessage1 = "From which area do you select a card?";
+                                string notSelectPlayerMessage1 = "The opponent is choosing from which area to select a card.";
+
+                                GManager.instance.userSelectionManager.SetBoolSelection(selectionElements: selectionElements1, selectPlayer: card.Owner, selectPlayerMessage: selectPlayerMessage1, notSelectPlayerMessage: notSelectPlayerMessage1);
                             }
+                            else
+                            {
+                                GManager.instance.userSelectionManager.SetBool(canSelectHand);
+                            }
+
+                            yield return ContinuousController.instance.StartCoroutine(GManager.instance.userSelectionManager.WaitForEndSelect());
+                            bool fromHand = GManager.instance.userSelectionManager.SelectedBoolValue;
+
+
+                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DigivolveIntoHandOrTrashCard(
+                                    targetPermanent: card.PermanentOfThisCard(),
+                                    cardCondition: CanSelectCardCondition1,
+                                    payCost: true,
+                                    reduceCostTuple: null,
+                                    fixedCostTuple: null,
+                                    ignoreDigivolutionRequirementFixedCost: -1,
+                                    isHand: fromHand,
+                                    activateClass: activateClass,
+                                    successProcess: null));
+
                         }
                     }
                 }

Assets/CardEffect/EX9/Black/EX9_052.cs

@@ -31,12 +31,13 @@ namespace DCGO.CardEffects.EX9
             #endregion
 
             #region End of Your Turn
+
             if (timing == EffectTiming.OnEndTurn)
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Place 3 digimon from trash as source, to digivolve", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDiscription());
-                activateClass.SetHashString("Digivolve_EX9_052");
+                activateClass.SetHashString("Digivolve_EX9-052");
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -44,14 +45,27 @@ namespace DCGO.CardEffects.EX9
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnBattleArea(card) && CardEffectCommons.IsOwnerTurn(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
+                           CardEffectCommons.IsOwnerTurn(card);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
+                           CardEffectCommons.MatchConditionOwnersCardCountInTrash(card, CanSelectCardCondition) >= 3;
+                }
+
+                bool CanSelectCardCondition(CardSource cardSource)
+                {
+                    return cardSource.IsDigimon &&
+                           cardSource.EqualsTraits("Ver.5");
+                }
+
+                bool CanSelectCardCondition1(CardSource cardSource)
+                {
+                    if (cardSource.EqualsTraits("Ver.5"))
                     {
-                        if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
+                        if (cardSource.CanPlayCardTargetFrame(card.PermanentOfThisCard().PermanentFrame, false, activateClass))
                         {
                             return true;
                         }
@@ -59,78 +73,64 @@ namespace DCGO.CardEffects.EX9
                     return false;
                 }
 
-                bool CanSelectCardCondition(CardSource cardSource)
-                {
-                    return cardSource.IsDigimon && cardSource.ContainsTraits("Ver.5");
-                }
-
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    bool added = false;
+                    List<CardSource> selectedCards = new List<CardSource>();
 
-                    List<CardSource> selectedCards = new List<CardSource>(); 
-
-                    int maxCount = 3;
                     SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
-
                     selectCardEffect.SetUp(
-                                canTargetCondition: CanSelectCardCondition,
-                                canTargetCondition_ByPreSelecetedList: null,
-                                canEndSelectCondition: null,
-                                canNoSelect: () => true,
-                                selectCardCoroutine: SelectCardCoroutine,
-                                afterSelectCardCoroutine: null,
-                                message: "Select 3 cards to place face down under digimon",
-                                maxCount: maxCount,
-                                canEndNotMax: false,
-                                isShowOpponent: true,
-                                mode: SelectCardEffect.Mode.Custom,
-                                root: SelectCardEffect.Root.Trash,
-                                customRootCardList: null,
-                                canLookReverseCard: true,
-                                selectPlayer: card.Owner,
-                                cardEffect: activateClass);
-
-                    selectCardEffect.SetUpCustomMessage("Select 3 cards to place face down under digimon", "The opponent is selecting 3 cards to place face down under digimon.");
+                        canTargetCondition: CanSelectCardCondition,
+                        canTargetCondition_ByPreSelecetedList: null,
+                        canEndSelectCondition: null,
+                        canNoSelect: () => true,
+                        selectCardCoroutine: null,
+                        afterSelectCardCoroutine: AfterSelectCardCoroutine,
+                        message: "Select 3 cards to add as source",
+                        maxCount: 3,
+                        canEndNotMax: true,
+                        isShowOpponent: true,
+                        mode: SelectCardEffect.Mode.Custom,
+                        root: SelectCardEffect.Root.Trash,
+                        customRootCardList: null,
+                        canLookReverseCard: true,
+                        selectPlayer: card.Owner,
+                        cardEffect: activateClass);
+
+                    selectCardEffect.SetUpCustomMessage("Select 3 cards to add as source.", "The opponent is selecting 3 cards to add as source.");
                     selectCardEffect.SetUpCustomMessage_ShowCard("Selected Cards");
-                    yield return StartCoroutine(selectCardEffect.Activate());
+                    yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
 
-                    IEnumerator SelectCardCoroutine(CardSource cardSource)
+                    IEnumerator AfterSelectCardCoroutine(List<CardSource> cardSources)
                     {
-                        selectedCards.Add(cardSource);
-
+                        selectedCards.AddRange(cardSources);
                         yield return null;
                     }
 
-                    if (selectedCards.Count >= 3)
+                    if (selectedCards.Count == 3)
                     {
-                        foreach (CardSource card in selectedCards)
-                            yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddExecutingCard(card));
-                        
-                        yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(selectedCards, activateClass, isFacedown:true));
+                        foreach (var selectedCard in selectedCards)
+                        {
+                            yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddExecutingCard(selectedCard));
+                            yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass, isFacedown: true));
+                        }
 
-                        added = true;
-                    }
-
-                    if (added)
-                    {
-                        bool canSelectHand = card.Owner.HandCards.Count() >= 1;
-                        bool canSelectTrash = card.Owner.TrashCards.Count(CanSelectCardCondition) >= 1;
+                        bool canSelectHand = CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardCondition1);
+                        bool canSelectTrash = CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition1);
 
                         if (canSelectHand || canSelectTrash)
                         {
                             if (canSelectHand && canSelectTrash)
                             {
-                                List<SelectionElement<bool>> selectionElements = new List<SelectionElement<bool>>()
-                        {
-                            new SelectionElement<bool>(message: $"From hand", value : true, spriteIndex: 0),
-                            new SelectionElement<bool>(message: $"From trash", value : false, spriteIndex: 1),
-                        };
+                                List<SelectionElement<bool>> selectionElements1 = new List<SelectionElement<bool>>()
+                                        {
+                                            new SelectionElement<bool>(message: $"From hand", value : true, spriteIndex: 0),
+                                            new SelectionElement<bool>(message: $"From trash", value : false, spriteIndex: 1),
+                                        };
 
-                                string selectPlayerMessage = "From which area do you want to digivolve from?";
-                                string notSelectPlayerMessage = "The opponent is choosing where to digivolve from.";
+                                string selectPlayerMessage1 = "From which area do you select a card?";
+                                string notSelectPlayerMessage1 = "The opponent is choosing from which area to select a card.";
 
-                                GManager.instance.userSelectionManager.SetBoolSelection(selectionElements: selectionElements, selectPlayer: card.Owner, selectPlayerMessage: selectPlayerMessage, notSelectPlayerMessage: notSelectPlayerMessage);
+                                GManager.instance.userSelectionManager.SetBoolSelection(selectionElements: selectionElements1, selectPlayer: card.Owner, selectPlayerMessage: selectPlayerMessage1, notSelectPlayerMessage: notSelectPlayerMessage1);
                             }
                             else
                             {
@@ -138,35 +138,20 @@ namespace DCGO.CardEffects.EX9
                             }
 
                             yield return ContinuousController.instance.StartCoroutine(GManager.instance.userSelectionManager.WaitForEndSelect());
-
                             bool fromHand = GManager.instance.userSelectionManager.SelectedBoolValue;
 
-                            if (fromHand)
-                            {
-                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DigivolveIntoHandOrTrashCard(
-                                targetPermanent: card.PermanentOfThisCard(),
-                                cardCondition: CanSelectCardCondition,
-                                payCost: true,
-                                reduceCostTuple: null,
-                                fixedCostTuple: null,
-                                ignoreDigivolutionRequirementFixedCost: -1,
-                                isHand: true,
-                                activateClass: activateClass,
-                                successProcess: null));
-                            }
-                            else
-                            {
-                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DigivolveIntoHandOrTrashCard(
-                                targetPermanent: card.PermanentOfThisCard(),
-                                cardCondition: CanSelectCardCondition,
-                                payCost: true,
-                                reduceCostTuple: null,
-                                fixedCostTuple: null,
-                                ignoreDigivolutionRequirementFixedCost: -1,
-                                isHand: false,
-                                activateClass: activateClass,
-                                successProcess: null));
-                            }
+
+                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DigivolveIntoHandOrTrashCard(
+                                    targetPermanent: card.PermanentOfThisCard(),
+                                    cardCondition: CanSelectCardCondition1,
+                                    payCost: true,
+                                    reduceCostTuple: null,
+                                    fixedCostTuple: null,
+                                    ignoreDigivolutionRequirementFixedCost: -1,
+                                    isHand: fromHand,
+                                    activateClass: activateClass,
+                                    successProcess: null));
+
                         }
                     }
                 }

Assets/CardEffect/EX9/Black/EX9_073.cs

@@ -243,7 +243,7 @@ namespace DCGO.CardEffects.EX9
                         yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard()
                             .AddDigivolutionCardsTop(new List<CardSource>() { selectedCard }, activateClass));
 
-                        List<ICardEffect> candidateEffects = selectedCard.EffectList_ForCard(EffectTiming.OnEnterFieldAnyone, card)
+                        List<ICardEffect> candidateEffects = selectedCard.cEntity_EffectController.GetCardEffects_ExceptAddedEffects(EffectTiming.OnEnterFieldAnyone, card)
                             .Clone()
                             .Filter(cardEffect =>
                                 cardEffect is ActivateICardEffect && !cardEffect.IsSecurityEffect &&
@@ -435,7 +435,7 @@ namespace DCGO.CardEffects.EX9
                         yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard()
                             .AddDigivolutionCardsTop(new List<CardSource>() { selectedCard }, activateClass));
 
-                        List<ICardEffect> candidateEffects = selectedCard.EffectList_ForCard(EffectTiming.OnEnterFieldAnyone, card)
+                        List<ICardEffect> candidateEffects = selectedCard.cEntity_EffectController.GetCardEffects_ExceptAddedEffects(EffectTiming.OnEnterFieldAnyone, card)
                             .Clone()
                             .Filter(cardEffect =>
                                 cardEffect is ActivateICardEffect && !cardEffect.IsSecurityEffect &&
@@ -627,7 +627,7 @@ namespace DCGO.CardEffects.EX9
                         yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard()
                             .AddDigivolutionCardsTop(new List<CardSource>() { selectedCard }, activateClass));
 
-                        List<ICardEffect> candidateEffects = selectedCard.EffectList_ForCard(EffectTiming.OnEnterFieldAnyone, card)
+                        List<ICardEffect> candidateEffects = selectedCard.cEntity_EffectController.GetCardEffects_ExceptAddedEffects(EffectTiming.OnEnterFieldAnyone, card)
                             .Clone()
                             .Filter(cardEffect =>
                                 cardEffect is ActivateICardEffect && !cardEffect.IsSecurityEffect &&

Assets/CardEffect/EX9/Blue/EX9_021.cs

@@ -320,7 +320,7 @@ namespace DCGO.CardEffects.EX9
                         yield return ContinuousController.instance.StartCoroutine(new IPutSecurityPermanent(
                             card.PermanentOfThisCard(),
                             CardEffectCommons.CardEffectHashtable(activateClass),
-                            toTop: false).PutSecurity());
+                            toTop: true).PutSecurity());
                     }
                 }
             }

Assets/CardEffect/EX9/Yellow/EX9_028.cs

@@ -29,8 +29,8 @@ namespace DCGO.CardEffects.EX9
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("By Placing 3 [Ver.4] digimon FD as this digimon bottom sources, digivolve into a [Ver.4] digimon in hand or trash", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
-                activateClass.SetHashString("EX9_028_OnEndTurn");
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDiscription());
+                activateClass.SetHashString("Digivolve_EX9-028");
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -40,22 +40,38 @@ namespace DCGO.CardEffects.EX9
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsOwnerTurn(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) && 
+                           CardEffectCommons.IsOwnerTurn(card);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
+                           CardEffectCommons.MatchConditionOwnersCardCountInTrash(card,CanSelectCardCondition) >= 3;
                 }
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    return cardSource.IsDigimon && cardSource.EqualsTraits("Ver.4");
+                    return cardSource.IsDigimon && 
+                           cardSource.EqualsTraits("Ver.4");
+                }
+
+                bool CanSelectCardCondition1(CardSource cardSource)
+                {
+                    if (cardSource.EqualsTraits("Ver.4"))
+                    {
+                        if (cardSource.CanPlayCardTargetFrame(card.PermanentOfThisCard().PermanentFrame, false, activateClass))
+                        {
+                            return true;
+                        }
+                    }
+                    return false;
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
                     List<CardSource> selectedCards = new List<CardSource>();
+
                     SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
                     selectCardEffect.SetUp(
                         canTargetCondition: CanSelectCardCondition,
@@ -87,49 +103,50 @@ namespace DCGO.CardEffects.EX9
 
                     if (selectedCards.Count == 3)
                     {
-                        foreach (CardSource selectedCard in selectedCards)
+                        foreach (var selectedCard in selectedCards)
                         {
                             yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddExecutingCard(selectedCard));
                             yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass, isFacedown: true));
                         }
 
-                        List<SelectionElement<bool>> selectionElements = new List<SelectionElement<bool>>()
+                        bool canSelectHand = CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardCondition1);
+                        bool canSelectTrash = CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition1);
+
+                        if (canSelectHand || canSelectTrash)
                         {
-                            new SelectionElement<bool>(message: $"Hand", value : true, spriteIndex: 0),
-                            new SelectionElement<bool>(message: $"Trash", value : false, spriteIndex: 1),
-                        };
+                            if (canSelectHand && canSelectTrash)
+                            {
+                                List<SelectionElement<bool>> selectionElements1 = new List<SelectionElement<bool>>()
+                                        {
+                                            new SelectionElement<bool>(message: $"From hand", value : true, spriteIndex: 0),
+                                            new SelectionElement<bool>(message: $"From trash", value : false, spriteIndex: 1),
+                                        };
+
+                                string selectPlayerMessage1 = "From which area do you select a card?";
+                                string notSelectPlayerMessage1 = "The opponent is choosing from which area to select a card.";
+
+                                GManager.instance.userSelectionManager.SetBoolSelection(selectionElements: selectionElements1, selectPlayer: card.Owner, selectPlayerMessage: selectPlayerMessage1, notSelectPlayerMessage: notSelectPlayerMessage1);
+                            }
+                            else
+                            {
+                                GManager.instance.userSelectionManager.SetBool(canSelectHand);
+                            }
+
+                            yield return ContinuousController.instance.StartCoroutine(GManager.instance.userSelectionManager.WaitForEndSelect());
+                            bool fromHand = GManager.instance.userSelectionManager.SelectedBoolValue;
 
-                        string selectPlayerMessage = "Select which location to use";
-                        string notSelectPlayerMessage = "The opponent is selecting which location to use";
-                        GManager.instance.userSelectionManager.SetBoolSelection(selectionElements: selectionElements, selectPlayer: card.Owner, selectPlayerMessage: selectPlayerMessage, notSelectPlayerMessage: notSelectPlayerMessage);
-                        yield return ContinuousController.instance.StartCoroutine(GManager.instance.userSelectionManager.WaitForEndSelect());
-                        bool useHand = GManager.instance.userSelectionManager.SelectedBoolValue;
 
-                        if (useHand)
-                        {
-                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DigivolveIntoHandOrTrashCard(
-                                targetPermanent: card.PermanentOfThisCard(),
-                                cardCondition: CanSelectCardCondition,
-                                payCost: true,
-                                reduceCostTuple: null,
-                                fixedCostTuple: null,
-                                ignoreDigivolutionRequirementFixedCost: -1,
-                                isHand: true,
-                                activateClass: activateClass,
-                                successProcess: null));
-                        }
-                        else
-                        {
                             yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DigivolveIntoHandOrTrashCard(
-                                targetPermanent: card.PermanentOfThisCard(),
-                                cardCondition: CanSelectCardCondition,
-                                payCost: true,
-                                reduceCostTuple: null,
-                                fixedCostTuple: null,
-                                ignoreDigivolutionRequirementFixedCost: -1,
-                                isHand: false,
-                                activateClass: activateClass,
-                                successProcess: null));
+                                    targetPermanent: card.PermanentOfThisCard(),
+                                    cardCondition: CanSelectCardCondition1,
+                                    payCost: true,
+                                    reduceCostTuple: null,
+                                    fixedCostTuple: null,
+                                    ignoreDigivolutionRequirementFixedCost: -1,
+                                    isHand: fromHand,
+                                    activateClass: activateClass,
+                                    successProcess: null));
+
                         }
                     }
                 }

Assets/Scripts/CardEffectCommons.cs

@@ -448,9 +448,13 @@ public partial class CardEffectCommons
 
         List<CardSource> trashTargetCards = new List<CardSource>();
 
-        while (trashTargetCards.Count < trashCount)
+        for (int i = 0; i < targetPermanent.DigivolutionCards.Count; i++)
         {
-            int index = isFromTop ? trashTargetCards.Count : targetPermanent.DigivolutionCards.Count - 1 - trashTargetCards.Count;
+            if (trashTargetCards.Count >= trashCount)
+                break;
+
+            int index = isFromTop ? i : targetPermanent.DigivolutionCards.Count - 1 - i;
+
             CardSource trashTargetCard = targetPermanent.DigivolutionCards[index];
 
             bool trashCard = true;

ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac3b2afebe7dbf3d2256e57ad5bee312aef4fc0e38a1f369aa43102677c7fc6a
-size 20166
+oid sha256:2bbed0701ea930f2c6016cafa6c1f9d9bcaf5ad9a09f949800ec59f1d084688c
+size 20168