External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-10 21:02:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[FIC] fix missing filter in Tidus, Yuna's Guardian

Browse source
This commit is contained in:
theelk801 2025-05-23 08:53:40 -04:00
parent 152513cf6f
commit c26968b111
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage.Sets/src/mage/cards/t/TidusYunasGuardian.java
View file

@ -16,6 +16,7 @@ import mage.constants.SuperType;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.other.AnotherTargetPredicate;
import mage.filter.predicate.permanent.CounterAnyPredicate;
import mage.target.TargetPermanent;
import mage.target.common.TargetControlledCreaturePermanent;
@ -28,9 +29,12 @@ public final class TidusYunasGuardian extends CardImpl {
private static final FilterPermanent filter
= new FilterControlledCreaturePermanent("a second target creature you control");
private static final FilterPermanent filter2
= new FilterControlledCreaturePermanent("creatures you control with counters on them");
static {
filter.add(new AnotherTargetPredicate(2));
filter2.add(CounterAnyPredicate.instance);
}
public TidusYunasGuardian(UUID ownerId, CardSetInfo setInfo) {
@ -50,7 +54,7 @@ public final class TidusYunasGuardian extends CardImpl {
// Cheer - Whenever one or more creatures you control with counters on them deal combat damage to a player, you may draw a card and proliferate. Do this only once each turn.
ability = new OneOrMoreCombatDamagePlayerTriggeredAbility(
new DrawCardSourceControllerEffect(1), SetTargetPointer.NONE, true
new DrawCardSourceControllerEffect(1), SetTargetPointer.NONE, filter2, true
).setDoOnlyOnceEachTurn(true);
ability.addEffect(new ProliferateEffect(false).concatBy("and"));
this.addAbility(ability.withFlavorWord("Cheer"));

12
Mage/src/main/java/mage/abilities/common/OneOrMoreCombatDamagePlayerTriggeredAbility.java
View file

@ -3,8 +3,8 @@ package mage.abilities.common;
import mage.abilities.effects.Effect;
import mage.constants.SetTargetPointer;
import mage.constants.Zone;
import mage.filter.FilterPermanent;
import mage.filter.StaticFilters;
import mage.filter.common.FilterCreaturePermanent;
/**
* @author Xanderhall, xenohedron
@ -15,19 +15,19 @@ public class OneOrMoreCombatDamagePlayerTriggeredAbility extends OneOrMoreDamage
this(effect, SetTargetPointer.NONE);
}
public OneOrMoreCombatDamagePlayerTriggeredAbility(Effect effect, FilterCreaturePermanent filter) {
public OneOrMoreCombatDamagePlayerTriggeredAbility(Effect effect, FilterPermanent filter) {
this(Zone.BATTLEFIELD, effect, filter, SetTargetPointer.NONE, false);
}
public OneOrMoreCombatDamagePlayerTriggeredAbility(Effect effect, SetTargetPointer setTargetPointer) {
this(effect, setTargetPointer, false);
this(effect, setTargetPointer, StaticFilters.FILTER_PERMANENT_CREATURES, false);
}
public OneOrMoreCombatDamagePlayerTriggeredAbility(Effect effect, SetTargetPointer setTargetPointer, boolean optional) {
this(Zone.BATTLEFIELD, effect, StaticFilters.FILTER_PERMANENT_CREATURES, setTargetPointer, optional);
public OneOrMoreCombatDamagePlayerTriggeredAbility(Effect effect, SetTargetPointer setTargetPointer, FilterPermanent filter, boolean optional) {
this(Zone.BATTLEFIELD, effect, filter, setTargetPointer, optional);
}
public OneOrMoreCombatDamagePlayerTriggeredAbility(Zone zone, Effect effect, FilterCreaturePermanent filter,
public OneOrMoreCombatDamagePlayerTriggeredAbility(Zone zone, Effect effect, FilterPermanent filter,
SetTargetPointer setTargetPointer, boolean optional) {
super(zone, effect, filter, true, true, setTargetPointer, optional);
}