mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-16 10:48: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:
@@ -1,3 +1,18 @@
|
|||||||
|
Cagemail
|
||||||
|
1 W
|
||||||
|
Enchantment Aura
|
||||||
|
Enchanted creature gets +2/+2 and can't attack.
|
||||||
|
Enchant creature
|
||||||
|
enPumpCurse:+2/+2/CARDNAME can't attack.
|
||||||
|
|
||||||
|
Cessation
|
||||||
|
2 W
|
||||||
|
Enchantment Aura
|
||||||
|
Enchanted creature can't attack.
|
||||||
|
Enchant creature
|
||||||
|
enPumpCurse:CARDNAME can't attack.
|
||||||
|
When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
|
||||||
|
|
||||||
Bound in Silence
|
Bound in Silence
|
||||||
2 W
|
2 W
|
||||||
Tribal Enchantment Rebel Aura
|
Tribal Enchantment Rebel Aura
|
||||||
@@ -190,14 +205,6 @@ Enchant creature
|
|||||||
enPump:+1/+2
|
enPump:+1/+2
|
||||||
When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
|
When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
|
||||||
|
|
||||||
Cessation
|
|
||||||
2 W
|
|
||||||
Enchantment Aura
|
|
||||||
Enchanted creature can't attack.
|
|
||||||
Enchant creature
|
|
||||||
enPumpCurse:This creature can't attack
|
|
||||||
When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
|
|
||||||
|
|
||||||
Despondency
|
Despondency
|
||||||
1 B
|
1 B
|
||||||
Enchantment Aura
|
Enchantment Aura
|
||||||
@@ -3086,13 +3093,6 @@ Goblin Assault
|
|||||||
Enchantment
|
Enchantment
|
||||||
At the beginning of your upkeep, put a 1/1 red Goblin creature token with haste onto the battlefield. Goblin creatures attack each turn if able.
|
At the beginning of your upkeep, put a 1/1 red Goblin creature token with haste onto the battlefield. Goblin creatures attack each turn if able.
|
||||||
|
|
||||||
Cagemail
|
|
||||||
1 W
|
|
||||||
Enchantment Aura
|
|
||||||
Enchanted creature gets +2/+2 and can't attack.
|
|
||||||
Enchant creature
|
|
||||||
enPumpCurse:+2/+2/This creature can't attack
|
|
||||||
|
|
||||||
Cursed Flesh
|
Cursed Flesh
|
||||||
B
|
B
|
||||||
Enchantment Aura
|
Enchantment Aura
|
||||||
|
|||||||
@@ -1826,12 +1826,12 @@ public class CardFactoryUtil {
|
|||||||
|
|
||||||
//else we may need to filter the list and remove inappropriate targets
|
//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
|
// then remove creatures with Defender from the list
|
||||||
|
|
||||||
final ArrayList<String> extKeywords = new ArrayList<String>(Arrays.asList(extrinsicKeywords));
|
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() {
|
list = list.filter(new CardListFilter() {
|
||||||
public boolean addCard(Card c) {
|
public boolean addCard(Card c) {
|
||||||
return c.isCreature() && !c.getKeyword().contains("Defender");
|
return c.isCreature() && !c.getKeyword().contains("Defender");
|
||||||
|
|||||||
@@ -1649,7 +1649,7 @@ class CardFactory_Auras {
|
|||||||
public void execute() {
|
public void execute() {
|
||||||
if(card.isEnchanting()) {
|
if(card.isEnchanting()) {
|
||||||
Card crd = card.getEnchanting().get(0);
|
Card crd = card.getEnchanting().get(0);
|
||||||
crd.addExtrinsicKeyword("This creature can't attack");
|
crd.addExtrinsicKeyword("CARDNAME can't attack.");
|
||||||
}
|
}
|
||||||
}//execute()
|
}//execute()
|
||||||
};//Command
|
};//Command
|
||||||
@@ -1661,7 +1661,7 @@ class CardFactory_Auras {
|
|||||||
public void execute() {
|
public void execute() {
|
||||||
if(card.isEnchanting()) {
|
if(card.isEnchanting()) {
|
||||||
Card crd = card.getEnchanting().get(0);
|
Card crd = card.getEnchanting().get(0);
|
||||||
crd.removeExtrinsicKeyword("This creature can't attack");
|
crd.removeExtrinsicKeyword("CARDNAME can't attack.");
|
||||||
}
|
}
|
||||||
|
|
||||||
}//execute()
|
}//execute()
|
||||||
|
|||||||
@@ -295,7 +295,7 @@ public class CombatUtil {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(c.isTapped() || c.hasSickness() || c.getKeyword().contains("Defender") || moatPrevented
|
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;
|
|| c.getKeyword().contains("CARDNAME can't attack or block.")) return false;
|
||||||
|
|
||||||
//if Card has Haste, Card.hasSickness() will return false
|
//if Card has Haste, Card.hasSickness() will return false
|
||||||
|
|||||||
Reference in New Issue
Block a user