Browse Source

Update BT25_075.cs

x89rt2 2 tháng trước cách đây
mục cha
commit
2a278433fa

+ 4 - 4
Assets/Scripts/CardEffect/BT25/Black/BT25_075.cs

@@ -255,11 +255,11 @@ namespace DCGO.CardEffects.BT25
                     return "[Your Turn] When your Digimon get linked, one of them may attack.";
                     return "[Your Turn] When your Digimon get linked, one of them may attack.";
                 }
                 }
 
 
-                bool PermanentCondition(Permanent permanent) => CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card) && permanent.CanAttack(activateClass);
+                bool PermanentCondition(Permanent permanent) => CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card);
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.IsExistOnBattleArea(card)
+                    return CardEffectCommons.IsExistOnBattleAreaTrigger(card, activateClass)
                         && CardEffectCommons.IsOwnerTurn(card)
                         && CardEffectCommons.IsOwnerTurn(card)
                         && CardEffectCommons.CanTriggerWhenLinked(hashtable, PermanentCondition, null);
                         && CardEffectCommons.CanTriggerWhenLinked(hashtable, PermanentCondition, null);
                 }
                 }
@@ -271,13 +271,13 @@ namespace DCGO.CardEffects.BT25
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
                     activateClass.SetEffectName($"{GetAttacker(hashtable).TopCard.BaseENGCardNameFromEntity} may attack");
                     activateClass.SetEffectName($"{GetAttacker(hashtable).TopCard.BaseENGCardNameFromEntity} may attack");
-                    return CardEffectCommons.IsExistOnBattleArea(card);
+                    return CardEffectCommons.IsExistOnBattleAreaActivate(card, activateClass);
                 }
                 }
 
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
                 {
                     Permanent attacker = GetAttacker(hashtable);
                     Permanent attacker = GetAttacker(hashtable);
-                    if (attacker != null && attacker.TopCard != null)
+                    if (attacker != null && attacker.TopCard != null && attacker.CanAttack(activateClass))
                     {
                     {
                         SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
                         SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();