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

- Added the "Optional" parameter to AF Discard.

Browse Source 
- Added Lim-Dul's Paladin by Jeff.
This commit is contained in:
Sloth
2012-02-09 11:34:16 +00:00
parent 4949869a17
commit 2c0058c43d
3 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java
View File

@@ -1267,27 +1267,29 @@ public class AbilityFactoryZoneAffecting {
GuiUtils.getChoiceOptional("Computer has chosen", dCs.toArray());
}
discarded.add(dC);
AllZone.getComputerPlayer().discard(dC, sa); // is
// this
// right?
p.discard(dC, sa);
}
}
} else {
// human
if (mode.startsWith("Reveal")) {
GuiUtils.getChoiceOptional("Revealed computer hand", dPHand.toArray());
GuiUtils.getChoiceOptional("Revealed " + p + " hand", dPHand.toArray());
}
for (int i = 0; i < numCards; i++) {
if (dPChHand.size() > 0) {
final Card dC = GuiUtils.getChoice("Choose a card to be discarded",
Card dC = null;
if(params.containsKey("Optional")) {
dC = GuiUtils.getChoiceOptional("Choose a card to be discarded",
dPChHand.toArray());
} else {
dC = GuiUtils.getChoice("Choose a card to be discarded",
dPChHand.toArray());
dPChHand.remove(dC);
discarded.add(dC);
AllZone.getHumanPlayer().discard(dC, sa); // is
// this
// right?
} if (dC != null) {
dPChHand.remove(dC);
discarded.add(dC);
p.discard(dC, sa);
}
}
}
}