From 36857782feeacfa03caf99f7dd178fc026f82741 Mon Sep 17 00:00:00 2001 From: Susucre <34709007+Susucre@users.noreply.github.com> Date: Sat, 30 Mar 2024 19:21:19 +0100 Subject: [PATCH] [OTJ] Implement Stoic Sphinx --- .../src/mage/cards/c/ConduitOfWorlds.java | 7 +-- Mage.Sets/src/mage/cards/s/StoicSphinx.java | 53 +++++++++++++++++++ .../mage/sets/OutlawsOfThunderJunction.java | 1 + .../HaventCastSpellThisTurnCondition.java | 26 +++++++++ 4 files changed, 82 insertions(+), 5 deletions(-) create mode 100644 Mage.Sets/src/mage/cards/s/StoicSphinx.java create mode 100644 Mage/src/main/java/mage/abilities/condition/common/HaventCastSpellThisTurnCondition.java diff --git a/Mage.Sets/src/mage/cards/c/ConduitOfWorlds.java b/Mage.Sets/src/mage/cards/c/ConduitOfWorlds.java index cddd85e63d0..9f2c649eaf0 100644 --- a/Mage.Sets/src/mage/cards/c/ConduitOfWorlds.java +++ b/Mage.Sets/src/mage/cards/c/ConduitOfWorlds.java @@ -4,6 +4,7 @@ import mage.ApprovingObject; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.condition.common.HaventCastSpellThisTurnCondition; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; @@ -21,7 +22,6 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; -import mage.watchers.common.SpellsCastWatcher; import java.util.UUID; @@ -78,10 +78,7 @@ class ConduitOfWorldsEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - if (!game.getState() - .getWatcher(SpellsCastWatcher.class) - .getSpellsCastThisTurn(source.getControllerId()) - .isEmpty()) { + if (!HaventCastSpellThisTurnCondition.instance.apply(game, source)) { return false; } Player player = game.getPlayer(source.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/s/StoicSphinx.java b/Mage.Sets/src/mage/cards/s/StoicSphinx.java new file mode 100644 index 00000000000..9e1d68b2986 --- /dev/null +++ b/Mage.Sets/src/mage/cards/s/StoicSphinx.java @@ -0,0 +1,53 @@ +package mage.cards.s; + +import mage.MageInt; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.condition.common.HaventCastSpellThisTurnCondition; +import mage.abilities.decorator.ConditionalContinuousEffect; +import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; +import mage.abilities.keyword.FlashAbility; +import mage.abilities.keyword.FlyingAbility; +import mage.abilities.keyword.HexproofAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.SubType; + +import java.util.UUID; + +/** + * @author Susucr + */ +public final class StoicSphinx extends CardImpl { + + public StoicSphinx(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}{U}"); + + this.subtype.add(SubType.SPHINX); + this.power = new MageInt(5); + this.toughness = new MageInt(3); + + // Flash + this.addAbility(FlashAbility.getInstance()); + + // Flying + this.addAbility(FlyingAbility.getInstance()); + + // Stoic Sphinx has hexproof as long as you haven't cast a spell this turn. + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( + new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield), + HaventCastSpellThisTurnCondition.instance, + "{this} has hexproof as long as you haven't cast a spell this turn" + ))); + } + + private StoicSphinx(final StoicSphinx card) { + super(card); + } + + @Override + public StoicSphinx copy() { + return new StoicSphinx(this); + } +} diff --git a/Mage.Sets/src/mage/sets/OutlawsOfThunderJunction.java b/Mage.Sets/src/mage/sets/OutlawsOfThunderJunction.java index 59f47a6998d..5e18a8d4b97 100644 --- a/Mage.Sets/src/mage/sets/OutlawsOfThunderJunction.java +++ b/Mage.Sets/src/mage/sets/OutlawsOfThunderJunction.java @@ -160,6 +160,7 @@ public final class OutlawsOfThunderJunction extends ExpansionSet { cards.add(new SetCardInfo("Step Between Worlds", 70, Rarity.RARE, mage.cards.s.StepBetweenWorlds.class)); cards.add(new SetCardInfo("Sterling Keykeeper", 32, Rarity.COMMON, mage.cards.s.SterlingKeykeeper.class)); cards.add(new SetCardInfo("Stingerback Terror", 147, Rarity.RARE, mage.cards.s.StingerbackTerror.class)); + cards.add(new SetCardInfo("Stoic Sphinx", 71, Rarity.RARE, mage.cards.s.StoicSphinx.class)); cards.add(new SetCardInfo("Swamp", 274, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Terror of the Peaks", 149, Rarity.MYTHIC, mage.cards.t.TerrorOfThePeaks.class)); cards.add(new SetCardInfo("This Town Ain't Big Enough", 74, Rarity.UNCOMMON, mage.cards.t.ThisTownAintBigEnough.class)); diff --git a/Mage/src/main/java/mage/abilities/condition/common/HaventCastSpellThisTurnCondition.java b/Mage/src/main/java/mage/abilities/condition/common/HaventCastSpellThisTurnCondition.java new file mode 100644 index 00000000000..9e60ec2fe20 --- /dev/null +++ b/Mage/src/main/java/mage/abilities/condition/common/HaventCastSpellThisTurnCondition.java @@ -0,0 +1,26 @@ +package mage.abilities.condition.common; + +import mage.abilities.Ability; +import mage.abilities.condition.Condition; +import mage.game.Game; +import mage.watchers.common.SpellsCastWatcher; + +/** + * @author Susucr + */ +public enum HaventCastSpellThisTurnCondition implements Condition { + instance; + + @Override + public boolean apply(Game game, Ability source) { + return game.getState() + .getWatcher(SpellsCastWatcher.class) + .getSpellsCastThisTurn(source.getControllerId()) + .isEmpty(); + } + + @Override + public String toString() { + return "if you haven't cast a spell this turn"; + } +}