forked from External/mage
Remove custom multitarget handling from DestroyTargetEffect (use EachTargetPointer instead)
This commit is contained in:
parent
addfd5166e
commit
e3b8a813e5
24 changed files with 124 additions and 217 deletions
|
|
@ -19,7 +19,6 @@ import java.util.UUID;
|
|||
public class DestroyTargetEffect extends OneShotEffect {
|
||||
|
||||
protected boolean noRegen;
|
||||
protected boolean multitargetHandling;
|
||||
|
||||
public DestroyTargetEffect() {
|
||||
this(false);
|
||||
|
|
@ -30,24 +29,18 @@ public class DestroyTargetEffect extends OneShotEffect {
|
|||
}
|
||||
|
||||
public DestroyTargetEffect(boolean noRegen) {
|
||||
this(noRegen, false);
|
||||
super(Outcome.DestroyPermanent);
|
||||
this.noRegen = noRegen;
|
||||
}
|
||||
|
||||
public DestroyTargetEffect(String ruleText, boolean noRegen) {
|
||||
this(noRegen, false);
|
||||
this(noRegen);
|
||||
staticText = ruleText;
|
||||
}
|
||||
|
||||
public DestroyTargetEffect(boolean noRegen, boolean multitargetHandling) {
|
||||
super(Outcome.Detriment);
|
||||
this.noRegen = noRegen;
|
||||
this.multitargetHandling = multitargetHandling;
|
||||
}
|
||||
|
||||
public DestroyTargetEffect(final DestroyTargetEffect effect) {
|
||||
super(effect);
|
||||
this.noRegen = effect.noRegen;
|
||||
this.multitargetHandling = effect.multitargetHandling;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -58,29 +51,13 @@ public class DestroyTargetEffect extends OneShotEffect {
|
|||
@Override
|
||||
public boolean apply(Game game, Ability source) {
|
||||
int affectedTargets = 0;
|
||||
if (multitargetHandling
|
||||
&& source.getTargets().size() > 1
|
||||
&& targetPointer instanceof FirstTargetPointer) { // Decimate
|
||||
for (Target target : source.getTargets()) {
|
||||
for (UUID permanentId : target.getTargets()) {
|
||||
Permanent permanent = game.getPermanent(permanentId);
|
||||
if (permanent != null
|
||||
&& permanent.isPhasedIn()
|
||||
&& !permanent.isPhasedOutIndirectly()) {
|
||||
permanent.destroy(source, game, noRegen);
|
||||
affectedTargets++;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (UUID permanentId : targetPointer.getTargets(game, source)) {
|
||||
Permanent permanent = game.getPermanent(permanentId);
|
||||
if (permanent != null
|
||||
&& permanent.isPhasedIn()
|
||||
&& !permanent.isPhasedOutIndirectly()) {
|
||||
permanent.destroy(source, game, noRegen);
|
||||
affectedTargets++;
|
||||
}
|
||||
for (UUID permanentId : targetPointer.getTargets(game, source)) {
|
||||
Permanent permanent = game.getPermanent(permanentId);
|
||||
if (permanent != null
|
||||
&& permanent.isPhasedIn()
|
||||
&& !permanent.isPhasedOutIndirectly()) {
|
||||
permanent.destroy(source, game, noRegen);
|
||||
affectedTargets++;
|
||||
}
|
||||
}
|
||||
return affectedTargets > 0;
|
||||
|
|
@ -91,36 +68,11 @@ public class DestroyTargetEffect extends OneShotEffect {
|
|||
if (staticText != null && !staticText.isEmpty()) {
|
||||
return staticText;
|
||||
}
|
||||
StringBuilder sb = new StringBuilder();
|
||||
if (mode.getTargets().isEmpty()) {
|
||||
sb.append("destroy that creature"); //TODO add possibility to specify text with targetPointer usage
|
||||
} else {
|
||||
Target target;
|
||||
if (targetPointer instanceof SecondTargetPointer && mode.getTargets().size() > 1) {
|
||||
target = mode.getTargets().get(1);
|
||||
} else {
|
||||
target = mode.getTargets().get(0);
|
||||
}
|
||||
if (target.getNumberOfTargets() == 1) {
|
||||
String targetName = target.getTargetName();
|
||||
sb.append("destroy ");
|
||||
if (!targetName.startsWith("another")) {
|
||||
sb.append("target ");
|
||||
}
|
||||
sb.append(targetName);
|
||||
} else {
|
||||
if (target.getMaxNumberOfTargets() == target.getMinNumberOfTargets()) {
|
||||
sb.append("destroy ").append(CardUtil.numberToText(target.getNumberOfTargets()));
|
||||
} else {
|
||||
sb.append("destroy up to ").append(CardUtil.numberToText(target.getMaxNumberOfTargets()));
|
||||
}
|
||||
sb.append(" target ").append(target.getTargetName());
|
||||
}
|
||||
}
|
||||
StringBuilder sb = new StringBuilder("destroy " + getTargetPointer().describeTargets(mode.getTargets(), "that creature"));
|
||||
if (noRegen) {
|
||||
sb.append(". It can't be regenerated");
|
||||
sb.append(getTargetPointer().isPlural(mode.getTargets()) ? ". They" : ". It");
|
||||
sb.append(" can't be regenerated");
|
||||
}
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue