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

Merge pull request #5316 from magefree/targetAdjustment

Browse source 
Updated implementation of target adjustment
This commit is contained in:
theelk801 2018-09-20 20:15:46 -04:00 • committed by GitHub
commit beb190a47b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 336 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage/src/main/java/mage/abilities/Ability.java
View file

@ -1,4 +1,3 @@
package mage.abilities;
import java.io.Serializable;
@ -14,7 +13,6 @@ import mage.abilities.effects.Effects;
import mage.constants.AbilityType;
import mage.constants.AbilityWord;
import mage.constants.EffectType;
import mage.constants.TargetAdjustment;
import mage.constants.Zone;
import mage.game.Controllable;
import mage.game.Game;
@ -23,6 +21,7 @@ import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.Target;
import mage.target.Targets;
import mage.target.targetadjustment.TargetAdjuster;
import mage.watchers.Watcher;
/**
@ -527,7 +526,9 @@ public interface Ability extends Controllable, Serializable {
boolean canFizzle();
void setTargetAdjustment(TargetAdjustment targetAdjustment);
void setTargetAdjuster(TargetAdjuster targetAdjuster);
TargetAdjustment getTargetAdjustment();
TargetAdjuster getTargetAdjuster();
void adjustTargets(Game game);
}

21
Mage/src/main/java/mage/abilities/AbilityImpl.java
View file

@ -1,4 +1,3 @@
package mage.abilities;
import java.util.ArrayList;
@ -33,6 +32,7 @@ import mage.game.stack.StackAbility;
import mage.players.Player;
import mage.target.Target;
import mage.target.Targets;
import mage.target.targetadjustment.TargetAdjuster;
import mage.util.GameLog;
import mage.util.ThreadLocalStringBuilder;
import mage.watchers.Watcher;
@ -72,7 +72,7 @@ public abstract class AbilityImpl implements Ability {
protected List<Watcher> watchers = new ArrayList<>();
protected List<Ability> subAbilities = null;
protected boolean canFizzle = true;
protected TargetAdjustment targetAdjustment = TargetAdjustment.NONE;
protected TargetAdjuster targetAdjuster = null;
public AbilityImpl(AbilityType abilityType, Zone zone) {
this.id = UUID.randomUUID();
@ -119,7 +119,7 @@ public abstract class AbilityImpl implements Ability {
this.sourceObject = ability.sourceObject;
this.sourceObjectZoneChangeCounter = ability.sourceObjectZoneChangeCounter;
this.canFizzle = ability.canFizzle;
this.targetAdjustment = ability.targetAdjustment;
this.targetAdjuster = ability.targetAdjuster;
}
@Override
@ -1225,12 +1225,19 @@ public abstract class AbilityImpl implements Ability {
}
@Override
public void setTargetAdjustment(TargetAdjustment targetAdjustment) {
this.targetAdjustment = targetAdjustment;
public void setTargetAdjuster(TargetAdjuster targetAdjuster) {
this.targetAdjuster = targetAdjuster;
}
@Override
public TargetAdjustment getTargetAdjustment() {
return targetAdjustment;
public TargetAdjuster getTargetAdjuster() {
return targetAdjuster;
}
@Override
public void adjustTargets(Game game) {
if (targetAdjuster != null) {
targetAdjuster.adjustTargets(this, game);
}
}
}