From 3b9b2e15be83cb405756501351a57273c0ee6722 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Wed, 9 Nov 2022 08:53:51 -0500 Subject: [PATCH] [40K] a few text fixes --- .../src/mage/cards/a/AbaddonTheDespoiler.java | 2 +- .../src/mage/cards/a/AspiringChampion.java | 2 +- Mage.Sets/src/mage/cards/b/BileBlight.java | 30 ++++++++++--------- .../src/mage/cards/b/BirthOfTheImperium.java | 6 ++-- .../java/mage/verify/VerifyCardDataTest.java | 2 +- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AbaddonTheDespoiler.java b/Mage.Sets/src/mage/cards/a/AbaddonTheDespoiler.java index 3275d51442b..7b0bfcfe478 100644 --- a/Mage.Sets/src/mage/cards/a/AbaddonTheDespoiler.java +++ b/Mage.Sets/src/mage/cards/a/AbaddonTheDespoiler.java @@ -61,7 +61,7 @@ public final class AbaddonTheDespoiler extends CardImpl { MyTurnCondition.instance, "during your turn, spells you cast from " + "your hand with mana value X or less have cascade, where X is the " + "total amount of life your opponents have lost this turn" - )).addHint(hint)); + )).addHint(hint).withFlavorWord("Mark of the Chaos Ascendant")); } private AbaddonTheDespoiler(final AbaddonTheDespoiler card) { diff --git a/Mage.Sets/src/mage/cards/a/AspiringChampion.java b/Mage.Sets/src/mage/cards/a/AspiringChampion.java index 05f78213b32..efe48abeebf 100644 --- a/Mage.Sets/src/mage/cards/a/AspiringChampion.java +++ b/Mage.Sets/src/mage/cards/a/AspiringChampion.java @@ -35,7 +35,7 @@ public final class AspiringChampion extends CardImpl { // Ruinous Ascension -- When Aspiring Champion deals combat damage to a player, sacrifice it. If you do, reveal cards from the top of your library until you reveal a creature card. Put that card onto the battlefield, then shuffle the rest into your library. If that creature is a Demon, it deals damage equal to its power to each opponent. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility( new AspiringChampionEffect(), false - ).withFlavorWord("Ruinous Ascension")); + ).setTriggerPhrase("When {this} deals combat damage to a player, ").withFlavorWord("Ruinous Ascension")); } private AspiringChampion(final AspiringChampion card) { diff --git a/Mage.Sets/src/mage/cards/b/BileBlight.java b/Mage.Sets/src/mage/cards/b/BileBlight.java index e6f19f79794..3e8e6007fc1 100644 --- a/Mage.Sets/src/mage/cards/b/BileBlight.java +++ b/Mage.Sets/src/mage/cards/b/BileBlight.java @@ -42,7 +42,7 @@ class BileBlightEffect extends BoostAllEffect { public BileBlightEffect() { super(-3, -3, Duration.EndOfTurn); - staticText = "Target creature and all creatures with the same name as that creature get -3/-3 until end of turn"; + staticText = "Target creature and all other creatures with the same name as that creature get -3/-3 until end of turn"; } public BileBlightEffect(final BileBlightEffect effect) { @@ -53,19 +53,21 @@ class BileBlightEffect extends BoostAllEffect { public void init(Ability source, Game game) { super.init(source, game); affectedObjectList.clear(); - if (this.affectedObjectsSet) { - Permanent target = game.getPermanent(getTargetPointer().getFirst(game, source)); - if (target != null) { - if (CardUtil.haveEmptyName(target)) { // face down creature - affectedObjectList.add(new MageObjectReference(target, game)); - } else { - String name = target.getName(); - for (Permanent perm : game.getBattlefield().getActivePermanents(source.getControllerId(), game)) { - if (CardUtil.haveSameNames(perm, name, game)) { - affectedObjectList.add(new MageObjectReference(perm, game)); - } - } - } + if (!this.affectedObjectsSet) { + return; + } + Permanent target = game.getPermanent(getTargetPointer().getFirst(game, source)); + if (target == null) { + return; + } + if (CardUtil.haveEmptyName(target)) { // face down creature + affectedObjectList.add(new MageObjectReference(target, game)); + return; + } + String name = target.getName(); + for (Permanent perm : game.getBattlefield().getActivePermanents(source.getControllerId(), game)) { + if (CardUtil.haveSameNames(perm, name, game)) { + affectedObjectList.add(new MageObjectReference(perm, game)); } } } diff --git a/Mage.Sets/src/mage/cards/b/BirthOfTheImperium.java b/Mage.Sets/src/mage/cards/b/BirthOfTheImperium.java index bb6996a83c2..350a82bc281 100644 --- a/Mage.Sets/src/mage/cards/b/BirthOfTheImperium.java +++ b/Mage.Sets/src/mage/cards/b/BirthOfTheImperium.java @@ -16,12 +16,12 @@ import mage.constants.SubType; import mage.filter.StaticFilters; import mage.game.Controllable; import mage.game.Game; +import mage.game.permanent.token.WhiteAstartesWarriorToken; import java.util.Map; import java.util.UUID; import java.util.function.Function; import java.util.stream.Collectors; -import mage.game.permanent.token.WhiteAstartesWarriorToken; /** * @author TheElk801 @@ -82,7 +82,7 @@ enum BirthOfTheImperiumValue implements DynamicValue { .map(Controllable::getControllerId) .collect(Collectors.toMap(Function.identity(), x -> 1, Integer::sum)); int yourCreatures = map.getOrDefault(sourceAbility.getControllerId(), 0); - return yourCreatures > 0 ? game + return yourCreatures > 0 ? 2 * game .getOpponents(sourceAbility.getControllerId()) .stream().mapToInt(uuid -> map.getOrDefault(uuid, 0)) .filter(x -> x < yourCreatures) @@ -101,6 +101,6 @@ enum BirthOfTheImperiumValue implements DynamicValue { @Override public String toString() { - return "1"; + return "two"; } } diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java index eff49b0a9c7..a6eec412ce5 100644 --- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java +++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java @@ -60,7 +60,7 @@ public class VerifyCardDataTest { private static final Logger logger = Logger.getLogger(VerifyCardDataTest.class); - private static final String FULL_ABILITIES_CHECK_SET_CODE = "BRC"; // check all abilities and output cards with wrong abilities texts; + private static final String FULL_ABILITIES_CHECK_SET_CODE = "40K"; // check all abilities and output cards with wrong abilities texts; private static final boolean AUTO_FIX_SAMPLE_DECKS = false; // debug only: auto-fix sample decks by test_checkSampleDecks test run private static final boolean ONLY_TEXT = false; // use when checking text locally, suppresses unnecessary checks and output messages