github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-14 19:19:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

[40K] a few text fixes

Browse source
This commit is contained in:
Evan Kranzler 2022-11-09 08:53:51 -05:00
parent 60269cfcbf
commit 3b9b2e15be
5 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/a/AbaddonTheDespoiler.java
View file

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

2
Mage.Sets/src/mage/cards/a/AspiringChampion.java
View file

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

30
Mage.Sets/src/mage/cards/b/BileBlight.java
View file

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

6
Mage.Sets/src/mage/cards/b/BirthOfTheImperium.java
View file

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

2
Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
View file

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