diff --git a/Mage.Sets/src/mage/cards/h/HallOfOracles.java b/Mage.Sets/src/mage/cards/h/HallOfOracles.java new file mode 100644 index 00000000000..f2eb88b2096 --- /dev/null +++ b/Mage.Sets/src/mage/cards/h/HallOfOracles.java @@ -0,0 +1,82 @@ +package mage.cards.h; + +import mage.MageObject; +import mage.abilities.Ability; +import mage.abilities.ActivatedAbility; +import mage.abilities.condition.Condition; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.decorator.ConditionalActivatedAbility; +import mage.abilities.effects.common.counter.AddCountersTargetEffect; +import mage.abilities.mana.AnyColorManaAbility; +import mage.abilities.mana.ColorlessManaAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.TimingRule; +import mage.constants.Zone; +import mage.counters.CounterType; +import mage.game.Game; +import mage.game.stack.Spell; +import mage.target.common.TargetCreaturePermanent; +import mage.watchers.common.SpellsCastWatcher; + +import java.util.List; +import java.util.Objects; +import java.util.UUID; + +/** + * @author TheElk801 + */ +public final class HallOfOracles extends CardImpl { + + public HallOfOracles(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); + + // {T}: Add {C}. + this.addAbility(new ColorlessManaAbility()); + + // {1}, {T}: Add one mana of any color. + ActivatedAbility ability = new AnyColorManaAbility(new GenericManaCost(1)); + ability.addCost(new TapSourceCost()); + this.addAbility(ability); + + // {T}: Put a +1/+1 counter on target creature. Activate only as a sorcery and only if you've cast an instant or sorcery spell this turn. + ability = new ConditionalActivatedAbility( + Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new TapSourceCost(), + HallOfOraclesCondition.instance, "{T}: Put a +1/+1 counter on target creature. " + + "Activate only as a sorcery and only if you've cast an instant or sorcery spell this turn." + ); + ability.addTarget(new TargetCreaturePermanent()); + ability.setTiming(TimingRule.SORCERY); + this.addAbility(ability, new SpellsCastWatcher()); + } + + private HallOfOracles(final HallOfOracles card) { + super(card); + } + + @Override + public HallOfOracles copy() { + return new HallOfOracles(this); + } +} + +enum HallOfOraclesCondition implements Condition { + instance; + + @Override + public boolean apply(Game game, Ability source) { + SpellsCastWatcher watcher = game.getState().getWatcher(SpellsCastWatcher.class); + if (watcher == null) { + return false; + } + List spells = watcher.getSpellsCastThisTurn(source.getControllerId()); + return spells != null && spells + .stream() + .filter(Objects::nonNull) + .filter(MageObject::isInstantOrSorcery) + .map(Spell::getSourceId) + .anyMatch(source.getSourceId()::equals); + } +} diff --git a/Mage.Sets/src/mage/cards/l/Leapfrog.java b/Mage.Sets/src/mage/cards/l/Leapfrog.java index 124a7980620..b0f2cd6f660 100644 --- a/Mage.Sets/src/mage/cards/l/Leapfrog.java +++ b/Mage.Sets/src/mage/cards/l/Leapfrog.java @@ -1,26 +1,27 @@ package mage.cards.l; -import java.util.List; -import java.util.UUID; import mage.MageInt; +import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; -import mage.constants.SubType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.constants.Zone; +import mage.constants.SubType; import mage.game.Game; import mage.game.stack.Spell; import mage.watchers.common.SpellsCastWatcher; +import java.util.List; +import java.util.Objects; +import java.util.UUID; + /** - * * @author TheElk801 */ public final class Leapfrog extends CardImpl { @@ -33,17 +34,12 @@ public final class Leapfrog extends CardImpl { this.toughness = new MageInt(1); // Leapfrog has flying as long as you've cast an instant or sorcery spell this turn. - this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, - new ConditionalContinuousEffect( - new GainAbilitySourceEffect( - FlyingAbility.getInstance(), - Duration.WhileOnBattlefield - ), LeapfrogCondition.instance, - "{this} has flying as long as you've cast " - + "an instant or sorcery spell this turn." - ) - ), new SpellsCastWatcher()); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( + new GainAbilitySourceEffect( + FlyingAbility.getInstance(), Duration.WhileOnBattlefield + ), LeapfrogCondition.instance, "{this} has flying as long as " + + "you've cast an instant or sorcery spell this turn." + )), new SpellsCastWatcher()); } private Leapfrog(final Leapfrog card) { @@ -61,23 +57,16 @@ enum LeapfrogCondition implements Condition { @Override public boolean apply(Game game, Ability source) { - SpellsCastWatcher watcher - = game.getState().getWatcher( - SpellsCastWatcher.class - ); + SpellsCastWatcher watcher = game.getState().getWatcher(SpellsCastWatcher.class); if (watcher == null) { return false; } List spells = watcher.getSpellsCastThisTurn(source.getControllerId()); - if (spells == null) { - return false; - } - for (Spell spell : spells) { - if (!spell.getSourceId().equals(source.getSourceId()) - && spell.isInstantOrSorcery()) { - return true; - } - } - return false; + return spells != null && spells + .stream() + .filter(Objects::nonNull) + .filter(MageObject::isInstantOrSorcery) + .map(Spell::getSourceId) + .anyMatch(source.getSourceId()::equals); } } diff --git a/Mage.Sets/src/mage/sets/StrixhavenSchoolOfMages.java b/Mage.Sets/src/mage/sets/StrixhavenSchoolOfMages.java index ab87bd54ad6..74211cd4c99 100644 --- a/Mage.Sets/src/mage/sets/StrixhavenSchoolOfMages.java +++ b/Mage.Sets/src/mage/sets/StrixhavenSchoolOfMages.java @@ -108,6 +108,7 @@ public final class StrixhavenSchoolOfMages extends ExpansionSet { cards.add(new SetCardInfo("Grinning Ignus", 104, Rarity.UNCOMMON, mage.cards.g.GrinningIgnus.class)); cards.add(new SetCardInfo("Guiding Voice", 19, Rarity.COMMON, mage.cards.g.GuidingVoice.class)); cards.add(new SetCardInfo("Hall Monitor", 105, Rarity.UNCOMMON, mage.cards.h.HallMonitor.class)); + cards.add(new SetCardInfo("Hall of Oracles", 267, Rarity.RARE, mage.cards.h.HallOfOracles.class)); cards.add(new SetCardInfo("Heated Debate", 106, Rarity.COMMON, mage.cards.h.HeatedDebate.class)); cards.add(new SetCardInfo("Honor Troll", 134, Rarity.UNCOMMON, mage.cards.h.HonorTroll.class)); cards.add(new SetCardInfo("Humiliate", 193, Rarity.UNCOMMON, mage.cards.h.Humiliate.class)); diff --git a/Mage/src/main/java/mage/abilities/ActivatedAbility.java b/Mage/src/main/java/mage/abilities/ActivatedAbility.java index 521e2e00c0a..2390b78c059 100644 --- a/Mage/src/main/java/mage/abilities/ActivatedAbility.java +++ b/Mage/src/main/java/mage/abilities/ActivatedAbility.java @@ -1,11 +1,12 @@ package mage.abilities; +import mage.ApprovingObject; import mage.abilities.mana.ManaOptions; import mage.constants.TargetController; +import mage.constants.TimingRule; import mage.game.Game; import java.util.UUID; -import mage.ApprovingObject; /** * @author BetaSteward_at_googlemail.com @@ -68,4 +69,6 @@ public interface ActivatedAbility extends Ability { void setMaxActivationsPerTurn(int maxActivationsPerTurn); int getMaxActivationsPerTurn(Game game); + + public void setTiming(TimingRule timing); } diff --git a/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java b/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java index 639287d9c8d..ecf20a1ca66 100644 --- a/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java @@ -1,5 +1,6 @@ package mage.abilities; +import mage.ApprovingObject; import mage.MageObject; import mage.abilities.condition.Condition; import mage.abilities.costs.Cost; @@ -19,7 +20,6 @@ import mage.game.permanent.Permanent; import mage.util.CardUtil; import java.util.UUID; -import mage.ApprovingObject; /** * @author BetaSteward_at_googlemail.com @@ -237,6 +237,7 @@ public abstract class ActivatedAbilityImpl extends AbilityImpl implements Activa return timing; } + @Override public void setTiming(TimingRule timing) { this.timing = timing; }