Fixes: Darkdramon, Dorugoramon, dorugreymon, tankdramon, moonmon, magnamon, few translations

Assets/AddOn/GlitchFx-master/GlitchFx.unitypackage.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d80f995af690a474e841364c1e88ee1b
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/CardEffect/BT16/Black/Darkdramon_BT16_065.cs

@@ -81,19 +81,19 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanTriggerWhenPermanentWouldPlay(hashtable, CardCondition))
-                    {
-                        return true;
-                    }
-
-                    return false;
+                    return CardEffectCommons.CanTriggerWhenPermanentWouldPlay(hashtable, CardCondition);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                     if (CardEffectCommons.IsExistOnHand(card))
                     {
-                        if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectDBrigadeCondition))
+                        if (CardEffectCommons.MatchConditionOwnersCardCountInTrash(card, CanSelectDBrigadeCondition) >= 6)
+                        {
+                            return true;
+                        }
+
+                        if (CardEffectCommons.HasMatchConditionPermanent(HasBossTraitInPlay))
                         {
                             return true;
                         }
@@ -104,138 +104,121 @@ namespace DCGO.CardEffects.BT16
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
-                    bool CanSelectTrashCardCondition(CardSource cardSource)
-                    {
-                        if (CanSelectDBrigadeCondition(cardSource))
-                        {
-                            return true;
-                        }
-
-                        return false;
-                    }
+                    List<CardSource> selectedCards = new List<CardSource>();
 
-                    if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectTrashCardCondition(cardSource)))
+                    if (CardEffectCommons.MatchConditionOwnersCardCountInTrash(card, CanSelectDBrigadeCondition) >= 6)
                     {
                         bool noSelect = CanNoSelect(CardEffectCommons.GetCardFromHashtable(_hashtable));
-                        List<CardSource> selectedCards = new List<CardSource>();
 
                         int maxCount = 6;
 
-                        if (maxCount >= 1)
-                        {
-                            SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
-
-                            selectCardEffect.SetUp(
-                                canTargetCondition: CanSelectTrashCardCondition,
-                                canTargetCondition_ByPreSelecetedList: null,
-                                canEndSelectCondition: null,
-                                canNoSelect: () => noSelect,
-                                selectCardCoroutine: SelectCardCoroutine,
-                                afterSelectCardCoroutine: null,
-                                message: "Select cards to place in Digivolution cards.",
-                                maxCount: maxCount,
-                                canEndNotMax: true,
-                                isShowOpponent: true,
-                                mode: SelectCardEffect.Mode.Custom,
-                                root: SelectCardEffect.Root.Trash,
-                                customRootCardList: null,
-                                canLookReverseCard: true,
-                                selectPlayer: card.Owner,
-                                cardEffect: activateClass);
+                        SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
 
-                            yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
+                        selectCardEffect.SetUp(
+                            canTargetCondition: CanSelectDBrigadeCondition,
+                            canTargetCondition_ByPreSelecetedList: null,
+                            canEndSelectCondition: null,
+                            canNoSelect: () => noSelect,
+                            selectCardCoroutine: SelectCardCoroutine,
+                            afterSelectCardCoroutine: null,
+                            message: "Select cards to place on top of deck.",
+                            maxCount: maxCount,
+                            canEndNotMax: false,
+                            isShowOpponent: true,
+                            mode: SelectCardEffect.Mode.Custom,
+                            root: SelectCardEffect.Root.Trash,
+                            customRootCardList: null,
+                            canLookReverseCard: true,
+                            selectPlayer: card.Owner,
+                            cardEffect: activateClass);
 
-                            IEnumerator SelectCardCoroutine(CardSource cardSource)
-                            {
-                                selectedCards.Add(cardSource);
-                                yield return null;
-                            }
+                        yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
 
-                            if (selectedCards.Count >= 1)
-                            {
-                                yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddLibraryTopCards(selectedCards));
-                                yield return StartCoroutine(AfterSelectCardCoroutine(selectedCards));
-                            }
+                        IEnumerator SelectCardCoroutine(CardSource cardSource)
+                        {
+                            selectedCards.Add(cardSource);
+                            yield return null;
                         }
-                    }
 
