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

- Added Three Wishes

Browse Source
This commit is contained in:
swordshine
2014-12-18 08:50:19 +00:00
parent 2f5b7e0744
commit cded63fe9f
4 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-game/src/main/java/forge/game/ability/effects/MillEffect.java
View File

@@ -18,6 +18,7 @@ public class MillEffect extends SpellAbilityEffect {
final Card source = sa.getHostCard();
final int numCards = AbilityUtils.calculateAmount(sa.getHostCard(), sa.getParam("NumCards"), sa);
final boolean bottom = sa.hasParam("FromBottom");
final boolean facedown = sa.hasParam("ExileFaceDown");
if (sa.hasParam("ForgetOtherRemembered")) {
source.clearRemembered();
@@ -38,8 +39,8 @@ public class MillEffect extends SpellAbilityEffect {
continue;
}
}
final CardCollectionView milled = p.mill(numCards, destination, bottom);
if (destination.equals(ZoneType.Exile) && sa.hasParam("ExileFaceDown")) {
final CardCollectionView milled = p.mill(numCards, destination, bottom, facedown);
if (destination.equals(ZoneType.Exile) && facedown) {
for (final Card c : milled) {
c.setState(CardStateName.FaceDown, true);
}

9
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -1303,9 +1303,10 @@ public class Player extends GameEntity implements Comparable<Player> {
}
public final CardCollectionView mill(final int n) {
return mill(n, ZoneType.Graveyard, false);
return mill(n, ZoneType.Graveyard, false, false);
}
public final CardCollectionView mill(final int n, final ZoneType zone, final boolean bottom) {
public final CardCollectionView mill(final int n, final ZoneType zone,
final boolean bottom, final boolean facedown) {
final CardCollectionView lib = getCardsIn(ZoneType.Library);
final CardCollection milled = new CardCollection();
@@ -1323,7 +1324,9 @@ public class Player extends GameEntity implements Comparable<Player> {
}
// Reveal the milled cards, so players don't have to manually inspect the
// graveyard to figure out which ones were milled.
game.getAction().reveal(milled, this, false);
if (!facedown) { // do not reveal when exiling face down
game.getAction().reveal(milled, this, false);
}
return milled;
}