external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed Bloodthirst overwriting the X SVar.

Browse Source 
- Fixed StackDescription of AF PumpAll.
This commit is contained in:
Sloth
2012-12-03 19:22:04 +00:00
parent 32c0867390
commit 077df91e43
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/cardsfolder/a/accorder_paladin.txt
View File

@@ -4,7 +4,7 @@ Types:Creature Human Knight
Text:no text Text:no text
PT:3/1 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.) 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:Rarity:Uncommon
SVar:Picture:http://www.wizards.com/global/images/magic/general/accorder_paladin.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/accorder_paladin.jpg
SetInfo:MBS|Uncommon|http://magiccards.info/scans/en/mbs/1.jpg SetInfo:MBS|Uncommon|http://magiccards.info/scans/en/mbs/1.jpg

2
res/cardsfolder/r/rabble_rouser.txt
View File

@@ -4,7 +4,7 @@ Types:Creature Goblin Shaman
Text:no text Text:no text
PT:1/1 PT:1/1
K:Bloodthirst 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:X:Count$CardPower
SVar:Rarity:Uncommon SVar:Rarity:Uncommon
SVar:Picture:http://www.wizards.com/global/images/magic/general/rabble_rouser.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/rabble_rouser.jpg

3
src/main/java/forge/card/abilityfactory/effects/PumpAllEffect.java
View File

@@ -22,9 +22,10 @@ public class PumpAllEffect extends SpellEffect {
String desc = ""; String desc = "";
if (sa.hasParam("PumpAllDescription")) { if (sa.hasParam("PumpAllDescription")) {
desc = sa.getParam("PumpAllDescription"); desc = sa.getParam("PumpAllDescription");
} else if (sa.hasParam("SpellDescription")){
desc = sa.getParam("SpellDescription").replace("CARDNAME", sa.getSourceCard().getName());
} }
sb.append(desc); sb.append(desc);
final AbilitySub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();

1
src/main/java/forge/card/cardfactory/CardFactoryUtil.java
View File

@@ -4686,7 +4686,6 @@ public class CardFactoryUtil {
+ "where X is the damage dealt to your opponents this turn.)"; + "where X is the damage dealt to your opponents this turn.)";
card.setSVar("X", "Count$BloodthirstAmount"); card.setSVar("X", "Count$BloodthirstAmount");
} }
card.setSVar("X", "Count$BloodthirstAmount");
card.addIntrinsicKeyword("etbCounter:P1P1:" + numCounters + ":Bloodthirst$ True:" + desc); card.addIntrinsicKeyword("etbCounter:P1P1:" + numCounters + ":Bloodthirst$ True:" + desc);
} // bloodthirst } // bloodthirst