-                    IEnumerator AfterSelectCardCoroutine(List<CardSource> cardSources)
-                    {
-                        if (card.Owner.CanReduceCost(null, card))
+                        if (selectedCards.Count == 6)
                         {
-                            ContinuousController.instance.PlaySE(GManager.instance.GetComponent<Effects>().BuffSE);
+                            yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddLibraryTopCards(selectedCards));
                         }
+                    }
 
-                        ChangeCostClass changeCostClass = new ChangeCostClass();
-                        changeCostClass.SetUpICardEffect("Play Cost -1", CanUseCondition1, card);
-                        changeCostClass.SetUpChangeCostClass(changeCostFunc: ChangeCost, cardSourceCondition: CardSourceCondition, rootCondition: RootCondition, isUpDown: isUpDown, isCheckAvailability: () => false, isChangePayingCost: () => true);
-                        card.Owner.UntilCalculateFixedCostEffect.Add((_timing) => changeCostClass);
+                    if (card.Owner.CanReduceCost(null, card))
+                    {
+                        ContinuousController.instance.PlaySE(GManager.instance.GetComponent<Effects>().BuffSE);
+                    }
 
-                        bool CanUseCondition1(Hashtable hashtable)
-                        {
-                            return true;
-                        }
+                    ChangeCostClass changeCostClass = new ChangeCostClass();
+                    changeCostClass.SetUpICardEffect("Play Cost -1", CanUseCondition1, card);
+                    changeCostClass.SetUpChangeCostClass(changeCostFunc: ChangeCost, cardSourceCondition: CardSourceCondition, rootCondition: RootCondition, isUpDown: isUpDown, isCheckAvailability: () => false, isChangePayingCost: () => true);
+                    card.Owner.UntilCalculateFixedCostEffect.Add((_timing) => changeCostClass);
 
-                        int ChangeCost(CardSource cardSource, int Cost, SelectCardEffect.Root root, List<Permanent> targetPermanents)
+                    bool CanUseCondition1(Hashtable hashtable)
+                    {
+                        return true;
+                    }
+
+                    int ChangeCost(CardSource cardSource, int Cost, SelectCardEffect.Root root, List<Permanent> targetPermanents)
+                    {
+                        if (CardSourceCondition(cardSource))
                         {
-                            if (CardSourceCondition(cardSource))
+                            if (RootCondition(root))
                             {
-                                if (RootCondition(root))
+                                if (PermanentsCondition(targetPermanents))
                                 {
-                                    if (PermanentsCondition(targetPermanents))
-                                    {
-                                        int targetCost = 0;
+                                    int targetCost = 0;
 
-                                        if(CardEffectCommons.HasMatchConditionOwnersPermanent(card, HasBossTraitInPlay))
-                                            targetCost += 6;
+                                    if (CardEffectCommons.HasMatchConditionPermanent(HasBossTraitInPlay))
+                                        targetCost += 6;
 
-                                        targetCost += cardSources.Count * 1;
+                                    if (selectedCards.Count >= 6)
+                                        targetCost += 6;
 
-                                        Cost -= targetCost;
-                                    }
+                                    Cost -= targetCost;
                                 }
                             }
+                        }
+
+                        return Cost;
+                    }
 
-                            return Cost;
+                    bool PermanentsCondition(List<Permanent> targetPermanents)
+                    {
+                        if (targetPermanents == null)
+                        {
+                            return true;
                         }
 
-                        bool PermanentsCondition(List<Permanent> targetPermanents)
+                        else
                         {
-                            if (targetPermanents == null)
+                            if (targetPermanents.Count((targetPermanent) => targetPermanent != null) == 0)
                             {
                                 return true;
                             }
-
-                            else
-                            {
-                                if (targetPermanents.Count((targetPermanent) => targetPermanent != null) == 0)
-                                {
-                                    return true;
-                                }
-                            }
-
-                            return false;
                         }
 
-                        bool CardSourceCondition(CardSource cardSource)
-                        {
-                            return cardSource == card;
-                        }
-
-                        bool RootCondition(SelectCardEffect.Root root)
-                        {
-                            return true;
-                        }
+                        return false;
+                    }
 
