External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-27 05:52:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup some new cards

Browse source
This commit is contained in:
Susucre 2024-04-11 11:24:35 +02:00
parent 50e8a3b530
commit add0fa4f58
4 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage.Sets/src/mage/cards/a/AjaniNacatlAvenger.java
View file

@ -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()));

5
Mage.Sets/src/mage/cards/m/MythosOfSnapdax.java
View file

@ -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());

2
Mage.Sets/src/mage/cards/p/PreWarFormalwear.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/s/SmirkingSpelljacker.java
View file

@ -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."
));
}