rework triggered ability class for putting counters on permanents

fix #13870 (Kate Stewart; All Will Be One)
This commit is contained in:
xenohedron 2025-08-09 19:25:28 -04:00
parent 8994c8e7aa
commit 6f398ca2fc
11 changed files with 122 additions and 171 deletions

View file

@ -1,106 +0,0 @@
package mage.abilities.common;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.constants.Zone;
import mage.counters.Counter;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.target.targetpointer.FixedTarget;
/**
* "Whenever you put one or more counters on a creature " triggered ability
*
* @author PurpleCrowbar
*/
public class PutCounterOnCreatureTriggeredAbility extends TriggeredAbilityImpl {
private final Counter counterType; // when null, any counter type is accepted
private final FilterPermanent filter;
private final boolean setTargetPointer;
public PutCounterOnCreatureTriggeredAbility(Effect effect) {
this(effect, (Counter) null);
}
public PutCounterOnCreatureTriggeredAbility(Effect effect, Counter counter) {
this(effect, counter, new FilterCreaturePermanent());
}
public PutCounterOnCreatureTriggeredAbility(Effect effect, FilterPermanent filter) {
this(effect, null, filter);
}
public PutCounterOnCreatureTriggeredAbility(Effect effect, Counter counter, FilterPermanent filter) {
this(effect, counter, filter, false);
}
public PutCounterOnCreatureTriggeredAbility(Effect effect, Counter counter, FilterPermanent filter, boolean setTargetPointer) {
this(effect, counter, filter, setTargetPointer, false);
}
public PutCounterOnCreatureTriggeredAbility(Effect effect, Counter counter, FilterPermanent filter, boolean setTargetPointer, boolean optional) {
super(Zone.BATTLEFIELD, effect, optional);
this.counterType = counter;
this.filter = filter;
this.setTargetPointer = setTargetPointer;
setFilterMessage();
}
protected PutCounterOnCreatureTriggeredAbility(final PutCounterOnCreatureTriggeredAbility ability) {
super(ability);
this.counterType = ability.counterType;
this.filter = ability.filter;
this.setTargetPointer = ability.setTargetPointer;
}
@Override
public PutCounterOnCreatureTriggeredAbility copy() {
return new PutCounterOnCreatureTriggeredAbility(this);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.COUNTERS_ADDED;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (!isControlledBy(event.getPlayerId())) {
return false;
}
Permanent permanent = game.getPermanentOrLKIBattlefield(event.getTargetId());
if (permanent == null) {
permanent = game.getPermanentEntering(event.getTargetId());
}
if (permanent == null || !filter.match(permanent, controllerId, this, game)) {
return false;
}
if (counterType != null && !event.getData().equals(counterType.getName())) {
return false;
}
if (setTargetPointer) {
getEffects().setTargetPointer(new FixedTarget(event.getTargetId(), game));
}
getEffects().setValue("countersAdded", event.getAmount());
return true;
}
private void setFilterMessage() {
String filterMessage = filter.getMessage();
if (!filterMessage.startsWith("another")) {
filterMessage = "a " + filterMessage;
}
if (this.counterType == null) {
setTriggerPhrase("Whenever you put one or more counters on " + filterMessage + ", ");
} else {
setTriggerPhrase("Whenever you put one or more " + this.counterType.getName() + " counters on " + filterMessage + ", ");
}
}
}

View file

@ -0,0 +1,79 @@
package mage.abilities.common;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.target.targetpointer.FixedTarget;
import mage.util.CardUtil;
/**
* "Whenever you put one or more [] counters on a []" triggered ability
*
* @author PurpleCrowbar
*/
public class PutCounterOnPermanentTriggeredAbility extends TriggeredAbilityImpl {
private final CounterType counterType; // when null, any counter type is accepted
private final FilterPermanent filter;
private final boolean setTargetPointer;
public PutCounterOnPermanentTriggeredAbility(Effect effect, CounterType counterType, FilterPermanent filter) {
this(effect, counterType, filter, false, false);
}
public PutCounterOnPermanentTriggeredAbility(Effect effect, CounterType counterType, FilterPermanent filter,
boolean setTargetPointer, boolean optional) {
super(Zone.BATTLEFIELD, effect, optional);
this.counterType = counterType;
this.filter = filter;
this.setTargetPointer = setTargetPointer;
setTriggerPhrase("Whenever you put one or more "
+ (this.counterType == null ? "" : this.counterType.getName() + " ")
+ "counters on " + CardUtil.addArticle(filter.getMessage()) + ", ");
}
protected PutCounterOnPermanentTriggeredAbility(final PutCounterOnPermanentTriggeredAbility ability) {
super(ability);
this.counterType = ability.counterType;
this.filter = ability.filter;
this.setTargetPointer = ability.setTargetPointer;
}
@Override
public PutCounterOnPermanentTriggeredAbility copy() {
return new PutCounterOnPermanentTriggeredAbility(this);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.COUNTERS_ADDED;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (!isControlledBy(event.getPlayerId())) {
return false;
}
Permanent permanent = game.getPermanentOrLKIBattlefield(event.getTargetId());
if (permanent == null) {
permanent = game.getPermanentEntering(event.getTargetId());
}
if (permanent == null || !filter.match(permanent, controllerId, this, game)) {
return false;
}
if (counterType != null && !event.getData().equals(counterType.getName())) {
return false;
}
if (setTargetPointer) {
getEffects().setTargetPointer(new FixedTarget(event.getTargetId(), game));
}
getEffects().setValue("countersAdded", event.getAmount());
return true;
}
}