浏览代码

Various bug fixes

Albert Vasconcellos 2 年之前
父节点
当前提交
fecff1f88b

+ 3 - 1
Assets/CardEffect/BT15/Purple/Mist_Barrier_BT15_098.cs

@@ -124,11 +124,13 @@ public class Mist_Barrier_BT15_098 : CEntity_Effect
 
                                 yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlayPermanentCards(cardSources: selectedCards, activateClass: activateClass, payCost: false, isTapped: false, root: SelectCardEffect.Root.Trash, activateETB: true));
 
-                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlaceDelayOptionCards(card: card, cardEffect: activateClass));
                             }
                         }
                     }
                 }
+
+                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlaceDelayOptionCards(card: card, cardEffect: activateClass));
+
             }
         }
         #endregion

+ 14 - 8
Assets/CardEffect/BT16/Blue/MagnaAngemon_BT16_024.cs

@@ -69,11 +69,14 @@ namespace DCGO.CardEffects.BT16
                 
                 bool CanSelectCardRecoverCondition(CardSource cardSource)
                 {
-                    if (cardSource.HasAngelTraitRestrictive)
+                    if (cardSource.IsDigimon)
                     {
-                        return true;
+                        if (cardSource.HasAngelTraitRestrictive)
+                        {
+                            return true;
+                        }
                     }
-                    
+
                     return false;
                 }
                 
@@ -262,17 +265,20 @@ namespace DCGO.CardEffects.BT16
                     
                     return false;
                 }
-                
+
                 bool CanSelectCardRecoverCondition(CardSource cardSource)
                 {
-                    if (cardSource.HasAngelTraitRestrictive)
+                    if (cardSource.IsDigimon)
                     {
-                        return true;
+                        if (cardSource.HasAngelTraitRestrictive)
+                        {
+                            return true;
+                        }
                     }
-                    
+
                     return false;
                 }
-                
+
                 bool CanUseCondition(Hashtable hashtable)
                 {
                     return CardEffectCommons.IsOwnerTurn(card) && CardEffectCommons.CanTriggerWhenDigivolving(hashtable, card);

+ 1 - 1
Assets/CardEffect/BT16/Green/Stingmon_BT16_041.cs

@@ -42,7 +42,7 @@ namespace DCGO.CardEffects.BT16
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Suspend 1 Digimon", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDiscription());
                 activateClass.SetHashString("Suspend_BT16-041");
                 activateClass.SetIsInheritedEffect(true);
                 cardEffects.Add(activateClass);

+ 2 - 2
Assets/CardEffect/BT16/Green/Wormmon_BT16_040.cs

@@ -114,7 +114,7 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    if (cardSource.CardTraits.Contains("Insectiod") || cardSource.CardTraits.Contains("Free"))
+                    if (cardSource.CardTraits.Contains("Insectoid") || cardSource.CardTraits.Contains("Free"))
                     {
                         if (cardSource.HasLevel && cardSource.Level == 4)
                         {
@@ -241,7 +241,7 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    if (cardSource.CardTraits.Contains("Insectiod") || cardSource.CardTraits.Contains("Free"))
+                    if (cardSource.CardTraits.Contains("Insectoid") || cardSource.CardTraits.Contains("Free"))
                     {
                         if (cardSource.HasLevel && cardSource.Level == 4)
                         {

+ 1 - 1
Assets/CardEffect/BT16/Red/Aquilamon_BT16_008.cs

@@ -178,7 +178,7 @@ namespace DCGO.CardEffects.BT16
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Suspend 1 of your opponent's Digimon.", CanUseCondition, card);
                 activateClass.SetIsInheritedEffect(true);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDiscription());
                 activateClass.SetHashString("Suspend_BT16_008");
                 cardEffects.Add(activateClass);
 

+ 1 - 1
Assets/CardEffect/BT16/Red/Hawkmon_BT16_007.cs

@@ -106,7 +106,7 @@ namespace DCGO.CardEffects.BT16
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Suspend 1 of your opponent's Digimon", CanUseCondition, card);
                 activateClass.SetIsInheritedEffect(true);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDiscription());
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()

+ 8 - 1
Assets/CardEffect/BT6/Black/ParaboricJunk_BT6_104.cs

@@ -26,7 +26,14 @@ public class ParaboricJunk_BT6_104 : CEntity_Effect
 
             bool CanSelectPermanentCondition(Permanent permanent)
             {
-                return CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card);
+                if (CardEffectCommons.IsPermanentExistsOnOwnerBattleArea(permanent, card))
+                {
+                    if(permanent.IsDigimon || permanent.IsToken)
+                    {
+                        return true;
+                    }
+                }
+                return false;
             }
 
             bool CanUseCondition(Hashtable hashtable)

+ 1 - 1
Assets/CardEffect/EX4/Purple/DirtyHero_EX4_070.cs

@@ -49,7 +49,7 @@ public class DirtyHero_EX4_070 : CEntity_Effect
 
             string EffectDiscription()
             {
-                return "[Main] 1 of your Digimon gains <Security Attack +1> for the turn. (This Digimon checks 1 additional security card.) Then, place this card in your battle area.";
+                return "[Main] Delete one of your opponent's level 3 Digimon. Then place this card in your battle area.";
             }
 
             bool CanSelectPermanentCondition(Permanent permanent)

+ 4 - 0
Assets/CardEffect/EX6/Purple/Barbamon_EX6_059.cs

@@ -61,6 +61,8 @@ namespace DCGO.CardEffects.EX6
                         }
                     }
 
