From 3e092c221186aaf98ffa1d7a6041ec332e3fabce Mon Sep 17 00:00:00 2001 From: spjspj Date: Thu, 12 Apr 2018 21:03:53 +1000 Subject: [PATCH] Continuing implementation of Planechase. --- .../java/org/mage/plugins/card/images/DownloadPictures.java | 5 +++++ Mage.Client/src/main/resources/card-pictures-tok.txt | 1 + Mage/src/main/java/mage/game/command/planes/AkoumPlane.java | 2 +- .../mage/game/command/planes/HedronFieldsOfAgadeemPlane.java | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java index 5755522b1be..389c0be5a7d 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java @@ -527,6 +527,11 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab CardDownloadData card = new CardDownloadData(params[3], set, "0", false, type, "", "", true, fileName); card.setTokenClassName(tokenClassName); list.add(card); + } else if (params[1].toLowerCase(Locale.ENGLISH).equals("generate") && params[2].startsWith("PLANE:")) { + String set = params[2].substring(6); + CardDownloadData card = new CardDownloadData(params[3], set, "0", false, type, "", "", true, fileName); + card.setTokenClassName(tokenClassName); + list.add(card); } } else { logger.error("wrong format for image urls: " + line); diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt index 3abc3a71feb..3c848c62476 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -88,6 +88,7 @@ |Generate|PLANE:PCA|Plane - Academy At Tolaria West|||AcademyAtTolariaWestPlane| |Generate|PLANE:PCA|Plane - Agyrem|||AgyremPlane| |Generate|PLANE:PCA|Plane - Akoum|||AkoumPlane| +|Generate|PLANE:PCA|Plane - Astral Arena|||AstralArenaPlane| |Generate|PLANE:PCA|Plane - Bant|||BantPlane| |Generate|PLANE:PCA|Plane - Edge Of Malacol|||EdgeOfMalacolPlane| |Generate|PLANE:PCA|Plane - Feeding Grounds|||FeedingGroundsPlane| diff --git a/Mage/src/main/java/mage/game/command/planes/AkoumPlane.java b/Mage/src/main/java/mage/game/command/planes/AkoumPlane.java index 75c8dbc9fbb..b748bf7395e 100644 --- a/Mage/src/main/java/mage/game/command/planes/AkoumPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/AkoumPlane.java @@ -74,7 +74,7 @@ public class AkoumPlane extends Plane { this.getAbilities().add(ability); // Active player can roll the planar die: Whenever you roll {CHAOS}, destroy target creature that isn't enchanted - Effect chaosEffect = new DestroyTargetEffect(true); + Effect chaosEffect = new DestroyTargetEffect("destroy target creature that isn't enchanted"); Target chaosTarget = new TargetCreaturePermanent(filter); List chaosEffects = new ArrayList(); diff --git a/Mage/src/main/java/mage/game/command/planes/HedronFieldsOfAgadeemPlane.java b/Mage/src/main/java/mage/game/command/planes/HedronFieldsOfAgadeemPlane.java index 936dd496dd6..e3206a4be94 100644 --- a/Mage/src/main/java/mage/game/command/planes/HedronFieldsOfAgadeemPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/HedronFieldsOfAgadeemPlane.java @@ -62,7 +62,7 @@ public class HedronFieldsOfAgadeemPlane extends Plane { this.setExpansionSetCodeForImage("PCA"); // Creatures with power 7 or greater can't attack or block - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new HedronFieldsOfAgadeemRestrictionEffect()); + Ability ability = new SimpleStaticAbility(Zone.COMMAND, new HedronFieldsOfAgadeemRestrictionEffect()); this.getAbilities().add(ability); // Active player can roll the planar die: Whenever you roll {CHAOS}, create a 7/7 colorless Eldrazi creature with annhilator 1 @@ -92,7 +92,7 @@ class HedronFieldsOfAgadeemRestrictionEffect extends RestrictionEffect { } public HedronFieldsOfAgadeemRestrictionEffect() { - super(Duration.WhileOnBattlefield); + super(Duration.Custom); staticText = "Creatures with power 7 or greater can't attack or block"; }