-                        bool isUpDown()
-                        {
-                            return true;
-                        }
+                    bool CardSourceCondition(CardSource cardSource)
+                    {
+                        return cardSource == card;
+                    }
 
-                        yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ShowReducedCost(_hashtable));
+                    bool RootCondition(SelectCardEffect.Root root)
+                    {
+                        return true;
+                    }
 
-                        yield return null;
+                    bool isUpDown()
+                    {
+                        return true;
                     }
+
+                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ShowReducedCost(_hashtable));
                 }
             }
             #endregion
@@ -258,7 +241,12 @@ namespace DCGO.CardEffects.BT16
 
                         if (activateClass != null)
                         {
-                            if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectDBrigadeCondition))
+                            if (CardEffectCommons.MatchConditionOwnersCardCountInTrash(card, CanSelectDBrigadeCondition) >= 6)
+                            {
+                                return true;
+                            }
+
+                            if (CardEffectCommons.HasMatchConditionPermanent(HasBossTraitInPlay))
                             {
                                 return true;
                             }
@@ -276,10 +264,13 @@ namespace DCGO.CardEffects.BT16
                         {
                             if (PermanentsCondition(targetPermanents))
                             {
-                                List<CardSource> trashSources = card.Owner.TrashCards.Filter(CanSelectDBrigadeCondition);
-                                int targetCount = (from trashCard in trashSources select trashCard.CardID).Count();
+                                int trashCount = CardEffectCommons.MatchConditionOwnersCardCountInTrash(card, CanSelectDBrigadeCondition);
+                                int targetCount = 0;
 
-                                if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, HasBossTraitInPlay))
+                                if (trashCount >= 6)
+                                    targetCount += 6;
+
+                                if (CardEffectCommons.HasMatchConditionPermanent(HasBossTraitInPlay))
                                     targetCount += 6;
 
                                 Cost -= targetCount;
@@ -381,24 +372,26 @@ namespace DCGO.CardEffects.BT16
                 {
                     int costDeletion = 0;
 
-                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.RevealDeckTopCardsAndProcessForAll(
-                            revealCount: 3,
-                            simplifiedSelectCardCondition:
+                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.SimplifiedRevealDeckTopCardsAndSelect(
+                        revealCount: 3,
+                        simplifiedSelectCardConditions:
+                        new SimplifiedSelectCardConditionClass[]
+                        {
                             new SimplifiedSelectCardConditionClass(
-                                canTargetCondition: RevealSelectCardCondition,
-                                message: "Select play cost to use",
-                                mode: SelectCardEffect.Mode.Discard,
+                                canTargetCondition:RevealSelectCardCondition,
+                                message: "Select Play cost to use",
+                                mode: SelectCardEffect.Mode.Custom,
                                 maxCount: 1,
-                                selectCardCoroutine: SelectCardCoroutine),
-                            remainingCardsPlace: RemainingCardsPlace.Trash,
-                            activateClass: activateClass,
-                            revealedCardsCoroutine: null
-                        ));
+                                selectCardCoroutine: SelectCardCoroutine)
+                        },
+                        remainingCardsPlace: RemainingCardsPlace.Trash,
+                        activateClass: activateClass,
+                        isSendAllCardsToSamePlace: true
+                    ));
 
                     IEnumerator SelectCardCoroutine(CardSource cardSource)
                     {
                         costDeletion = cardSource.GetCostItself;
-
                         yield return null;
                     }
 
