From ebe34a9938b13cc252ebb8d32b05f4f9fd522d08 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 03:52:20 +0000 Subject: [PATCH] 1) Added these cards and their LQ pic urls: Cagemail; Cursed Flesh; Leaden Fists; Zephyr Net. 2) I attempted to modify the canPlayAI() to handle the cards above and I think it is working, we shall see. Our beta testers will let us know. :) --- res/card-pictures.txt | 4 ++++ res/cards.txt | 29 +++++++++++++++++++++++++++++ src/forge/CardFactoryUtil.java | 15 +++++++++------ 3 files changed, 42 insertions(+), 6 deletions(-) diff --git a/res/card-pictures.txt b/res/card-pictures.txt index 9e044dc30d2..23591c237bb 100644 --- a/res/card-pictures.txt +++ b/res/card-pictures.txt @@ -38,6 +38,10 @@ snow_covered_mountain.jpg http://www.wizards.com/global/images/magic/gene snow_covered_mountain1.jpg http://www.wizards.com/global/images/magic/general/snow_covered_mountain.jpg snow_covered_mountain2.jpg http://www.magickartenmarkt.de/img/cards/Ice_Age/snow_covered_mountain.jpg snow_covered_mountain3.jpg http://www.magickartenmarkt.de/img/cards/Ice_Age/snow_covered_mountain.jpg +cagemail.jpg http://www.wizards.com/global/images/magic/general/cagemail.jpg +cursed_flesh.jpg http://www.wizards.com/global/images/magic/general/cursed_flesh.jpg +leaden_fists.jpg http://www.wizards.com/global/images/magic/general/leaden_fists.jpg +zephyr_net.jpg http://www.wizards.com/global/images/magic/general/zephyr_net.jpg immolation.jpg http://www.wizards.com/global/images/magic/general/immolation.jpg maggot_therapy.jpg http://www.wizards.com/global/images/magic/general/maggot_therapy.jpg riot_spikes.jpg http://www.wizards.com/global/images/magic/general/riot_spikes.jpg diff --git a/res/cards.txt b/res/cards.txt index 32cc1ffba59..dcb62650126 100644 --- a/res/cards.txt +++ b/res/cards.txt @@ -1,3 +1,32 @@ +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 +B +Enchantment Aura +Enchanted creature gets -1/-1 and has fear. +Enchant creature +enPump:-1/-1/Fear + +Leaden Fists +2 U +Enchantment Aura +Enchanted creature gets +3/+3 and doesn't untap during its controller's untap step. +Flash +Enchant creature +enPumpCurse:+3/+3/This card doesn't untap during your untap step. + +Zephyr Net +1 U +Enchantment Aura +Enchanted creature has defender and flying. +Enchant creature +enPumpCurse:Defender & Flying + Immolation R Enchantment Aura diff --git a/src/forge/CardFactoryUtil.java b/src/forge/CardFactoryUtil.java index 56d15382d4b..a6f833fb065 100644 --- a/src/forge/CardFactoryUtil.java +++ b/src/forge/CardFactoryUtil.java @@ -1589,16 +1589,19 @@ public class CardFactoryUtil { // then remove creatures with Vigilance from the list if (extKeywords.contains("This card doesn't untap during your untap step.")) { - list = list.filter(new CardListFilter() { - public boolean addCard(Card c) { - return c.isCreature() && !c.getKeyword().contains("Vigilance"); + list = list.filter(new CardListFilter() { + public boolean addCard(Card c) { + return c.isCreature() && + (c.getKeyword().contains("Vigilance") && c.isTapped()) || + (! c.getKeyword().contains("Vigilance") && + ((! c.isTapped() && Power < 1) || c.isTapped())); } }); } - //else (if aura is keyword only) + //else (if aura is keyword only or is Cagemail) - if (Power == 0 && Tough == 0) { // This aura is keyword only + if (Power >= 0 && Tough >= 0) { // This aura is keyword only or is Cagemail list = list.filter(new CardListFilter() { public boolean addCard(Card c){ ArrayList extKeywords = new ArrayList(Arrays.asList(extrinsicKeywords)); @@ -1613,7 +1616,7 @@ public class CardFactoryUtil { } - //else aura is power/toughness boost and may have keyword(s) + //else aura is power/toughness decrease and may have keyword(s) CardListUtil.sortAttack(list); CardListUtil.sortFlying(list);