+                    card.Owner.Enemy.HandCards = RandomUtility.ShuffledDeckCards(card.Owner.Enemy.HandCards);
+
                     List<CardSource> selectedCards = new List<CardSource>();
 
                     SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
@@ -139,6 +141,8 @@ namespace DCGO.CardEffects.EX6
                         }
                     }
 
+                    card.Owner.Enemy.HandCards = RandomUtility.ShuffledDeckCards(card.Owner.Enemy.HandCards);
+
                     List<CardSource> selectedCards = new List<CardSource>();
 
                     SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();

+ 1 - 1
Assets/CardEffect/EX6/Purple/Boogiemon_EX6_047.cs

@@ -87,7 +87,7 @@ namespace DCGO.CardEffects.EX6
 
                     IEnumerator RevealedCardsCoroutine(List<CardSource> revealedCards)
                     {
-                        added = revealedCards.Count(CanSelectCardCondition) >= 1;
+                        added = revealedCards.Count(CanSelectCardCondition) >= 1 || revealedCards.Count(CanSelectCardCondition1) >= 1;
 
                         yield return null;
                     }

+ 1 - 1
Assets/CardEffect/EX6/Yellow/Descent_of_the_Three_Great_Angels_EX6_068.cs

@@ -168,7 +168,7 @@ namespace DCGO.CardEffects.EX6
                 
                 IEnumerator SuccessProcess()
                 {
-                    if (card.Owner.SecurityCards.Count(IsThreeGreatAngelsDigimonCard) >= 1)
+                    if (card.Owner.SecurityCards.Count() >= 1)
                     {
                         int maxCount = Math.Min(1, card.Owner.SecurityCards.Count(IsThreeGreatAngelsDigimonCard));
                         

+ 1 - 1
Assets/CardEffect/EX6/Yellow/Dominimon_EX6_030.cs

@@ -62,7 +62,7 @@ namespace DCGO.CardEffects.EX6
                     {
                         if (cardSource.Level <= 5)
                         {
-                            if (cardSource.ContainsTraits("Angel") || cardSource.ContainsTraits("Archangel"))
+                            if (cardSource.CardTraits.Contains("Angel") || cardSource.CardTraits.Contains("Archangel"))
                             {
                                 if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false,
                                         cardEffect: activateClass))

+ 2 - 10
Assets/CardEffect/P/Green/Drimogemon_P_143.cs

@@ -56,17 +56,9 @@ namespace DCGO.CardEffects.P
             #endregion
 
             #region Piercing - ESS
-            if (timing == EffectTiming.None)
+            if (timing == EffectTiming.OnDetermineDoSecurityCheck)
             {
-                bool PiercingCondition()
-                {
-                    return true;
-                }
-
-                cardEffects.Add(CardEffectFactory.PierceSelfEffect(
-                    isInheritedEffect: true,
-                    card: card,
-                    condition: PiercingCondition));
+                cardEffects.Add(CardEffectFactory.PierceSelfEffect(isInheritedEffect: true, card: card, condition: null));
             }
             #endregion
 

+ 1 - 2
Assets/CardEffect/P/Purple/MyotismonXAntibody_P_145.cs

@@ -195,8 +195,7 @@ namespace DCGO.CardEffects.P
                 {
                     if(CardEffectCommons.CanTriggerOnDeletion(hashtable, card))
                     {
-                        if(card.PermanentOfThisCard().DigivolutionCards.Count(source => 
-                            source.CardNames.Contains("Myotismon") || source.CardNames.Contains("X Antibody") || source.CardNames.Contains("XAntibody")) >= 0)
+                        if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.CardNames.Contains("Myotismon") || cardSource.EqualsCardName("X Antibody")) >= 1)
                         {
                             return true;
                         }

+ 9 - 1
Assets/CardEffect/RB1/Blue/Anfimon_RB1_016.cs

@@ -200,7 +200,15 @@ public class Anfimon_RB1_016 : CEntity_Effect
 
             bool CanSelectPermanentCondition1(Permanent permanent)
             {
-                return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card);
+                if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
+                {
+                    if (permanent.HasNoDigivolutionCards)
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
             }
 
             bool CanUseCondition(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffectCommons/KeyWordEffects/Barrier.cs

@@ -89,7 +89,7 @@ public partial class CardEffectCommons
             isInheritedEffect: false,
             condition: CanUseCondition,
             rootCardEffect: activateClass,
-            card: targetPermanent.TopCard);
+            card: card);
 
         AddEffectToPermanent(
             targetPermanent: targetPermanent,