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

slowtrip - remove duplication

Browse Source
This commit is contained in:
Maxmtg
2012-11-11 12:19:35 +00:00
parent 37c54b3791
commit 56bfb6ea2c
1 changed files with 11 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/forge/game/phase/Upkeep.java
View File

@@ -227,13 +227,20 @@ public class Upkeep extends Phase {
* </p> * </p>
*/ */
private static void upkeepSlowtrips() { private static void upkeepSlowtrips() {
final Player player = Singletons.getModel().getGame().getPhaseHandler().getPlayerTurn(); Player turnOwner = Singletons.getModel().getGame().getPhaseHandler().getPlayerTurn();
// does order matter here?
drawForSlowtrips(turnOwner);
for(Player p : Singletons.getModel().getGame().getPlayers()) {
if ( p == turnOwner ) continue;
drawForSlowtrips(p);
}
}
public static void drawForSlowtrips(final Player player) {
List<Card> list = player.getSlowtripList(); List<Card> list = player.getSlowtripList();
for (int i = 0; i < list.size(); i++) { for (Card card : list) {
final Card card = list.get(i);
// otherwise another slowtrip gets added // otherwise another slowtrip gets added
card.removeIntrinsicKeyword("Draw a card at the beginning of the next turn's upkeep."); card.removeIntrinsicKeyword("Draw a card at the beginning of the next turn's upkeep.");
@@ -250,31 +257,6 @@ public class Upkeep extends Phase {
} }
player.clearSlowtripList(); player.clearSlowtripList();
// Do the same for the opponent
final Player opponent = player.getOpponent();
list = opponent.getSlowtripList();
for (int i = 0; i < list.size(); i++) {
final Card card = list.get(i);
// otherwise another slowtrip gets added
card.removeIntrinsicKeyword("Draw a card at the beginning of the next turn's upkeep.");
final Ability slowtrip = new Ability(card, "0") {
@Override
public void resolve() {
opponent.drawCard();
}
};
slowtrip.setStackDescription(card.getName() + " - Draw a card");
slowtrip.setDescription(card + " - Draw a card.");
Singletons.getModel().getGame().getStack().addSimultaneousStackEntry(slowtrip);
}
opponent.clearSlowtripList();
} }
/** /**