Selaa lähdekoodia

1.5.1 update, 3 card fixes

mbunch_kascope 1 vuosi sitten
vanhempi
sitoutus
e693972b5c

+ 4 - 3
Assets/CardEffect/BT18/Purple/FistofAthena_BT18_099.cs

@@ -238,13 +238,13 @@ namespace DCGO.CardEffects.BT18
                         {
                             yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainPierce(
                                 targetPermanent: selectedPermanent,
-                                effectDuration: EffectDuration.UntilEachTurnEnd,
+                                effectDuration: EffectDuration.UntilOwnerTurnEnd,
                                 activateClass: activateClass));
 
                             yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonSAttack(
                                 targetPermanent: selectedPermanent,
                                 changeValue: 1,
-                                effectDuration: EffectDuration.UntilEachTurnEnd,
+                                effectDuration: EffectDuration.UntilOwnerTurnEnd,
                                 activateClass: activateClass));
                         }
                     }
@@ -321,7 +321,8 @@ namespace DCGO.CardEffects.BT18
                         cardSources: selectedCards, activateClass: activateClass, payCost: false, isTapped: false,
                         root: SelectCardEffect.Root.Trash, activateETB: true));
 
-                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.AddThisCardToHand(card, activateClass));
+                    yield return ContinuousController.instance.StartCoroutine(
+                        CardEffectCommons.PlaceDelayOptionCards(card: card, cardEffect: activateClass));
                 }
             }
 

+ 1 - 1
Assets/CardEffect/BT18/Yellow/ArkhaiAngemon_BT18_038.cs

@@ -149,7 +149,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card))
                     {
                         if (card.Owner.HandCards.Count(CanSelectCardCondition) >= 1)
                         {

+ 6 - 4
Assets/CardEffect/BT18/Yellow/Patamon_BT18_033.cs

@@ -11,7 +11,7 @@ namespace DCGO.CardEffects.BT18
             List<ICardEffect> cardEffects = new List<ICardEffect>();
 
             #region Main
-            if (timing == EffectTiming.OnDeclaration)
+            if (timing == EffectTiming.OnEndTurn)
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Delete your 1 Digimon to play 1 Digimon from hand", CanUseCondition, card);
@@ -38,16 +38,18 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return card.Owner.HandCards.Contains(card);
+                    return card.Owner.GetBreedingAreaPermanents().Count == 0 &&
+                           CardEffectCommons.HasMatchConditionOwnersCardInTrash(card,CanSelectCardCondition) &&
+                           card.Owner.HandCards.Contains(card);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                     if (card.Owner.GetBreedingAreaPermanents().Count == 0)
                     {
-                        if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
+                        if (CardEffectCommons.IsExistOnHand(card))
                         {
-                            if (card.Owner.TrashCards.Count(CanSelectCardCondition) >= 1)
+                            if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
                             {
                                 return true;
                             }

+ 2 - 2
ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c26bbe6f4d9b38b8538f0a6447bf38b67602824178134a62184aa732ef91c293
-size 262
+oid sha256:37562c49a315e8afa942bbc5ef2ca9590fb241c8266a020ab7d1fafac365c9ce
+size 20166