- Kor Skyfisher should not be able to target the manapool anymore.

- New quest pricelist?\127?\127?\127?\127?\127?\127.

.gitattributes

@@ -54,6 +54,7 @@ res/pics_link/card-pictures_w.txt -text svneol=native#text/plain
 res/pics_link/card-pictures_x.txt -text svneol=native#text/plain
 res/pics_link/card-pictures_y.txt -text svneol=native#text/plain
 res/pics_link/card-pictures_z.txt -text svneol=native#text/plain
+res/quest/all-prices.txt -text svneol=native#text/plain
 res/quest/common.txt -text svneol=native#text/plain
 res/quest/easy.txt -text svneol=native#text/plain
 res/quest/hard.txt -text svneol=native#text/plain

res/quest/quest.properties

@@ -2,7 +2,7 @@ common--file=common.txt
 uncommon--file=uncommon.txt
 rare--file=rare.txt
 
-price--file=price.txt
+price--file=all-prices.txt
 
 easy--file=easy.txt
 medium--file=medium.txt

src/forge/CardFactory_Creatures.java

@@ -11396,6 +11396,13 @@ public class CardFactory_Creatures {
                 public void execute() {
                     PlayerZone play = AllZone.getZone(Constant.Zone.Play, card.getController());
                     CardList choice = new CardList(play.getCards());
+                    choice = choice.filter(new CardListFilter()
+                    {
+                    	public boolean addCard(Card c)
+                    	{
+                    		return !c.getName().equals("Mana Pool");
+                    	}
+                    });
                     AllZone.InputControl.setInput(CardFactoryUtil.input_targetSpecific(ability, choice,
                             "Select a permanent you control.", false, false));
                     ButtonUtil.disableAll();

src/forge/Gui_CardShop.java

@@ -231,6 +231,7 @@ public class Gui_CardShop extends JFrame implements CardContainer, DeckDisplay,
         	
         	 for(int i = 0; i < shopList.size(); i++) {
                  Card c = AllZone.CardFactory.getCard(shopList.get(i).toString(), "");
+                 
                  c.setValue(map.get(c.getName()));
                  c.setRarity(pack.getRarity(c.getName()));
              	 shop.add(c);
@@ -242,8 +243,20 @@ public class Gui_CardShop extends JFrame implements CardContainer, DeckDisplay,
         
         for(int i = 0; i < list.size(); i++) {
             Card c = AllZone.CardFactory.getCard(list.get(i).toString(), "");
-            c.setValue(map.get(c.getName()));
+            
             c.setRarity(pack.getRarity(c.getName()));
+            if (map.containsKey(c.getName()))
+            	c.setValue(map.get(c.getName()));
+            else //card is not on pricelist
+            {
+            	System.out.println("Card " + c.getName() + " is not in the price list.");
+            	if (c.getRarity().equals("Common"))
+            		c.setValue(10);
+            	else if (c.getRarity().equals("Uncommon"))
+            		c.setValue(50);
+            	else if (c.getRarity().equals("Rare"))
+            		c.setValue(200);
+            }
         	owned.add(c);
         }
        

src/forge/ReadPriceList.java

@@ -42,6 +42,7 @@ public class ReadPriceList implements NewConstants {
                 	String name = s[0].trim();
                 	String price = s[1].trim();
                 	
+                	//System.out.println("Name: " + name + ", Price: " + price);
                     
                     try {
                         long val = Long.parseLong(price.trim());