External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 10:40:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

update SourceBecomesTargetTriggeredAbility with proper logic and trigger phrase generation

Browse source
This commit is contained in:
xenohedron 2023-09-21 01:33:49 -04:00
parent 4ab36880fe
commit d83d27dfa3
3 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage.Sets/src/mage/cards/b/BonecrusherGiant.java
View file

@ -31,8 +31,7 @@ public final class BonecrusherGiant extends AdventureCard {
this.addAbility(new SourceBecomesTargetTriggeredAbility( this.addAbility(new SourceBecomesTargetTriggeredAbility(
new DamageTargetEffect( new DamageTargetEffect(
2, true, "that spell's controller", "{this}" 2, true, "that spell's controller", "{this}"
), StaticFilters.FILTER_SPELL_A, SetTargetPointer.PLAYER ), StaticFilters.FILTER_SPELL_A, SetTargetPointer.PLAYER, false));
).setTriggerPhrase("Whenever {this} becomes the target of a spell, "));
// Stomp // Stomp
// Damage can’t be prevented this turn. Stomp deals 2 damage to any target. // Damage can’t be prevented this turn. Stomp deals 2 damage to any target.

3
Mage.Sets/src/mage/cards/w/WardenOfTheWoods.java
View file

@ -32,8 +32,7 @@ public final class WardenOfTheWoods extends CardImpl {
this.addAbility(new SourceBecomesTargetTriggeredAbility( this.addAbility(new SourceBecomesTargetTriggeredAbility(
new DrawCardSourceControllerEffect(2), new DrawCardSourceControllerEffect(2),
StaticFilters.FILTER_SPELL_OR_ABILITY_OPPONENTS, StaticFilters.FILTER_SPELL_OR_ABILITY_OPPONENTS,
SetTargetPointer.NONE, true SetTargetPointer.NONE, true));
).setTriggerPhrase("Whenever {this} becomes the target of a spell or ability an opponent controls, "));
} }
private WardenOfTheWoods(final WardenOfTheWoods card) { private WardenOfTheWoods(final WardenOfTheWoods card) {

42
Mage/src/main/java/mage/abilities/common/SourceBecomesTargetTriggeredAbility.java
View file

@ -2,6 +2,10 @@ package mage.abilities.common;
import mage.abilities.TriggeredAbilityImpl; import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect; import mage.abilities.effects.Effect;
import mage.abilities.effects.common.ExileSourceEffect;
import mage.abilities.effects.common.ReturnToHandSourceEffect;
import mage.abilities.effects.common.SacrificeSourceEffect;
import mage.abilities.effects.common.ShuffleIntoLibrarySourceEffect;
import mage.constants.SetTargetPointer; import mage.constants.SetTargetPointer;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterStackObject; import mage.filter.FilterStackObject;
@ -10,6 +14,7 @@ import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.stack.StackObject; import mage.game.stack.StackObject;
import mage.target.targetpointer.FixedTarget; import mage.target.targetpointer.FixedTarget;
import mage.util.CardUtil;
/** /**
* @author North * @author North
@ -24,18 +29,18 @@ public class SourceBecomesTargetTriggeredAbility extends TriggeredAbilityImpl {
} }
public SourceBecomesTargetTriggeredAbility(Effect effect, FilterStackObject filter) { public SourceBecomesTargetTriggeredAbility(Effect effect, FilterStackObject filter) {
this(effect, filter, SetTargetPointer.NONE); this(effect, filter, SetTargetPointer.NONE, false);
}
public SourceBecomesTargetTriggeredAbility(Effect effect, FilterStackObject filter, SetTargetPointer setTargetPointer) {
this(effect, filter, setTargetPointer, false);
} }
public SourceBecomesTargetTriggeredAbility(Effect effect, FilterStackObject filter, SetTargetPointer setTargetPointer, boolean optional) { public SourceBecomesTargetTriggeredAbility(Effect effect, FilterStackObject filter, SetTargetPointer setTargetPointer, boolean optional) {
super(Zone.BATTLEFIELD, effect, optional); super(Zone.BATTLEFIELD, effect, optional);
this.filter = filter; this.filter = filter;
this.setTargetPointer = setTargetPointer; this.setTargetPointer = setTargetPointer;
setTriggerPhrase("When {this} becomes the target of " + filter.getMessage() + ", "); boolean textWhen = (effect instanceof SacrificeSourceEffect
|| effect instanceof ReturnToHandSourceEffect
|| effect instanceof ShuffleIntoLibrarySourceEffect
|| effect instanceof ExileSourceEffect);
setTriggerPhrase((textWhen ? "When" : "Whenever") + " {this} becomes the target of " + filter.getMessage() + ", ");
} }
protected SourceBecomesTargetTriggeredAbility(final SourceBecomesTargetTriggeredAbility ability) { protected SourceBecomesTargetTriggeredAbility(final SourceBecomesTargetTriggeredAbility ability) {
@ -56,24 +61,27 @@ public class SourceBecomesTargetTriggeredAbility extends TriggeredAbilityImpl {
@Override @Override
public boolean checkTrigger(GameEvent event, Game game) { public boolean checkTrigger(GameEvent event, Game game) {
StackObject sourceObject = game.getStack().getStackObject(event.getSourceId()); if (!event.getTargetId().equals(getSourceId())) {
if (!event.getTargetId().equals(getSourceId()) return false;
|| !filter.match(sourceObject, getControllerId(), this, game)) { }
StackObject targetingObject = CardUtil.getTargetingStackObject(event, game);
if (targetingObject == null || !filter.match(targetingObject, getControllerId(), this, game)) {
return false;
}
if (!CardUtil.checkTargetMap(this.id, targetingObject, event, game)) {
return false; return false;
} }
switch (setTargetPointer) { switch (setTargetPointer) {
case PLAYER: case PLAYER:
this.getEffects().stream() this.getAllEffects().setTargetPointer(new FixedTarget(targetingObject.getControllerId(), game));
.forEach(effect -> effect.setTargetPointer(
new FixedTarget(sourceObject.getControllerId(), game)
));
break; break;
case SPELL: case SPELL:
this.getEffects().stream() this.getAllEffects().setTargetPointer(new FixedTarget(targetingObject.getId()));
.forEach(effect -> effect.setTargetPointer(
new FixedTarget(sourceObject.getId(), game)
));
break; break;
case NONE:
break;
default:
throw new IllegalArgumentException("Unsupported SetTargetPointer in BecomesTargetSourceTriggeredAbility");
} }
return true; return true;
} }