From 1a96eb8a966dc6020102e11306e09d3e6dcd7f81 Mon Sep 17 00:00:00 2001 From: Agetian Date: Thu, 2 Feb 2017 08:18:41 +0000 Subject: [PATCH] - Fixed Bloodthirst hard-crashing Forge (and updated Bloodthirst cards to account for the change, consistent with other similar parametric keywords). --- forge-game/src/main/java/forge/game/card/CardFactoryUtil.java | 2 +- forge-gui/res/cardsfolder/b/battering_wurm.txt | 2 +- forge-gui/res/cardsfolder/b/blood_ogre.txt | 2 +- forge-gui/res/cardsfolder/b/bloodlord_of_vaasgoth.txt | 2 +- forge-gui/res/cardsfolder/b/bloodrage_vampire.txt | 2 +- forge-gui/res/cardsfolder/b/bloodscale_prowler.txt | 2 +- forge-gui/res/cardsfolder/b/bogardan_lancer.txt | 2 +- forge-gui/res/cardsfolder/b/burning_tree_bloodscale.txt | 2 +- forge-gui/res/cardsfolder/c/carnage_wurm.txt | 2 +- forge-gui/res/cardsfolder/d/duskhunter_bat.txt | 2 +- forge-gui/res/cardsfolder/f/furyborn_hellkite.txt | 2 +- forge-gui/res/cardsfolder/g/ghor_clan_savage.txt | 2 +- forge-gui/res/cardsfolder/g/gorehorn_minotaurs.txt | 2 +- forge-gui/res/cardsfolder/g/gristleback.txt | 2 +- forge-gui/res/cardsfolder/l/lurking_crocodile.txt | 2 +- forge-gui/res/cardsfolder/p/petrified_wood_kin.txt | 2 +- forge-gui/res/cardsfolder/r/rabble_rouser.txt | 2 +- forge-gui/res/cardsfolder/s/scab_clan_mauler.txt | 2 +- forge-gui/res/cardsfolder/s/skarrgan_firebird.txt | 2 +- forge-gui/res/cardsfolder/s/skarrgan_pit_skulk.txt | 2 +- forge-gui/res/cardsfolder/s/skarrgan_skybreaker.txt | 2 +- forge-gui/res/cardsfolder/s/stormblood_berserker.txt | 2 +- forge-gui/res/cardsfolder/v/vampire_outcasts.txt | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index b23eafad033..236db5e4a4e 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -3317,7 +3317,7 @@ public class CardFactoryUtil { final boolean intrinsic = kws == null; if (keyword.startsWith("Bloodthirst")) { - final String numCounters = keyword.split(" ")[1]; + final String numCounters = keyword.split(":")[1]; String desc; if (numCounters.equals("X")) { diff --git a/forge-gui/res/cardsfolder/b/battering_wurm.txt b/forge-gui/res/cardsfolder/b/battering_wurm.txt index a79b85fa4ef..9e7ddbb5eb0 100644 --- a/forge-gui/res/cardsfolder/b/battering_wurm.txt +++ b/forge-gui/res/cardsfolder/b/battering_wurm.txt @@ -2,7 +2,7 @@ Name:Battering Wurm ManaCost:6 G Types:Creature Wurm PT:4/3 -K:Bloodthirst 1 +K:Bloodthirst:1 K:Creatures with power less than CARDNAME's power can't block it. SVar:Picture:http://www.wizards.com/global/images/magic/general/battering_wurm.jpg Oracle:Bloodthirst 1 (If an opponent was dealt damage this turn, this creature enters the battlefield with a +1/+1 counter on it.)\nCreatures with power less than Battering Wurm's power can't block it. diff --git a/forge-gui/res/cardsfolder/b/blood_ogre.txt b/forge-gui/res/cardsfolder/b/blood_ogre.txt index 207591824e7..d89e6c33c18 100644 --- a/forge-gui/res/cardsfolder/b/blood_ogre.txt +++ b/forge-gui/res/cardsfolder/b/blood_ogre.txt @@ -2,7 +2,7 @@ Name:Blood Ogre ManaCost:2 R Types:Creature Ogre Warrior PT:2/2 -K:Bloodthirst 1 +K:Bloodthirst:1 K:First Strike SVar:Picture:http://www.wizards.com/global/images/magic/general/blood_ogre.jpg Oracle:Bloodthirst 1 (If an opponent was dealt damage this turn, this creature enters the battlefield with a +1/+1 counter on it.)\nFirst strike (This creature deals combat damage before creatures without first strike.) diff --git a/forge-gui/res/cardsfolder/b/bloodlord_of_vaasgoth.txt b/forge-gui/res/cardsfolder/b/bloodlord_of_vaasgoth.txt index cabddf40b1a..c99b97a0335 100644 --- a/forge-gui/res/cardsfolder/b/bloodlord_of_vaasgoth.txt +++ b/forge-gui/res/cardsfolder/b/bloodlord_of_vaasgoth.txt @@ -2,7 +2,7 @@ Name:Bloodlord of Vaasgoth ManaCost:3 B B Types:Creature Vampire Warrior PT:3/3 -K:Bloodthirst 3 +K:Bloodthirst:3 K:Flying T:Mode$ SpellCast | ValidCard$ Creature.Vampire | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ BloodPump | TriggerDescription$ Whenever you cast a Vampire creature spell, it gains bloodthirst 3. SVar:BloodPump:AB$ Animate | Cost$ 0 | Defined$ TriggeredCard | Keywords$ Bloodthirst 3 | Permanent$ True diff --git a/forge-gui/res/cardsfolder/b/bloodrage_vampire.txt b/forge-gui/res/cardsfolder/b/bloodrage_vampire.txt index 13c4f4ce8c8..9d3c3810a16 100644 --- a/forge-gui/res/cardsfolder/b/bloodrage_vampire.txt +++ b/forge-gui/res/cardsfolder/b/bloodrage_vampire.txt @@ -2,6 +2,6 @@ Name:Bloodrage Vampire ManaCost:2 B Types:Creature Vampire PT:3/1 -K:Bloodthirst 1 +K:Bloodthirst:1 SVar:Picture:http://www.wizards.com/global/images/magic/general/bloodrage_vampire.jpg Oracle:Bloodthirst 1 (If an opponent was dealt damage this turn, this creature enters the battlefield with a +1/+1 counter on it.) diff --git a/forge-gui/res/cardsfolder/b/bloodscale_prowler.txt b/forge-gui/res/cardsfolder/b/bloodscale_prowler.txt index 570b30781a9..b056d8cb3fa 100644 --- a/forge-gui/res/cardsfolder/b/bloodscale_prowler.txt +++ b/forge-gui/res/cardsfolder/b/bloodscale_prowler.txt @@ -2,6 +2,6 @@ Name:Bloodscale Prowler ManaCost:2 R Types:Creature Viashino Warrior PT:3/1 -K:Bloodthirst 1 +K:Bloodthirst:1 SVar:Picture:http://www.wizards.com/global/images/magic/general/bloodscale_prowler.jpg Oracle:Bloodthirst 1 (If an opponent was dealt damage this turn, this creature enters the battlefield with a +1/+1 counter on it.) diff --git a/forge-gui/res/cardsfolder/b/bogardan_lancer.txt b/forge-gui/res/cardsfolder/b/bogardan_lancer.txt index bae5839190f..2e6bd497f80 100644 --- a/forge-gui/res/cardsfolder/b/bogardan_lancer.txt +++ b/forge-gui/res/cardsfolder/b/bogardan_lancer.txt @@ -2,7 +2,7 @@ Name:Bogardan Lancer ManaCost:1 R Types:Creature Human Knight PT:1/1 -K:Bloodthirst 1 +K:Bloodthirst:1 K:Flanking SVar:Picture:http://www.wizards.com/global/images/magic/general/bogardan_lancer.jpg Oracle:Bloodthirst 1 (If an opponent was dealt damage this turn, this creature enters the battlefield with a +1/+1 counter on it.)\nFlanking (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.) diff --git a/forge-gui/res/cardsfolder/b/burning_tree_bloodscale.txt b/forge-gui/res/cardsfolder/b/burning_tree_bloodscale.txt index 7370fc2bff0..bd809d96467 100644 --- a/forge-gui/res/cardsfolder/b/burning_tree_bloodscale.txt +++ b/forge-gui/res/cardsfolder/b/burning_tree_bloodscale.txt @@ -2,7 +2,7 @@ Name:Burning-Tree Bloodscale ManaCost:2 R G Types:Creature Viashino Berserker PT:2/2 -K:Bloodthirst 1 +K:Bloodthirst:1 A:AB$ Pump | Cost$ 2 R | ValidTgts$ Creature | TgtPrompt$ Select target creature that can't block this creature this turn | IsCurse$ True | KW$ HIDDEN CantBlockCardUIDSource | DefinedKW$ CardUIDSource | UntilHostLeavesPlayOrEOT$ True | StackDescription$ {c:Targeted} can't block CARDNAME this turn. | SpellDescription$ Target creature can't block CARDNAME this turn. A:AB$ MustBlock | Cost$ 2 G | ValidTgts$ Creature | TgtPrompt$ Select target creature that must block this creature this turn | SpellDescription$ Target creature blocks CARDNAME this turn if able. SVar:RemAIDeck:True diff --git a/forge-gui/res/cardsfolder/c/carnage_wurm.txt b/forge-gui/res/cardsfolder/c/carnage_wurm.txt index 3c37e97ac14..3c7d79847be 100644 --- a/forge-gui/res/cardsfolder/c/carnage_wurm.txt +++ b/forge-gui/res/cardsfolder/c/carnage_wurm.txt @@ -2,7 +2,7 @@ Name:Carnage Wurm ManaCost:6 G Types:Creature Wurm PT:6/6 -K:Bloodthirst 3 +K:Bloodthirst:3 K:Trample SVar:Picture:http://www.wizards.com/global/images/magic/general/carnage_wurm.jpg Oracle:Bloodthirst 3 (If an opponent was dealt damage this turn, this creature enters the battlefield with three +1/+1 counters on it.)\nTrample (If this creature would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker.) diff --git a/forge-gui/res/cardsfolder/d/duskhunter_bat.txt b/forge-gui/res/cardsfolder/d/duskhunter_bat.txt index b87754ef07b..3510f66fda1 100644 --- a/forge-gui/res/cardsfolder/d/duskhunter_bat.txt +++ b/forge-gui/res/cardsfolder/d/duskhunter_bat.txt @@ -3,6 +3,6 @@ ManaCost:1 B Types:Creature Bat PT:1/1 K:Flying -K:Bloodthirst 1 +K:Bloodthirst:1 SVar:Picture:http://www.wizards.com/global/images/magic/general/duskhunter_bat.jpg Oracle:Bloodthirst 1 (If an opponent was dealt damage this turn, this creature enters the battlefield with a +1/+1 counter on it.)\nFlying diff --git a/forge-gui/res/cardsfolder/f/furyborn_hellkite.txt b/forge-gui/res/cardsfolder/f/furyborn_hellkite.txt index c5cf7e1c2c9..71e776a39e3 100644 --- a/forge-gui/res/cardsfolder/f/furyborn_hellkite.txt +++ b/forge-gui/res/cardsfolder/f/furyborn_hellkite.txt @@ -2,7 +2,7 @@ Name:Furyborn Hellkite ManaCost:4 R R R Types:Creature Dragon PT:6/6 -K:Bloodthirst 6 +K:Bloodthirst:6 K:Flying SVar:Picture:http://www.wizards.com/global/images/magic/general/furyborn_hellkite.jpg Oracle:Bloodthirst 6 (If an opponent was dealt damage this turn, this creature enters the battlefield with six +1/+1 counters on it.)\nFlying diff --git a/forge-gui/res/cardsfolder/g/ghor_clan_savage.txt b/forge-gui/res/cardsfolder/g/ghor_clan_savage.txt index b11bf3b24df..484a667ac36 100644 --- a/forge-gui/res/cardsfolder/g/ghor_clan_savage.txt +++ b/forge-gui/res/cardsfolder/g/ghor_clan_savage.txt @@ -2,6 +2,6 @@ Name:Ghor-Clan Savage ManaCost:3 G G Types:Creature Centaur Berserker PT:2/3 -K:Bloodthirst 3 +K:Bloodthirst:3 SVar:Picture:http://www.wizards.com/global/images/magic/general/ghor_clan_savage.jpg Oracle:Bloodthirst 3 (If an opponent was dealt damage this turn, this creature enters the battlefield with three +1/+1 counters on it.) diff --git a/forge-gui/res/cardsfolder/g/gorehorn_minotaurs.txt b/forge-gui/res/cardsfolder/g/gorehorn_minotaurs.txt index 45cf8f67da7..3f3147e85af 100644 --- a/forge-gui/res/cardsfolder/g/gorehorn_minotaurs.txt +++ b/forge-gui/res/cardsfolder/g/gorehorn_minotaurs.txt @@ -2,6 +2,6 @@ Name:Gorehorn Minotaurs ManaCost:2 R R Types:Creature Minotaur Warrior PT:3/3 -K:Bloodthirst 2 +K:Bloodthirst:2 SVar:Picture:http://www.wizards.com/global/images/magic/general/gorehorn_minotaurs.jpg Oracle:Bloodthirst 2 (If an opponent was dealt damage this turn, this creature enters the battlefield with two +1/+1 counters on it.) diff --git a/forge-gui/res/cardsfolder/g/gristleback.txt b/forge-gui/res/cardsfolder/g/gristleback.txt index a65540d09cc..beba447bb9c 100644 --- a/forge-gui/res/cardsfolder/g/gristleback.txt +++ b/forge-gui/res/cardsfolder/g/gristleback.txt @@ -2,7 +2,7 @@ Name:Gristleback ManaCost:2 G Types:Creature Boar Beast PT:2/2 -K:Bloodthirst 1 +K:Bloodthirst:1 A:AB$ GainLife | Cost$ Sac<1/CARDNAME> | LifeAmount$ X | References$ X | SpellDescription$ You gain life equal to CARDNAME's power. SVar:X:Sacrificed$CardPower SVar:Picture:http://www.wizards.com/global/images/magic/general/gristleback.jpg diff --git a/forge-gui/res/cardsfolder/l/lurking_crocodile.txt b/forge-gui/res/cardsfolder/l/lurking_crocodile.txt index c690e484eb7..04c2fa2db09 100644 --- a/forge-gui/res/cardsfolder/l/lurking_crocodile.txt +++ b/forge-gui/res/cardsfolder/l/lurking_crocodile.txt @@ -2,7 +2,7 @@ Name:Lurking Crocodile ManaCost:2 G Types:Creature Crocodile PT:2/2 -K:Bloodthirst 1 +K:Bloodthirst:1 K:Islandwalk SVar:Picture:http://www.wizards.com/global/images/magic/general/lurking_crocodile.jpg Oracle:Bloodthirst 1 (If an opponent was dealt damage this turn, this creature enters the battlefield with a +1/+1 counter on it.)\nIslandwalk (This creature can't be blocked as long as defending player controls an Island.) diff --git a/forge-gui/res/cardsfolder/p/petrified_wood_kin.txt b/forge-gui/res/cardsfolder/p/petrified_wood_kin.txt index 9f87d1c29af..43ba8836645 100644 --- a/forge-gui/res/cardsfolder/p/petrified_wood_kin.txt +++ b/forge-gui/res/cardsfolder/p/petrified_wood_kin.txt @@ -3,7 +3,7 @@ ManaCost:6 G Types:Creature Elemental Warrior PT:3/3 K:CARDNAME can't be countered. -K:Bloodthirst X +K:Bloodthirst:X K:Protection:Instant:Protection from instants SVar:Picture:http://www.wizards.com/global/images/magic/general/petrified_wood_kin.jpg Oracle:Petrified Wood-Kin can't be countered.\nBloodthirst X (This creature enters the battlefield with X +1/+1 counters on it, where X is the damage dealt to your opponents this turn.)\nProtection from instants diff --git a/forge-gui/res/cardsfolder/r/rabble_rouser.txt b/forge-gui/res/cardsfolder/r/rabble_rouser.txt index 047f9eabec9..3f4b000c85b 100644 --- a/forge-gui/res/cardsfolder/r/rabble_rouser.txt +++ b/forge-gui/res/cardsfolder/r/rabble_rouser.txt @@ -2,7 +2,7 @@ Name:Rabble-Rouser ManaCost:3 R Types:Creature Goblin Shaman 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. SVar:X:Count$CardPower SVar:Picture:http://www.wizards.com/global/images/magic/general/rabble_rouser.jpg diff --git a/forge-gui/res/cardsfolder/s/scab_clan_mauler.txt b/forge-gui/res/cardsfolder/s/scab_clan_mauler.txt index 4fd36eed272..5c6c5be04f2 100644 --- a/forge-gui/res/cardsfolder/s/scab_clan_mauler.txt +++ b/forge-gui/res/cardsfolder/s/scab_clan_mauler.txt @@ -2,7 +2,7 @@ Name:Scab-Clan Mauler ManaCost:R G Types:Creature Human Berserker PT:1/1 -K:Bloodthirst 2 +K:Bloodthirst:2 K:Trample SVar:Picture:http://www.wizards.com/global/images/magic/general/scab_clan_mauler.jpg Oracle:Bloodthirst 2 (If an opponent was dealt damage this turn, this creature enters the battlefield with two +1/+1 counters on it.)\nTrample diff --git a/forge-gui/res/cardsfolder/s/skarrgan_firebird.txt b/forge-gui/res/cardsfolder/s/skarrgan_firebird.txt index 8acb259e55c..6f28020813b 100644 --- a/forge-gui/res/cardsfolder/s/skarrgan_firebird.txt +++ b/forge-gui/res/cardsfolder/s/skarrgan_firebird.txt @@ -2,7 +2,7 @@ Name:Skarrgan Firebird ManaCost:4 R R Types:Creature Phoenix PT:3/3 -K:Bloodthirst 3 +K:Bloodthirst:3 K:Flying A:AB$ ChangeZone | Cost$ R R R | Origin$ Graveyard | Destination$ Hand | ActivationZone$ Graveyard | CheckSVar$ OppDamaged | SVarCompare$ GE1 | References$ OppDamaged | SpellDescription$ Return CARDNAME from your graveyard to your hand. Activate this ability only if an opponent was dealt damage this turn. SVar:OppDamaged:Count$TotalOppDamageThisTurn diff --git a/forge-gui/res/cardsfolder/s/skarrgan_pit_skulk.txt b/forge-gui/res/cardsfolder/s/skarrgan_pit_skulk.txt index 6a013017134..1397cd4bb31 100644 --- a/forge-gui/res/cardsfolder/s/skarrgan_pit_skulk.txt +++ b/forge-gui/res/cardsfolder/s/skarrgan_pit_skulk.txt @@ -2,7 +2,7 @@ Name:Skarrgan Pit-Skulk ManaCost:G Types:Creature Human Warrior PT:1/1 -K:Bloodthirst 1 +K:Bloodthirst:1 K:Creatures with power less than CARDNAME's power can't block it. SVar:Picture:http://www.wizards.com/global/images/magic/general/skarrgan_pit_skulk.jpg Oracle:Bloodthirst 1 (If an opponent was dealt damage this turn, this creature enters the battlefield with a +1/+1 counter on it.)\nCreatures with power less than Skarrgan Pit-Skulk's power can't block it. diff --git a/forge-gui/res/cardsfolder/s/skarrgan_skybreaker.txt b/forge-gui/res/cardsfolder/s/skarrgan_skybreaker.txt index feb272c3da3..f1f5f777b2a 100644 --- a/forge-gui/res/cardsfolder/s/skarrgan_skybreaker.txt +++ b/forge-gui/res/cardsfolder/s/skarrgan_skybreaker.txt @@ -2,7 +2,7 @@ Name:Skarrgan Skybreaker ManaCost:4 R R G Types:Creature Giant Shaman PT:3/3 -K:Bloodthirst 3 +K:Bloodthirst:3 A:AB$ DealDamage | Cost$ 1 Sac<1/CARDNAME> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ X | References$ X | SpellDescription$ CARDNAME deals damage equal to its power to target creature or player. SVar:X:Count$CardPower SVar:Picture:http://www.wizards.com/global/images/magic/general/skarrgan_skybreaker.jpg diff --git a/forge-gui/res/cardsfolder/s/stormblood_berserker.txt b/forge-gui/res/cardsfolder/s/stormblood_berserker.txt index cb3d454ea7d..a99ca7c690d 100644 --- a/forge-gui/res/cardsfolder/s/stormblood_berserker.txt +++ b/forge-gui/res/cardsfolder/s/stormblood_berserker.txt @@ -2,7 +2,7 @@ Name:Stormblood Berserker ManaCost:1 R Types:Creature Human Berserker PT:1/1 -K:Bloodthirst 2 +K:Bloodthirst:2 K:Menace SVar:Picture:http://www.wizards.com/global/images/magic/general/stormblood_berserker.jpg Oracle:Bloodthirst 2 (If an opponent was dealt damage this turn, this creature enters the battlefield with two +1/+1 counters on it.)\nMenace \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/v/vampire_outcasts.txt b/forge-gui/res/cardsfolder/v/vampire_outcasts.txt index 5e594636b1e..620d787af8e 100644 --- a/forge-gui/res/cardsfolder/v/vampire_outcasts.txt +++ b/forge-gui/res/cardsfolder/v/vampire_outcasts.txt @@ -2,7 +2,7 @@ Name:Vampire Outcasts ManaCost:2 B B Types:Creature Vampire PT:2/2 -K:Bloodthirst 2 +K:Bloodthirst:2 K:Lifelink SVar:Picture:http://www.wizards.com/global/images/magic/general/vampire_outcasts.jpg Oracle:Bloodthirst 2 (If an opponent was dealt damage this turn, this creature enters the battlefield with two +1/+1 counters on it.)\nLifelink (Damage dealt by this creature also causes you to gain that much life.)