- Added Possibility Storm and Rhystic Lightning

This commit is contained in:
swordshine
2013-04-30 05:53:44 +00:00
parent f79184a9d5
commit 94fc6239e1
6 changed files with 45 additions and 5 deletions

View File

@@ -5536,10 +5536,9 @@ public class Card extends GameEntity implements Comparable<Card> {
}
}
} else if (property.substring(10).equals("Enchanted")) {
for (final Card card : source.getEnchantedBy()) {
if (!this.equippedBy.contains(card)) {
return false;
}
if (source.getEnchantingCard() == null ||
!this.equippedBy.contains(source.getEnchantingCard())) {
return false;
}
} else {
if (!this.equippedBy.contains(source)) {

View File

@@ -1,7 +1,9 @@
package forge.card.ability.effects;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import com.google.common.collect.Iterables;
@@ -15,6 +17,7 @@ import forge.game.GameState;
import forge.game.player.Player;
import forge.game.zone.ZoneType;
import forge.gui.GuiChoose;
import forge.util.MyRandom;
public class ChangeZoneAllEffect extends SpellAbilityEffect {
@@ -59,14 +62,20 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect {
final String remember = sa.getParam("RememberChanged");
final String forget = sa.getParam("ForgetChanged");
final String imprint = sa.getParam("Imprint");
final boolean random = sa.hasParam("RandomOrder");
final int libraryPos = sa.hasParam("LibraryPosition") ? Integer.parseInt(sa.getParam("LibraryPosition")) : 0;
if (sa.getActivatingPlayer().isHuman() && destination.equals(ZoneType.Library) && !sa.hasParam("Shuffle")
&& cards.size() >= 2) {
&& cards.size() >= 2 && !random) {
cards = GuiChoose.order("Choose order of cards to put into the library", "Put first", 0, cards, null, null);
}
if (destination.equals(ZoneType.Library) && random) {
final Random ran = MyRandom.getRandom();
Collections.shuffle(cards, ran);
}
for (final Card c : cards) {
if (destination.equals(ZoneType.Battlefield)) {
// Auras without Candidates stay in their current location

View File

@@ -148,6 +148,11 @@ public class DigUntilEffect extends SpellAbilityEffect {
host.addRemembered(c);
}
}
if (sa.hasParam("ImprintRevealed")) {
for (final Card c : revealed) {
host.addImprinted(c);
}
}
// TODO Use getOrderChoices before this moveTo call for the Human
final Iterator<Card> itr = revealed.iterator();