- Fixed Bloodthirst overwriting the X SVar.

- Fixed StackDescription of AF PumpAll.

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

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();

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