From 72d623784a654ca43474ec44f4803dc99395c5eb Mon Sep 17 00:00:00 2001 From: Agetian Date: Tue, 14 May 2019 08:38:24 +0300 Subject: [PATCH] - Added Ashiok, Dream Render. --- .../game/ability/effects/ChangeZoneAllEffect.java | 5 +++++ .../forge/game/ability/effects/ChangeZoneEffect.java | 2 +- .../src/main/java/forge/game/player/Player.java | 12 ++++++++++++ forge-gui/res/cardsfolder/a/ashiok_dream_render.txt | 8 ++++++++ 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 forge-gui/res/cardsfolder/a/ashiok_dream_render.txt diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java index ab5e1eea5eb..69f1e42d6a1 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java @@ -48,6 +48,11 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect { cards = new CardCollection(); for (final Player p : tgtPlayers) { cards.addAll(p.getCardsIn(origin)); + + if (origin.contains(ZoneType.Library) && sa.hasParam("Search") && !sa.getActivatingPlayer().canSearchOwnLibraryWith(sa, p)) { + cards.removeAll(p.getCardsIn(ZoneType.Library)); + } + } if (origin.contains(ZoneType.Library) && sa.hasParam("Search")) { // Search library using changezoneall effect need a param "Search" diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java index fdcab6ed8dd..050a005589f 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java @@ -767,7 +767,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect { fetchList.addAll(player.getCardsIn(ZoneType.Library, fetchNum)); } } - if (decider.hasKeyword("CantSearchLibrary")) { + if (decider.hasKeyword("CantSearchLibrary") || !decider.canSearchOwnLibraryWith(sa, player)) { fetchList.removeAll(player.getCardsIn(ZoneType.Library)); // "if you do/sb does, shuffle" is not mandatory (usually a triggered ability), should has this param. // "then shuffle" is mandatory diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java index 79670788306..cf9d8a4e36c 100644 --- a/forge-game/src/main/java/forge/game/player/Player.java +++ b/forge-game/src/main/java/forge/game/player/Player.java @@ -2965,4 +2965,16 @@ public class Player extends GameEntity implements Comparable { return true; } + + public boolean canSearchOwnLibraryWith(SpellAbility sa, Player targetPlayer) { + if (sa == null) { + return true; + } + + if (targetPlayer.equals(sa.getActivatingPlayer()) && hasKeyword("Spells and abilities you control can't cause you to search your library.")) { + return false; + } + + return true; + } } diff --git a/forge-gui/res/cardsfolder/a/ashiok_dream_render.txt b/forge-gui/res/cardsfolder/a/ashiok_dream_render.txt new file mode 100644 index 00000000000..34ef0b5e471 --- /dev/null +++ b/forge-gui/res/cardsfolder/a/ashiok_dream_render.txt @@ -0,0 +1,8 @@ +Name:Ashiok, Dream Render +ManaCost:1 UB UB +Types:Legendary Planeswalker Ashiok +Loyalty:5 +S:Mode$ Continuous | Affected$ Opponent | AddKeyword$ Spells and abilities you control can't cause you to search your library. | Description$ Spells and abilities your opponents control can't cause their controller to search their library. +A:AB$ Mill | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | NumCards$ 4 | ValidTgts$ Player | TgtPrompt$ Choose a player | SubAbility$ DBExileGrave | SpellDescription$ Target player puts the top four cards of their library into their graveyard. Then exile each opponent's graveyard. +SVar:DBExileGrave:DB$ ChangeZoneAll | Origin$ Graveyard | Destination$ Exile | Defined$ Opponent | ChangeType$ Card +Oracle:Spells and abilities your opponents control can't cause their controller to search their library.\n[-1]: Target player puts the top four cards of their library into their graveyard. Then exile each opponent's graveyard.