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

remove gui calls from RepeatEachEffect.java

Browse Source
This commit is contained in:
Maxmtg
2014-01-12 18:22:26 +00:00
parent 7f9ef96178
commit c95ee53137
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-gui/src/main/java/forge/game/ability/effects/RepeatEachEffect.java
View File

@@ -21,7 +21,6 @@ import forge.game.player.Player;
import forge.game.spellability.AbilitySub; import forge.game.spellability.AbilitySub;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.gui.GuiChoose;
import forge.util.Aggregates; import forge.util.Aggregates;
public class RepeatEachEffect extends SpellAbilityEffect { public class RepeatEachEffect extends SpellAbilityEffect {
@@ -38,7 +37,8 @@ public class RepeatEachEffect extends SpellAbilityEffect {
repeat.setActivatingPlayer(sa.getActivatingPlayer()); repeat.setActivatingPlayer(sa.getActivatingPlayer());
((AbilitySub) repeat).setParent(sa); ((AbilitySub) repeat).setParent(sa);
final Game game = sa.getActivatingPlayer().getGame(); final Player player = sa.getActivatingPlayer();
final Game game = player.getGame();
boolean useImprinted = sa.hasParam("UseImprinted"); boolean useImprinted = sa.hasParam("UseImprinted");
boolean loopOverCards = false; boolean loopOverCards = false;
@@ -66,8 +66,8 @@ public class RepeatEachEffect extends SpellAbilityEffect {
if (loopOverCards) { if (loopOverCards) {
// TODO (ArsenalNut 22 Dec 2012) Add logic to order cards for AI // TODO (ArsenalNut 22 Dec 2012) Add logic to order cards for AI
if (sa.getActivatingPlayer().isHuman() && sa.hasParam("ChooseOrder") && repeatCards.size() >= 2) { if (sa.hasParam("ChooseOrder") && repeatCards.size() >= 2) {
repeatCards = GuiChoose.order("Choose order of copies to cast", "Put first", repeatCards, null); repeatCards = player.getController().orderMoveToZoneList(repeatCards, ZoneType.Stack);
} }
for (Card card : repeatCards) { for (Card card : repeatCards) {
@@ -92,13 +92,13 @@ public class RepeatEachEffect extends SpellAbilityEffect {
if (sa.hasParam("RepeatOptionalForEachPlayer")) { if (sa.hasParam("RepeatOptionalForEachPlayer")) {
optional = true; optional = true;
} }
for (Player player : repeatPlayers) { for (Player p : repeatPlayers) {
if (optional && !player.getController().confirmAction(repeat, null, sa.getParam("RepeatOptionalMessage"))) { if (optional && !p.getController().confirmAction(repeat, null, sa.getParam("RepeatOptionalMessage"))) {
continue; continue;
} }
source.addRemembered(player); source.addRemembered(p);
AbilityUtils.resolve(repeat); AbilityUtils.resolve(repeat);
source.removeRemembered(player); source.removeRemembered(p);
} }
} }

2
forge-gui/src/main/java/forge/gui/player/PlayerControllerHuman.java
View File

@@ -511,6 +511,8 @@ public class PlayerControllerHuman extends PlayerController {
return GuiChoose.order("Choose order of cards to put into the planar deck", "Closest to top", cards, null); return GuiChoose.order("Choose order of cards to put into the planar deck", "Closest to top", cards, null);
case SchemeDeck: case SchemeDeck:
return GuiChoose.order("Choose order of cards to put into the scheme deck", "Closest to top", cards, null); return GuiChoose.order("Choose order of cards to put into the scheme deck", "Closest to top", cards, null);
case Stack:
return GuiChoose.order("Choose order of copies to cast", "Put first", cards, null);
default: default:
System.out.println("ZoneType " + destinationZone + " - Not Ordered"); System.out.println("ZoneType " + destinationZone + " - Not Ordered");
break; break;