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

- Cleanup.

Browse Source
This commit is contained in:
Sloth
2014-10-26 13:19:30 +00:00
parent 6d82637767
commit 3da6b32a7b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-game/src/main/java/forge/game/ability/effects/DigEffect.java
View File

@@ -114,7 +114,7 @@ public class DigEffect extends SpellAbilityEffect {
top.add(sourceZone.get(i)); top.add(sourceZone.get(i));
} }
if (top.size() > 0) { if (!top.isEmpty()) {
DelayedReveal delayedReveal = null; DelayedReveal delayedReveal = null;
boolean hasRevealed = true; boolean hasRevealed = true;
if (sa.hasParam("Reveal")) { if (sa.hasParam("Reveal")) {
@@ -148,7 +148,7 @@ public class DigEffect extends SpellAbilityEffect {
delayedReveal = new DelayedReveal(top, srcZone, p); delayedReveal = new DelayedReveal(top, srcZone, p);
} }
if ((sa.hasParam("RememberRevealed")) && !sa.hasParam("RevealValid") && hasRevealed) { if (sa.hasParam("RememberRevealed") && !sa.hasParam("RevealValid") && hasRevealed) {
for (final Card one : top) { for (final Card one : top) {
host.addRemembered(one); host.addRemembered(one);
} }
@@ -194,7 +194,7 @@ public class DigEffect extends SpellAbilityEffect {
else if (allButOne) { else if (allButOne) {
movedCards = new CardCollection(valid); movedCards = new CardCollection(valid);
String prompt; String prompt;
if (destZone2.equals(ZoneType.Library) && (libraryPosition2 == 0)) { if (destZone2.equals(ZoneType.Library) && libraryPosition2 == 0) {
prompt = "Choose a card to leave on top of {player's} library"; prompt = "Choose a card to leave on top of {player's} library";
} }
else { else {
@@ -220,7 +220,7 @@ public class DigEffect extends SpellAbilityEffect {
} }
movedCards = new CardCollection(); movedCards = new CardCollection();
while ((j < destZone1ChangeNum) || (anyNumber && (j < numToDig))) { while (j < destZone1ChangeNum || (anyNumber && j < numToDig)) {
// let user get choice // let user get choice
Card chosen = null; Card chosen = null;
if (!valid.isEmpty()) { if (!valid.isEmpty()) {
@@ -248,7 +248,7 @@ public class DigEffect extends SpellAbilityEffect {
j++; j++;
} }
if (changeValid.length() > 0) { if (!changeValid.isEmpty()) {
game.getAction().reveal(movedCards, chooser, true, game.getAction().reveal(movedCards, chooser, true,
chooser + " picked " + (movedCards.size() == 1 ? "this card" : "these cards") + " from "); chooser + " picked " + (movedCards.size() == 1 ? "this card" : "these cards") + " from ");
} }