@@ -491,24 +484,26 @@ namespace DCGO.CardEffects.BT16
                 {
                     int costDeletion = 0;
 
-                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.RevealDeckTopCardsAndProcessForAll(
-                            revealCount: 3,
-                            simplifiedSelectCardCondition:
+                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.SimplifiedRevealDeckTopCardsAndSelect(
+                        revealCount: 3,
+                        simplifiedSelectCardConditions:
+                        new SimplifiedSelectCardConditionClass[]
+                        {
                             new SimplifiedSelectCardConditionClass(
-                                canTargetCondition: RevealSelectCardCondition,
-                                message: "Select play cost to use",
-                                mode: SelectCardEffect.Mode.Discard,
+                                canTargetCondition:RevealSelectCardCondition,
+                                message: "Select Play cost to use",
+                                mode: SelectCardEffect.Mode.Custom,
                                 maxCount: 1,
-                                selectCardCoroutine: SelectCardCoroutine),
-                            remainingCardsPlace: RemainingCardsPlace.Trash,
-                            activateClass: activateClass,
-                            revealedCardsCoroutine: null
-                        ));
+                                selectCardCoroutine: SelectCardCoroutine)
+                        },
+                        remainingCardsPlace: RemainingCardsPlace.Trash,
+                        activateClass: activateClass,
+                        isSendAllCardsToSamePlace: true
+                    ));
 
                     IEnumerator SelectCardCoroutine(CardSource cardSource)
                     {
                         costDeletion = cardSource.GetCostItself;
-
                         yield return null;
                     }
 
@@ -589,112 +584,115 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsOwnerTurn(card);
+                    if (!CardEffectCommons.IsOwnerTurn(card))
+                        return false;
+
+                    if (card.Owner.GetBattleAreaDigimons().Count < 2)
+                        return false;
+
+                    if (card.Owner.HandCards.Count(CanSelectDNACardCondition) < 1)
+                        return false;
+
+                    return true;
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
                     // DNA digivolve
