From 7b93e95842c8e85ff10f5718406f271b62d1fdec Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 15 Jan 2016 11:47:33 +0100 Subject: [PATCH] * Added missing non creature subtypes. --- .../sets/oathofthegatewatch/AkoumFlameseeker.java | 2 +- Mage/src/main/java/mage/util/CardUtil.java | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/AkoumFlameseeker.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/AkoumFlameseeker.java index 800c4fa4240..1614e2e63b1 100644 --- a/Mage.Sets/src/mage/sets/oathofthegatewatch/AkoumFlameseeker.java +++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/AkoumFlameseeker.java @@ -109,7 +109,7 @@ class AkoumFlameseekerEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - Cards cards = controller.discard(1, applyEffectsAfter, source, game); + Cards cards = controller.discard(1, false, source, game); if (!cards.isEmpty()) { controller.drawCards(1, game); } diff --git a/Mage/src/main/java/mage/util/CardUtil.java b/Mage/src/main/java/mage/util/CardUtil.java index c35f680a42b..e03b1f1bde4 100644 --- a/Mage/src/main/java/mage/util/CardUtil.java +++ b/Mage/src/main/java/mage/util/CardUtil.java @@ -74,10 +74,21 @@ public class CardUtil { static String numberStrings[] = {"zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten", "eleven", "twelve", "thirteen", "fourteen", "fifteen", "sixteen", "seventeen", "eighteen", "ninteen", "twenty"}; - public static final String[] NON_CHANGELING_SUBTYPES_VALUES = new String[]{"Mountain", "Forest", "Plains", "Swamp", "Island", + public static final String[] NON_CHANGELING_SUBTYPES_VALUES = new String[]{ + // basic lands subtypes + "Mountain", "Forest", "Plains", "Swamp", "Island", + // Enchantment subtypes "Aura", "Curse", "Shrine", + // Artifact subtypes "Equipment", "Fortification", "Contraption", - "Trap", "Arcane", "Gate"}; + // Land subtypes + "Desert", "Gate", "Lair", "Locus", "Urza's", "Mine", "Power-Plant", "Tower", + // Planeswalker subtypes + "Ajani", "Ashiok", "Bolas", "Chandra", "Dack", "Daretti", "Domri", "Elspeth", "Freyalise", "Garruk", "Gideon", "Jace", + "Karn", "Kiora", "Koth", "Liliana", "Nahiri", "Nissa", "Narset", "Nixilis", "Ral", "Sarkhan", "Sorin", "Tamiyo", "Teferi", + "Tezzeret", "Tibalt", "Ugin", "Venser", "Vraska", "Xenagos", + // Instant sorcery subtypes + "Trap", "Arcane"}; public static final Set NON_CREATURE_SUBTYPES = new HashSet<>(Arrays.asList(NON_CHANGELING_SUBTYPES_VALUES)); /**