From c24fba980d2ed18af85d1e03393b5712bb9194cd Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 04:10:07 +0000 Subject: [PATCH] 1) Modified the CardFactoryUtil.hasProtectionFrom() method and wards should no longer be removed because of the type of protection that is given to the enchanted creature. 2) Added 2 LQ pic urls. --- res/card-pictures.txt | 2 ++ src/forge/CardFactoryUtil.java | 21 ++++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/res/card-pictures.txt b/res/card-pictures.txt index 327bc18c259..99bfa4fb199 100644 --- a/res/card-pictures.txt +++ b/res/card-pictures.txt @@ -38,6 +38,8 @@ 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 +awakening_zone.jpg http://www.wizards.com/global/images/magic/general/awakening_zone.jpg +chromatic_star.jpg http://www.wizards.com/global/images/magic/general/chromatic_star.jpg animate_artifact.jpg http://www.wizards.com/global/images/magic/general/animate_artifact.jpg burning_inquiry.jpg http://www.wizards.com/global/images/magic/general/burning_inquiry.jpg vampire_nocturnus.jpg http://www.wizards.com/global/images/magic/general/vampire_nocturnus.jpg diff --git a/src/forge/CardFactoryUtil.java b/src/forge/CardFactoryUtil.java index afde20dfff0..7f39c0eb5f8 100644 --- a/src/forge/CardFactoryUtil.java +++ b/src/forge/CardFactoryUtil.java @@ -2679,15 +2679,21 @@ public class CardFactoryUtil { kw = list.get(i); - if(kw.equals("Protection from white") && CardUtil.getColors(card).contains(Constant.Color.White)) return true; - if(kw.equals("Protection from blue") && CardUtil.getColors(card).contains(Constant.Color.Blue)) return true; - if(kw.equals("Protection from black") && CardUtil.getColors(card).contains(Constant.Color.Black)) return true; - if(kw.equals("Protection from red") && CardUtil.getColors(card).contains(Constant.Color.Red)) return true; - if(kw.equals("Protection from green") && CardUtil.getColors(card).contains(Constant.Color.Green)) return true; + if(kw.equals("Protection from white") && CardUtil.getColors(card).contains(Constant.Color.White) && + !card.getName().contains("White Ward")) return true; + if(kw.equals("Protection from blue") && CardUtil.getColors(card).contains(Constant.Color.Blue) && + !card.getName().contains("Blue Ward")) return true; + if(kw.equals("Protection from black") && CardUtil.getColors(card).contains(Constant.Color.Black) && + !card.getName().contains("Black Ward")) return true; + if(kw.equals("Protection from red") && CardUtil.getColors(card).contains(Constant.Color.Red) && + !card.getName().contains("Red Ward")) return true; + if(kw.equals("Protection from green") && CardUtil.getColors(card).contains(Constant.Color.Green) && + !card.getName().contains("Green Ward")) return true; if(kw.equals("Protection from creatures") && card.isCreature()) return true; - if(kw.equals("Protection from artifacts") && card.isArtifact()) return true; + if(kw.equals("Protection from artifacts") && card.isArtifact() && + !card.getName().contains("Artifact Ward")) return true; if(kw.equals("Protection from everything")) return true; @@ -2698,7 +2704,8 @@ public class CardFactoryUtil { if(kw.equals("Protection from Goblins") && (card.getType().contains("Goblin") || card.getKeyword().contains("Changeling"))) return true; - if(kw.equals("Protection from enchantments") && card.getType().contains("Enchantment")) return true; + if(kw.equals("Protection from enchantments") && card.getType().contains("Enchantment") && + !card.getName().contains("Tattoo Ward")) return true; } } return false;