-                    if (card.Owner.GetBattleAreaDigimons().Count >= 2)
-                    {
-                        if (card.Owner.HandCards.Count(CanSelectDNACardCondition) >= 1)
-                        {
-                            List<CardSource> selectedCards = new List<CardSource>();
+                    List<CardSource> selectedCards = new List<CardSource>();
 
-                            int maxCount = 1;
+                    int maxCount = 1;
 
-                            SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();
+                    SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();
 
-                            selectHandEffect.SetUp(
-                                selectPlayer: card.Owner,
-                                canTargetCondition: CanSelectDNACardCondition,
-                                canTargetCondition_ByPreSelecetedList: null,
-                                canEndSelectCondition: null,
-                                maxCount: maxCount,
-                                canNoSelect: true,
-                                canEndNotMax: false,
-                                isShowOpponent: true,
-                                selectCardCoroutine: SelectCardCoroutine,
-                                afterSelectCardCoroutine: null,
-                                mode: SelectHandEffect.Mode.Custom,
-                                cardEffect: activateClass);
+                    selectHandEffect.SetUp(
+                        selectPlayer: card.Owner,
+                        canTargetCondition: CanSelectDNACardCondition,
+                        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 DNA digivolve.", "The opponent is selecting 1 card to DNA digivolve.");
-                            selectHandEffect.SetNotShowCard();
+                    selectHandEffect.SetUpCustomMessage("Select 1 card to DNA digivolve.", "The opponent is selecting 1 card to DNA digivolve.");
+                    selectHandEffect.SetNotShowCard();
 
-                            yield return StartCoroutine(selectHandEffect.Activate());
+                    yield return StartCoroutine(selectHandEffect.Activate());
 
-                            IEnumerator SelectCardCoroutine(CardSource cardSource)
-                            {
-                                selectedCards.Add(cardSource);
+                    IEnumerator SelectCardCoroutine(CardSource cardSource)
+                    {
+                        selectedCards.Add(cardSource);
 
-                                yield return null;
-                            }
+                        yield return null;
+                    }
 
-                            if (selectedCards.Count >= 1)
+                    if (selectedCards.Count >= 1)
+                    {
+                        foreach (CardSource selectedCard in selectedCards)
+                        {
+                            if (selectedCard.CanPlayJogress(true))
                             {
-                                foreach (CardSource selectedCard in selectedCards)
+                                _jogressEvoRootsFrameIDs = new int[0];
+
+                                yield return GManager.instance.photonWaitController.StartWait("Darkdramon_BT16_065");
+
+                                if (card.Owner.isYou || GManager.instance.IsAI)
                                 {
-                                    if (selectedCard.CanPlayJogress(true))
-                                    {
-                                        _jogressEvoRootsFrameIDs = new int[0];
+                                    GManager.instance.selectJogressEffect.SetUp_SelectDigivolutionRoots
+                                                                (card: selectedCard,
+                                                                isLocal: true,
+                                                                isPayCost: true,
+                                                                canNoSelect: true,
+                                                                endSelectCoroutine_SelectDigivolutionRoots: EndSelectCoroutine_SelectDigivolutionRoots,
+                                                                noSelectCoroutine: null);
 
-                                        yield return GManager.instance.photonWaitController.StartWait("Darkdramon_BT16_065");
+                                    yield return ContinuousController.instance.StartCoroutine(GManager.instance.selectJogressEffect.SelectDigivolutionRoots());
 
-                                        if (card.Owner.isYou || GManager.instance.IsAI)
+                                    IEnumerator EndSelectCoroutine_SelectDigivolutionRoots(List<Permanent> permanents)
+                                    {
+                                        if (permanents.Count == 2)
                                         {
-                                            GManager.instance.selectJogressEffect.SetUp_SelectDigivolutionRoots
-                                                                        (card: selectedCard,
-                                                                        isLocal: true,
-                                                                        isPayCost: true,
-                                                                        canNoSelect: true,
-                                                                        endSelectCoroutine_SelectDigivolutionRoots: EndSelectCoroutine_SelectDigivolutionRoots,
-                                                                        noSelectCoroutine: null);
-
-                                            yield return ContinuousController.instance.StartCoroutine(GManager.instance.selectJogressEffect.SelectDigivolutionRoots());
-
-                                            IEnumerator EndSelectCoroutine_SelectDigivolutionRoots(List<Permanent> permanents)
-                                            {
-                                                if (permanents.Count == 2)
-                                                {
-                                                    _jogressEvoRootsFrameIDs = permanents.Distinct().ToArray().Map(permanent => permanent.PermanentFrame.FrameID);
-                                                }
-
-                                                yield return null;
-                                            }
-
-                                            photonView.RPC("SetJogressEvoRootsFrameIDs", RpcTarget.All, _jogressEvoRootsFrameIDs);
+                                            _jogressEvoRootsFrameIDs = permanents.Distinct().ToArray().Map(permanent => permanent.PermanentFrame.FrameID);
                                         }
 
-                                        else
-                                        {
-                                            GManager.instance.commandText.OpenCommandText("The opponent is choosing a card to DNA digivolve.");
-                                        }
+                                        yield return null;
+                                    }
 
-                                        yield return new WaitWhile(() => !_endSelect);
-                                        _endSelect = false;
+                                    photonView.RPC("SetJogressEvoRootsFrameIDs", RpcTarget.All, _jogressEvoRootsFrameIDs);
+                                }
 
-                                        GManager.instance.commandText.CloseCommandText();
-                                        yield return new WaitWhile(() => GManager.instance.commandText.gameObject.activeSelf);
+                                else
+                                {
+                                    GManager.instance.commandText.OpenCommandText("The opponent is choosing a card to DNA digivolve.");
+                                }
 
-                                        if (_jogressEvoRootsFrameIDs.Length == 2)
-                                        {
-                                            yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().ShowCardEffect(new List<CardSource>() { selectedCard }, "Played Card", true, true));
+                                yield return new WaitWhile(() => !_endSelect);
+                                _endSelect = false;
 
-                                            PlayCardClass playCard = new PlayCardClass(
-                                                cardSources: new List<CardSource>() { selectedCard },
-                                                hashtable: CardEffectCommons.CardEffectHashtable(activateClass),
-                                                payCost: true,
-                                                targetPermanent: null,
-                                                isTapped: false,
-                                                root: SelectCardEffect.Root.Hand,
-                                                activateETB: true);
+                                GManager.instance.commandText.CloseCommandText();
+                                yield return new WaitWhile(() => GManager.instance.commandText.gameObject.activeSelf);
 
-                                            playCard.SetJogress(_jogressEvoRootsFrameIDs);
+                                if (_jogressEvoRootsFrameIDs.Length == 2)
+                                {
+                                    yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().ShowCardEffect(new List<CardSource>() { selectedCard }, "Played Card", true, true));
 
-                                            yield return ContinuousController.instance.StartCoroutine(playCard.PlayCard());
-                                        }
-                                    }
+                                    PlayCardClass playCard = new PlayCardClass(
+                                        cardSources: new List<CardSource>() { selectedCard },
+                                        hashtable: CardEffectCommons.CardEffectHashtable(activateClass),
+                                        payCost: true,
+                                        targetPermanent: null,
+                                        isTapped: false,
+                                        root: SelectCardEffect.Root.Hand,
+                                        activateETB: true);
+
+                                    playCard.SetJogress(_jogressEvoRootsFrameIDs);
+
+                                    yield return ContinuousController.instance.StartCoroutine(playCard.PlayCard());
                                 }
                             }
                         }

Assets/CardEffect/BT16/Black/DoruGreymon_BT16_061.cs

@@ -126,11 +126,13 @@ namespace DCGO.CardEffects.BT16
             #endregion
 
             #region All Turns - ESS
-            if (timing == EffectTiming.OnDestroyedAnyone)
+            if (timing == EffectTiming.OnDestroyedAnyone || timing == EffectTiming.OnEndBattle)
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Play 1 digimon 5 cost or less", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDiscription());
+                activateClass.SetIsInheritedEffect(true);
+                activateClass.SetHashString("PlayDigimon_BT16_061");
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -156,25 +158,6 @@ namespace DCGO.CardEffects.BT16
                     return false;
                 }
 
-                bool CanSelectPermanentCondition(Permanent permanent)
-                {
-                    if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card))
-                    {
-                        foreach (CardSource cardSource in card.Owner.TrashCards)
-                        {
-                            if (SelectCardCondition(cardSource))
-                            {
-                                if (cardSource.CanPlayCardTargetFrame(permanent.PermanentFrame, false, activateClass))
-                                {
-                                    return true;
-                                }
-                            }
-                        }
-                    }
-
-                    return false;
-                }
-
                 bool CanUseCondition(Hashtable hashtable)
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
@@ -182,7 +165,7 @@ namespace DCGO.CardEffects.BT16
                         bool WinnerCondition(Permanent permanent) => permanent.cardSources.Contains(card);
                         bool LoserCondition(Permanent permanent) => CardEffectCommons.IsOpponentPermanent(permanent, card);
 
