From a4ca2465d1d3d80345d59b9110c4a4685686a9d8 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 05:01:58 +0000 Subject: [PATCH] Fixed Coat of Arms, it now counts creatures, not creature types and also considers Changeling creatures --- src/forge/GameActionUtil.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 8886d4a084d..de5d842804c 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -10179,18 +10179,23 @@ public class GameActionUtil { return !card.equals(crd) && card.isCreature() && !crd.getName().equals("Mana Pool"); } }); + CardList Already_Added = new CardList(); for(int x = 0; x < Type.size(); x++) { + Already_Added.clear(); for(int x2 = 0; x2 < Type.get(x).getType().size(); x2++) { - if(crd.getType().contains(Type.get(x).getType().get(x2))) { - if(Type.get(x).getType().get(x2).equals("Creature") || Type.get(x).getType().get(x2).equals("Legendary") - || Type.get(x).getType().get(x2).equals("Artifact") ) { - } else { + if(!Already_Added.contains(Type.get(x))) { + if(!Type.get(x).getType().get(x2).equals("Creature") && !Type.get(x).getType().get(x2).equals("Legendary") + && !Type.get(x).getType().get(x2).equals("Artifact") ) { + if(crd.getType().contains(Type.get(x).getType().get(x2)) || crd.getKeyword().contains("Changeling") + || Type.get(x).getKeyword().contains("Changeling")) { + Already_Added.add(Type.get(x)); crd.addSemiPermanentAttackBoost(1); crd.addSemiPermanentDefenseBoost(1); gloriousAnthemList.add(crd); } } } + } } }// for inner }// for outer