From add0fa4f58286bce7d27fa528fb8786823b21ec7 Mon Sep 17 00:00:00 2001
From: Susucre <34709007+Susucre@users.noreply.github.com>
Date: Thu, 11 Apr 2024 11:24:35 +0200
Subject: [PATCH] cleanup some new cards

---
 Mage.Sets/src/mage/cards/a/AjaniNacatlAvenger.java  | 8 +++-----
 Mage.Sets/src/mage/cards/m/MythosOfSnapdax.java     | 5 ++---
 Mage.Sets/src/mage/cards/p/PreWarFormalwear.java    | 2 +-
 Mage.Sets/src/mage/cards/s/SmirkingSpelljacker.java | 2 +-
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/a/AjaniNacatlAvenger.java b/Mage.Sets/src/mage/cards/a/AjaniNacatlAvenger.java
index 1c33eedf4e9..597fec72c1c 100644
--- a/Mage.Sets/src/mage/cards/a/AjaniNacatlAvenger.java
+++ b/Mage.Sets/src/mage/cards/a/AjaniNacatlAvenger.java
@@ -31,6 +31,7 @@ import mage.game.permanent.token.CatWarrior21Token;
 import mage.players.Player;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetAnyTarget;
+import mage.util.CardUtil;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -154,19 +155,16 @@ class AjaniNacatlAvengerMinusFourEffect extends OneShotEffect {
         }
 
         List<Player> playerList = game
-                .getState()
-                .getPlayersInRange(source.getControllerId(), game)
+                .getOpponents(controller.getId())
                 .stream()
                 .map(game::getPlayer)
                 .filter(Objects::nonNull)
-                .filter(player -> controller.hasOpponent(player.getId(), game))
                 .collect(Collectors.toList());
 
         Set<UUID> toKeep = new HashSet<>();
         for (Player player : playerList) {
             for (CardType cardType : cardTypes) {
-                String message = cardType.toString().equals("Artifact") ? "an " : "a ";
-                message += cardType.toString().toLowerCase(Locale.ENGLISH);
+                String message = CardUtil.addArticle(cardType.toString());
                 FilterPermanent filter = new FilterNonlandPermanent(message);
                 filter.add(cardType.getPredicate());
                 filter.add(new ControllerIdPredicate(player.getId()));
diff --git a/Mage.Sets/src/mage/cards/m/MythosOfSnapdax.java b/Mage.Sets/src/mage/cards/m/MythosOfSnapdax.java
index d50ad30e4be..fdac4eb5a33 100644
--- a/Mage.Sets/src/mage/cards/m/MythosOfSnapdax.java
+++ b/Mage.Sets/src/mage/cards/m/MythosOfSnapdax.java
@@ -8,7 +8,6 @@ import mage.abilities.effects.OneShotEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.ColoredManaSymbol;
 import mage.constants.Outcome;
 import mage.filter.FilterPermanent;
 import mage.filter.StaticFilters;
@@ -18,6 +17,7 @@ import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 import mage.target.TargetPermanent;
+import mage.util.CardUtil;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -92,8 +92,7 @@ class MythosOfSnapdaxEffect extends OneShotEffect {
         Set<UUID> toKeep = new HashSet();
         for (Player player : playerList) {
             for (CardType cardType : cardTypes) {
-                String message = cardType.toString().equals("Artifact") ? "an " : "a ";
-                message += cardType.toString().toLowerCase(Locale.ENGLISH);
+                String message = CardUtil.addArticle(cardType.toString());
                 message += (conditionMet && player != controller) ? " controlled by " + player.getName() : " you control";
                 FilterPermanent filter = new FilterNonlandPermanent(message);
                 filter.add(cardType.getPredicate());
diff --git a/Mage.Sets/src/mage/cards/p/PreWarFormalwear.java b/Mage.Sets/src/mage/cards/p/PreWarFormalwear.java
index 5cea2049e2e..352b7c049dc 100644
--- a/Mage.Sets/src/mage/cards/p/PreWarFormalwear.java
+++ b/Mage.Sets/src/mage/cards/p/PreWarFormalwear.java
@@ -70,7 +70,7 @@ class PreWarFormalwerEffect extends OneShotEffect {
     PreWarFormalwerEffect() {
         super(Outcome.PutCreatureInPlay);
         staticText = "return target creature card with mana value 3 or less from your graveyard "
-                + "to the battlefield and attach Pre-War Formalwear to it";
+                + "to the battlefield and attach {this} to it";
     }
 
     private PreWarFormalwerEffect(final PreWarFormalwerEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SmirkingSpelljacker.java b/Mage.Sets/src/mage/cards/s/SmirkingSpelljacker.java
index 137dde27d99..baf584f3555 100644
--- a/Mage.Sets/src/mage/cards/s/SmirkingSpelljacker.java
+++ b/Mage.Sets/src/mage/cards/s/SmirkingSpelljacker.java
@@ -63,7 +63,7 @@ public final class SmirkingSpelljacker extends CardImpl {
         this.addAbility(new ConditionalInterveningIfTriggeredAbility(
                 new AttacksTriggeredAbility(new SmirkingSpelljackerEffect()),
                 SmirkingSpelljackerCondition.instance,
-                "Whenever Smirking Spelljacker attacks, if a card is exiled with it, "
+                "Whenever {this} attacks, if a card is exiled with it, "
                         + "you may cast the exiled card without paying its mana cost."
         ));
     }