mbunch_kascope 9 місяців тому
батько
коміт
667c563c6c

+ 2 - 2
Assets/CardBaseEntity/BT23/White/Tamer/BT23_090.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56a76681bd78d21029fe6cf7e0fb1cccc3a18275925778418955609104af09a7
-size 1428
+oid sha256:2ac4bb636bc88f19d85bc7cf4fd3115cdc3b9e9e28a05e16d5ab7f59045d9990
+size 1438

+ 2 - 2
Assets/CardBaseEntity/BT23/White/Tamer/BT23_090_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:827cdee5c3e5403d699057dd58256e6a0a621e72899e261765faa7028ebd3f30
-size 1434
+oid sha256:957a1f6890b4be08ad95f91e7dce9dedfe58f7d4d72070fca832b9ec3c841f84
+size 1444

+ 2 - 2
Assets/CardBaseEntity/BT23/White/Tamer/BT23_090_P2.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dfa759e2cb5e45c24486fe973597fa50ff28e4c228600258aa5e21eca1e70420
-size 1434
+oid sha256:db6e66a88e31e78e2a3045c1e6314adfc824c39a2d449022ab9ec0f3a98c1be1
+size 1444

+ 1 - 1
Assets/CardEffect/BT23/Black/BT23_085.cs

@@ -202,7 +202,7 @@ namespace DCGO.CardEffects.BT23
                         hashtable: hashtable).Tap()
                     );
 
-                    if (card.Owner.HandCards.Count(CanSelectOptionCard) >= 1 && CardEffectCommons.IsOwnerTurn(card))
+                    if (card.Owner.HandCards.Count(CanSelectOptionCard) >= 1)
                     {
                         List<CardSource> selectedCards = new List<CardSource>();
 

+ 2 - 3
Assets/CardEffect/BT23/Green/BT23_083.cs

@@ -65,9 +65,8 @@ namespace DCGO.CardEffects.BT23
 
                 bool SecurityCondition(CardSource cardSource)
                 {
-                    return cardSource.IsDigimon
-                        && !cardSource.IsFlipped
-                        && cardSource.HasRoyalBaseTraits || cardSource.EqualsTraits("Zaxon");
+                    return !cardSource.IsFlipped && 
+                           (cardSource.HasRoyalBaseTraits || cardSource.EqualsTraits("Zaxon"));
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 2 - 2
Assets/CardEffect/BT23/Purple/BT23_066.cs

@@ -236,14 +236,14 @@ namespace DCGO.CardEffects.BT23
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Protect others", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDiscription());
                 activateClass.SetHashString("AllTurn_BT23_066");
                 activateClass.SetIsInheritedEffect(true);
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
                 {
-                    return "[All Turns] When any of your other Digimon would leave the battle area, by deleting this Digimon, they don't leave.";
+                    return "[All Turns] [Once per Turn] When any of your other Digimon would leave the battle area, by deleting this Digimon, they don't leave.";
                 }
 
                 bool PermanentCondition(Permanent permanent)

+ 6 - 1
Assets/CardEffect/BT23/Purple/BT23_069.cs

@@ -241,12 +241,17 @@ namespace DCGO.CardEffects.BT23
 
                             yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
 
-                            if (selectPermanentEffect != null) yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DeletePeremanentAndProcessAccordingToResult(
+                            if (selectPermanentEffect != null) 
+                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DeletePeremanentAndProcessAccordingToResult(
                                 new List<Permanent>() { selectedPermament },
                                 activateClass: activateClass,
                                 successProcess: null,
                                 failureProcess: OpponentLevel6FailureProcess));
                         }
+                        else
+                        {
+                            yield return ContinuousController.instance.StartCoroutine(OpponentLevel6FailureProcess());
+                        }                        
                     }
 
                     IEnumerator OpponentLevel6FailureProcess()

+ 10 - 10
Assets/CardEffect/BT23/Purple/BT23_087.cs

@@ -162,12 +162,6 @@ namespace DCGO.CardEffects.BT23
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (DigivolvingDigimon != null)
-                    {
-                        if (!DigivolvingCondition(DigivolvingDigimon))
-                            return false;
-                    }
-
                     return CardEffectCommons.IsExistOnField(card)
                         && CardEffectCommons.IsOwnerTurn(card)
                         && CardEffectCommons.CanActivateSuspendCostEffect(card);
@@ -186,10 +180,16 @@ namespace DCGO.CardEffects.BT23
 
                     List<Permanent> digivolvedPermanent = CardEffectCommons.GetPlayedPermanentsFromEnterFieldHashtable(hashtable, null);
 
-                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainRush(
-                            targetPermanent: digivolvedPermanent[0],
-                            effectDuration: EffectDuration.UntilEachTurnEnd,
-                            activateClass: activateClass));
+                    if(digivolvedPermanent.Count > 0)
+                    {
+                        if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(digivolvedPermanent[0], card))
+                        {
+                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainRush(
+                                                        targetPermanent: digivolvedPermanent[0],
+                                                        effectDuration: EffectDuration.UntilEachTurnEnd,
+                                                        activateClass: activateClass));
+                        }                        
+                    }                    
                 }
             }
 

+ 1 - 1
Assets/CardEffect/BT23/Purple/BT23_097.cs

@@ -73,7 +73,7 @@ namespace DCGO.CardEffects.BT23
 
                 string EffectDiscription()
                 {
-                    return "Delete 1 of your opponent's Digimon with a level as high or higher as the number of cards in your hand.";
+                    return "[Main] Delete 1 of your opponent's Digimon with a level as high or higher as the number of cards in your hand.";
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

+ 4 - 4
Assets/CardEffect/BT23/Purple/BT23_098.cs

@@ -164,7 +164,7 @@ namespace DCGO.CardEffects.BT23
                     return CardEffectCommons.IsExistOnBattleArea(card)
                         && CardEffectCommons.CanDeclareOptionDelayEffect(card) &&
                         CardEffectCommons.IsOwnerTurn(card) &&
-                        CardEffectCommons.CanTriggerWhenPermanentSuspends(hashtable, IsArisaKinosaki);
+                        CardEffectCommons.CanTriggerWhenPermanentSuspends(hashtable, IsVioletInboots);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
@@ -172,7 +172,7 @@ namespace DCGO.CardEffects.BT23
                     return CardEffectCommons.IsExistOnBattleArea(card);
                 }
 
-                bool IsArisaKinosaki(Permanent permanent)
+                bool IsVioletInboots(Permanent permanent)
                 {
                     return CardEffectCommons.IsPermanentExistsOnOwnerBattleArea(permanent, card)
                         && permanent.IsTamer
@@ -182,13 +182,13 @@ namespace DCGO.CardEffects.BT23
                 bool PermanentCondition(Permanent permanent)
                 {
                     return CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card)
-                        && permanent.TopCard.HasRockMineralTraits;
+                        && permanent.TopCard.HasGhostTraits;
                 }
 
                 bool CardCondition(CardSource cardSource)
                 {
                     return cardSource.IsDigimon
-                           && cardSource.HasRockMineralTraits
+                           && cardSource.HasGhostTraits
                            && cardSource.HasLiberatorTraits;
                 }