From 833ecff40973f6892913a01422988b4c1777f819 Mon Sep 17 00:00:00 2001 From: Susucre <34709007+Susucre@users.noreply.github.com> Date: Wed, 22 May 2024 20:34:20 +0200 Subject: [PATCH] implement [MH3] Flare of Malice --- Mage.Sets/src/mage/cards/f/FlareOfMalice.java | 58 +++++++++++++++++++ .../src/mage/cards/r/RiveteersCharm.java | 4 +- Mage.Sets/src/mage/cards/s/SoulShatter.java | 4 +- Mage.Sets/src/mage/sets/ModernHorizons3.java | 1 + ...olledCreatureOrPlaneswalkerPredicate.java} | 2 +- 5 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 Mage.Sets/src/mage/cards/f/FlareOfMalice.java rename Mage/src/main/java/mage/filter/predicate/permanent/{MaxManaValueControlledPermanentPredicate.java => MaxManaValueControlledCreatureOrPlaneswalkerPredicate.java} (90%) diff --git a/Mage.Sets/src/mage/cards/f/FlareOfMalice.java b/Mage.Sets/src/mage/cards/f/FlareOfMalice.java new file mode 100644 index 00000000000..dcda6cf7661 --- /dev/null +++ b/Mage.Sets/src/mage/cards/f/FlareOfMalice.java @@ -0,0 +1,58 @@ +package mage.cards.f; + +import mage.ObjectColor; +import mage.abilities.costs.AlternativeCostSourceAbility; +import mage.abilities.costs.common.SacrificeTargetCost; +import mage.abilities.effects.common.SacrificeOpponentsEffect; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.filter.FilterPermanent; +import mage.filter.common.FilterControlledCreaturePermanent; +import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; +import mage.filter.predicate.mageobject.ColorPredicate; +import mage.filter.predicate.permanent.MaxManaValueControlledCreatureOrPlaneswalkerPredicate; +import mage.filter.predicate.permanent.TokenPredicate; + +import java.util.UUID; + +/** + * @author Susucr + */ +public final class FlareOfMalice extends CardImpl { + + private static final FilterPermanent filter = new FilterControlledCreaturePermanent("nontoken black creature"); + + static { + filter.add(TokenPredicate.FALSE); + filter.add(new ColorPredicate(ObjectColor.BLACK)); + } + + private static final FilterPermanent filterCreatureOrPlaneswalker = new FilterCreatureOrPlaneswalkerPermanent( + "creature or planeswalker with the greatest mana value " + + "among creatures and planeswalkers they control" + ); + + static { + filterCreatureOrPlaneswalker.add(MaxManaValueControlledCreatureOrPlaneswalkerPredicate.instance); + } + + public FlareOfMalice(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{B}{B}"); + + // You may sacrifice a nontoken black creature rather than pay this spell's mana cost. + this.addAbility(new AlternativeCostSourceAbility(new SacrificeTargetCost(filter)).setRuleAtTheTop(true)); + + // Each opponent sacrifices a creature or planeswalker with the greatest converted mana value among creatures and planeswalkers they control. + this.getSpellAbility().addEffect(new SacrificeOpponentsEffect(filter)); + } + + private FlareOfMalice(final FlareOfMalice card) { + super(card); + } + + @Override + public FlareOfMalice copy() { + return new FlareOfMalice(this); + } +} diff --git a/Mage.Sets/src/mage/cards/r/RiveteersCharm.java b/Mage.Sets/src/mage/cards/r/RiveteersCharm.java index f3a335388ba..7c9372dd9a4 100644 --- a/Mage.Sets/src/mage/cards/r/RiveteersCharm.java +++ b/Mage.Sets/src/mage/cards/r/RiveteersCharm.java @@ -10,7 +10,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; -import mage.filter.predicate.permanent.MaxManaValueControlledPermanentPredicate; +import mage.filter.predicate.permanent.MaxManaValueControlledCreatureOrPlaneswalkerPredicate; import mage.target.TargetPlayer; import mage.target.common.TargetOpponent; @@ -27,7 +27,7 @@ public final class RiveteersCharm extends CardImpl { ); static { - filter.add(MaxManaValueControlledPermanentPredicate.instance); + filter.add(MaxManaValueControlledCreatureOrPlaneswalkerPredicate.instance); } public RiveteersCharm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SoulShatter.java b/Mage.Sets/src/mage/cards/s/SoulShatter.java index 77030b36cd0..464e93525f5 100644 --- a/Mage.Sets/src/mage/cards/s/SoulShatter.java +++ b/Mage.Sets/src/mage/cards/s/SoulShatter.java @@ -6,7 +6,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; -import mage.filter.predicate.permanent.MaxManaValueControlledPermanentPredicate; +import mage.filter.predicate.permanent.MaxManaValueControlledCreatureOrPlaneswalkerPredicate; import java.util.UUID; @@ -21,7 +21,7 @@ public final class SoulShatter extends CardImpl { ); static { - filter.add(MaxManaValueControlledPermanentPredicate.instance); + filter.add(MaxManaValueControlledCreatureOrPlaneswalkerPredicate.instance); } public SoulShatter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/sets/ModernHorizons3.java b/Mage.Sets/src/mage/sets/ModernHorizons3.java index cd5d26fc535..2fcfc858cf8 100644 --- a/Mage.Sets/src/mage/sets/ModernHorizons3.java +++ b/Mage.Sets/src/mage/sets/ModernHorizons3.java @@ -40,6 +40,7 @@ public final class ModernHorizons3 extends ExpansionSet { cards.add(new SetCardInfo("Flare of Denial", 62, Rarity.RARE, mage.cards.f.FlareOfDenial.class)); cards.add(new SetCardInfo("Flare of Duplication", 119, Rarity.RARE, mage.cards.f.FlareOfDuplication.class)); cards.add(new SetCardInfo("Flare of Fortitude", 26, Rarity.RARE, mage.cards.f.FlareOfFortitude.class)); + cards.add(new SetCardInfo("Flare of Malice", 95, Rarity.RARE, mage.cards.f.FlareOfMalice.class)); cards.add(new SetCardInfo("Flooded Strand", 220, Rarity.RARE, mage.cards.f.FloodedStrand.class)); cards.add(new SetCardInfo("Flusterstorm", 496, Rarity.RARE, mage.cards.f.Flusterstorm.class)); cards.add(new SetCardInfo("Forest", 308, Rarity.LAND, mage.cards.basiclands.Forest.class, FULL_ART_BFZ_VARIOUS)); diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/MaxManaValueControlledPermanentPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/MaxManaValueControlledCreatureOrPlaneswalkerPredicate.java similarity index 90% rename from Mage/src/main/java/mage/filter/predicate/permanent/MaxManaValueControlledPermanentPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/MaxManaValueControlledCreatureOrPlaneswalkerPredicate.java index bcb91d8a465..62d474dda07 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/MaxManaValueControlledPermanentPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/MaxManaValueControlledCreatureOrPlaneswalkerPredicate.java @@ -14,7 +14,7 @@ import java.util.Objects; /** * @author TheElk801 */ -public enum MaxManaValueControlledPermanentPredicate implements ObjectSourcePlayerPredicate { +public enum MaxManaValueControlledCreatureOrPlaneswalkerPredicate implements ObjectSourcePlayerPredicate { instance; private static final FilterPermanent filter = new FilterCreatureOrPlaneswalkerPermanent();