Просмотр исходного кода

Merge pull request #1411 from DCGO2/hooperk-BT25-093

Update can link conditions
x89rt2 3 месяцев назад
Родитель
Сommit
1d8a4359bf

+ 2 - 2
Assets/Scripts/CardEffect/BT25/Black/BT25_100.cs

@@ -80,8 +80,8 @@ namespace DCGO.CardEffects.BT25
 
                 bool CanSelectOwnerPermamentCondition(Permanent permanent)
                 {
-                    return permanent.IsDigimon
-                        && CardEffectCommons.IsOwnerPermanent(permanent, card)
+                    return CardEffectCommons.IsOwnerPermanent(permanent, card)
+                        && permanent.IsDigimon
                         && card.CanLinkToTargetPermanent(permanent, false, true);
                 }
 

+ 5 - 2
Assets/Scripts/CardEffect/BT25/Red/BT25_093.cs

@@ -56,8 +56,11 @@ namespace DCGO.CardEffects.BT25
                     => CardEffectCommons.CanTriggerOptionMainEffect(hashtable, card);
 
                 bool CanSelectOwnerPermamentCondition(Permanent permanent)
-                    => (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card) || CardEffectCommons.IsPermanentExistsOnOwnerBreedingArea(permanent, card))
+                {
+                    return CardEffectCommons.IsOwnerPermanent(permanent, card)
+                        && permanent.IsDigimon
                         && card.CanLinkToTargetPermanent(permanent, false, true);
+                }
 
                 bool CanSelectEnemyOptionCondition(Permanent permanent)
                     => CardEffectCommons.IsPermanentExistsOnOpponentBattleArea(permanent, card)
@@ -111,7 +114,7 @@ namespace DCGO.CardEffects.BT25
 
 
                     // Link to 1 Owner digimon on the field
-                    if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, CanSelectOwnerPermamentCondition))
+                    if (CardEffectCommons.HasMatchConditionPermanent(CanSelectOwnerPermamentCondition, true))
                     {
                         Permanent selectedPermament = null;