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

change zone... still didn't dare to change it =)

Browse Source
This commit is contained in:
Maxmtg
2014-02-02 18:11:32 +00:00
parent 394e96d051
commit 1b4b9ad32b
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -730,6 +730,8 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
} }
private List<Card> changeHiddenOriginResolveHuman(final Player decider, final SpellAbility sa, Player player, int changeNum, List<ZoneType> origin, ZoneType destination, List<Card> fetchList, int libraryPos) { private List<Card> changeHiddenOriginResolveHuman(final Player decider, final SpellAbility sa, Player player, int changeNum, List<ZoneType> origin, ZoneType destination, List<Card> fetchList, int libraryPos) {
final List<Card> movedCards = new ArrayList<Card>();
final Card source = sa.getSourceCard(); final Card source = sa.getSourceCard();
final Game game = player.getGame(); final Game game = player.getGame();
@@ -741,7 +743,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
final String totalcmc = sa.getParam("WithTotalCMC"); final String totalcmc = sa.getParam("WithTotalCMC");
int totcmc = AbilityUtils.calculateAmount(source, totalcmc, sa); int totcmc = AbilityUtils.calculateAmount(source, totalcmc, sa);
final List<Card> movedCards = new ArrayList<Card>();
for (int i = 0; i < changeNum && destination != null; i++) { for (int i = 0; i < changeNum && destination != null; i++) {
if (sa.hasParam("DifferentNames")) { if (sa.hasParam("DifferentNames")) {
@@ -918,12 +920,12 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
private List<Card> hiddenOriginResolveAI(final Player decider, final SpellAbility sa, Player player, int changeNum, List<ZoneType> origin, ZoneType destination, List<Card> fetchList, int libraryPos) { private List<Card> hiddenOriginResolveAI(final Player decider, final SpellAbility sa, Player player, int changeNum, List<ZoneType> origin, ZoneType destination, List<Card> fetchList, int libraryPos) {
final List<Card> movedCards = new ArrayList<Card>();
final Card source = sa.getSourceCard(); final Card source = sa.getSourceCard();
final boolean defined = sa.hasParam("Defined");
final Game game = decider.getGame(); final Game game = decider.getGame();
final List<Card> movedCards = new ArrayList<Card>();
final boolean remember = sa.hasParam("RememberChanged"); final boolean remember = sa.hasParam("RememberChanged");
final boolean forget = sa.hasParam("ForgetChanged"); final boolean forget = sa.hasParam("ForgetChanged");
final boolean champion = sa.hasParam("Champion"); final boolean champion = sa.hasParam("Champion");
@@ -942,7 +944,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
fetchList = CardLists.getValidCards(fetchList, "Card.cmcLE" + Integer.toString(totcmc), decider, source); fetchList = CardLists.getValidCards(fetchList, "Card.cmcLE" + Integer.toString(totcmc), decider, source);
} }
} }
if ((fetchList.size() == 0) || (destination == null)) { if (fetchList.isEmpty()) {
break; break;
} }
@@ -950,7 +952,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
Card c = null; Card c = null;
if (sa.hasParam("AtRandom")) { if (sa.hasParam("AtRandom")) {
c = Aggregates.random(fetchList); c = Aggregates.random(fetchList);
} else if (defined) { } else if (sa.hasParam("Defined")) {
c = fetchList.get(0); c = fetchList.get(0);
} else { } else {
c = ChangeZoneAi.chooseCardToHiddenOriginChangeZone(destination, origin, sa, fetchList, player, decider); c = ChangeZoneAi.chooseCardToHiddenOriginChangeZone(destination, origin, sa, fetchList, player, decider);