From 29835786c372d987340a6ec38f74e67bcb6ab7af Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Tue, 24 Aug 2021 09:43:33 -0400 Subject: [PATCH] updated a few card type methods for companions --- Mage.Sets/src/mage/cards/k/KerugaTheMacrosage.java | 4 ++-- Mage.Sets/src/mage/cards/l/LurrusOfTheDreamDen.java | 2 +- Mage.Sets/src/mage/cards/l/LutriTheSpellchaser.java | 2 +- Mage.Sets/src/mage/cards/o/OboshThePreypiercer.java | 2 +- Mage.Sets/src/mage/cards/u/UmoriTheCollector.java | 2 +- Mage.Sets/src/mage/cards/z/ZirdaTheDawnwaker.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/cards/k/KerugaTheMacrosage.java b/Mage.Sets/src/mage/cards/k/KerugaTheMacrosage.java index fade4c0b3df..526f9f82a9d 100644 --- a/Mage.Sets/src/mage/cards/k/KerugaTheMacrosage.java +++ b/Mage.Sets/src/mage/cards/k/KerugaTheMacrosage.java @@ -67,6 +67,6 @@ enum KerugaCondition implements CompanionCondition { @Override public boolean isLegal(Set deck, int startingHandSize) { - return deck.stream().allMatch(card -> card.isLand() || card.getManaValue() >= 3); + return deck.stream().allMatch(card -> card.hasCardTypeForDeckbuilding(CardType.LAND) || card.getManaValue() >= 3); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/l/LurrusOfTheDreamDen.java b/Mage.Sets/src/mage/cards/l/LurrusOfTheDreamDen.java index 0646597eb48..6152d94c530 100644 --- a/Mage.Sets/src/mage/cards/l/LurrusOfTheDreamDen.java +++ b/Mage.Sets/src/mage/cards/l/LurrusOfTheDreamDen.java @@ -69,7 +69,7 @@ enum LurrusOfTheDreamDenCompanionCondition implements CompanionCondition { @Override public boolean isLegal(Set deck, int startingHandSize) { return deck.stream() - .filter(card -> card.isPermanent()) + .filter(MageObject::isPermanent) .mapToInt(MageObject::getManaValue) .max() .orElse(0) <= 2; diff --git a/Mage.Sets/src/mage/cards/l/LutriTheSpellchaser.java b/Mage.Sets/src/mage/cards/l/LutriTheSpellchaser.java index 523117ba913..aa407b426de 100644 --- a/Mage.Sets/src/mage/cards/l/LutriTheSpellchaser.java +++ b/Mage.Sets/src/mage/cards/l/LutriTheSpellchaser.java @@ -86,7 +86,7 @@ enum LutriTheSpellchaserCompanionCondition implements CompanionCondition { public boolean isLegal(Set deck, int startingHandSize) { Map cardMap = new HashMap<>(); deck.stream() - .filter(card -> !card.isLand()) + .filter(card -> !card.hasCardTypeForDeckbuilding(CardType.LAND)) .map(MageObject::getName) .forEach(s -> { cardMap.putIfAbsent(s, 0); diff --git a/Mage.Sets/src/mage/cards/o/OboshThePreypiercer.java b/Mage.Sets/src/mage/cards/o/OboshThePreypiercer.java index 231739eb43d..acce61c7468 100644 --- a/Mage.Sets/src/mage/cards/o/OboshThePreypiercer.java +++ b/Mage.Sets/src/mage/cards/o/OboshThePreypiercer.java @@ -61,7 +61,7 @@ enum OboshThePreypiercerCompanionCondition implements CompanionCondition { public boolean isLegal(Set deck, int startingHandSize) { return deck .stream() - .filter(card -> !card.isLand()) + .filter(card -> !card.hasCardTypeForDeckbuilding(CardType.LAND)) .mapToInt(MageObject::getManaValue) .map(i -> i % 2) .allMatch(i -> i == 1); diff --git a/Mage.Sets/src/mage/cards/u/UmoriTheCollector.java b/Mage.Sets/src/mage/cards/u/UmoriTheCollector.java index 13cff2b991b..5caf077572c 100644 --- a/Mage.Sets/src/mage/cards/u/UmoriTheCollector.java +++ b/Mage.Sets/src/mage/cards/u/UmoriTheCollector.java @@ -68,7 +68,7 @@ enum UmoriCondition implements CompanionCondition { Set cardTypes = new HashSet<>(); for (Card card : deck) { // Lands are fine. - if (card.isLand()) { + if (card.hasCardTypeForDeckbuilding(CardType.LAND)) { continue; } // First nonland checked. diff --git a/Mage.Sets/src/mage/cards/z/ZirdaTheDawnwaker.java b/Mage.Sets/src/mage/cards/z/ZirdaTheDawnwaker.java index 508e1bacf51..91226d0679c 100644 --- a/Mage.Sets/src/mage/cards/z/ZirdaTheDawnwaker.java +++ b/Mage.Sets/src/mage/cards/z/ZirdaTheDawnwaker.java @@ -76,7 +76,7 @@ enum ZirdaTheDawnwakerCompanionCondition implements CompanionCondition { public boolean isLegal(Set deck, int startingHandSize) { return deck .stream() - .filter(card -> card.isPermanent()) + .filter(MageObject::isPermanent) .map(MageObject::getAbilities) .flatMap(Collection::stream) .anyMatch(ActivatedAbility.class::isInstance);