-                        if (CardEffectCommons.CanTriggerWhenDeleteOpponentDigimon(hashtable: hashtable, winnerCondition: WinnerCondition, loserCondition: LoserCondition))
+                        if (CardEffectCommons.CanTriggerWhenDeleteOpponentDigimon(hashtable, WinnerCondition, LoserCondition))
                         {
                             return true;
                         }

Assets/CardEffect/BT16/Black/Dorugoramon_BT16_064.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using UnityEngine;
 using System.Linq;
 
 namespace DCGO.CardEffects.BT16
@@ -53,6 +54,7 @@ namespace DCGO.CardEffects.BT16
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Delete Unsuspended Digimon or Tamer", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
+                activateClass.SetEffectSourcePermanent(card.PermanentOfThisCard());
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -83,7 +85,16 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanTriggerWhenDigivolving(hashtable, card);
+                    if(CardEffectCommons.CanTriggerWhenDigivolving(hashtable, card))
+                    {
+                        return true;
+                        if (card.PermanentOfThisCard().DigivolutionCards.Count(HasTamerWithTrait) >= 1)
+                        {
+                            return true;
+                        }
+                    }
+
+                    return false;
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
@@ -93,28 +104,24 @@ namespace DCGO.CardEffects.BT16
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    if(card.PermanentOfThisCard().DigivolutionCards.Count(HasTamerWithTrait) >= 1)
+                    if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                     {
-                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
-                        {
-                            SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
-
-                            selectPermanentEffect.SetUp(
-                                selectPlayer: card.Owner,
-                                canTargetCondition: CanSelectPermanentCondition,
-                                canTargetCondition_ByPreSelecetedList: null,
-                                canEndSelectCondition: null,
-                                maxCount: 1,
-                                canNoSelect: false,
-                                canEndNotMax: false,
-                                selectPermanentCoroutine: null,
-                                afterSelectPermanentCoroutine: null,
-                                mode: SelectPermanentEffect.Mode.Destroy,
-                                cardEffect: activateClass);
-
-                            yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
-                        }
-
+                        SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
+
+                        selectPermanentEffect.SetUp(
+                            selectPlayer: card.Owner,
+                            canTargetCondition: CanSelectPermanentCondition,
+                            canTargetCondition_ByPreSelecetedList: null,
+                            canEndSelectCondition: null,
+                            maxCount: 1,
+                            canNoSelect: false,
+                            canEndNotMax: false,
+                            selectPermanentCoroutine: null,
+                            afterSelectPermanentCoroutine: null,
+                            mode: SelectPermanentEffect.Mode.Destroy,
+                            cardEffect: activateClass);
+
+                        yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
                     }
 
                     yield return null;
