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

- If a SA can target the Stack and another zone, remove the host spell if it's on the Stack

Browse Source
This commit is contained in:
Sol
2013-02-22 01:16:19 +00:00
parent d05dbd7112
commit 4a08debffe
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/forge/card/spellability/TargetSelection.java
View File

@@ -266,14 +266,23 @@ public class TargetSelection {
final List<ZoneType> zone = tgt.getZone(); final List<ZoneType> zone = tgt.getZone();
final boolean mandatory = this.target.getMandatory() ? this.target.hasCandidates(this.ability, true) : false; final boolean mandatory = this.target.getMandatory() ? this.target.hasCandidates(this.ability, true) : false;
if (zone.contains(ZoneType.Stack) && (zone.size() == 1)) { final boolean canTgtStack = zone.contains(ZoneType.Stack);
if (canTgtStack && (zone.size() == 1)) {
// If Zone is Stack, the choices are handled slightly differently // If Zone is Stack, the choices are handled slightly differently
this.chooseCardFromStack(mandatory); this.chooseCardFromStack(mandatory);
return; return;
} }
List<Card> choices = CardLists.getTargetableCards(CardLists.getValidCards(Singletons.getModel().getGame().getCardsIn(zone), this.target.getValidTgts(), this.ability.getActivatingPlayer(), this.ability.getSourceCard()), this.ability); List<Card> choices = CardLists.getTargetableCards(CardLists.getValidCards(Singletons.getModel().getGame().getCardsIn(zone), this.target.getValidTgts(), this.ability.getActivatingPlayer(), this.ability.getSourceCard()), this.ability);
if (canTgtStack) {
// Since getTargetableCards doesn't have additional checks if one of the Zones is stack
// Remove the activating card from targeting itself if its on the Stack
Card activatingCard = tgt.getSourceCard();
if (activatingCard.isInZone(ZoneType.Stack)) {
choices.remove(tgt.getSourceCard());
}
}
ArrayList<Object> objects = getUniqueTargets(this.ability); ArrayList<Object> objects = getUniqueTargets(this.ability);
if (tgt.isUniqueTargets()) { if (tgt.isUniqueTargets()) {
@@ -549,7 +558,7 @@ public class TargetSelection {
final Card divLibrary = new Card(); final Card divLibrary = new Card();
divLibrary.setName("--CARDS IN LIBRARY:--"); divLibrary.setName("--CARDS IN LIBRARY:--");
final Card divStack = new Card(); final Card divStack = new Card();
divStack.setName("--CARDS IN LIBRARY:--"); divStack.setName("--CARDS IN STACK:--");
List<Card> choicesZoneUnfiltered = choices; List<Card> choicesZoneUnfiltered = choices;
final List<Card> crdsBattle = new ArrayList<Card>(); final List<Card> crdsBattle = new ArrayList<Card>();