-
Notifications
You must be signed in to change notification settings - Fork 783
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rework drawing cards and associated replacement effects; implement [W…
…HO] River Song (#12700) * remove unused scoring system code * add test for Alms Collector replacement effect * flatten draw cards into single method in PlayerImpl * remove outdated MageAction framework * clarify game event for drawing two or more cards * clarify methods for getting cards from library * implement [WHO] River Song * fix error * adjust library methods * add lots of test cases for draw replacement effects * fix #12616 * track cards drawn this way through multi draw replacement as well * add test for River Song * remove redundant comment
- Loading branch information
1 parent
34ae226
commit 9fcbfde
Showing
22 changed files
with
634 additions
and
334 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -89,4 +89,4 @@ public boolean apply(Game game, Ability source) { | |
|
|
||
| return true; | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| package mage.cards.r; | ||
|
|
||
| import mage.MageInt; | ||
| import mage.abilities.Ability; | ||
| import mage.abilities.TriggeredAbility; | ||
| import mage.abilities.TriggeredAbilityImpl; | ||
| import mage.abilities.common.SimpleStaticAbility; | ||
| import mage.abilities.dynamicvalue.common.SourcePermanentPowerCount; | ||
| import mage.abilities.effects.Effect; | ||
| import mage.abilities.effects.ReplacementEffectImpl; | ||
| import mage.abilities.effects.common.DamageTargetEffect; | ||
| import mage.abilities.effects.common.counter.AddCountersSourceEffect; | ||
| import mage.cards.CardImpl; | ||
| import mage.cards.CardSetInfo; | ||
| import mage.constants.*; | ||
| import mage.counters.CounterType; | ||
| import mage.game.Game; | ||
| import mage.game.events.DrawCardEvent; | ||
| import mage.game.events.GameEvent; | ||
| import mage.players.Player; | ||
| import mage.target.targetpointer.FixedTarget; | ||
|
|
||
| import java.util.UUID; | ||
|
|
||
| /** | ||
| * @author xenohedron | ||
| */ | ||
| public final class RiverSong extends CardImpl { | ||
|
|
||
| public RiverSong(UUID ownerId, CardSetInfo setInfo) { | ||
| super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}{R}"); | ||
|
|
||
| this.supertype.add(SuperType.LEGENDARY); | ||
| this.subtype.add(SubType.HUMAN); | ||
| this.subtype.add(SubType.TIME_LORD); | ||
| this.subtype.add(SubType.ROGUE); | ||
| this.power = new MageInt(2); | ||
| this.toughness = new MageInt(2); | ||
|
|
||
| // Meet in Reverse -- You draw cards from the bottom of your library rather than the top. | ||
| this.addAbility(new SimpleStaticAbility(new RiverSongDrawFromBottomReplacementEffect()) | ||
| .withFlavorWord("Meet in Reverse")); | ||
|
|
||
| // Spoilers -- Whenever an opponent scries, surveils, or searches their library, put a +1/+1 counter on River Song. | ||
| // Then River Song deals damage to that player equal to its power. | ||
| TriggeredAbility trigger = new RiverSongTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance())); | ||
| trigger.addEffect(new DamageTargetEffect(new SourcePermanentPowerCount(false)) | ||
| .setText("Then {this} deals damage to that player equal to its power")); | ||
| this.addAbility(trigger.withFlavorWord("Spoilers")); | ||
| } | ||
|
|
||
| private RiverSong(final RiverSong card) { | ||
| super(card); | ||
| } | ||
|
|
||
| @Override | ||
| public RiverSong copy() { | ||
| return new RiverSong(this); | ||
| } | ||
| } | ||
|
|
||
| class RiverSongDrawFromBottomReplacementEffect extends ReplacementEffectImpl { | ||
|
|
||
| RiverSongDrawFromBottomReplacementEffect() { | ||
| super(Duration.WhileOnBattlefield, Outcome.Neutral); | ||
| staticText = "You draw cards from the bottom of your library rather than the top"; | ||
| } | ||
|
|
||
| private RiverSongDrawFromBottomReplacementEffect(final RiverSongDrawFromBottomReplacementEffect effect) { | ||
| super(effect); | ||
| } | ||
|
|
||
| @Override | ||
| public RiverSongDrawFromBottomReplacementEffect copy() { | ||
| return new RiverSongDrawFromBottomReplacementEffect(this); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean replaceEvent(GameEvent event, Ability source, Game game) { | ||
| ((DrawCardEvent) event).setFromBottom(true); | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean checksEventType(GameEvent event, Game game) { | ||
| return event.getType() == GameEvent.EventType.DRAW_CARD; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean applies(GameEvent event, Ability source, Game game) { | ||
| return source.getControllerId().equals(event.getPlayerId()); | ||
| } | ||
| } | ||
|
|
||
| class RiverSongTriggeredAbility extends TriggeredAbilityImpl { | ||
|
|
||
| RiverSongTriggeredAbility(Effect effect) { | ||
| super(Zone.BATTLEFIELD, effect); | ||
| setTriggerPhrase("Whenever an opponent scries, surveils, or searches their library, "); | ||
| } | ||
|
|
||
| private RiverSongTriggeredAbility(final RiverSongTriggeredAbility ability) { | ||
| super(ability); | ||
| } | ||
|
|
||
| @Override | ||
| public RiverSongTriggeredAbility copy() { | ||
| return new RiverSongTriggeredAbility(this); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean checkEventType(GameEvent event, Game game) { | ||
| switch (event.getType()) { | ||
| case SCRIED: | ||
| case SURVEILED: | ||
| case LIBRARY_SEARCHED: | ||
| return true; | ||
| default: | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean checkTrigger(GameEvent event, Game game) { | ||
| Player controller = game.getPlayer(getControllerId()); | ||
| if (controller != null | ||
| && controller.hasOpponent(event.getPlayerId(), game) | ||
| && event.getPlayerId().equals(event.getTargetId())) { // searches own library | ||
| getEffects().setTargetPointer(new FixedTarget(event.getPlayerId())); | ||
| return true; | ||
| } | ||
| return false; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.