@@ -177,7 +184,7 @@ namespace DCGO.CardEffects.BT16
                             {
                                 if (hashtables.Count >= 1)
                                 {
-                                    return true;
+                                    return false;
                                 }
                             }
                         }

Assets/CardEffect/BT16/Black/Tankdramon_BT16_060.cs

@@ -70,7 +70,7 @@ namespace DCGO.CardEffects.BT16
                             mode: SelectCardEffect.Mode.Custom,
                             maxCount: -1,
                             selectCardCoroutine: null),
-                        remainingCardsPlace: RemainingCardsPlace.DeckTopOrBottom,
+                        remainingCardsPlace: RemainingCardsPlace.DeckTop,
                         activateClass: activateClass,
                         revealedCardsCoroutine: RevealedCardsCoroutine
                     ));
@@ -181,7 +181,7 @@ namespace DCGO.CardEffects.BT16
                             mode: SelectCardEffect.Mode.Custom,
                             maxCount: -1,
                             selectCardCoroutine: null),
-                        remainingCardsPlace: RemainingCardsPlace.DeckTopOrBottom,
+                        remainingCardsPlace: RemainingCardsPlace.DeckTop,
                         activateClass: activateClass,
                         revealedCardsCoroutine: RevealedCardsCoroutine
                     ));

Assets/CardEffect/EX5/Blue/Moonmon_EX5_002.cs

@@ -17,6 +17,7 @@ public class Moonmon_EX5_002 : CEntity_Effect
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("This Digimon digivolves", CanUseCondition, card);
             activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDiscription());
+            activateClass.SetIsInheritedEffect(true);
             activateClass.SetHashString("Digivolve_EX5_002");
             cardEffects.Add(activateClass);
 
