From 0e4483dd7cead6c0833d3c545689d539577f238f Mon Sep 17 00:00:00 2001 From: theelk801 Date: Mon, 16 Jan 2023 14:51:45 -0500 Subject: [PATCH] [ONE] Implement Jor Kadeen, First Goldwarden --- .../cards/j/JorKadeenFirstGoldwarden.java | 74 +++++++++++++++++++ .../src/mage/sets/PhyrexiaAllWillBeOne.java | 1 + .../common/SourceMatchesFilterCondition.java | 13 +--- 3 files changed, 79 insertions(+), 9 deletions(-) create mode 100644 Mage.Sets/src/mage/cards/j/JorKadeenFirstGoldwarden.java diff --git a/Mage.Sets/src/mage/cards/j/JorKadeenFirstGoldwarden.java b/Mage.Sets/src/mage/cards/j/JorKadeenFirstGoldwarden.java new file mode 100644 index 0000000000..712fce2b53 --- /dev/null +++ b/Mage.Sets/src/mage/cards/j/JorKadeenFirstGoldwarden.java @@ -0,0 +1,74 @@ +package mage.cards.j; + +import java.util.UUID; + +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.AttacksTriggeredAbility; +import mage.abilities.condition.Condition; +import mage.abilities.condition.common.SourceMatchesFilterCondition; +import mage.abilities.decorator.ConditionalOneShotEffect; +import mage.abilities.dynamicvalue.DynamicValue; +import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; +import mage.abilities.effects.common.continuous.BoostSourceEffect; +import mage.abilities.hint.Hint; +import mage.abilities.hint.ValueHint; +import mage.constants.*; +import mage.abilities.keyword.TrampleAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.filter.FilterPermanent; +import mage.filter.common.FilterControlledCreaturePermanent; +import mage.filter.predicate.mageobject.PowerPredicate; +import mage.filter.predicate.permanent.EquippedPredicate; + +/** + * @author TheElk801 + */ +public final class JorKadeenFirstGoldwarden extends CardImpl { + + private static final FilterPermanent filter = new FilterControlledCreaturePermanent(); + private static final FilterPermanent filter2 = new FilterPermanent(); + + static { + filter.add(EquippedPredicate.instance); + filter2.add(new PowerPredicate(ComparisonType.MORE_THAN, 3)); + } + + private static final DynamicValue xValue = new PermanentsOnBattlefieldCount(filter, null); + private static final Hint hint = new ValueHint("Equipped creatures you control", xValue); + private static final Condition condition = new SourceMatchesFilterCondition(filter2); + + public JorKadeenFirstGoldwarden(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{R}{W}"); + + this.addSuperType(SuperType.LEGENDARY); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.REBEL); + this.power = new MageInt(2); + this.toughness = new MageInt(2); + + // Trample + this.addAbility(TrampleAbility.getInstance()); + + // Whenever Jor Kadeen, First Goldwarden attacks, it gets +X/+X until end of turn, where X is the number of equipped creatures you control. Then if Jor Kadeen's power is 4 or greater, draw a card. + Ability ability = new AttacksTriggeredAbility(new BoostSourceEffect( + xValue, xValue, Duration.EndOfTurn, true, "it" + )); + ability.addEffect(new ConditionalOneShotEffect( + new DrawCardSourceControllerEffect(1), + condition, "Then if {this}'s power is 4 or greater" + )); + this.addAbility(ability.addHint(hint)); + } + + private JorKadeenFirstGoldwarden(final JorKadeenFirstGoldwarden card) { + super(card); + } + + @Override + public JorKadeenFirstGoldwarden copy() { + return new JorKadeenFirstGoldwarden(this); + } +} diff --git a/Mage.Sets/src/mage/sets/PhyrexiaAllWillBeOne.java b/Mage.Sets/src/mage/sets/PhyrexiaAllWillBeOne.java index 4b1c0f11f2..467da351a3 100644 --- a/Mage.Sets/src/mage/sets/PhyrexiaAllWillBeOne.java +++ b/Mage.Sets/src/mage/sets/PhyrexiaAllWillBeOne.java @@ -32,6 +32,7 @@ public final class PhyrexiaAllWillBeOne extends ExpansionSet { cards.add(new SetCardInfo("Ezuri, Stalker of Spheres", 201, Rarity.RARE, mage.cards.e.EzuriStalkerOfSpheres.class)); cards.add(new SetCardInfo("Forest", 276, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Island", 273, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Jor Kadeen, First Goldwarden", 203, Rarity.RARE, mage.cards.j.JorKadeenFirstGoldwarden.class)); cards.add(new SetCardInfo("Karumonix, the Rat King", 292, Rarity.RARE, mage.cards.k.KarumonixTheRatKing.class)); cards.add(new SetCardInfo("Kaya, Intangible Slayer", 205, Rarity.RARE, mage.cards.k.KayaIntangibleSlayer.class)); cards.add(new SetCardInfo("Koth, Fire of Resistance", 138, Rarity.RARE, mage.cards.k.KothFireOfResistance.class)); diff --git a/Mage/src/main/java/mage/abilities/condition/common/SourceMatchesFilterCondition.java b/Mage/src/main/java/mage/abilities/condition/common/SourceMatchesFilterCondition.java index ebab226cc5..95f8036514 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/SourceMatchesFilterCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/SourceMatchesFilterCondition.java @@ -1,4 +1,3 @@ - package mage.abilities.condition.common; import mage.abilities.Ability; @@ -14,8 +13,8 @@ import mage.game.permanent.Permanent; */ public class SourceMatchesFilterCondition implements Condition { - private FilterPermanent FILTER; - private String text; + private final FilterPermanent FILTER; + private final String text; public SourceMatchesFilterCondition(FilterPermanent filter) { this(null, filter); @@ -28,12 +27,8 @@ public class SourceMatchesFilterCondition implements Condition { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getBattlefield().getPermanent(source.getSourceId()); - if (FILTER.match(permanent, permanent.getControllerId(), source, game)) { - return true; - } - - return false; + Permanent permanent = source.getSourcePermanentOrLKI(game); + return FILTER.match(permanent, permanent.getControllerId(), source, game); } @Override