mirror of
https://github.com/correl/mage.git
synced 2025-04-13 17:00:09 -09:00
[KHC] text fixes
This commit is contained in:
parent
ebbff82f82
commit
df38d7213e
6 changed files with 13 additions and 11 deletions
Mage.Sets/src/mage/cards
Mage.Tests/src/test/java/org/mage/test/cards/single/khm
Mage.Verify/src/test/java/mage/verify
Mage/src/main/java/mage/abilities/keyword
|
@ -23,7 +23,7 @@ import java.util.UUID;
|
||||||
*/
|
*/
|
||||||
public final class ElderfangVenom extends CardImpl {
|
public final class ElderfangVenom extends CardImpl {
|
||||||
|
|
||||||
private static final FilterPermanent filter = new FilterPermanent(SubType.ELF, "attacking elves");
|
private static final FilterPermanent filter = new FilterPermanent(SubType.ELF, "attacking Elves");
|
||||||
|
|
||||||
static {
|
static {
|
||||||
filter.add(AttackingPredicate.instance);
|
filter.add(AttackingPredicate.instance);
|
||||||
|
|
|
@ -18,7 +18,7 @@ import java.util.UUID;
|
||||||
*/
|
*/
|
||||||
public final class RuthlessWinnower extends CardImpl {
|
public final class RuthlessWinnower extends CardImpl {
|
||||||
|
|
||||||
private static final FilterPermanent filter = new FilterPermanent("a non-Elf creature");
|
private static final FilterPermanent filter = new FilterPermanent("non-Elf creature");
|
||||||
|
|
||||||
static {
|
static {
|
||||||
filter.add(Predicates.not(SubType.ELF.getPredicate()));
|
filter.add(Predicates.not(SubType.ELF.getPredicate()));
|
||||||
|
|
|
@ -24,7 +24,7 @@ public class DreamDevourerTest extends CardTestPlayerBase {
|
||||||
|
|
||||||
// bears must have foretell and normal cast
|
// bears must have foretell and normal cast
|
||||||
checkPlayableAbility("normal cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Grizzly Bears", true);
|
checkPlayableAbility("normal cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Grizzly Bears", true);
|
||||||
checkPlayableAbility("foretell exile", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2}: Foretell", true);
|
checkPlayableAbility("foretell exile", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Foretell", true);
|
||||||
checkPT("no boost", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Dream Devourer", 0, 3);
|
checkPT("no boost", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Dream Devourer", 0, 3);
|
||||||
|
|
||||||
// normal cast and no boost
|
// normal cast and no boost
|
||||||
|
@ -35,7 +35,7 @@ public class DreamDevourerTest extends CardTestPlayerBase {
|
||||||
checkPT("after normal cast - no boost", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Dream Devourer", 0, 3);
|
checkPT("after normal cast - no boost", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Dream Devourer", 0, 3);
|
||||||
|
|
||||||
// foretell for {2}
|
// foretell for {2}
|
||||||
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2}: Fore");
|
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Fore");
|
||||||
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
|
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
|
||||||
checkPermanentCount("after foretell", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Grizzly Bears", 1);
|
checkPermanentCount("after foretell", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Grizzly Bears", 1);
|
||||||
checkExileCount("after foretell", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Grizzly Bears", 1);
|
checkExileCount("after foretell", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Grizzly Bears", 1);
|
||||||
|
|
|
@ -17,7 +17,7 @@ public class KarfellHarbingerTest extends CardTestPlayerBase {
|
||||||
addCard(Zone.BATTLEFIELD, playerA, "Karfell Harbinger");
|
addCard(Zone.BATTLEFIELD, playerA, "Karfell Harbinger");
|
||||||
addCard(Zone.HAND, playerA, "Augury Raven");
|
addCard(Zone.HAND, playerA, "Augury Raven");
|
||||||
|
|
||||||
activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{2}: Fore");
|
activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Fore");
|
||||||
|
|
||||||
setStrictChooseMode(true);
|
setStrictChooseMode(true);
|
||||||
setStopAt(1, PhaseStep.END_TURN);
|
setStopAt(1, PhaseStep.END_TURN);
|
||||||
|
|
|
@ -53,7 +53,7 @@ public class VerifyCardDataTest {
|
||||||
|
|
||||||
private static final Logger logger = Logger.getLogger(VerifyCardDataTest.class);
|
private static final Logger logger = Logger.getLogger(VerifyCardDataTest.class);
|
||||||
|
|
||||||
private static final String FULL_ABILITIES_CHECK_SET_CODE = "KHM"; // check all abilities and output cards with wrong abilities texts;
|
private static final String FULL_ABILITIES_CHECK_SET_CODE = "KHC"; // 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 AUTO_FIX_SAMPLE_DECKS = false; // debug only: auto-fix sample decks by test_checkSampleDecks test run
|
||||||
|
|
||||||
private static final HashMap<String, Set<String>> skipCheckLists = new HashMap<>();
|
private static final HashMap<String, Set<String>> skipCheckLists = new HashMap<>();
|
||||||
|
|
|
@ -71,6 +71,13 @@ public class ForetellAbility extends SpecialAction {
|
||||||
}
|
}
|
||||||
return super.canActivate(playerId, game);
|
return super.canActivate(playerId, game);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getRule() {
|
||||||
|
return "Foretell " + foretellCost + " <i>(During your turn, " +
|
||||||
|
"you may pay {2} and exile this card from your hand face down. " +
|
||||||
|
"Cast it on a later turn for its foretell cost.)</i>";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class ForetellExileEffect extends OneShotEffect {
|
class ForetellExileEffect extends OneShotEffect {
|
||||||
|
@ -82,11 +89,6 @@ class ForetellExileEffect extends OneShotEffect {
|
||||||
super(Outcome.Neutral);
|
super(Outcome.Neutral);
|
||||||
this.card = card;
|
this.card = card;
|
||||||
this.foretellCost = foretellCost;
|
this.foretellCost = foretellCost;
|
||||||
StringBuilder sbRule = new StringBuilder("Foretell");
|
|
||||||
sbRule.append("—");
|
|
||||||
sbRule.append(foretellCost);
|
|
||||||
sbRule.append(" <i>(During your turn, you may pay {2} and exile this card from your hand face down. Cast it on a later turn for its foretell cost.)</i>");
|
|
||||||
staticText = sbRule.toString();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public ForetellExileEffect(final ForetellExileEffect effect) {
|
public ForetellExileEffect(final ForetellExileEffect effect) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue