diff --git a/src/main/java/forge/GameActionUtil.java b/src/main/java/forge/GameActionUtil.java index 2ee2432df42..df707eb1327 100644 --- a/src/main/java/forge/GameActionUtil.java +++ b/src/main/java/forge/GameActionUtil.java @@ -52,7 +52,6 @@ public final class GameActionUtil { //playCard_Storm(sa); playCard_Vengevine(c); - //playCard_Curse_of_Wizardry(c); playCard_Venser_Emblem(c); playCard_Ichneumon_Druid(c); @@ -450,39 +449,6 @@ public final class GameActionUtil { } } - /** - *
playCard_Curse_of_Wizardry.
- * - * @param c a {@link forge.Card} object. - */ - /*public static void playCard_Curse_of_Wizardry(final Card c) { - CardList list = AllZoneUtil.getCardsIn(Zone.Battlefield, "Curse of Wizardry"); - - if (list.size() > 0) { - ArrayListpayManaDuringAbilityResolve.
* @@ -1416,69 +1382,6 @@ public final class GameActionUtil { } - /* ConstantConspiracy
- public static Command Conspiracy = new Command() {
- private static final long serialVersionUID = -752798545956593342L;
-
- CardList gloriousAnthemList = new CardList();
-
- public void execute() {
- //String keyword = "Defender";
-
- CardList list = gloriousAnthemList;
- Card c;
- // reset all cards in list - aka "old" cards
- for (int i = 0; i < list.size(); i++) {
- c = list.get(i);
- //System.out.println("prev type: " +c.getPrevType());
- c.setType(c.getPrevType());
- }
-
- list.clear();
-
- PlayerZone[] zone = new PlayerZone[4];
-
- CardList cl = AllZoneUtil.getCardsIn(Zone.Battlefield, "Conspiracy");
-
- for (int i = 0; i < cl.size(); i++) {
- Card card = cl.get(i);
- Player player = card.getController();
- zone[0] = AllZone.getZone(Constant.Zone.Hand,
- player);
- zone[1] = AllZone.getZone(Constant.Zone.Library,
- player);
- zone[2] = AllZone.getZone(
- Constant.Zone.Graveyard, player);
- zone[3] = AllZone.getZone(Constant.Zone.Battlefield,
- player);
-
- for (int outer = 0; outer < zone.length; outer++) {
- CardList creature = AllZoneUtil.getCardsInZone(zone[outer]);
- creature = creature.getType("Creature");
-
- for (int j = 0; j < creature.size(); j++) {
- boolean art = false;
- boolean ench = false;
-
- c = creature.get(j);
-
- if (c.isArtifact()) art = true;
- if (c.isEnchantment()) ench = true;
-
- if (c.getPrevType().size() == 0) c.setPrevType(c.getType());
- c.setType(new ArrayListElspeth_Emblem. */
public static Command Elspeth_Emblem = new Command() {
diff --git a/src/main/java/forge/card/cardFactory/AbstractCardFactory.java b/src/main/java/forge/card/cardFactory/AbstractCardFactory.java
index 3d0a01c01b5..9a2e75cf06a 100644
--- a/src/main/java/forge/card/cardFactory/AbstractCardFactory.java
+++ b/src/main/java/forge/card/cardFactory/AbstractCardFactory.java
@@ -1136,54 +1136,6 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
} //*************** END ************ END **************************
- //*************** START *********** START **************************
- /*else if (cardName.equals("Curse of Wizardry")) {
- final Ability ability = new Ability(card, "0") {
- @Override
- public void resolve() {
- if (card.getController().isHuman()) {
-
- String color = "";
- String[] colors = Constant.Color.Colors;
- colors[colors.length - 1] = null;
-
- Object o = GuiUtils.getChoice("Choose color", colors);
- color = (String) o;
- card.setChosenColor(color);
- } else {
- CardList list = AllZone.getHumanPlayer().getCardsIn(Zone.Library);
- list.addAll(AllZone.getHumanPlayer().getCardsIn(Zone.Hand));
-
- if (list.size() > 0) {
- String color = CardFactoryUtil.getMostProminentColor(list);
- if (!color.equals("")) {
- card.setChosenColor(color);
- } else {
- card.setChosenColor("black");
- }
- } else {
- card.setChosenColor("black");
- }
- }
- }
- };
- Command comesIntoPlay = new Command() {
- private static final long serialVersionUID = -6417019967914398902L;
-
- public void execute() {
- AllZone.getStack().addSimultaneousStackEntry(ability);
-
- }
- }; //Command
-
- StringBuilder sb = new StringBuilder();
- sb.append("As ").append(cardName).append(" enters the battlefield, choose a color.");
- ability.setStackDescription(sb.toString());
-
- card.addComesIntoPlayCommand(comesIntoPlay);
- }*/ //*************** END ************ END **************************
-
-
//*************** START *********** START **************************
else if (cardName.equals("Barl's Cage")) {
final String[] tgts = {"Creature"};