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

extended RememberReveal to work with all the possible reveal conditions. Fixed Brutal/Callous/Feral Deceiver scripts.

Browse Source
This commit is contained in:
ArsenalNut
2012-01-27 03:20:09 +00:00
parent 1b23ae2fad
commit 5347bbe625
4 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/forge/card/abilityfactory/AbilityFactoryReveal.java
View File

@@ -393,9 +393,11 @@ public final class AbilityFactoryReveal {
if (top.size() > 0) {
final Card dummy = new Card();
dummy.setName("[No valid cards]");
boolean cardsRevealed = false;
if (params.containsKey("Reveal")) {
GuiUtils.getChoice("Revealing cards from library", top.toArray());
cardsRevealed = true;
// AllZone.getGameAction().revealToCopmuter(top.toArray());
// - for when it exists
} else if (params.containsKey("RevealOptional")) {
@@ -406,23 +408,31 @@ public final class AbilityFactoryReveal {
if (p.isHuman() && GameActionUtil.showYesNoDialog(host, question)) {
GuiUtils.getChoice("Revealing cards from library", top.toArray());
// AllZone.getGameAction().revealToCopmuter(top.toArray());
if (params.containsKey("RememberRevealed")) {
for (final Card one : top) {
host.addRemembered(one);
}
}
cardsRevealed = true;
}
} else if (params.containsKey("RevealValid")) {
final String revealValid = params.get("RevealValid");
final CardList toReveal = top.getValidCards(revealValid, host.getController(), host);
if (!toReveal.isEmpty()) {
GuiUtils.getChoice("Revealing cards from library", toReveal.toArray());
if (params.containsKey("RememberRevealed")) {
for (final Card one : toReveal) {
host.addRemembered(one);
}
}
}
// AllZone.getGameAction().revealToCopmuter(top.toArray());
// - for when it exists
} else if (choser.isHuman()) {
// show the user the revealed cards
GuiUtils.getChoice("Looking at cards from library", top.toArray());
cardsRevealed = true;
}
if ((params.containsKey("RememberRevealed")) && cardsRevealed) {
for (final Card one : top) {
host.addRemembered(one);
}
}
if (!noMove) {