external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

CantBeCounteredBy : make Autumns veil card text changing work

Browse Source
This commit is contained in:
Hanmac
2018-06-30 17:45:04 +02:00
parent 7c97129dcf
commit c37701ef1e
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -1445,7 +1445,10 @@ public class Card extends GameEntity implements Comparable<Card> {
}
}
}
if (keyword.startsWith("etbCounter")) {
if (keyword.startsWith("CantBeCounteredBy")) {
final String[] p = keyword.split(":");
sbLong.append(p[2]).append("\r\n");
} else if (keyword.startsWith("etbCounter")) {
final String[] p = keyword.split(":");
final StringBuilder s = new StringBuilder();
if (p.length > 4) {

13
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -300,10 +300,15 @@ public class CardFactoryUtil {
if (!isCounterable(c)) {
return false;
}
// Autumn's Veil
if (c.hasKeyword("CARDNAME can't be countered by blue or black spells.") && sa.isSpell()
&& (sa.getHostCard().isBlack() || sa.getHostCard().isBlue())) {
return false;
for (KeywordInterface k : c.getKeywords()) {
final String o = k.getOriginal();
if (o.startsWith("CantBeCounteredBy")) {
final String m[] = o.split(":");
if (sa.isValid(m[1].split(","), c.getController(), c, null)) {
return false;
}
}
}
return true;
}