From df54500d9e30d854eaa91454dbd64d41d7f29ad9 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 14:02:24 +0000 Subject: [PATCH] Changed order of Kiki-Jiki copying morph. Added set and image info copying to a number of zone-changing effects. --- src/forge/CardFactory_Creatures.java | 40 +++++++++++++++++++++------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java index 5344d948952..1fbb46a7e30 100644 --- a/src/forge/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -287,16 +287,6 @@ public class CardFactory_Creatures { copy.setToken(true); copy.setCopiedToken(true); - if(getTargetCard().isFaceDown()) { - copy.setIsFaceDown(true); - copy.setManaCost(""); - copy.setBaseAttack(2); - copy.setBaseDefense(2); - copy.setIntrinsicKeyword(new ArrayList()); //remove all keywords - copy.setType(new ArrayList()); //remove all types - copy.addType("Creature"); - copy.clearSpellAbility(); //disallow "morph_up" - } copy.addIntrinsicKeyword("Haste"); } else //isToken() { @@ -323,6 +313,20 @@ public class CardFactory_Creatures { copy.setCurSetCode(getTargetCard().getCurSetCode()); copy.setImageFilename(getTargetCard().getImageFilename()); + if(getTargetCard().isFaceDown()) { + copy.setIsFaceDown(true); + copy.setManaCost(""); + copy.setBaseAttack(2); + copy.setBaseDefense(2); + copy.setIntrinsicKeyword(new ArrayList()); //remove all keywords + copy.setType(new ArrayList()); //remove all types + copy.addType("Creature"); + copy.clearSpellAbility(); //disallow "morph_up" + copy.setCurSetCode(""); + copy.setImageFilename("morph.jpg"); + } + + PlayerZone play = AllZone.getZone(Constant.Zone.Battlefield, card.getController()); play.add(copy); crds[i] = copy; @@ -7828,6 +7832,10 @@ public class CardFactory_Creatures { if(!c.isToken()) { Card newCard = AllZone.CardFactory.getCard(c.getName(), c.getOwner()); + + newCard.setCurSetCode(c.getCurSetCode()); + newCard.setImageFilename(c.getImageFilename()); + hand.add(newCard); } } @@ -7879,6 +7887,10 @@ public class CardFactory_Creatures { if(!c.isToken()) { Card newCard = AllZone.CardFactory.getCard(c.getName(), c.getOwner()); + + newCard.setCurSetCode(c.getCurSetCode()); + newCard.setImageFilename(c.getImageFilename()); + hand.add(newCard); } } @@ -7941,6 +7953,10 @@ public class CardFactory_Creatures { if(!c.isToken()) { Card newCard = AllZone.CardFactory.getCard(c.getName(), c.getOwner()); + + newCard.setCurSetCode(c.getCurSetCode()); + newCard.setImageFilename(c.getImageFilename()); + hand.add(newCard); } } @@ -8002,6 +8018,10 @@ public class CardFactory_Creatures { if(!c.isToken()) { Card newCard = AllZone.CardFactory.getCard(c.getName(), c.getOwner()); + + newCard.setCurSetCode(c.getCurSetCode()); + newCard.setImageFilename(c.getImageFilename()); + hand.add(newCard); } }