From 98e68707c97e705d44cf23f6eccdeacc645b6502 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 03:11:42 +0000
Subject: [PATCH] Added two new cards, Mana Tithe and Miscalculation to Dennis'
 new counter-spell code. I also included the LQ pic urls for these two cards.
 I made a minor change to the code to get the two cards with cycling to show a
 spellDescription in the choose dialog. I do not think that I damaged Dennis'
 code.  :)

---
 res/card-pictures.txt      |  2 ++
 res/cards.txt              | 13 ++++++++++++-
 res/main.properties        |  2 +-
 src/forge/CardFactory.java | 13 ++++++++++---
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/res/card-pictures.txt b/res/card-pictures.txt
index e043ded9898..553c4e0fb06 100644
--- a/res/card-pictures.txt
+++ b/res/card-pictures.txt
@@ -18,6 +18,8 @@ forest.jpg					http://resources.wizards.com/magic/cards/unh/en-us/card73946.jpg
 forest1.jpg					http://gatherer.wizards.com/handlers/image.ashx?type=card&multiverseid=2748
 forest2.jpg					http://gatherer.wizards.com/handlers/image.ashx?type=card&multiverseid=587
 forest3.jpg					http://gatherer.wizards.com/handlers/image.ashx?type=card&multiverseid=586
+mana_tithe.jpg		http://www.wizards.com/global/images/magic/general/mana_tithe.jpg
+miscalculation.jpg		http://www.wizards.com/global/images/magic/general/miscalculation.jpg
 eyeblights_ending.jpg		http://www.wizards.com/global/images/magic/general/eyeblights_ending.jpg
 collective_restraint.jpg		http://www.wizards.com/global/images/magic/general/collective_restraint.jpg
 force_spike.jpg		http://www.wizards.com/global/images/magic/general/force_spike.jpg
diff --git a/res/cards.txt b/res/cards.txt
index 343df83395c..4689103b339 100644
--- a/res/cards.txt
+++ b/res/cards.txt
@@ -1,3 +1,14 @@
+Mana Tithe
+W
+Instant
+Counter target spell unless its controller pays 1.
+
+Miscalculation
+1 U
+Instant
+Counter target spell unless its controller pays 2.
+Cycling:2
+
 Eyeblight's Ending
 2 B
 Tribal Instant Elf
@@ -27,7 +38,7 @@ Counter target spell unless its controller pays 4.
 Runeboggle
 2 U
 Instant
-Counter target spell unless its controller pays 1.
+Counter target spell unless its controller pays 1. Draw a card.
 Cantrip
 
 Spell Snip
diff --git a/res/main.properties b/res/main.properties
index 0b38b49e3ca..b5a49242876 100644
--- a/res/main.properties
+++ b/res/main.properties
@@ -1,6 +1,6 @@
 program/mail=mtgerror@yahoo.com
 program/forum=http://www.slightlymagic.net/forum/viewforum.php?f=26
-program/version=Forge -- official beta: 10/01/01, SVN revision: 264
+program/version=Forge -- official beta: 10/01/01, SVN revision: 266
 
 tokens--file=AllTokens.txt
 
diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index 98e40d4fc75..ae9e08b1c60 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -9490,9 +9490,9 @@ public class CardFactory implements NewConstants {
     }//*************** END ************ END **************************
 
 
-  //*************** START *********** START **************************
+    //*************** START *********** START **************************
     else if(cardName.equals("Mana Leak") || cardName.equals("Convolute") || cardName.equals("Daze") || cardName.equals("Force Spike") || 
-    		cardName.equals("Runeboggle") || cardName.equals("Spell Snip"))
+    		cardName.equals("Runeboggle") || cardName.equals("Spell Snip") || cardName.equals("Mana Tithe") || cardName.equals("Miscalculation"))
     {
       SpellAbility spell = new Spell(card)
       {
@@ -9500,7 +9500,9 @@ public class CardFactory implements NewConstants {
 		public void resolve()
         {
 		  String manaCost = "1";
-		  if (cardName.equals("Mana Leak"))
+		  if (cardName.equals("Miscalculation"))
+			  manaCost = "2";
+		  else if (cardName.equals("Mana Leak"))
 			  manaCost = "3";
 		  else if (cardName.equals("Convolute"))
 			  manaCost = "4";
@@ -9623,6 +9625,11 @@ public class CardFactory implements NewConstants {
 	      bounce.setBeforePayMana(bounceIslands);
 	      card.addSpellAbility(bounce);
       }//if Daze
+      else	// This is Chris' Evil hack to get the Cycling cards to give us a choose window with text for the SpellAbility
+      {
+        spell.setDescription(card.getText());
+        card.setText("");
+      }
     }//*************** END ************ END **************************