Bladeren bron

Fix red and blue card issues

Andrej Erdelsky 2 jaren geleden
bovenliggende
commit
5d7d13d7f0

+ 5 - 2
Assets/CardEffect/BT17/Blue/DavisMotomiyaAndKenIchijoji_BT17_084.cs

@@ -201,7 +201,7 @@ namespace DCGO.CardEffects.BT17
                     {
                         if (permanent.TopCard.ContainsTraits("Free"))
                         {
-                            return true;
+                            return permanent.CanAttack(activateClass);
                         }
                     }
 
@@ -225,7 +225,10 @@ namespace DCGO.CardEffects.BT17
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
-                        return true;
+                        if (CardEffectCommons.HasMatchConditionPermanent(IsFreePermanentCondition))
+                        {
+                            return true;
+                        }
                     }
 
                     return false;

+ 1 - 1
Assets/CardEffect/BT17/Blue/Gabumon_BT17_019.cs

@@ -224,7 +224,7 @@ namespace DCGO.CardEffects.BT17
                                             JogressEvoRootsFrameIDs = Array.Empty<int>();
 
                                             yield return GManager.instance.photonWaitController.StartWait(
-                                                "Agumon_BT17_007");
+                                                "Gabumon_BT17_019");
 
                                             if (card.Owner.isYou || GManager.instance.IsAI)
                                             {

+ 1 - 1
Assets/CardEffect/BT17/Blue/MetalGarurumon_BT17_027.cs

@@ -47,7 +47,7 @@ namespace DCGO.CardEffects.BT17
                 {
                     if (card.Owner.HandCards.Contains(card))
                     {
-                        if (!CardEffectCommons.HasMatchConditionOwnersPermanent(card, IsCorrectTamer))
+                        if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, IsCorrectTamer))
                         {
                             return true;
                         }

+ 4 - 4
Assets/CardEffect/BT17/Blue/Seasarmon_BT17_024.cs

@@ -32,14 +32,14 @@ namespace DCGO.CardEffects.BT17
             if (timing == EffectTiming.OnEnterFieldAnyone)
             {
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("Place 1 card to digivolution cards to Draw 1", CanUseCondition, card);
+                activateClass.SetUpICardEffect("Place 1 card to digivolution cards to give [Jamming]", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDescription());
                 cardEffects.Add(activateClass);
 
                 string EffectDescription()
                 {
                     return
-                        "[On Play] By placing 1 [Seasarmon] or 1 level 3 blue Digimon card from your hand as this Digimon's bottom digivolution card, <Draw 1>.";
+                        "[On Play] By placing 1 level 3 blue Digimon card from your hand as this Digimon's bottom digivolution card, 1 of your Digimon gains [Jamming] for the turn.";
                 }
 
                 bool CanUseCondition(Hashtable hashtable)
@@ -147,14 +147,14 @@ namespace DCGO.CardEffects.BT17
             if (timing == EffectTiming.OnEnterFieldAnyone)
             {
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("Place 1 card to digivolution cards to Draw 1", CanUseCondition, card);
+                activateClass.SetUpICardEffect("Place 1 card to digivolution cards to give [Jamming]", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDescription());
                 cardEffects.Add(activateClass);
 
                 string EffectDescription()
                 {
                     return
-                        "[When Digivolving] By placing 1 [Seasarmon] or 1 level 3 blue Digimon card from your hand as this Digimon's bottom digivolution card, <Draw 1>.";
+                        "[When Digivolving] By placing 1 level 3 blue Digimon card from your hand as this Digimon's bottom digivolution card, 1 of your Digimon gains [Jamming] for the turn.";
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

+ 6 - 3
Assets/CardEffect/BT17/Red/TaiKamiyaAndMattIshida_BT17_081.cs

@@ -15,7 +15,7 @@ namespace DCGO.CardEffects.BT17
             if (timing == EffectTiming.OnEnterFieldAnyone)
             {
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("Gain 1 Memory", CanUseCondition, card);
+                activateClass.SetUpICardEffect("Gain Memory", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true,
                     EffectDescription());
                 cardEffects.Add(activateClass);
@@ -114,7 +114,7 @@ namespace DCGO.CardEffects.BT17
                     {
                         if (permanent.TopCard.ContainsCardName("Omnimon"))
                         {
-                            return true;
+                            return permanent.CanAttack(activateClass);
                         }
                     }
 
@@ -138,7 +138,10 @@ namespace DCGO.CardEffects.BT17
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
-                        return true;
+                        if (CardEffectCommons.HasMatchConditionPermanent(IsOmnimonPermanentCondition))
+                        {
+                            return true;
+                        }
                     }
 
                     return false;

+ 1 - 1
Assets/CardEffect/BT17/Red/WarGreymon_BT17_015.cs

@@ -47,7 +47,7 @@ namespace DCGO.CardEffects.BT17
                 {
                     if (card.Owner.HandCards.Contains(card))
                     {
-                        if (!CardEffectCommons.HasMatchConditionOwnersPermanent(card, IsCorrectTamer))
+                        if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, IsCorrectTamer))
                         {
                             return true;
                         }