forked from External/mage
fix Shared Fate to respect range of influence correctly (#13839)
* change opponents filter to check oponents of drawing player instead of cards controller * check for player and controller range
This commit is contained in:
parent
4dd7e963bc
commit
41b8f57883
1 changed files with 22 additions and 13 deletions
|
|
@ -8,15 +8,21 @@ import mage.cards.Card;
|
||||||
import mage.cards.CardImpl;
|
import mage.cards.CardImpl;
|
||||||
import mage.cards.CardSetInfo;
|
import mage.cards.CardSetInfo;
|
||||||
import mage.constants.*;
|
import mage.constants.*;
|
||||||
|
import mage.filter.FilterPlayer;
|
||||||
|
import mage.filter.predicate.Predicates;
|
||||||
|
import mage.filter.predicate.other.PlayerIdPredicate;
|
||||||
import mage.game.ExileZone;
|
import mage.game.ExileZone;
|
||||||
import mage.game.Game;
|
import mage.game.Game;
|
||||||
import mage.game.events.GameEvent;
|
import mage.game.events.GameEvent;
|
||||||
import mage.game.permanent.Permanent;
|
import mage.game.permanent.Permanent;
|
||||||
import mage.players.Player;
|
import mage.players.Player;
|
||||||
import mage.players.PlayerList;
|
import mage.players.PlayerList;
|
||||||
import mage.target.common.TargetOpponent;
|
import mage.target.Target;
|
||||||
|
import mage.target.TargetPlayer;
|
||||||
import mage.util.CardUtil;
|
import mage.util.CardUtil;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -74,13 +80,25 @@ class SharedFateReplacementEffect extends ReplacementEffectImpl {
|
||||||
Permanent sourcePermanent = game.getPermanent(source.getSourceId());
|
Permanent sourcePermanent = game.getPermanent(source.getSourceId());
|
||||||
Player playerToDraw = game.getPlayer(event.getPlayerId());
|
Player playerToDraw = game.getPlayer(event.getPlayerId());
|
||||||
Player controller = game.getPlayer(source.getControllerId());
|
Player controller = game.getPlayer(source.getControllerId());
|
||||||
PlayerList playersInRange = game.getState().getPlayersInRange(source.getControllerId(), game);
|
PlayerList playersInControllerRange = game.getState().getPlayersInRange(source.getControllerId(), game);
|
||||||
|
// Check if the player currently drawing is in range of the source
|
||||||
if (sourcePermanent == null || playerToDraw == null || controller == null
|
if (sourcePermanent == null || playerToDraw == null || controller == null
|
||||||
|| !playersInRange.contains(playerToDraw.getId())) {
|
|| !playersInControllerRange.contains(playerToDraw.getId())) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
TargetOpponent target = new TargetOpponent(true);
|
|
||||||
|
// Create opponent filter list manually because otherwise opponent check prevents controller of this to be valid
|
||||||
|
PlayerList playersInPlayerRange = game.getState().getPlayersInRange(playerToDraw.getId(), game);
|
||||||
|
FilterPlayer filter = new FilterPlayer("opponent");
|
||||||
|
List<PlayerIdPredicate> opponentPredicates = new ArrayList<>();
|
||||||
|
for (UUID opponentId : game.getOpponents(playerToDraw.getId())) {
|
||||||
|
if (playersInPlayerRange.contains(opponentId) && playersInControllerRange.contains(opponentId)) {
|
||||||
|
opponentPredicates.add(new PlayerIdPredicate(opponentId));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
filter.add(Predicates.or(opponentPredicates));
|
||||||
|
Target target = new TargetPlayer(1, 1, true, filter);
|
||||||
if (!playerToDraw.choose(Outcome.DrawCard, target, source, game)) {
|
if (!playerToDraw.choose(Outcome.DrawCard, target, source, game)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
@ -90,15 +108,6 @@ class SharedFateReplacementEffect extends ReplacementEffectImpl {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!playersInRange.contains(chosenPlayer.getId())) {
|
|
||||||
game.informPlayers(
|
|
||||||
"Nothing exiled. " + playerToDraw.getLogName()
|
|
||||||
+ " chose to exile from " + chosenPlayer.getLogName() + "'s library. "
|
|
||||||
+ "That player is outside of " + controller.getLogName() + "'s range of influence."
|
|
||||||
);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
game.informPlayers(playerToDraw.getLogName() + " chose to exile from " + chosenPlayer.getLogName() + "' library.");
|
game.informPlayers(playerToDraw.getLogName() + " chose to exile from " + chosenPlayer.getLogName() + "' library.");
|
||||||
|
|
||||||
Card card = chosenPlayer.getLibrary().getFromTop(game);
|
Card card = chosenPlayer.getLibrary().getFromTop(game);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue