From f9014d67e7275fc33e7fd2f263786c940db59f3a Mon Sep 17 00:00:00 2001 From: jendave Date: Sun, 7 Aug 2011 00:12:36 +0000 Subject: [PATCH] - Fixed Show and Tell. --- res/cardsfolder/show_and_tell.txt | 4 ++-- src/forge/Card.java | 2 +- .../card/abilityFactory/AbilityFactory_ChangeZone.java | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/res/cardsfolder/show_and_tell.txt b/res/cardsfolder/show_and_tell.txt index 4675fa0e855..b0240fd4fb6 100644 --- a/res/cardsfolder/show_and_tell.txt +++ b/res/cardsfolder/show_and_tell.txt @@ -2,8 +2,8 @@ Name:Show and Tell ManaCost:2 U Types:Sorcery Text:no text -A:SP$ ChangeZone | Cost$ 2 U | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature,Artifact,Enchantment,Land | Defined$ Each | ChangeNum$ 1 | SpellDescription$ Each player may put an artifact, creature, enchantment, or land card from his or her hand onto the battlefield. -SVar:Picture:http://www.wizards.com/global/images/magic/general/show_and_tell.jpg +A:SP$ ChangeZone | Cost$ 2 U | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature,Artifact,Enchantment.nonAura,Land | Defined$ Each | ChangeNum$ 1 | SpellDescription$ Each player may put an artifact, creature, enchantment, or land card from his or her hand onto the battlefield. SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/show_and_tell.jpg SetInfo:USG|Rare|http://magiccards.info/scans/en/us/96.jpg End diff --git a/src/forge/Card.java b/src/forge/Card.java index 0cf636066b0..91a07cd5cd2 100644 --- a/src/forge/Card.java +++ b/src/forge/Card.java @@ -1874,7 +1874,7 @@ public class Card extends MyObservable { } public void unEnchantAllCards() { - for(int i = 0; i < equippedBy.size(); i++) { + for(int i = 0; i < enchantedBy.size(); i++) { enchantedBy.get(i).unEnchantCard(this); } } diff --git a/src/forge/card/abilityFactory/AbilityFactory_ChangeZone.java b/src/forge/card/abilityFactory/AbilityFactory_ChangeZone.java index 58cf384f8a7..6f75ed71080 100644 --- a/src/forge/card/abilityFactory/AbilityFactory_ChangeZone.java +++ b/src/forge/card/abilityFactory/AbilityFactory_ChangeZone.java @@ -446,9 +446,10 @@ public class AbilityFactory_ChangeZone { } for(Player player : fetchers){ - if (chooser == null) - chooser = player; - if (chooser.isComputer()){ + Player decider = chooser; + if (decider == null) + decider = player; + if (decider.isComputer()){ changeHiddenOriginResolveAI(af, sa, player); } else{ @@ -491,7 +492,7 @@ public class AbilityFactory_ChangeZone { GuiUtils.getChoiceOptional(af.getHostCard().getName() + " - Looking at Library", AllZoneUtil.getCardsInZone("Library", player).toArray()); if (origin.contains("Hand") && player.isComputer()) // Look at opponents hand before moving onto choosing a card - GuiUtils.getChoiceOptional(af.getHostCard().getName() + " - Looking at Human's Hand", AllZoneUtil.getCardsInZone("Hand", player).toArray()); + GuiUtils.getChoiceOptional(af.getHostCard().getName() + " - Looking at Opponent's Hand", AllZoneUtil.getCardsInZone("Hand", player).toArray()); fetchList = filterListByType(fetchList, params, sa);