diff --git a/Mage.Sets/src/mage/cards/d/DelightfulDiscovery.java b/Mage.Sets/src/mage/cards/d/DelightfulDiscovery.java index 742222efb38..756d6f1ceea 100644 --- a/Mage.Sets/src/mage/cards/d/DelightfulDiscovery.java +++ b/Mage.Sets/src/mage/cards/d/DelightfulDiscovery.java @@ -32,7 +32,7 @@ public final class DelightfulDiscovery extends CardImpl { new SpellCostReductionForEachSourceEffect( 1, DelightfulDiscoveryValue.instance ).setCanWorksOnStackOnly(true) - ).setRuleAtTheTop(true).addHint(DelightfulDiscoveryValue.getHint()), new SpellsCastWatcher()); + ).setRuleAtTheTop(true).addHint(DelightfulDiscoveryValue.getHint())); // Scry 2, then draw two cards. this.getSpellAbility().addEffect(new ScryEffect(2, false)); diff --git a/Mage.Sets/src/mage/cards/l/LyseHext.java b/Mage.Sets/src/mage/cards/l/LyseHext.java new file mode 100644 index 00000000000..a86f4394891 --- /dev/null +++ b/Mage.Sets/src/mage/cards/l/LyseHext.java @@ -0,0 +1,113 @@ +package mage.cards.l; + +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.condition.Condition; +import mage.abilities.decorator.ConditionalContinuousEffect; +import mage.abilities.dynamicvalue.DynamicValue; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; +import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect; +import mage.abilities.hint.Hint; +import mage.abilities.hint.ValueHint; +import mage.abilities.keyword.DoubleStrikeAbility; +import mage.abilities.keyword.ProwessAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.SubType; +import mage.constants.SuperType; +import mage.filter.FilterCard; +import mage.filter.common.FilterNoncreatureCard; +import mage.game.Game; +import mage.watchers.common.SpellsCastWatcher; + +import java.util.UUID; + +/** + * @author TheElk801 + */ +public final class LyseHext extends CardImpl { + + private static final FilterCard filter = new FilterNoncreatureCard("noncreature spells"); + + public LyseHext(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{U}"); + + this.supertype.add(SuperType.LEGENDARY); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.REBEL); + this.subtype.add(SubType.MONK); + this.power = new MageInt(2); + this.toughness = new MageInt(2); + + // Prowess + this.addAbility(new ProwessAbility()); + + // Noncreature spells you cast cost {1} less to cast. + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); + + // As long as you've cast two or more noncreature spells this turn, Lyse Hext has double strike. + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( + new GainAbilitySourceEffect( + DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield + ), LyseHextCondition.instance, "as long as you've cast two or more " + + "noncreature spells this turn, {this} has double strike" + )).addHint(LyseHextValue.getHint())); + } + + private LyseHext(final LyseHext card) { + super(card); + } + + @Override + public LyseHext copy() { + return new LyseHext(this); + } +} + +enum LyseHextCondition implements Condition { + instance; + + @Override + public boolean apply(Game game, Ability source) { + return LyseHextValue.instance.calculate(game, source, null) >= 2; + } +} + +enum LyseHextValue implements DynamicValue { + instance; + private static final Hint hint = new ValueHint("Noncreature spells you've cast this turn", instance); + + public static Hint getHint() { + return hint; + } + + @Override + public int calculate(Game game, Ability sourceAbility, Effect effect) { + return game + .getState() + .getWatcher(SpellsCastWatcher.class) + .getSpellsCastThisTurn(sourceAbility.getControllerId()) + .stream() + .mapToInt(spell -> spell.isCreature(game) ? 0 : 1) + .sum(); + } + + @Override + public LyseHextValue copy() { + return this; + } + + @Override + public String getMessage() { + return ""; + } + + @Override + public String toString() { + return "1"; + } +} diff --git a/Mage.Sets/src/mage/sets/FinalFantasyCommander.java b/Mage.Sets/src/mage/sets/FinalFantasyCommander.java index 13e0845ba8e..fe98cf0a157 100644 --- a/Mage.Sets/src/mage/sets/FinalFantasyCommander.java +++ b/Mage.Sets/src/mage/sets/FinalFantasyCommander.java @@ -212,6 +212,8 @@ public final class FinalFantasyCommander extends ExpansionSet { cards.add(new SetCardInfo("Lulu, Stern Guardian", 143, Rarity.RARE, mage.cards.l.LuluSternGuardian.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Lulu, Stern Guardian", 38, Rarity.RARE, mage.cards.l.LuluSternGuardian.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Luminous Broodmoth", 246, Rarity.MYTHIC, mage.cards.l.LuminousBroodmoth.class)); + cards.add(new SetCardInfo("Lyse Hext", 178, Rarity.RARE, mage.cards.l.LyseHext.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Lyse Hext", 88, Rarity.RARE, mage.cards.l.LyseHext.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Mask of Memory", 350, Rarity.UNCOMMON, mage.cards.m.MaskOfMemory.class)); cards.add(new SetCardInfo("Meteor Golem", 351, Rarity.UNCOMMON, mage.cards.m.MeteorGolem.class)); cards.add(new SetCardInfo("Millikin", 352, Rarity.UNCOMMON, mage.cards.m.Millikin.class));