1.7.8 build

Assets/CardBaseEntity/BT14/Green/Digimon/BT14_054_P0.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b193033def5b20e770e69e481e8cbdcb9720ee09e7a85945477a4e592105205
-size 1244
+oid sha256:6e1e11d625aeb8cfe30456e3e8609d5608470324fbda9ed07854235c6b31188a
+size 1241

Assets/CardBaseEntity/BT16/Red/Option/BT16_091.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:992795fd5246d33dfb721dc02d6516ff481627ea9aa2466582c10f1f69f77d9b
-size 2298
+oid sha256:d3ac000302f624e47750e4ea95f5553722ede4194385fb2d386b564ee4e288cc
+size 2305

Assets/CardBaseEntity/BT20/Red/Digimon/BT20_013.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:38faa65737df8bfd35cb5e19c01d5ec3733a7f63f159e1bad9436fc99c0fe9e8
+oid sha256:51d6bfe5feb186751feecfb40cf238a5368924488e07a759979178ee2d4f8849
 size 1229

Assets/CardEffect/BT20/Black/BT20_055.cs

@@ -261,16 +261,22 @@ namespace DCGO.CardEffects.BT20
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsOwnerTurn(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
-                        if(CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(CardEffectCommons.GetAttackerFromHashtable(hashtable), card))
+                        if (CardEffectCommons.IsOwnerTurn(card))
                         {
-                            if (!CardEffectCommons.GetCardFromHashtable(hashtable).IsFlipped)
+                            if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(CardEffectCommons.GetAttackerFromHashtable(hashtable), card))
                             {
-                                return card.PermanentOfThisCard().DigivolutionCards.Count > 0;
+                                if (!CardEffectCommons.GetCardFromHashtable(hashtable).IsFlipped)
+                                {
+                                    UnityEngine.Debug.Log(card);
+                                    UnityEngine.Debug.Log(card.PermanentOfThisCard());
+                                    UnityEngine.Debug.Log(card.PermanentOfThisCard().DigivolutionCards);
+                                    return card.PermanentOfThisCard().DigivolutionCards.Count > 0;
+                                }
                             }
                         }
-                    }
+                    }                    
 
                     return false;
                 }

Assets/CardEffect/BT20/Black/BT20_059.cs

@@ -144,24 +144,6 @@ namespace DCGO.CardEffects.BT20
             #region Opponents Turn
             if (timing == EffectTiming.None)
             {
-                AddSkillClass addSkillClass = new AddSkillClass();
-                addSkillClass.SetUpICardEffect("[Opponent's Turn] All of your Digimon with [Sistermon] or [Huckmon] in their names or the [Royal Knight] trait gain <Reboot> and <Blocker>.", CanUseCondition, card);
-                addSkillClass.SetUpAddSkillClass(cardSourceCondition: CardSourceCondition, getEffects: GetEffects);
-                cardEffects.Add(addSkillClass);
-
-                bool CanUseCondition(Hashtable hashtable)
-                {
-                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
-                    {
-                        if (CardEffectCommons.IsOpponentTurn(card))
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
-                }
-
                 bool PermanentCondition(Permanent permanent)
                 {
                     if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card))
@@ -169,51 +151,45 @@ namespace DCGO.CardEffects.BT20
                         if (permanent.TopCard.ContainsCardName("Sistermon") || permanent.TopCard.ContainsCardName("Huckmon"))
                             return true;
 
-                        if (permanent.TopCard.EqualsTraits("Royal Knight"))
+                        if (permanent.TopCard.HasRoyalKnightTraits)
                             return true;
                     }
 
                     return false;
                 }
 
-                bool CardSourceCondition(CardSource cardSource)
-                {
-                    return PermanentCondition(cardSource.PermanentOfThisCard());
-                }
-
-                List<ICardEffect> GetEffects(CardSource cardSource, List<ICardEffect> cardEffects, EffectTiming _timing)
+                bool Condition()
                 {
-                    if (_timing == EffectTiming.None)
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
-                        bool Condition()
+                        if (CardEffectCommons.IsOpponentTurn(card))
                         {
-                            return CardSourceCondition(cardSource);
+                            return true;
                         }
-
-                        cardEffects.Add(CardEffectFactory.RebootSelfStaticEffect(isInheritedEffect: false, card: card, condition: Condition));
-                        cardEffects.Add(CardEffectFactory.BlockerSelfStaticEffect(isInheritedEffect: false, card: card, condition: Condition));
                     }
 
