From ddcc695e9d32dce14fa882af9eeaaafbab003fa0 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 09:07:04 +0000
Subject: [PATCH] - Fixed the destination Library in AbilityFactory_Fetch by
 moving the shuffling effect and improved the prompt. - Added Sterling Grove.

---
 .gitattributes                      |  1 +
 res/cardsfolder/sterling_grove.txt  | 10 ++++++++++
 src/forge/AbilityFactory_Fetch.java | 12 ++++++------
 3 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 res/cardsfolder/sterling_grove.txt

diff --git a/.gitattributes b/.gitattributes
index 4886a9029c9..11b7c7dd4cf 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3874,6 +3874,7 @@ res/cardsfolder/steelshaper_apprentice.txt -text svneol=native#text/plain
 res/cardsfolder/steelshapers_gift.txt -text svneol=native#text/plain
 res/cardsfolder/steely_resolve.txt -text svneol=native#text/plain
 res/cardsfolder/steppe_lynx.txt -text svneol=native#text/plain
+res/cardsfolder/sterling_grove.txt -text svneol=native#text/plain
 res/cardsfolder/stern_judge.txt -text svneol=native#text/plain
 res/cardsfolder/stern_proctor.txt -text svneol=native#text/plain
 res/cardsfolder/steward_of_valeron.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/sterling_grove.txt b/res/cardsfolder/sterling_grove.txt
new file mode 100644
index 00000000000..0befc0feaf0
--- /dev/null
+++ b/res/cardsfolder/sterling_grove.txt
@@ -0,0 +1,10 @@
+Name:Sterling Grove
+ManaCost:W G
+Types:Enchantment
+Text:no text
+K:stPumpOther:Enchantment.YouCtrl:0/0/Shroud:No Condition:Other enchantments you control have shroud. (They can't be the targets of spells or abilities.)
+A:AB$Fetch|Cost$1 Sac<1/CARDNAME>|Destination$Library|FetchType$Enchantment|FetchNum$1|SpellDescription$Search your library for an enchantment card and reveal that card. Shuffle your library, then put the card on top of it.
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/sterling_grove.jpg
+End
\ No newline at end of file
diff --git a/src/forge/AbilityFactory_Fetch.java b/src/forge/AbilityFactory_Fetch.java
index 07d7d232382..0ff541c1384 100644
--- a/src/forge/AbilityFactory_Fetch.java
+++ b/src/forge/AbilityFactory_Fetch.java
@@ -82,6 +82,7 @@ public class AbilityFactory_Fetch {
 	            
 	            if(o != null) {
 	            	AllZone.Human_Library.remove(o);
+	                AllZone.GameAction.shuffle(player);
 	            	Card c = (Card) o;
 	            	library.remove(c);
 	            	if (destination.equals("Hand")) 
@@ -95,7 +96,6 @@ public class AbilityFactory_Fetch {
 	            	break;
 	        }//if
         }
-        AllZone.GameAction.shuffle(player);
 	}
 	
 	private static void doFetchAI(AbilityFactory af, String player){
@@ -125,24 +125,24 @@ public class AbilityFactory_Fetch {
 	        		c = library.get(0);
 
             	AllZone.Computer_Library.remove(c);
+                AllZone.GameAction.shuffle(player);
             	library.remove(c);
-            	if (destination.equals("Hand")) {
+            	if (destination.equals("Hand")&& !type.equals("Card")) {
                     	CardList l = new CardList();
                     	l.add(c);
-                    	AllZone.Display.getChoiceOptional("Computer picked:", l.toArray());
+                    	AllZone.Display.getChoiceOptional(af.getHostCard().getName() + " - Computer picked:", l.toArray());
             		AllZone.Computer_Hand.add(c);
             	}//move to hand
             	else if (destination.equals("Battlefield")) 
                 	AllZone.getZone(Constant.Zone.Play, player).add(c); //move to battlefield
-            	else if (destination.equals("Library")) {
+            	else if (destination.equals("Library") && !type.equals("Card")) {
                 	CardList l = new CardList();
                 	l.add(c);
-                	AllZone.Display.getChoiceOptional("Computer picked:", l.toArray());
+                	AllZone.Display.getChoiceOptional(af.getHostCard().getName() + " - Computer picked:", l.toArray());
                 	AllZone.Computer_Library.add(c, libraryPosition); 
             	}//move to top of library
 	        }//if
         }
-        AllZone.GameAction.shuffle(player);
 	}
 
 	private static boolean fetchCanPlayAI(SpellAbility sa, AbilityFactory af){