From acf6af17dd5cf9d060b9f21c66bb10b3bac73594 Mon Sep 17 00:00:00 2001 From: Noah Gleason Date: Sun, 17 Jun 2018 22:46:38 -0400 Subject: [PATCH 1/2] Implement Saproling Infestation (INV) --- .../mage/cards/s/SaprolingInfestation.java | 79 +++++++++++++++++++ Mage.Sets/src/mage/sets/Invasion.java | 1 + 2 files changed, 80 insertions(+) create mode 100644 Mage.Sets/src/mage/cards/s/SaprolingInfestation.java diff --git a/Mage.Sets/src/mage/cards/s/SaprolingInfestation.java b/Mage.Sets/src/mage/cards/s/SaprolingInfestation.java new file mode 100644 index 00000000000..b1441e53e92 --- /dev/null +++ b/Mage.Sets/src/mage/cards/s/SaprolingInfestation.java @@ -0,0 +1,79 @@ +package mage.cards.s; + +import mage.abilities.Ability; +import mage.abilities.TriggeredAbilityImpl; +import mage.abilities.effects.common.CreateTokenEffect; +import mage.abilities.keyword.KickerAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.permanent.token.SaprolingToken; +import mage.game.stack.Spell; + +import java.util.UUID; + +/** + * + * @author noahg + */ +public final class SaprolingInfestation extends CardImpl { + + public SaprolingInfestation(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); + + + // Whenever a player kicks a spell, you put a 1/1 green Saproling creature token onto the battlefield. + this.addAbility(new SaprolingInfestationTriggeredAbility()); + } + + public SaprolingInfestation(final SaprolingInfestation card) { + super(card); + } + + @Override + public SaprolingInfestation copy() { + return new SaprolingInfestation(this); + } + + class SaprolingInfestationTriggeredAbility extends TriggeredAbilityImpl { + + SaprolingInfestationTriggeredAbility() { + super(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken("INV")).setText("you create a 1/1 green Saproling creature token"), false); + } + + SaprolingInfestationTriggeredAbility(final SaprolingInfestationTriggeredAbility ability) { + super(ability); + } + + @Override + public SaprolingInfestationTriggeredAbility copy() { + return new SaprolingInfestationTriggeredAbility(this); + } + + @Override + public boolean checkEventType(GameEvent event, Game game) { + return event.getType() == GameEvent.EventType.SPELL_CAST; + } + + @Override + public boolean checkTrigger(GameEvent event, Game game) { + Spell spell = game.getStack().getSpell(event.getTargetId()); + if (spell != null) { + for (Ability ability : spell.getAbilities()) { + if (ability instanceof KickerAbility && ((KickerAbility) ability).getKickedCounter(game, spell.getSpellAbility()) > 0) { + return true; + } + } + } + return false; + } + + @Override + public String getRule() { + return "Whenever a player kicks a spell, " + super.getRule(); + } + } +} diff --git a/Mage.Sets/src/mage/sets/Invasion.java b/Mage.Sets/src/mage/sets/Invasion.java index b69da56388a..b011786d5ff 100644 --- a/Mage.Sets/src/mage/sets/Invasion.java +++ b/Mage.Sets/src/mage/sets/Invasion.java @@ -247,6 +247,7 @@ public final class Invasion extends ExpansionSet { cards.add(new SetCardInfo("Salt Marsh", 326, Rarity.UNCOMMON, mage.cards.s.SaltMarsh.class)); cards.add(new SetCardInfo("Samite Archer", 269, Rarity.UNCOMMON, mage.cards.s.SamiteArcher.class)); cards.add(new SetCardInfo("Sapphire Leech", 71, Rarity.RARE, mage.cards.s.SapphireLeech.class)); + cards.add(new SetCardInfo("Saproling Infestation", 208, Rarity.RARE, mage.cards.s.SaprolingInfestation.class)); cards.add(new SetCardInfo("Saproling Symbiosis", 209, Rarity.RARE, mage.cards.s.SaprolingSymbiosis.class)); cards.add(new SetCardInfo("Savage Offensive", 162, Rarity.COMMON, mage.cards.s.SavageOffensive.class)); cards.add(new SetCardInfo("Scarred Puma", 163, Rarity.COMMON, mage.cards.s.ScarredPuma.class)); From c3b9d55e98d3a463a95c333e05eb1279890c4a49 Mon Sep 17 00:00:00 2001 From: Noah Gleason Date: Mon, 18 Jun 2018 10:52:23 -0400 Subject: [PATCH 2/2] Add Kicker Event --- .../mage/cards/s/SaprolingInfestation.java | 19 ++++--------------- .../mage/abilities/keyword/KickerAbility.java | 2 ++ .../main/java/mage/game/events/GameEvent.java | 1 + 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/Mage.Sets/src/mage/cards/s/SaprolingInfestation.java b/Mage.Sets/src/mage/cards/s/SaprolingInfestation.java index b1441e53e92..7fd3df301ee 100644 --- a/Mage.Sets/src/mage/cards/s/SaprolingInfestation.java +++ b/Mage.Sets/src/mage/cards/s/SaprolingInfestation.java @@ -1,9 +1,7 @@ package mage.cards.s; -import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.CreateTokenEffect; -import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -11,7 +9,6 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.token.SaprolingToken; -import mage.game.stack.Spell; import java.util.UUID; @@ -41,7 +38,7 @@ public final class SaprolingInfestation extends CardImpl { class SaprolingInfestationTriggeredAbility extends TriggeredAbilityImpl { SaprolingInfestationTriggeredAbility() { - super(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken("INV")).setText("you create a 1/1 green Saproling creature token"), false); + super(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken("INV")), false); } SaprolingInfestationTriggeredAbility(final SaprolingInfestationTriggeredAbility ability) { @@ -55,25 +52,17 @@ public final class SaprolingInfestation extends CardImpl { @Override public boolean checkEventType(GameEvent event, Game game) { - return event.getType() == GameEvent.EventType.SPELL_CAST; + return event.getType() == GameEvent.EventType.KICKED; } @Override public boolean checkTrigger(GameEvent event, Game game) { - Spell spell = game.getStack().getSpell(event.getTargetId()); - if (spell != null) { - for (Ability ability : spell.getAbilities()) { - if (ability instanceof KickerAbility && ((KickerAbility) ability).getKickedCounter(game, spell.getSpellAbility()) > 0) { - return true; - } - } - } - return false; + return true; } @Override public String getRule() { - return "Whenever a player kicks a spell, " + super.getRule(); + return "Whenever a player kicks a spell, you put a 1/1 green Saproling creature token onto the battlefield."; } } } diff --git a/Mage/src/main/java/mage/abilities/keyword/KickerAbility.java b/Mage/src/main/java/mage/abilities/keyword/KickerAbility.java index 39522121f52..fdf305c5320 100644 --- a/Mage/src/main/java/mage/abilities/keyword/KickerAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/KickerAbility.java @@ -14,6 +14,7 @@ import mage.constants.AbilityType; import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; +import mage.game.events.GameEvent; import mage.players.Player; /** @@ -152,6 +153,7 @@ public class KickerAbility extends StaticAbility implements OptionalAdditionalSo amount += activations.get(key); } activations.put(key, amount); + game.fireEvent(GameEvent.getEvent(GameEvent.EventType.KICKED, source.getSourceId(), source.getSourceId(), source.getControllerId())); } private String getActivationKey(Ability source, String costText, Game game) { diff --git a/Mage/src/main/java/mage/game/events/GameEvent.java b/Mage/src/main/java/mage/game/events/GameEvent.java index 9f1f77659b9..63d5f3249e3 100644 --- a/Mage/src/main/java/mage/game/events/GameEvent.java +++ b/Mage/src/main/java/mage/game/events/GameEvent.java @@ -72,6 +72,7 @@ public class GameEvent implements Serializable { MIRACLE_CARD_REVEALED, MADNESS_CARD_EXILED, INVESTIGATED, + KICKED, DISCARD_CARD, DISCARDED_CARD, CYCLE_CARD, CYCLED_CARD,