-                    return cardEffects;
+                    return false;
                 }
+
+                cardEffects.Add(CardEffectFactory.RebootStaticEffect(permanentCondition: PermanentCondition, isInheritedEffect: false, card: card, Condition));
+                cardEffects.Add(CardEffectFactory.BlockerStaticEffect(permanentCondition: PermanentCondition, isInheritedEffect: false, card: card, Condition));
             }
             #endregion
 
             #region Opponents Turn - ESS
             if (timing == EffectTiming.None)
             {
-                AddSkillClass addSkillClass = new AddSkillClass();
-                addSkillClass.SetUpICardEffect("[Opponent's Turn] While this Digimon is [Jesmon GX], all of your Digimon gain <Reboot> and <Blocker>.", CanUseCondition, card);
-                addSkillClass.SetUpAddSkillClass(cardSourceCondition: CardSourceCondition, getEffects: GetEffects);
-                addSkillClass.SetIsInheritedEffect(true);
-                cardEffects.Add(addSkillClass);
+                bool PermanentCondition(Permanent permanent)
+                {
+                    return CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card);
+                }
 
-                bool CanUseCondition(Hashtable hashtable)
+                bool Condition()
                 {
                     if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         if (CardEffectCommons.IsOpponentTurn(card))
-                        { 
+                        {
                             return card.PermanentOfThisCard().TopCard.EqualsCardName("Jesmon GX");
                         }
                     }
@@ -221,26 +197,8 @@ namespace DCGO.CardEffects.BT20
                     return false;
                 }
 
-                bool CardSourceCondition(CardSource cardSource)
-                {
-                    return CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(cardSource.PermanentOfThisCard(), card);
-                }
-
-                List<ICardEffect> GetEffects(CardSource cardSource, List<ICardEffect> cardEffects, EffectTiming _timing)
-                {
-                    if (_timing == EffectTiming.None)
-                    {
-                        bool Condition()
-                        {
-                            return true;
-                        }
-
-                        cardEffects.Add(CardEffectFactory.RebootSelfStaticEffect(isInheritedEffect: false, card: card, condition: Condition));
-                        cardEffects.Add(CardEffectFactory.BlockerSelfStaticEffect(isInheritedEffect: false, card: card, condition: Condition));
-                    }
-
-                    return cardEffects;
-                }
+                cardEffects.Add(CardEffectFactory.RebootStaticEffect(permanentCondition: PermanentCondition, isInheritedEffect: true, card: card, Condition));
+                cardEffects.Add(CardEffectFactory.BlockerStaticEffect(permanentCondition: PermanentCondition, isInheritedEffect: true, card: card, Condition));
             }
             #endregion
 

Assets/CardEffect/BT20/Purple/BT20_076.cs

@@ -145,6 +145,12 @@ namespace DCGO.CardEffects.BT20
                     return false;
                 }
 
