1.7.10 build

Assets/CardEffect/BT20/Blue/BT20_027.cs

@@ -293,7 +293,6 @@ namespace DCGO.CardEffects.BT20
                 bool CanSelectPermanentCondition(Permanent permanent)
                 {
                     return CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card) &&
-                           CardEffectCommons.CanActivateSuspendCostEffect(card) &&
                            (permanent.TopCard.HasText("Dracomon") || permanent.TopCard.HasText("Examon"));
                 }
 
@@ -302,7 +301,7 @@ namespace DCGO.CardEffects.BT20
                     removedPermanents = CardEffectCommons.GetPermanentsFromHashtable(hashtable).Filter(CanSelectPermanentCondition);
 
                     return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
-                           card.PermanentOfThisCard().CanSuspend;
+                           CardEffectCommons.CanActivateSuspendCostEffect(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

Assets/CardEffect/BT20/Green/BT20_044.cs

@@ -117,7 +117,7 @@ namespace DCGO.CardEffects.BT20
                             canTargetCondition_ByPreSelecetedList: null,
                             canEndSelectCondition: null,
                             maxCount: 1,
-                            canNoSelect: false,
+                            canNoSelect: true,
                             canEndNotMax: false,
                             selectPermanentCoroutine: SelectPermanentCoroutine,
                             afterSelectPermanentCoroutine: null,
@@ -211,7 +211,7 @@ namespace DCGO.CardEffects.BT20
                             canTargetCondition_ByPreSelecetedList: null,
                             canEndSelectCondition: null,
                             maxCount: 1,
-                            canNoSelect: false,
+                            canNoSelect: true,
                             canEndNotMax: false,
                             selectPermanentCoroutine: SelectPermanentCoroutine,
                             afterSelectPermanentCoroutine: null,

Assets/CardEffect/BT20/Purple/BT20_097.cs

@@ -207,7 +207,7 @@ namespace DCGO.CardEffects.BT20
 
                     if(selectedPermanent != null)
                     {
-                        List<CardSource> selectedCards = new List<CardSource>();
+                        bool cardAdded = false;
 
                         SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
 
@@ -216,8 +216,8 @@ namespace DCGO.CardEffects.BT20
                                     canTargetCondition_ByPreSelecetedList: null,
                                     canEndSelectCondition: null,
                                     canNoSelect: () => false,
-                                    selectCardCoroutine: SelectDorumonCoroutine,
-                                    afterSelectCardCoroutine: null,
+                                    selectCardCoroutine: null,
+                                    afterSelectCardCoroutine: SelectDorumonCoroutine,
                                     message: "Select 1 digivolution card.",
                                     maxCount: 1,
                                     canEndNotMax: false,
@@ -234,14 +234,14 @@ namespace DCGO.CardEffects.BT20
 
                         yield return StartCoroutine(selectCardEffect.Activate());
 
-                        IEnumerator SelectDorumonCoroutine(CardSource cardSource)
+                        IEnumerator SelectDorumonCoroutine(List<CardSource> cardSources)
                         {
-                            selectedCards.Add(cardSource);
+                            cardAdded = true;
 
                             yield return null;
                         }
 
-                        if (selectedCards.Count > 0)
+                        if (cardAdded)
                         {
                             List<CardSource> selectedPlayedCards = new List<CardSource>();
 
@@ -274,7 +274,7 @@ namespace DCGO.CardEffects.BT20
                                 yield return null;
                             }
 
-                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlayPermanentCards(cardSources: selectedPlayedCards, activateClass: activateClass, payCost: false, isTapped: true, root: SelectCardEffect.Root.Trash, activateETB: true));
+                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlayPermanentCards(cardSources: selectedPlayedCards, activateClass: activateClass, payCost: false, isTapped: false, root: SelectCardEffect.Root.Trash, activateETB: true));
                         }
                     }
                 }

Assets/CardEffect/BT20/Red/BT20_014.cs

@@ -231,23 +231,11 @@ namespace DCGO.CardEffects.BT20
                 bool CanUseCondition()
                 {
                     return CardEffectCommons.IsExistOnBattleAreaDigimon(card) && 
-                           CardEffectCommons.IsOwnerTurn(card);
+                           CardEffectCommons.IsOwnerTurn(card) &&
+                           card.PermanentOfThisCard().TopCard.HasRoyalKnightTraits;
                 }
 
-                bool PermanentCondition(Permanent permanent)
-                {
-                    if (permanent == card.PermanentOfThisCard())
-                    {
-                        if (permanent.TopCard.HasRoyalKnightTraits)
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
-                }
-
-                cardEffects.Add(CardEffectFactory.AllianceStaticEffect(permanentCondition: PermanentCondition, isInheritedEffect: true, card: card, condition: CanUseCondition));
+                cardEffects.Add(CardEffectFactory.AllianceSelfEffect(isInheritedEffect: true, card: card, condition: CanUseCondition));
             }
             #endregion
 

Assets/CardEffect/BT20/Red/BT20_017.cs

@@ -108,7 +108,8 @@ namespace DCGO.CardEffects.BT20
 
                 bool PermanentCondition (Permanent permanent)
                 {
-                    return CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card);
+                    return CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card) &&
+                           permanent != card.PermanentOfThisCard();
                 }
 
                 bool CanUseCondition (Hashtable hashtable)

Assets/CardEffect/BT20/Red/BT20_021.cs

@@ -115,7 +115,7 @@ namespace DCGO.CardEffects.BT20
 
                         if (canSelectHand || canSelectTrash)
                         {
-                            if (canSelectHand && canSelectHand)
+                            if (canSelectHand && canSelectTrash)
                             {
                                 List<SelectionElement<bool>> selectionElements = new List<SelectionElement<bool>>()
                                 {
@@ -324,7 +324,7 @@ namespace DCGO.CardEffects.BT20
 
                         if (canSelectHand || canSelectTrash)
                         {
-                            if (canSelectHand && canSelectHand)
+                            if (canSelectHand && canSelectTrash)
                             {
                                 List<SelectionElement<bool>> selectionElements = new List<SelectionElement<bool>>()
                                 {
@@ -533,7 +533,7 @@ namespace DCGO.CardEffects.BT20
 
                         if (canSelectHand || canSelectTrash)
                         {
-                            if (canSelectHand && canSelectHand)
+                            if (canSelectHand && canSelectTrash)
                             {
                                 List<SelectionElement<bool>> selectionElements = new List<SelectionElement<bool>>()
                                 {

ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1b081603656da6a02a507f6733f455e936eddefb55c8c946378289d170d0472
-size 20168
+oid sha256:34fb04ead4063705b9bc20a3ba816301e8664bd01fed9330ba4001cd1b92f3db
+size 20169