Merge pull request #86 from DCGO2/2.5-bugfix

2.5 Bug fixes

Assets/CardBaseEntity/BT9/Yellow/Digimon/BT9_044.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e73b1afc7a26c7022bd4f0bc51428f504c676ed96fde80ac7e94831dceb235f
-size 2776
+oid sha256:208415e2c78cd4b97a8011ad752dda0e3e7805c9cc6a5574c0f1b9f9ffe3b54f
+size 2777

Assets/CardEffect/BT13/White/BT13_007.cs

@@ -42,7 +42,7 @@ namespace DCGO.CardEffects.BT13
                 isInheritedEffect: false,
                 card: card,
                 condition: Condition,
-                effectName: "Your Digimons can't digivolve")
+                effectName: "Your Digimon can't digivolve")
                 );
             }
 
@@ -480,7 +480,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool PermanentCondition(Permanent permanent)
                 {
-                    if (CardEffectCommons.IsPermanentExistsOnOwnerBattleArea(permanent, card))
+                    if (CardEffectCommons.IsPermanentExistsOnBattleArea(permanent))
                     {
                         if (permanent.TopCard.IsOption)
                         {

Assets/CardEffect/BT16/Black/BT16_064.cs

@@ -88,7 +88,12 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanTriggerWhenDigivolving(hashtable, card))
+                    return CardEffectCommons.CanTriggerWhenDigivolving(hashtable, card);
+                }
+
+                bool CanActivateCondition(Hashtable hashtable)
+                {
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         if (card.PermanentOfThisCard().DigivolutionCards.Count(HasTamerWithTrait) >= 1)
                         {
@@ -99,11 +104,6 @@ namespace DCGO.CardEffects.BT16
                     return false;
                 }
 
-                bool CanActivateCondition(Hashtable hashtable)
-                {
-                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
-                }
-
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))

Assets/CardEffect/BT16/Yellow/BT16_102.cs

@@ -89,7 +89,9 @@ namespace DCGO.CardEffects.BT16
 
                     if (selectedPermanent != null)
                     {
-                        if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.ContainsCardName("Magnamon (X Antibody)") || cardSource.ContainsTraits("Armor Form")) >= 1)
+                        if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) =>
+                                cardSource.EqualsCardName("Magnamon (X Antibody)") ||
+                                cardSource.ContainsTraits("Armor Form")) >= 1)
                         {
                             CanNotAffectedClass canNotAffectedClass = new CanNotAffectedClass();
                             canNotAffectedClass.SetUpICardEffect("Isn't affected by opponent's effects", CanUseCondition1, card);

Assets/CardEffect/BT17/Yellow/BT17_035.cs

@@ -248,7 +248,10 @@ namespace DCGO.CardEffects.BT17
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {
-                            return true;
+                            if (card.PermanentOfThisCard().TopCard.ContainsCardName("Sakuyamon"))
+                            {
+                                return true;
+                            }
                         }
                     }
 

Assets/CardEffect/BT19/Black/BT19_086.cs

@@ -61,9 +61,9 @@ namespace DCGO.CardEffects.BT19
                         mode: SelectHandEffect.Mode.Custom,
                         cardEffect: activateClass);
 
-                    selectHandEffect.SetUpCustomMessage("Select 1 card to place on bottom of digivolution cards.",
-                        "The opponent is selecting 1 card to place on bottom of digivolution cards.");
-                    selectHandEffect.SetUpCustomMessage_ShowCard("Digivolution Card");
+                    selectHandEffect.SetUpCustomMessage("Select 1 card to place in the battle area.",
+                        "The opponent is selecting 1 card to place in the battle area.");
+                    selectHandEffect.SetUpCustomMessage_ShowCard("Battle Area");
 
                     IEnumerator SelectCardCoroutine(CardSource cardSource)
                     {

Assets/CardEffect/BT19/Blue/BT19_027.cs

@@ -175,7 +175,7 @@ namespace DCGO.CardEffects.BT19
                         yield return null;
                     }
 
-                    if (selectedPermanent != null)
+                    if (selectedPermanent != null && selectedPermanent.TopCard.HasLevel)
                     {
                         int selectedLevel = selectedPermanent.Level;
 

Assets/CardEffect/BT20/Black/BT20_057.cs

@@ -14,7 +14,7 @@ namespace DCGO.CardEffects.BT20
             #region Reduce Play Cost
             bool HasProperTraitInPlay(Permanent permanent)
             {
-                if (CardEffectCommons.IsPermanentExistsOnBattleArea(permanent))
+                if (CardEffectCommons.IsPermanentExistsOnOwnerBattleArea(permanent, card))
                 {
                     if (permanent.IsDigimon)
                     {

Assets/CardEffect/BT20/Green/BT20_004.cs

@@ -38,8 +38,13 @@ namespace DCGO.CardEffects.BT20
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
-                           CardEffectCommons.CanTriggerOnPermanentPlay(hashtable, IsYourAccelDigimon);
+                    if (CardEffectCommons.IsOwnerTurn(card))
+                    {
+                        return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
+                               CardEffectCommons.CanTriggerOnPermanentPlay(hashtable, IsYourAccelDigimon);
+                    }
+
+                    return false;
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)

Assets/CardEffect/BT20/White/BT20_099.cs

@@ -64,15 +64,7 @@ namespace DCGO.CardEffects.BT20
 
                 bool CanSelectPermanentCondition(Permanent permanent)
                 {
-                    if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card))
-                    {
-                        if (permanent.DigivolutionCards.Count((cardSource) => cardSource.CardNames.Contains("X Antibody") || cardSource.CardNames.Contains("XAntibody")) == 0)
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
+                    return CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card);
                 }
 
                 bool CanUseCondition(Hashtable hashtable)