+                bool CanSelectDigivolveCondition(CardSource cardSource)
+                {
+                    return cardSource.EqualsCardName("Imperialdramon: Fighter Mode") &&
+                           cardSource.CanPlayCardTargetFrame(card.PermanentOfThisCard().PermanentFrame, false, activateClass);
+                }
+
                 bool CanUseCondition(Hashtable hashtable)
                 {
                     return CardEffectCommons.CanTriggerOnPlay(hashtable, card);
@@ -157,44 +163,89 @@ namespace DCGO.CardEffects.BT20
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
+                {
+                    if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
+                    {
+                        int maxCount = Math.Min(1, card.Owner.Enemy.GetBattleAreaPermanents().Count(CanSelectPermanentCondition));
+
+                        SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
+
+                        selectPermanentEffect.SetUp(
+                            selectPlayer: card.Owner,
+                            canTargetCondition: CanSelectPermanentCondition,
+                            canTargetCondition_ByPreSelecetedList: null,
+                            canEndSelectCondition: null,
+                            maxCount: maxCount,
+                            canNoSelect: false,
+                            canEndNotMax: false,
+                            selectPermanentCoroutine: null,
+                            afterSelectPermanentCoroutine: null,
+                            mode: SelectPermanentEffect.Mode.Destroy,
+                            cardEffect: activateClass);
+
+                        yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
+                    }
+
+                    if (CardEffectCommons.IsJogress(_hashtable))
                     {
-                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
+                        bool canSelectHand = card.Owner.HandCards.Count(CanSelectDigivolveCondition) >= 1;
+                        bool canSelectTrash = card.Owner.TrashCards.Count(CanSelectDigivolveCondition) >= 1;
+
+                        if (canSelectHand || canSelectTrash)
                         {
-                            int maxCount = Math.Min(1, card.Owner.Enemy.GetBattleAreaPermanents().Count(CanSelectPermanentCondition));
-
-                            SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
-
-                            selectPermanentEffect.SetUp(
-                                selectPlayer: card.Owner,
-                                canTargetCondition: CanSelectPermanentCondition,
-                                canTargetCondition_ByPreSelecetedList: null,
-                                canEndSelectCondition: null,
-                                maxCount: maxCount,
-                                canNoSelect: false,
-                                canEndNotMax: false,
-                                selectPermanentCoroutine: null,
-                                afterSelectPermanentCoroutine: null,
-                                mode: SelectPermanentEffect.Mode.Destroy,
-                                cardEffect: activateClass);
-
-                            yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
-                        }
-                        activateClass.SetUpICardEffect("Digivolve into Imperialdramon: Fightermode", CanUseCondition, card);
-                        activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
-                        cardEffects.Add(activateClass);      
-                
-                        bool CanSelectCardCondition (CardSource cardSource){
-                        return cardSource.EqualsCardName("Imperialdramon: Fighter Mode");
+                            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),
+                        };
+
+                                string selectPlayerMessage = "From which area do you want to digivolve from?";
+                                string notSelectPlayerMessage = "The opponent is choosing where to digivolve from.";
+
+                                GManager.instance.userSelectionManager.SetBoolSelection(selectionElements: selectionElements, selectPlayer: card.Owner, selectPlayerMessage: selectPlayerMessage, notSelectPlayerMessage: notSelectPlayerMessage);
+                            }
+                            else
+                            {
+                                GManager.instance.userSelectionManager.SetBool(canSelectHand);
+                            }
+
+                            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: CanSelectDigivolveCondition,
+                                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: CanSelectDigivolveCondition,
+                                payCost: true,
+                                reduceCostTuple: null,
+                                fixedCostTuple: null,
+                                ignoreDigivolutionRequirementFixedCost: -1,
+                                isHand: false,
+                                activateClass: activateClass,
+                                successProcess: null));
+                            }
                         }
-            
                     }
-            
-                        
-            
-                
-
+                }
             }
-                #endregion
+            #endregion
         
             #region When Digivolving
             if (timing == EffectTiming.OnEnterFieldAnyone)
@@ -222,6 +273,12 @@ namespace DCGO.CardEffects.BT20
                     return false;
                 }
 
