瀏覽代碼

Fix rest of Purple cards

Andrej Erdelsky 2 年之前
父節點
當前提交
c7667b5a5f

+ 2 - 2
Assets/CardEffect/BT17/Purple/Darcmon_BT17_063.cs

@@ -73,7 +73,7 @@ namespace DCGO.CardEffects.BT17
                            (card.Owner.LibraryCards.Count >= 1 ||
                             card.Owner.HandCards.Count >= 1 ||
                             (card.PermanentOfThisCard().DigivolutionCards.Some(IsHippoGryphonmonCardCondition) &&
-                             CardEffectCommons.HasMatchConditionOwnersHand(card, IsMurmukusmonCardCondition)));
+                             card.Owner.HandCards.Some(IsMurmukusmonCardCondition)));
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
@@ -106,7 +106,7 @@ namespace DCGO.CardEffects.BT17
                     }
 
                     if (card.PermanentOfThisCard().DigivolutionCards.Some(IsHippoGryphonmonCardCondition) &&
-                        CardEffectCommons.HasMatchConditionOwnersHand(card, IsMurmukusmonCardCondition))
+                        card.Owner.HandCards.Some(IsMurmukusmonCardCondition))
                     {
                         yield return ContinuousController.instance.StartCoroutine(
                             CardEffectCommons.DigivolveIntoHandOrTrashCard(

+ 9 - 9
Assets/CardEffect/BT17/Purple/Gulfmon_BT17_070.cs

@@ -8,7 +8,7 @@ namespace DCGO.CardEffects.BT17
         public override List<ICardEffect> CardEffects(EffectTiming timing, CardSource card)
         {
             List<ICardEffect> cardEffects = new List<ICardEffect>();
-            
+
             #region Alternate Digivolution
 
             if (timing == EffectTiming.None)
@@ -71,14 +71,14 @@ namespace DCGO.CardEffects.BT17
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                     return CardEffectCommons.IsExistOnBattleArea(card) &&
-                           (CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardSharedCondition) ||
-                            CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardSharedCondition));
+                           (card.Owner.HandCards.Some(CanSelectCardSharedCondition) ||
+                            card.Owner.TrashCards.Some(CanSelectCardSharedCondition));
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    bool canSelectHand = CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardSharedCondition);
-                    bool canSelectTrash = CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardSharedCondition);
+                    bool canSelectHand = card.Owner.HandCards.Some(CanSelectCardSharedCondition);
+                    bool canSelectTrash = card.Owner.TrashCards.Some(CanSelectCardSharedCondition);
 
                     if (canSelectHand || canSelectTrash)
                     {
@@ -224,14 +224,14 @@ namespace DCGO.CardEffects.BT17
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                     return CardEffectCommons.IsExistOnBattleArea(card) &&
-                           (CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardSharedCondition) ||
-                            CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardSharedCondition));
+                           (card.Owner.HandCards.Some(CanSelectCardSharedCondition) ||
+                            card.Owner.TrashCards.Some(CanSelectCardSharedCondition));
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    bool canSelectHand = CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardSharedCondition);
-                    bool canSelectTrash = CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardSharedCondition);
+                    bool canSelectHand = card.Owner.HandCards.Some(CanSelectCardSharedCondition);
+                    bool canSelectTrash = card.Owner.TrashCards.Some(CanSelectCardSharedCondition);
 
                     if (canSelectHand || canSelectTrash)
                     {

+ 2 - 2
Assets/CardEffect/BT17/Purple/HippoGryphonmon_BT17_066.cs

@@ -66,12 +66,12 @@ namespace DCGO.CardEffects.BT17
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                     return CardEffectCommons.IsExistOnBattleArea(card) &&
-                           CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardCondition);
+                           card.Owner.HandCards.Some(CanSelectCardCondition);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardCondition))
+                    if (card.Owner.HandCards.Some(CanSelectCardCondition))
                     {
                         List<CardSource> selectedCards = new List<CardSource>();
 

+ 4 - 4
Assets/CardEffect/BT17/Purple/Mephistomon_BT17_068.cs

@@ -241,14 +241,14 @@ namespace DCGO.CardEffects.BT17
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                     return CardEffectCommons.CanActivateOnDeletion(card) &&
-                           (CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardCondition) ||
-                            CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition));
+                           (card.Owner.HandCards.Some(CanSelectCardCondition) ||
+                            card.Owner.TrashCards.Some(CanSelectCardCondition));
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    bool canSelectHand = CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardCondition);
-                    bool canSelectTrash = CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition);
+                    bool canSelectHand = card.Owner.HandCards.Some(CanSelectCardCondition);
+                    bool canSelectTrash = card.Owner.TrashCards.Some(CanSelectCardCondition);
 
                     if (canSelectHand || canSelectTrash)
                     {

+ 2 - 2
Assets/CardEffect/BT17/Purple/Ornismon_BT17_072.cs

@@ -25,7 +25,7 @@ namespace DCGO.CardEffects.BT17
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Delete unsuspended Digimon", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDescription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDescription());
                 cardEffects.Add(activateClass);
 
                 string EffectDescription()
@@ -78,7 +78,7 @@ namespace DCGO.CardEffects.BT17
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Delete unsuspended Digimon", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDescription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDescription());
                 cardEffects.Add(activateClass);
 
                 string EffectDescription()