From e8adca4bcd4d2ba79c9cc8e69dfad252ba9d8639 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Thu, 9 Jan 2020 08:49:53 -0500 Subject: [PATCH] Implemented Sunlit Hoplite --- .../src/mage/cards/f/FreshFacedRecruit.java | 24 +++----- Mage.Sets/src/mage/cards/s/SunlitHoplite.java | 59 +++++++++++++++++++ .../src/mage/sets/TherosBeyondDeath.java | 1 + 3 files changed, 68 insertions(+), 16 deletions(-) create mode 100644 Mage.Sets/src/mage/cards/s/SunlitHoplite.java diff --git a/Mage.Sets/src/mage/cards/f/FreshFacedRecruit.java b/Mage.Sets/src/mage/cards/f/FreshFacedRecruit.java index 429a6d77e04..3076f0a122c 100644 --- a/Mage.Sets/src/mage/cards/f/FreshFacedRecruit.java +++ b/Mage.Sets/src/mage/cards/f/FreshFacedRecruit.java @@ -1,21 +1,20 @@ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MyTurnCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; -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 java.util.UUID; /** - * * @author TheElk801 */ public final class FreshFacedRecruit extends CardImpl { @@ -29,20 +28,13 @@ public final class FreshFacedRecruit extends CardImpl { this.toughness = new MageInt(1); // As long as it's your turn, Fresh-Faced Recruit has first strike. - this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, - new ConditionalContinuousEffect( - new GainAbilitySourceEffect( - FirstStrikeAbility.getInstance(), - Duration.WhileOnBattlefield - ), MyTurnCondition.instance, - "As long as it's your turn, " - + "{this} has first strike." - ) - )); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( + new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), + MyTurnCondition.instance, "As long as it's your turn, {this} has first strike." + ))); } - public FreshFacedRecruit(final FreshFacedRecruit card) { + private FreshFacedRecruit(final FreshFacedRecruit card) { super(card); } diff --git a/Mage.Sets/src/mage/cards/s/SunlitHoplite.java b/Mage.Sets/src/mage/cards/s/SunlitHoplite.java new file mode 100644 index 00000000000..8c84001500f --- /dev/null +++ b/Mage.Sets/src/mage/cards/s/SunlitHoplite.java @@ -0,0 +1,59 @@ +package mage.cards.s; + +import mage.MageInt; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.condition.Condition; +import mage.abilities.condition.common.MyTurnCondition; +import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; +import mage.abilities.decorator.ConditionalContinuousEffect; +import mage.abilities.effects.common.continuous.BoostSourceEffect; +import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; +import mage.abilities.keyword.FirstStrikeAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.SubType; +import mage.filter.FilterPermanent; +import mage.filter.common.FilterControlledPlaneswalkerPermanent; + +import java.util.UUID; + +/** + * @author TheElk801 + */ +public final class SunlitHoplite extends CardImpl { + + private static final FilterPermanent filter = new FilterControlledPlaneswalkerPermanent(SubType.ELSPETH); + private static final Condition condition = new PermanentsOnTheBattlefieldCondition(filter); + + public SunlitHoplite(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}"); + + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); + this.power = new MageInt(2); + this.toughness = new MageInt(1); + + // As long as it's your turn, Sunlit Hoplite has first strike. + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( + new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), + MyTurnCondition.instance, "As long as it's your turn, {this} has first strike." + ))); + + // Sunlit Hoplite gets +1/+0 as long as you control an Elspeth planeswalker. + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( + new BoostSourceEffect(1, 0, Duration.EndOfTurn), + condition, "{this} gets +1/+0 as long as you control an Elspeth planeswalker" + ))); + } + + private SunlitHoplite(final SunlitHoplite card) { + super(card); + } + + @Override + public SunlitHoplite copy() { + return new SunlitHoplite(this); + } +} diff --git a/Mage.Sets/src/mage/sets/TherosBeyondDeath.java b/Mage.Sets/src/mage/sets/TherosBeyondDeath.java index 86a3c3fbb9b..fbbb6bbe148 100644 --- a/Mage.Sets/src/mage/sets/TherosBeyondDeath.java +++ b/Mage.Sets/src/mage/sets/TherosBeyondDeath.java @@ -139,6 +139,7 @@ public final class TherosBeyondDeath extends ExpansionSet { cards.add(new SetCardInfo("Staggering Insight", 228, Rarity.UNCOMMON, mage.cards.s.StaggeringInsight.class)); cards.add(new SetCardInfo("Stinging Lionfish", 69, Rarity.UNCOMMON, mage.cards.s.StingingLionfish.class)); cards.add(new SetCardInfo("Storm's Wrath", 157, Rarity.RARE, mage.cards.s.StormsWrath.class)); + cards.add(new SetCardInfo("Sunlit Hoplite", 273, Rarity.COMMON, mage.cards.s.SunlitHoplite.class)); cards.add(new SetCardInfo("Swamp", 252, Rarity.LAND, mage.cards.basiclands.Swamp.class, FULL_ART_BFZ_VARIOUS)); cards.add(new SetCardInfo("Sweet Oblivion", 70, Rarity.UNCOMMON, mage.cards.s.SweetOblivion.class)); cards.add(new SetCardInfo("Swimmer in Nightmares", 275, Rarity.UNCOMMON, mage.cards.s.SwimmerInNightmares.class));