+                bool CanSelectDigivolveCondition(CardSource cardSource)
+                {
+                    return cardSource.EqualsCardName("Imperialdramon: Fighter Mode") &&
+                           cardSource.CanPlayCardTargetFrame(card.PermanentOfThisCard().PermanentFrame,false,activateClass);
+                }
+
                 bool CanUseCondition(Hashtable hashtable)
                 {
                     return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
@@ -235,48 +292,91 @@ namespace DCGO.CardEffects.BT20
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
+                {
+                    if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                     {
-                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
+                        int maxCount = Math.Min(1, card.Owner.Enemy.GetBattleAreaPermanents().Count(CanSelectPermanentCondition));
+
+                        SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
+
+                        selectPermanentEffect.SetUp(
+                            selectPlayer: card.Owner,
+                            canTargetCondition: CanSelectPermanentCondition,
+                            canTargetCondition_ByPreSelecetedList: null,
+                            canEndSelectCondition: null,
+                            maxCount: maxCount,
+                            canNoSelect: false,
+                            canEndNotMax: false,
+                            selectPermanentCoroutine: null,
+                            afterSelectPermanentCoroutine: null,
+                            mode: SelectPermanentEffect.Mode.Destroy,
+                            cardEffect: activateClass);
+
+                        yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
+                    }
+
+                    if (CardEffectCommons.IsJogress(_hashtable))
+                    {
+                        bool canSelectHand = card.Owner.HandCards.Count(CanSelectDigivolveCondition) >= 1;
+                        bool canSelectTrash = card.Owner.TrashCards.Count(CanSelectDigivolveCondition) >= 1;
+
+                        if (canSelectHand || canSelectTrash)
                         {
-                            int maxCount = Math.Min(1, card.Owner.Enemy.GetBattleAreaPermanents().Count(CanSelectPermanentCondition));
-
-                            SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
-
-                            selectPermanentEffect.SetUp(
-                                selectPlayer: card.Owner,
-                                canTargetCondition: CanSelectPermanentCondition,
-                                canTargetCondition_ByPreSelecetedList: null,
-                                canEndSelectCondition: null,
-                                maxCount: maxCount,
-                                canNoSelect: false,
-                                canEndNotMax: false,
-                                selectPermanentCoroutine: null,
-                                afterSelectPermanentCoroutine: null,
-                                mode: SelectPermanentEffect.Mode.Destroy,
-                                cardEffect: activateClass);
-
-                            yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
-                        }
-                        activateClass.SetUpICardEffect("Digivolve into Imperialdramon: Fightermode", CanUseCondition, card);
-                        activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
-                        cardEffects.Add(activateClass);      
-                
-                        bool CanSelectCardCondition (CardSource cardSource){
-                        return cardSource.EqualsCardName("Imperialdramon: Fighter Mode");
+                            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),
+                        };
+
+                                string selectPlayerMessage = "From which area do you want to digivolve from?";
+                                string notSelectPlayerMessage = "The opponent is choosing where to digivolve from.";
+
+                                GManager.instance.userSelectionManager.SetBoolSelection(selectionElements: selectionElements, selectPlayer: card.Owner, selectPlayerMessage: selectPlayerMessage, notSelectPlayerMessage: notSelectPlayerMessage);
+                            }
+                            else
+                            {
+                                GManager.instance.userSelectionManager.SetBool(canSelectHand);
+                            }
+
+                            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: CanSelectDigivolveCondition,
+                                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: CanSelectDigivolveCondition,
+                                payCost: true,
+                                reduceCostTuple: null,
+                                fixedCostTuple: null,
+                                ignoreDigivolutionRequirementFixedCost: -1,
+                                isHand: false,
+                                activateClass: activateClass,
+                                successProcess: null));
+                            }
                         }
-            
                     }
-            
-                        
-                if (timing == EffectTiming.OnEnterFieldAnyone){                
-                
-
                 }
             }
             #endregion
 
             return cardEffects;
-                
         }
     }
 }

Assets/CardEffect/BT20/Purple/BT20_097.cs

@@ -241,7 +241,7 @@ namespace DCGO.CardEffects.BT20
                             yield return null;
                         }
 
-                        if (selectedCards.Any(source => card.Owner.HandCards.Contains(source)))
+                        if (selectedCards.Count > 0)
                         {
                             List<CardSource> selectedPlayedCards = new List<CardSource>();
 
@@ -264,7 +264,6 @@ namespace DCGO.CardEffects.BT20
                                         cardEffect: activateClass);
 
                             selectCardEffect.SetUpCustomMessage("Select 1 [DeathXmon] to play.", "The opponent is selecting 1 [DeathXmon] to play.");
-                            selectCardEffect.SetUpCustomMessage_ShowCard("Digivolution Card");
 
                             yield return StartCoroutine(selectCardEffect.Activate());
 

Assets/CardEffect/BT20/Red/BT20_008.cs

@@ -10,7 +10,7 @@ namespace DCGO.CardEffects.BT20
         {
             List<ICardEffect> cardEffects = new List<ICardEffect>();
 
-            #region start of main phase
+            #region Start of Your Main Phase
             if (timing == EffectTiming.OnStartMainPhase)
             {
                 ActivateClass activateClass = new ActivateClass();
@@ -25,12 +25,13 @@ namespace DCGO.CardEffects.BT20
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return true;
+                    return CardEffectCommons.IsOwnerTurn(card);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
+                           CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelect);
                 }
 
                 bool CanSelect(CardSource cardSource)
