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

- Added the optional parameter "Choser" to AF Dig.

Browse Source 
- Added Ashnod's Cylix.
This commit is contained in:
Sloth
2011-11-25 15:59:08 +00:00
parent 66d357a11c
commit 71506d180b
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -310,6 +310,7 @@ public final class AbilityFactoryReveal {
final HashMap<String, String> params = af.getMapParams();
final Card host = af.getHostCard();
final Player player = sa.getActivatingPlayer();
Player choser = player;
int numToDig = AbilityFactory.calculateAmount(af.getHostCard(), params.get("DigNum"), sa);
final Zone destZone1 = params.containsKey("DestinationZone") ? Zone.smartValueOf(params.get("DestinationZone"))
: Zone.Hand;
@@ -349,6 +350,14 @@ public final class AbilityFactoryReveal {
} else {
tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Defined"), sa);
}
if (params.containsKey("Choser")) {
final ArrayList<Player> chosers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Choser"), sa);
if (!chosers.isEmpty()) {
choser = chosers.get(0);
System.out.println("choser: " +choser);
}
}
for (final Player p : tgtPlayers) {
if ((tgt == null) || p.canBeTargetedBy(sa)) {
@@ -393,7 +402,7 @@ public final class AbilityFactoryReveal {
}
// AllZone.getGameAction().revealToCopmuter(top.toArray());
// - for when it exists
} else if (player.isHuman()) {
} else if (choser.isHuman()) {
// show the user the revealed cards
GuiUtils.getChoice("Looking at cards from library", top.toArray());
}
@@ -446,16 +455,16 @@ public final class AbilityFactoryReveal {
}
} else {
int j = 0;
if (player.isHuman()) {
if (choser.isHuman()) {
while ((j < destZone1ChangeNum) || (anyNumber && (j < numToDig))) {
// let user get choice
Card chosen = null;
String prompt = "Choose a card to put into the ";
if (destZone1.equals(Zone.Library) && (libraryPosition == -1)) {
prompt = "Put the rest on the bottom of the ";
prompt = "Chose a card to put on the bottom of the ";
}
if (destZone1.equals(Zone.Library) && (libraryPosition == 0)) {
prompt = "Put the rest on top of the ";
prompt = "Chose a card to put on top of the ";
}
if (anyNumber || optional) {
chosen = GuiUtils.getChoiceOptional(prompt + destZone1, valid.toArray());
@@ -529,7 +538,7 @@ public final class AbilityFactoryReveal {
// now, move the rest to destZone2
if (destZone2.equals(Zone.Library)) {
if (player.isHuman()) {
if (choser.isHuman()) {
// put them in any order
while (rest.size() > 0) {
Card chosen;