mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-19 12:18:00 +00:00
1) Changed the keyword:
"This creature can't attack" to this new updated form: "CARDNAME can't attack." 2) I updated these cards.txt card entries and moved them to the top of file: Cagemail Cessation
This commit is contained in:
@@ -1826,12 +1826,12 @@ public class CardFactoryUtil {
|
||||
|
||||
//else we may need to filter the list and remove inappropriate targets
|
||||
|
||||
// If extrinsicKeywords contains "This creature can't attack" or "CARDNAME can't attack or block."
|
||||
// If extrinsicKeywords contains "CARDNAME can't attack." or "CARDNAME can't attack or block."
|
||||
// then remove creatures with Defender from the list
|
||||
|
||||
final ArrayList<String> extKeywords = new ArrayList<String>(Arrays.asList(extrinsicKeywords));
|
||||
|
||||
if (extKeywords.contains("This creature can't attack") || extKeywords.contains("CARDNAME can't attack or block.")) {
|
||||
if (extKeywords.contains("CARDNAME can't attack.") || extKeywords.contains("CARDNAME can't attack or block.")) {
|
||||
list = list.filter(new CardListFilter() {
|
||||
public boolean addCard(Card c) {
|
||||
return c.isCreature() && !c.getKeyword().contains("Defender");
|
||||
|
||||
@@ -1649,7 +1649,7 @@ class CardFactory_Auras {
|
||||
public void execute() {
|
||||
if(card.isEnchanting()) {
|
||||
Card crd = card.getEnchanting().get(0);
|
||||
crd.addExtrinsicKeyword("This creature can't attack");
|
||||
crd.addExtrinsicKeyword("CARDNAME can't attack.");
|
||||
}
|
||||
}//execute()
|
||||
};//Command
|
||||
@@ -1661,7 +1661,7 @@ class CardFactory_Auras {
|
||||
public void execute() {
|
||||
if(card.isEnchanting()) {
|
||||
Card crd = card.getEnchanting().get(0);
|
||||
crd.removeExtrinsicKeyword("This creature can't attack");
|
||||
crd.removeExtrinsicKeyword("CARDNAME can't attack.");
|
||||
}
|
||||
|
||||
}//execute()
|
||||
|
||||
@@ -295,7 +295,7 @@ public class CombatUtil {
|
||||
}
|
||||
|
||||
if(c.isTapped() || c.hasSickness() || c.getKeyword().contains("Defender") || moatPrevented
|
||||
|| oppControlsBlazingArchon(c) || c.getKeyword().contains("This creature can't attack")
|
||||
|| oppControlsBlazingArchon(c) || c.getKeyword().contains("CARDNAME can't attack.")
|
||||
|| c.getKeyword().contains("CARDNAME can't attack or block.")) return false;
|
||||
|
||||
//if Card has Haste, Card.hasSickness() will return false
|
||||
|
||||
Reference in New Issue
Block a user