@@ -67,8 +68,10 @@ public class Moonmon_EX5_002 : CEntity_Effect
                 {
                     if (CardEffectCommons.IsOwnerTurn(card))
                     {
+                        Debug.Log($"USE CONDITION: {CardEffectCommons.CanTriggerOnPermanentPlay(hashtable, PermanentCondition)}");
                         if (CardEffectCommons.CanTriggerOnPermanentPlay(hashtable, PermanentCondition))
                         {
+                            Debug.Log($"USE CONDITION: TRUE");
                             return true;
                         }
                     }
@@ -83,6 +86,7 @@ public class Moonmon_EX5_002 : CEntity_Effect
                 {
                     if (card.Owner.HandCards.Count >= 1)
                     {
+                        Debug.Log($"ACTIVATE CONDITION: TRUE");
                         return true;
                     }
                 }

Assets/CardEffect/ST17/Blue/Magnamon_ST17_13.cs

@@ -51,6 +51,7 @@ namespace DCGO.CardEffects.ST17
                 activateClass.SetUpICardEffect("De-Digivolve 1 to 1 Digimon", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
                 activateClass.SetIsSecurityEffect(true);
+                activateClass.SetIsDigimonEffect(true);
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -250,6 +251,7 @@ namespace DCGO.CardEffects.ST17
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Trash digivolution cards", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+                activateClass.SetIsDigimonEffect(true);
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()

Assets/Scripts/AutoProcessing.cs

@@ -1,11 +1,9 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using Photon;
-using Photon.Pun;
+using Photon.Pun;
 using System;
+using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
-using UnityEditor.Rendering;
+using UnityEngine;
 
 
 public class AutoProcessing : MonoBehaviourPunCallbacks
@@ -612,7 +610,7 @@ public class AutoProcessing : MonoBehaviourPunCallbacks
     #region Activate background effects
     public static IEnumerator ActivateBackgroundEffects(Hashtable hashtable, EffectTiming timing, Func<ICardEffect, bool> cardEffectCondition = null)
     {
-        #region プレイヤーの効果
+        #region Player effect
         foreach (Player player in GManager.instance.turnStateMachine.gameContext.Players_ForTurnPlayer)
         {
             foreach (ICardEffect cardEffect in player.EffectList(timing).Filter(cardEffect => cardEffectCondition == null || cardEffectCondition(cardEffect)))
@@ -632,7 +630,7 @@ public class AutoProcessing : MonoBehaviourPunCallbacks
         }
         #endregion
 
-        #region 場のパーマネントの効果
+        #region Effects of permanents in play
         foreach (Player player in GManager.instance.turnStateMachine.gameContext.Players_ForTurnPlayer)
         {
 
@@ -656,7 +654,7 @@ public class AutoProcessing : MonoBehaviourPunCallbacks
         }
         #endregion
 
-        #region トラッシュのカードの効果
+        #region Trash card effect
         foreach (Player player in GManager.instance.turnStateMachine.gameContext.Players_ForTurnPlayer)
         {
             foreach (CardSource cardSource in player.TrashCards)
@@ -679,7 +677,7 @@ public class AutoProcessing : MonoBehaviourPunCallbacks
         }
         #endregion
 
-        #region 手札のカードの効果
+        #region Effects of cards in hand
         foreach (Player player in GManager.instance.turnStateMachine.gameContext.Players_ForTurnPlayer)
         {
             foreach (CardSource cardSource in player.HandCards)
@@ -747,7 +745,7 @@ public class AutoProcessing : MonoBehaviourPunCallbacks
     #region Activate background effects of cards
     public static IEnumerator ActivateBackgroundEffectsOfCards(Hashtable hashtable, EffectTiming timing, List<CardSource> cardSources, Func<ICardEffect, bool> cardEffectCondition = null)
     {
-        #region カードリストの効果
+        #region Effect of card list
         foreach (CardSource cardSource in cardSources)
         {
             if (cardSource.PermanentOfThisCard() == null)

Assets/Scripts/ICardEffect.cs

@@ -980,7 +980,7 @@ public static class ActivateICardEffectExtensionClass
 
             Debug.Log($"{((ICardEffect)activateICardEffect).EffectName} was used");
 
-            #region ログ追加
+            #region Add log
             CardSource card = ((ICardEffect)activateICardEffect).EffectSourceCard;
 
             if (card != null)

Assets/Scripts/Permanent.cs

@@ -730,7 +730,7 @@ public class Permanent
                 yield return ContinuousController.instance.StartCoroutine(ShowingPermanentCard.ShowAddDigivolutionCardEffect());
             }
 
-            #region "進化元が増えた時"の効果
+            #region Effect of "when the number of evolution sources increases"
 
             #region Hashtable Setting
             Hashtable hashtable = new Hashtable()