Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

refactor: remove notTarget targets from abilities (#13651)

Browse source 
Adds OneShotNonTargetEffect and PutCountersTargetCost
Fixes the target timing of spells/abilities, as non-targets should be chosen on resolution.
This commit is contained in:
ssk97 2025-05-31 20:36:15 -07:00 • committed by GitHub
parent 8b2a81cb42
commit 3223d99b2a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 449 additions and 384 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Mage/src/main/java/mage/abilities/common/DiesCreatureTriggeredAbility.java
View file

@ -3,6 +3,7 @@ package mage.abilities.common;
import mage.MageObject;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.constants.SetTargetPointer;
import mage.constants.Zone;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterCreaturePermanent;
@ -18,7 +19,7 @@ import mage.target.targetpointer.FixedTarget;
public class DiesCreatureTriggeredAbility extends TriggeredAbilityImpl {
protected FilterPermanent filter;
private boolean setTargetPointer;
private SetTargetPointer setTargetPointer;
public DiesCreatureTriggeredAbility(Effect effect, boolean optional) {
this(effect, optional, false);
@ -33,7 +34,7 @@ public class DiesCreatureTriggeredAbility extends TriggeredAbilityImpl {
if (another) {
filter.add(AnotherPredicate.instance);
}
this.setTargetPointer = setTargetPointer;
this.setTargetPointer = (setTargetPointer ? SetTargetPointer.PERMANENT : SetTargetPointer.NONE);
}
public DiesCreatureTriggeredAbility(Effect effect, boolean optional, FilterPermanent filter) {
@ -44,7 +45,14 @@ public class DiesCreatureTriggeredAbility extends TriggeredAbilityImpl {
this(Zone.BATTLEFIELD, effect, optional, filter, setTargetPointer);
}
public DiesCreatureTriggeredAbility(Effect effect, SetTargetPointer setTargetPointer) {
this(Zone.BATTLEFIELD, effect, false, new FilterCreaturePermanent("a creature"), setTargetPointer);
}
public DiesCreatureTriggeredAbility(Zone zone, Effect effect, boolean optional, FilterPermanent filter, boolean setTargetPointer) {
this(zone, effect, optional, filter, (setTargetPointer ? SetTargetPointer.PERMANENT : SetTargetPointer.NONE));
}
public DiesCreatureTriggeredAbility(Zone zone, Effect effect, boolean optional, FilterPermanent filter, SetTargetPointer setTargetPointer) {
super(zone, effect, optional);
this.filter = filter;
this.setTargetPointer = setTargetPointer;
@ -75,8 +83,17 @@ public class DiesCreatureTriggeredAbility extends TriggeredAbilityImpl {
return false;
}
getEffects().setValue("creatureDied", zEvent.getTarget());
if (setTargetPointer) {
this.getEffects().setTargetPointer(new FixedTarget(event.getTargetId(), game));
switch (setTargetPointer) {
case PLAYER:
this.getAllEffects().setTargetPointer(new FixedTarget(event.getPlayerId(), game));
break;
case PERMANENT:
this.getAllEffects().setTargetPointer(new FixedTarget(event.getTargetId(), game));
break;
case NONE:
break;
default:
throw new IllegalArgumentException("Unsupported SetTargetPointer in DiesCreatureTriggeredAbility");
}
return true;
}