From 308a55cf9ad92212f749d1c5f549512648bb9b9b Mon Sep 17 00:00:00 2001 From: Colin Redman Date: Wed, 1 Aug 2018 14:12:09 -0600 Subject: [PATCH 1/4] Aminatou, the Fate Shifter minor fix - can be commander and author info --- Mage.Sets/src/mage/cards/a/AminatouTheFateShifter.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Mage.Sets/src/mage/cards/a/AminatouTheFateShifter.java b/Mage.Sets/src/mage/cards/a/AminatouTheFateShifter.java index 64533667f5..44168d26c0 100644 --- a/Mage.Sets/src/mage/cards/a/AminatouTheFateShifter.java +++ b/Mage.Sets/src/mage/cards/a/AminatouTheFateShifter.java @@ -2,6 +2,7 @@ package mage.cards.a; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; +import mage.abilities.common.CanBeYourCommanderAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -29,6 +30,10 @@ import mage.target.targetpointer.FixedTarget; import java.util.UUID; +/** + * + * @author Colin Redman + */ public class AminatouTheFateShifter extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("permanent you own"); @@ -59,6 +64,9 @@ public class AminatouTheFateShifter extends CardImpl { // Fateshifter controlled by the next player in the chosen direction. ability = new LoyaltyAbility(new AminatouUltimateEffect(), -6); this.addAbility(ability); + + // Aminatou, the Fateshifter can be your commander. + this.addAbility(CanBeYourCommanderAbility.getInstance()); } public AminatouTheFateShifter(final AminatouTheFateShifter card) { super(card); From ea641cd40a52ec345988e3c49e5311f3f664a9b7 Mon Sep 17 00:00:00 2001 From: credman0 <20376935+credman0@users.noreply.github.com> Date: Wed, 1 Aug 2018 17:00:07 -0600 Subject: [PATCH 2/4] Fixed typo in Aminatou, the Fateshifter's name --- Mage.Sets/src/mage/sets/Commander2018.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/sets/Commander2018.java b/Mage.Sets/src/mage/sets/Commander2018.java index 7f1aeea8b0..df4814dacc 100644 --- a/Mage.Sets/src/mage/sets/Commander2018.java +++ b/Mage.Sets/src/mage/sets/Commander2018.java @@ -27,7 +27,7 @@ public final class Commander2018 extends ExpansionSet { cards.add(new SetCardInfo("Ajani's Chosen", 61, Rarity.RARE, mage.cards.a.AjanisChosen.class)); cards.add(new SetCardInfo("Akoum Refuge", 231, Rarity.UNCOMMON, mage.cards.a.AkoumRefuge.class)); cards.add(new SetCardInfo("Akroma's Vengeance", 62, Rarity.RARE, mage.cards.a.AkromasVengeance.class)); - cards.add(new SetCardInfo("Amninatou, the Fateshifter", 37, Rarity.MYTHIC, mage.cards.a.AminatouTheFateShifter.class)); + cards.add(new SetCardInfo("Aminatou, the Fateshifter", 37, Rarity.MYTHIC, mage.cards.a.AminatouTheFateShifter.class)); cards.add(new SetCardInfo("Ancient Stone Idol", 53, Rarity.RARE, mage.cards.a.AncientStoneIdol.class)); cards.add(new SetCardInfo("Arcane Sanctum", 232, Rarity.UNCOMMON, mage.cards.a.ArcaneSanctum.class)); cards.add(new SetCardInfo("Archetype of Imagination", 81, Rarity.UNCOMMON, mage.cards.a.ArchetypeOfImagination.class)); From 7092d16c5d03cf00a2c9736ddbb37ffc67b3a1a3 Mon Sep 17 00:00:00 2001 From: Colin Redman Date: Wed, 1 Aug 2018 17:27:56 -0600 Subject: [PATCH 3/4] Fixed color identity interaction with special cases IE Transguild Courier --- Mage/src/main/java/mage/cards/CardImpl.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Mage/src/main/java/mage/cards/CardImpl.java b/Mage/src/main/java/mage/cards/CardImpl.java index dd77793fc5..2ac3a8d5cc 100644 --- a/Mage/src/main/java/mage/cards/CardImpl.java +++ b/Mage/src/main/java/mage/cards/CardImpl.java @@ -1,9 +1,6 @@ package mage.cards; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.util.*; import mage.MageObject; import mage.MageObjectImpl; import mage.Mana; @@ -45,6 +42,13 @@ import mage.util.SubTypeList; import mage.watchers.Watcher; import org.apache.log4j.Logger; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; + public abstract class CardImpl extends MageObjectImpl implements Card { private static final long serialVersionUID = 1L; @@ -852,11 +856,11 @@ public abstract class CardImpl extends MageObjectImpl implements Card { @Override public FilterMana getColorIdentity() { FilterMana mana = new FilterMana(); - mana.setBlack(getManaCost().getText().matches(regexBlack)); - mana.setBlue(getManaCost().getText().matches(regexBlue)); - mana.setGreen(getManaCost().getText().matches(regexGreen)); - mana.setRed(getManaCost().getText().matches(regexRed)); - mana.setWhite(getManaCost().getText().matches(regexWhite)); + mana.setBlack(getManaCost().getText().matches(regexBlack)||color.isBlack()); + mana.setBlue(getManaCost().getText().matches(regexBlue)||color.isBlue()); + mana.setGreen(getManaCost().getText().matches(regexGreen)||color.isGreen()); + mana.setRed(getManaCost().getText().matches(regexRed)||color.isRed()); + mana.setWhite(getManaCost().getText().matches(regexWhite)||color.isWhite()); for (String rule : getRules()) { rule = rule.replaceAll("(?i)", ""); // Ignoring reminder text in italic From 618070a8489c526552af17f39f8fcf81f8f7f508 Mon Sep 17 00:00:00 2001 From: credman0 <20376935+credman0@users.noreply.github.com> Date: Wed, 1 Aug 2018 17:46:02 -0600 Subject: [PATCH 4/4] Reverted 7092d16c5d03cf00a2c9736ddbb37ffc67b3a1a3 It busted the AI --- Mage/src/main/java/mage/cards/CardImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Mage/src/main/java/mage/cards/CardImpl.java b/Mage/src/main/java/mage/cards/CardImpl.java index 2ac3a8d5cc..4130242ad7 100644 --- a/Mage/src/main/java/mage/cards/CardImpl.java +++ b/Mage/src/main/java/mage/cards/CardImpl.java @@ -856,11 +856,11 @@ public abstract class CardImpl extends MageObjectImpl implements Card { @Override public FilterMana getColorIdentity() { FilterMana mana = new FilterMana(); - mana.setBlack(getManaCost().getText().matches(regexBlack)||color.isBlack()); - mana.setBlue(getManaCost().getText().matches(regexBlue)||color.isBlue()); - mana.setGreen(getManaCost().getText().matches(regexGreen)||color.isGreen()); - mana.setRed(getManaCost().getText().matches(regexRed)||color.isRed()); - mana.setWhite(getManaCost().getText().matches(regexWhite)||color.isWhite()); + mana.setBlack(getManaCost().getText().matches(regexBlack)); + mana.setBlue(getManaCost().getText().matches(regexBlue)); + mana.setGreen(getManaCost().getText().matches(regexGreen)); + mana.setRed(getManaCost().getText().matches(regexRed)); + mana.setWhite(getManaCost().getText().matches(regexWhite)); for (String rule : getRules()) { rule = rule.replaceAll("(?i)", ""); // Ignoring reminder text in italic