- BNG: Added Spirit of the Labyrinth

This commit is contained in:
swordshine
2014-01-20 14:32:16 +00:00
parent 8919532b84
commit d9f3bb8bdd

View File

@@ -1247,6 +1247,9 @@ public class Player extends GameEntity implements Comparable<Player> {
if (this.hasKeyword("You can't draw cards.")) { if (this.hasKeyword("You can't draw cards.")) {
return false; return false;
} }
if (this.hasKeyword("You can't draw more than one card each turn.")) {
return this.numDrawnThisTurn < 1;
}
return true; return true;
} }
@@ -1278,10 +1281,6 @@ public class Player extends GameEntity implements Comparable<Player> {
public final List<Card> drawCards(final int n) { public final List<Card> drawCards(final int n) {
final List<Card> drawn = new ArrayList<Card>(); final List<Card> drawn = new ArrayList<Card>();
if (!this.canDraw()) {
return drawn;
}
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
// // TODO: multiple replacements need to be selected by the controller // // TODO: multiple replacements need to be selected by the controller
@@ -1300,6 +1299,9 @@ public class Player extends GameEntity implements Comparable<Player> {
// } // }
// } // }
if (!this.canDraw()) {
return drawn;
}
drawn.addAll(this.doDraw()); drawn.addAll(this.doDraw());
} }
return drawn; return drawn;