From 077df91e43ed2531156b4cd61c9383096d8f4d0c Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Mon, 3 Dec 2012 19:22:04 +0000
Subject: [PATCH] - Fixed Bloodthirst overwriting the X SVar. - Fixed
 StackDescription of AF PumpAll.

---
 res/cardsfolder/a/accorder_paladin.txt                         | 2 +-
 res/cardsfolder/r/rabble_rouser.txt                            | 2 +-
 .../java/forge/card/abilityfactory/effects/PumpAllEffect.java  | 3 ++-
 src/main/java/forge/card/cardfactory/CardFactoryUtil.java      | 1 -
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/cardsfolder/a/accorder_paladin.txt b/res/cardsfolder/a/accorder_paladin.txt
index b45b6bbf98f..69ec01b9933 100644
--- a/res/cardsfolder/a/accorder_paladin.txt
+++ b/res/cardsfolder/a/accorder_paladin.txt
@@ -4,7 +4,7 @@ Types:Creature Human Knight
 Text:no text
 PT:3/1
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigBattleCry | TriggerDescription$ Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)
-SVar:TrigBattleCry:AB$PumpAll | Cost$ 0 | ValidCards$ Creature.attacking+Other | NumAtt$ 1
+SVar:TrigBattleCry:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.attacking+Other | NumAtt$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accorder_paladin.jpg
 SetInfo:MBS|Uncommon|http://magiccards.info/scans/en/mbs/1.jpg
diff --git a/res/cardsfolder/r/rabble_rouser.txt b/res/cardsfolder/r/rabble_rouser.txt
index a15342142e0..34fdbced61d 100644
--- a/res/cardsfolder/r/rabble_rouser.txt
+++ b/res/cardsfolder/r/rabble_rouser.txt
@@ -4,7 +4,7 @@ Types:Creature Goblin Shaman
 Text:no text
 PT:1/1
 K:Bloodthirst 1
-A:AB$ PumpAll | Cost$ R T | ValidCards$ Creature.attacking | NumAtt$ +X | References$ X | SpellDescription$ Attacking creatures get +X/+0 until end of turn, where X is CARDNAME's power.
+A:AB$ PumpAll | Cost$ R T | ValidCards$ Creature.attacking | NumAtt$ X | References$ X | SpellDescription$ Attacking creatures get +X/+0 until end of turn, where X is CARDNAME's power.
 SVar:X:Count$CardPower
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rabble_rouser.jpg
diff --git a/src/main/java/forge/card/abilityfactory/effects/PumpAllEffect.java b/src/main/java/forge/card/abilityfactory/effects/PumpAllEffect.java
index 59177ddb469..06fdd678f27 100644
--- a/src/main/java/forge/card/abilityfactory/effects/PumpAllEffect.java
+++ b/src/main/java/forge/card/abilityfactory/effects/PumpAllEffect.java
@@ -22,9 +22,10 @@ public class PumpAllEffect extends SpellEffect {
         String desc = "";
         if (sa.hasParam("PumpAllDescription")) {
             desc = sa.getParam("PumpAllDescription");
+        } else if (sa.hasParam("SpellDescription")){
+            desc = sa.getParam("SpellDescription").replace("CARDNAME", sa.getSourceCard().getName());
         }
 
-
         sb.append(desc);
 
         final AbilitySub abSub = sa.getSubAbility();
diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
index 205e33603f4..3b87f5efc00 100644
--- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
+++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
@@ -4686,7 +4686,6 @@ public class CardFactoryUtil {
                         + "where X is the damage dealt to your opponents this turn.)";
                 card.setSVar("X", "Count$BloodthirstAmount");
             }
-            card.setSVar("X", "Count$BloodthirstAmount");
 
             card.addIntrinsicKeyword("etbCounter:P1P1:" + numCounters + ":Bloodthirst$ True:" + desc);
         } // bloodthirst