refactor methods to find cards in exile (#13967)

* refactor exile method names, add comments

* fix card effects checking exile with filter to process ObjectSourcePlayerPredicates

* fix card effects checking exile to respect range of influence
This commit is contained in:
xenohedron 2025-09-12 17:06:53 -04:00 committed by GitHub
parent 32af4a0671
commit 34c26f09c8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
60 changed files with 183 additions and 195 deletions

View file

@ -147,7 +147,7 @@ public class ManifestTest extends CardTestPlayerBase {
runCode("after blink", 1, PhaseStep.PRECOMBAT_MAIN, playerA, (info, player, game) -> {
if (cardAfterBlink == null) {
Assert.assertEquals("after blink card must keep in exile",
1, currentGame.getExile().getAllCardsByRange(currentGame, playerA.getId()).size());
1, currentGame.getExile().getCardsInRange(currentGame, playerA.getId()).size());
} else {
String realPermanentName = currentGame.getBattlefield().getAllPermanents()
.stream()

View file

@ -66,7 +66,7 @@ public class DuneChanterTest extends CardTestPlayerBase {
private static void checkExile(String info, Player player, Game game, int count) {
int amount = game
.getExile()
.getAllCards(game, player.getId())
.getCardsOwned(game, player.getId())
.stream()
.filter(c -> c.getSubtype(game).contains(SubType.DESERT))
.mapToInt(k -> 1)

View file

@ -888,7 +888,7 @@ public class TokenImagesTest extends CardTestPlayerBase {
// check face down card in exile
runCode("on face down", 1, PhaseStep.PRECOMBAT_MAIN, playerA, (info, player, game) -> {
Card card = currentGame.getExile().getAllCards(currentGame, playerA.getId()).get(0);
Card card = currentGame.getExile().getCardsOwned(currentGame, playerA.getId()).get(0);
GameView gameView = getGameView(playerA);
CardView controllerCardView = gameView.getExile()
.stream()
@ -941,7 +941,7 @@ public class TokenImagesTest extends CardTestPlayerBase {
// check face down card
runCode("on face down", 1, PhaseStep.PRECOMBAT_MAIN, playerA, (info, player, game) -> {
Card card = currentGame.getExile().getAllCards(currentGame, playerA.getId()).get(0);
Card card = currentGame.getExile().getCardsOwned(currentGame, playerA.getId()).get(0);
GameView gameView = getGameView(playerA);
CardView controllerCardView = gameView.getExile()
.stream()