external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

SpellAbility: targetList removed (noone has assigned to it anything meaningful)

Browse Source
This commit is contained in:
Maxmtg
2012-11-07 21:00:43 +00:00
parent 63b8bc2fb4
commit 01b746c80b
4 changed files with 55 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/main/java/forge/card/spellability/SpellAbility.java
View File

@@ -69,7 +69,7 @@ public abstract class SpellAbility {
private Card originalHost = null;
private List<Card> splicedCards = null;
private List<Card> targetList;
// private List<Card> targetList;
// targetList doesn't appear to be used anymore
private boolean spell;
@@ -1288,49 +1288,49 @@ public abstract class SpellAbility {
this.setStackDescription(desc);
}
/**
* <p>
* Getter for the field <code>targetList</code>.
* </p>
*
* @return a {@link forge.CardList} object.
*/
public List<Card> getTargetList() {
return this.targetList;
}
// /**
// * <p>
// * Getter for the field <code>targetList</code>.
// * </p>
// *
// * @return a {@link forge.CardList} object.
// */
// public List<Card> getTargetList() {
// return this.targetList;
// }
/**
* <p>
* Setter for the field <code>targetList</code>.
* </p>
*
* @param list
* a {@link forge.CardList} object.
*/
public void setTargetList(final List<Card> list) {
// The line below started to create a null error at
// forge.CardFactoryUtil.canBeTargetedBy(CardFactoryUtil.java:3329)
// after ForgeSVN r2699. I hope that commenting out the line below will
// not result in other bugs. :)
// targetPlayer = null;//reset setTargetPlayer()
this.targetList = list;
final StringBuilder sb = new StringBuilder();
sb.append(this.getSourceCard().getName()).append(" - targeting ");
for (int i = 0; i < this.targetList.size(); i++) {
if (!this.targetList.get(i).isFaceDown()) {
sb.append(this.targetList.get(i));
} else {
sb.append("Morph(").append(this.targetList.get(i).getUniqueNumber()).append(")");
}
if (i < (this.targetList.size() - 1)) {
sb.append(", ");
}
}
this.setStackDescription(sb.toString());
}
// /**
// * <p>
// * Setter for the field <code>targetList</code>.
// * </p>
// *
// * @param list
// * a {@link forge.CardList} object.
// */
// public void setTargetList(final List<Card> list) {
// // The line below started to create a null error at
// // forge.CardFactoryUtil.canBeTargetedBy(CardFactoryUtil.java:3329)
// // after ForgeSVN r2699. I hope that commenting out the line below will
// // not result in other bugs. :)
// // targetPlayer = null;//reset setTargetPlayer()
//
// this.targetList = list;
// final StringBuilder sb = new StringBuilder();
// sb.append(this.getSourceCard().getName()).append(" - targeting ");
// for (int i = 0; i < this.targetList.size(); i++) {
//
// if (!this.targetList.get(i).isFaceDown()) {
// sb.append(this.targetList.get(i));
// } else {
// sb.append("Morph(").append(this.targetList.get(i).getUniqueNumber()).append(")");
// }
//
// if (i < (this.targetList.size() - 1)) {
// sb.append(", ");
// }
// }
// this.setStackDescription(sb.toString());
// }
/**
* <p>

16
src/main/java/forge/card/trigger/TriggerHandler.java
View File

@@ -698,10 +698,10 @@ public class TriggerHandler {
return sa[0].getTargetCard();
}
@Override
public List<Card> getTargetList() {
return sa[0].getTargetList();
}
// @Override
// public List<Card> getTargetList() {
// return sa[0].getTargetList();
// }
@Override
public Player getTargetPlayer() {
@@ -889,10 +889,10 @@ public class TriggerHandler {
sa[0].setTargetCard(card);
}
@Override
public void setTargetList(final List<Card> list) {
sa[0].setTargetList(list);
}
// @Override
// public void setTargetList(final List<Card> list) {
// sa[0].setTargetList(list);
// }
@Override
public void setTargetPlayer(final Player p) {

22
src/main/java/forge/card/trigger/TriggerSpellAbilityCast.java
View File

@@ -100,25 +100,11 @@ public class TriggerSpellAbilityCast extends Trigger {
final SpellAbility sa = si.getSpellAbility();
if (sa.getTarget() == null) {
if (sa.getTargetCard() == null) {
if (sa.getTargetList() == null) {
if (sa.getTargetPlayer() == null) {
return false;
} else {
if (!matchesValid(sa.getTargetPlayer(),
this.getMapParams().get("TargetsValid").split(","), this.getHostCard())) {
return false;
}
}
if (sa.getTargetPlayer() == null) {
return false;
} else {
boolean validTgtFound = false;
for (final Card tgt : sa.getTargetList()) {
if (matchesValid(tgt, this.getMapParams().get("TargetsValid").split(","),
this.getHostCard())) {
validTgtFound = true;
break;
}
}
if (!validTgtFound) {
if (!matchesValid(sa.getTargetPlayer(),
this.getMapParams().get("TargetsValid").split(","), this.getHostCard())) {
return false;
}
}

6
src/main/java/forge/game/zone/MagicStack.java
View File

@@ -766,12 +766,6 @@ public class MagicStack extends MyObservable {
runParams.put("Target", sp.getTargetCard());
game.getTriggerHandler().runTrigger(TriggerType.BecomesTarget, runParams);
} else if ((sp.getTargetList() != null) && (sp.getTargetList().size() > 0)) {
for (final Card ctgt : sp.getTargetList()) {
runParams.put("Target", ctgt);
game.getTriggerHandler().runTrigger(TriggerType.BecomesTarget, runParams);
}
} else if (sp.getTargetPlayer() != null) {
runParams.put("Target", sp.getTargetPlayer());