@@ -49,15 +50,13 @@ namespace DCGO.CardEffects.BT20
                 {
                     SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();
                     bool discarded = false;
-                    if (card.Owner.HandCards.Count(CanSelect) >= 1)
-                    {
-                        int maxCount = 1;
-                        selectHandEffect.SetUp(
+
+                    selectHandEffect.SetUp(
                             selectPlayer: card.Owner,
                             canTargetCondition: CanSelect,
                             canTargetCondition_ByPreSelecetedList: null,
                             canEndSelectCondition: null,
-                            maxCount: maxCount,
+                            maxCount: 1,
                             canNoSelect: true,
                             canEndNotMax: false,
                             isShowOpponent: true,
@@ -67,20 +66,19 @@ namespace DCGO.CardEffects.BT20
                             cardEffect: activateClass);
 
 
-                        IEnumerator AfterSelectCardCoroutine(List<CardSource> cardSources)
+                    IEnumerator AfterSelectCardCoroutine(List<CardSource> cardSources)
+                    {
+                        if (cardSources.Count == 1)
                         {
-                            if (cardSources.Count == 1)
-                            {
-                                discarded = true;
-                                yield return null;
-                            }
+                            discarded = true;
+                            yield return null;
                         }
+                    }
 
-                        selectHandEffect.SetUpCustomMessage("Select 1 card to discard.", "The opponent is selecting 1 card to discard.");
-                        selectHandEffect.SetUpCustomMessage_ShowCard("Discarded Card");
+                    selectHandEffect.SetUpCustomMessage("Select 1 card to discard.", "The opponent is selecting 1 card to discard.");
+                    selectHandEffect.SetUpCustomMessage_ShowCard("Discarded Card");
 
-                        yield return ContinuousController.instance.StartCoroutine(selectHandEffect.Activate());
-                    }
+                    yield return ContinuousController.instance.StartCoroutine(selectHandEffect.Activate());
 
                     if (discarded)
                     {
@@ -120,7 +118,7 @@ namespace DCGO.CardEffects.BT20
                 cardEffects.Add(CardEffectFactory.ChangeDPStaticEffect(
                     permanentCondition: PermanentCondition,
                     changeValue: 1000,
-                    isInheritedEffect: false,
+                    isInheritedEffect: true,
                     card: card,
                     condition: Condition,
                     effectName: () => "Your Digimons gain DP +1000"));

Assets/CardEffect/BT20/Red/BT20_013.cs

@@ -42,7 +42,7 @@ namespace DCGO.CardEffects.BT20
 
                 bool CanSelectCardCondition (CardSource cardSource)
                 {
-                    if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: true, cardEffect: activateClass))
+                    if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                     {
                         if (cardSource.ContainsCardName("Sistermon") || cardSource.ContainsCardName("Gankoomon"))
                         {

Assets/CardEffect/BT20/Red/BT20_014.cs

@@ -226,7 +226,7 @@ namespace DCGO.CardEffects.BT20
             #endregion
 
             #region Your Turn - ESS
-            if (timing == EffectTiming.None)
+            if (timing == EffectTiming.OnAllyAttack)
             {
                 bool CanUseCondition()
                 {

Assets/CardEffect/BT20/White/BT20_17_token.cs → Assets/CardEffect/BT20/Red/BT20_017_token.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace DCGO.CardEffects.Tokens
 {
-    public class BT20_17_token : CEntity_Effect
+    public class BT20_017_token : CEntity_Effect
     {
         public override List<ICardEffect> CardEffects(EffectTiming timing, CardSource card)
         {

Assets/CardEffect/BT20/Red/BT20_019.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.Http.Headers;
 
 namespace DCGO.CardEffects.BT20
 {
@@ -12,6 +11,30 @@ namespace DCGO.CardEffects.BT20
         {
             List<ICardEffect> cardEffects = new List<ICardEffect>();
 
+            #region Alternate Digivolution Requirement
+
+            if (timing == EffectTiming.None)
+            {
+                bool PermanentCondition(Permanent targetPermanent)
+                {
+
+                    return targetPermanent.TopCard.EqualsCardName("Jesmon");
+                }
+
+                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 1, ignoreDigivolutionRequirement: false, card: card, condition: null));
+            }
+
+            #endregion
+
+            #region Alliance
+
+            if (timing == EffectTiming.OnAllyAttack)
+            {
+                cardEffects.Add(CardEffectFactory.AllianceSelfEffect(isInheritedEffect: false, card: card, condition: null));
+            }
+
+            #endregion
+
             #region When Digivolving
             if (timing == EffectTiming.OnEnterFieldAnyone)
             {
@@ -23,7 +46,7 @@ namespace DCGO.CardEffects.BT20
 
                 string EffectDiscription()
                 {
-                    return "[When Digivolving] if [Jesmon]/[X Antibody] is in this Digimon's digivoulution cards, for the turn, 1 of your Digimon isn't affected by your opponent's effects. Then, 1 of your Digimon may attack.";
+                    return "[When Digivolving] If [Jesmon] or [X Antibody] is in this Digimon's digivolution cards, for the turn, 1 of your Digimon isn't affected by your opponent's effects. Then, 1 of your Digimon may attack.";
                 }
 
                 bool SourceCondition(CardSource source)
@@ -178,7 +201,7 @@ namespace DCGO.CardEffects.BT20
                                 mode: SelectPermanentEffect.Mode.Custom,
                                 cardEffect: activateClass);
 
-                            selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon that be immune from your opponent's effects.", "Opponent is selecting on Digimon that will be immune from your effects.");
+                            selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon that will attack.", "Opponent is selecting 1 Digimon that will attack.");
                             yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
                         }
                         #endregion
@@ -269,7 +292,7 @@ namespace DCGO.CardEffects.BT20
             }
             #endregion
 
-            #region Inherit
+            #region Your Turn - ESS
             if(timing == EffectTiming.None)
             {
                 AddSkillClass addSkillClass = new AddSkillClass();

Assets/CardEffect/BT20/Red/BT20_094.cs

@@ -185,68 +185,33 @@ namespace DCGO.CardEffects.BT20
             if (timing == EffectTiming.OnLoseSecurity)
             {
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect(
-                    "You may play 1 [Imperialdramon: Dragon Mode] from any of your [Imperialdramon: Fighter Mode]'s digivolution cards without paying the cost.",
-                    CanUseCondition, card);
-                activateClass.SetUpActivateClass(null, ActivateCoroutine, -1, false, EffectDescription());
-                activateClass.SetHashString("BT20_094");
+                activateClass.SetUpICardEffect("You may play 1 [Imperialdramon: Dragon Mode] from any of your [Imperialdramon: Fighter Mode]'s digivolution cards without paying the cost.", CanUseCondition, card);
+                activateClass.SetUpActivateClass(null, ActivateCoroutine, -1, true, EffectDescription());
                 cardEffects.Add(activateClass);
                 
                 string EffectDescription()
                 {
-                    return"[All Turns] When your opponent's security stack is removed from, <Delay>.\r\n• You may play 1 [Imperialdramon: Dragon Mode] from any of your [Imperialdramon: Fighter Mode]'s digivolution cards without paying the cost.";
+                    return "[All Turns] When your opponent's security stack is removed from, <Delay>.\r\n• You may play 1 [Imperialdramon: Dragon Mode] from any of your [Imperialdramon: Fighter Mode]'s digivolution cards without paying the cost.";
                 }
                 
-                bool IsOwnerPermanentCondition(Permanent permanent)
-                {
-                    if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card))
-                    {
-                        if (permanent.DigivolutionCards.Count(isImperialDramonFighterMode) >= 1)
-                        {
-                            return true;
-                        }
-                    }
-                    
-                    return false;
+                bool isImperialdramonFighterMode(Permanent permanent)
+                {                    
+                    return CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card) &&
+                           permanent.TopCard.EqualsCardName("Imperialdramon: Fighter Mode") &&
+                           (permanent.DigivolutionCards.Count(isImperialdramonDragonMode) >= 1);
                 }
                 
-                bool IsOwnerPermanentToBeDeletedCondition(Permanent permanent)
+                bool isImperialdramonDragonMode(CardSource cardSource)
                 {
-                    return IsOwnerPermanentCondition(permanent) && permanent.willBeRemoveField;
-                    
-                }
-                
-                bool isImperialDramonFighterMode(CardSource cardSource)
-                {
-                    if (cardSource.IsDigimon)
-                    {
-                        if (cardSource.ContainsCardName("Imperialdramon: Dragon Mode"))
-                        {
-                            if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false,cardEffect: activateClass))
-                            {
-                                return true;
-                            }
-                        }
-                    }
-                    
-                    return false;
+                    return cardSource.EqualsCardName("Imperialdramon: Dragon Mode") &&
+                           CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass, SelectCardEffect.Root.DigivolutionCards);
                 }
                 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanDeclareOptionDelayEffect(card))
-                    {
-                        if (CardEffectCommons.CanTriggerWhenLoseSecurity(hashtable, player => player == card.Owner.Enemy))
-                        {
-                            if (!CardEffectCommons.IsByEffect(hashtable,
-                                    cardEffect => CardEffectCommons.IsOwnerEffect(cardEffect, card)))
-                            {
-                                return true;
-                            }
-                        }
-                    }
-                    
-                    return false;
+                    return CardEffectCommons.CanDeclareOptionDelayEffect(card) &&
+                           CardEffectCommons.CanTriggerWhenLoseSecurity(hashtable, player => player == card.Owner.Enemy) &&
+                           CardEffectCommons.HasMatchConditionPermanent(isImperialdramonFighterMode);
                 }
                 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
@@ -256,62 +221,58 @@ namespace DCGO.CardEffects.BT20
                             targetPermanents: new List<Permanent>() { card.PermanentOfThisCard() },
                             activateClass: activateClass, successProcess: permanents => SuccessProcess(),
                             failureProcess: null));
-                }
-                
-                IEnumerator SuccessProcess()
-                {
-                    if (CardEffectCommons.HasMatchConditionPermanent(IsOwnerPermanentToBeDeletedCondition))
+
+                    IEnumerator SuccessProcess()
                     {
-                        int maxCount = Math.Min(1,
-                            CardEffectCommons.MatchConditionPermanentCount(IsOwnerPermanentToBeDeletedCondition));
-                        
-                        SelectPermanentEffect selectPermanentEffect =
-                            GManager.instance.GetComponent<SelectPermanentEffect>();
-                        
-                        selectPermanentEffect.SetUp(
-                            selectPlayer: card.Owner,
-                            canTargetCondition: IsOwnerPermanentToBeDeletedCondition,
-                            canTargetCondition_ByPreSelecetedList: null,
-                            canEndSelectCondition: null,
-                            maxCount: maxCount,
-                            canNoSelect: true,
-                            canEndNotMax: false,
-                            selectPermanentCoroutine: SelectPermanentCoroutine,
-                            afterSelectPermanentCoroutine: null,
-                            mode: SelectPermanentEffect.Mode.Custom,
-                            cardEffect: activateClass);
-                        
-                        selectPermanentEffect.SetUpCustomMessage(
-                            "Select 1 Digimon which has digivolution cards.",
-                            "The opponent is selecting 1 Digimon which has digivolution cards.");
-                        
-                        yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
-                        
-                        IEnumerator SelectPermanentCoroutine(Permanent permanent)
+                        if (CardEffectCommons.HasMatchConditionPermanent(isImperialdramonFighterMode))
                         {
-                            Permanent selectedPermanent = permanent;
-                            
+                            Permanent selectedPermanent = null;
+
+                            SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
+
+                            selectPermanentEffect.SetUp(
+                                selectPlayer: card.Owner,
+                                canTargetCondition: isImperialdramonFighterMode,
+                                canTargetCondition_ByPreSelecetedList: null,
+                                canEndSelectCondition: null,
+                                maxCount: 1,
+                                canNoSelect: true,
+                                canEndNotMax: false,
+                                selectPermanentCoroutine: SelectPermanentCoroutine,
+                                afterSelectPermanentCoroutine: null,
+                                mode: SelectPermanentEffect.Mode.Custom,
+                                cardEffect: activateClass);
+
+                            selectPermanentEffect.SetUpCustomMessage(
+                                "Select 1 Digimon to play source from.",
+                                "The opponent is selecting 1 Digimon to play source from.");
+
+                            yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
+
+                            IEnumerator SelectPermanentCoroutine(Permanent permanent)
+                            {
+                                Permanent selectedPermanent = permanent;
+
+                                yield return null;
+                            }
+
                             if (selectedPermanent != null)
                             {
-                                if (selectedPermanent.DigivolutionCards.Count(isImperialDramonFighterMode) >= 1)
+                                if (selectedPermanent.DigivolutionCards.Count(isImperialdramonDragonMode) >= 1)
                                 {
-                                    maxCount = Math.Min(1,
-                                        selectedPermanent.DigivolutionCards.Count(isImperialDramonFighterMode));
-                                    
                                     List<CardSource> selectedCards = new List<CardSource>();
-                                    
-                                    SelectCardEffect selectCardEffect =
-                                        GManager.instance.GetComponent<SelectCardEffect>();
-                                    
+
+                                    SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
+
                                     selectCardEffect.SetUp(
-                                        canTargetCondition: isImperialDramonFighterMode,
+                                        canTargetCondition: isImperialdramonDragonMode,
                                         canTargetCondition_ByPreSelecetedList: null,
                                         canEndSelectCondition: null,
                                         canNoSelect: () => true,
                                         selectCardCoroutine: SelectCardCoroutine,
                                         afterSelectCardCoroutine: null,
                                         message: "Select 1 digivolution card to play.",
-                                        maxCount: maxCount,
+                                        maxCount: 1,
                                         canEndNotMax: false,
                                         isShowOpponent: true,
                                         mode: SelectCardEffect.Mode.Custom,
@@ -320,21 +281,21 @@ namespace DCGO.CardEffects.BT20
                                         canLookReverseCard: true,
                                         selectPlayer: card.Owner,
                                         cardEffect: activateClass);
-                                    
+
                                     selectCardEffect.SetUpCustomMessage(
                                         "Select 1 digivolution card to play.",
                                         "The opponent is selecting 1 digivolution card to play.");
                                     selectCardEffect.SetUpCustomMessage_ShowCard("Played Card");
-                                    
+
                                     yield return StartCoroutine(selectCardEffect.Activate());
-                                    
+
                                     IEnumerator SelectCardCoroutine(CardSource cardSource)
                                     {
                                         selectedCards.Add(cardSource);
-                                        
+
                                         yield return null;
                                     }
-                                    
+
                                     yield return ContinuousController.instance.StartCoroutine(
                                         CardEffectCommons.PlayPermanentCards(
                                             cardSources: selectedCards,

Assets/CardEffect/BT20/Yellow/BT20_037.cs

@@ -76,8 +76,8 @@ namespace DCGO.CardEffects.BT20
             if (timing == EffectTiming.OnEnterFieldAnyone)
             {
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("For each level 6 in sources, suspend 1 Digimon and memory +1, Then Opponent's Digimon/Tamers can activate [On Play] or unsuspend", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
+                activateClass.SetUpICardEffect("For each level 6 in sources, suspend 1 Digimon and memory +1, Then Opponent's Digimon/Tamers can't activate [On Play] or unsuspend", CanUseCondition, card);
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()

Assets/Editor/Missing AAs.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ce495ac44d53f0547a7ee9c98df33f39
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Missing AAs/BT20.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 55c76b89e4f88ad4b8db16d4cc02cd8e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Missing AAs/BT20/Black.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4959c0672dabbed4ba7cabd8e52e87ea
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Missing AAs/BT20/Black/Digimon.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 46abbd1ecc8e8b545acac9a189bde474
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Missing AAs/BT20/Black/Tamer.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c63b31e7669a86444b7b4999f9911bb5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Missing AAs/BT20/Blue.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ebf053b7cd221df449babe4bb1d269ed
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Missing AAs/BT20/Blue/Digimon.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 892322fd2dd766f42b303ae5bc51ccc6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Missing AAs/BT20/Green.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 000332faa9e841e428d15e95cca656b1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Missing AAs/BT20/Green/Digimon.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8dffb3704ef7e254baa7de8fc6efb6b8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Missing AAs/BT20/Green/Tamer.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fba269762477cb64a9adec7379bb93cd
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Missing AAs/BT20/Purple.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: eedb0cb7129dc4542aaad0eda4882e39
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Missing AAs/BT20/Purple/Digimon.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9576fbf576e364f4d899f12feef14cad
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Missing AAs/BT20/Purple/Option.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 399bee068b38071498a6a033eda26bf0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Missing AAs/BT20/Purple/Tamer.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c2dc43a458ebb644a870856b184a9009
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Missing AAs/BT20/Red.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: de705616856ab6e45aa081ec016621f0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Missing AAs/BT20/Red/Digimon.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 920f2112253ed794dbf6e8c3426e2f61
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Missing AAs/BT20/White.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b69e569c11ac2df4fbdcbe82e8becfa7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Missing AAs/BT20/White/Digimon.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2e73cf106221c9d4b90f8604a823e74e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Missing AAs/BT20/White/Option.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f95cc8b90eab570428505d535274a2e3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Missing AAs/BT20/White/Tamer.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 37d25e865ca061948b0bb991665ecbe5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Missing AAs/BT20/Yellow.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ff284102dd5872346a54dde4b5989096
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Missing AAs/BT20/Yellow/Digimon.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 88ebe8e3bf6089c4c9fbb4373374f477
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: