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 hard-crashing Forge (and updated Bloodthirst cards to account for the change, consistent with other similar parametric keywords).

Browse Source
This commit is contained in:
Agetian
2017-02-02 08:18:41 +00:00
parent 0045034d16
commit 1a96eb8a96
23 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -3317,7 +3317,7 @@ public class CardFactoryUtil {
final boolean intrinsic = kws == null; final boolean intrinsic = kws == null;
if (keyword.startsWith("Bloodthirst")) { if (keyword.startsWith("Bloodthirst")) {
final String numCounters = keyword.split(" ")[1]; final String numCounters = keyword.split(":")[1];
String desc; String desc;
if (numCounters.equals("X")) { if (numCounters.equals("X")) {

2
forge-gui/res/cardsfolder/b/battering_wurm.txt
View File

@@ -2,7 +2,7 @@ Name:Battering Wurm
ManaCost:6 G ManaCost:6 G
Types:Creature Wurm Types:Creature Wurm
PT:4/3 PT:4/3
K:Bloodthirst 1 K:Bloodthirst:1
K:Creatures with power less than CARDNAME's power can't block it. 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 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. 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.

2
forge-gui/res/cardsfolder/b/blood_ogre.txt
View File

@@ -2,7 +2,7 @@ Name:Blood Ogre
ManaCost:2 R ManaCost:2 R
Types:Creature Ogre Warrior Types:Creature Ogre Warrior
PT:2/2 PT:2/2
K:Bloodthirst 1 K:Bloodthirst:1
K:First Strike K:First Strike
SVar:Picture:http://www.wizards.com/global/images/magic/general/blood_ogre.jpg 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.) 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.)

2
forge-gui/res/cardsfolder/b/bloodlord_of_vaasgoth.txt
View File

@@ -2,7 +2,7 @@ Name:Bloodlord of Vaasgoth
ManaCost:3 B B ManaCost:3 B B
Types:Creature Vampire Warrior Types:Creature Vampire Warrior
PT:3/3 PT:3/3
K:Bloodthirst 3 K:Bloodthirst:3
K:Flying 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. 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 SVar:BloodPump:AB$ Animate | Cost$ 0 | Defined$ TriggeredCard | Keywords$ Bloodthirst 3 | Permanent$ True

2
forge-gui/res/cardsfolder/b/bloodrage_vampire.txt
View File

@@ -2,6 +2,6 @@ Name:Bloodrage Vampire
ManaCost:2 B ManaCost:2 B
Types:Creature Vampire Types:Creature Vampire
PT:3/1 PT:3/1
K:Bloodthirst 1 K:Bloodthirst:1
SVar:Picture:http://www.wizards.com/global/images/magic/general/bloodrage_vampire.jpg 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.) Oracle:Bloodthirst 1 (If an opponent was dealt damage this turn, this creature enters the battlefield with a +1/+1 counter on it.)

2
forge-gui/res/cardsfolder/b/bloodscale_prowler.txt
View File

@@ -2,6 +2,6 @@ Name:Bloodscale Prowler
ManaCost:2 R ManaCost:2 R
Types:Creature Viashino Warrior Types:Creature Viashino Warrior
PT:3/1 PT:3/1
K:Bloodthirst 1 K:Bloodthirst:1
SVar:Picture:http://www.wizards.com/global/images/magic/general/bloodscale_prowler.jpg 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.) Oracle:Bloodthirst 1 (If an opponent was dealt damage this turn, this creature enters the battlefield with a +1/+1 counter on it.)

2
forge-gui/res/cardsfolder/b/bogardan_lancer.txt
View File

@@ -2,7 +2,7 @@ Name:Bogardan Lancer
ManaCost:1 R ManaCost:1 R
Types:Creature Human Knight Types:Creature Human Knight
PT:1/1 PT:1/1
K:Bloodthirst 1 K:Bloodthirst:1
K:Flanking K:Flanking
SVar:Picture:http://www.wizards.com/global/images/magic/general/bogardan_lancer.jpg 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.) 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.)

2
forge-gui/res/cardsfolder/b/burning_tree_bloodscale.txt
View File

@@ -2,7 +2,7 @@ Name:Burning-Tree Bloodscale
ManaCost:2 R G ManaCost:2 R G
Types:Creature Viashino Berserker Types:Creature Viashino Berserker
PT:2/2 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$ 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. 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 SVar:RemAIDeck:True

2
forge-gui/res/cardsfolder/c/carnage_wurm.txt
View File

@@ -2,7 +2,7 @@ Name:Carnage Wurm
ManaCost:6 G ManaCost:6 G
Types:Creature Wurm Types:Creature Wurm
PT:6/6 PT:6/6
K:Bloodthirst 3 K:Bloodthirst:3
K:Trample K:Trample
SVar:Picture:http://www.wizards.com/global/images/magic/general/carnage_wurm.jpg 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.) 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.)

2
forge-gui/res/cardsfolder/d/duskhunter_bat.txt
View File

@@ -3,6 +3,6 @@ ManaCost:1 B
Types:Creature Bat Types:Creature Bat
PT:1/1 PT:1/1
K:Flying K:Flying
K:Bloodthirst 1 K:Bloodthirst:1
SVar:Picture:http://www.wizards.com/global/images/magic/general/duskhunter_bat.jpg 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 Oracle:Bloodthirst 1 (If an opponent was dealt damage this turn, this creature enters the battlefield with a +1/+1 counter on it.)\nFlying

2
forge-gui/res/cardsfolder/f/furyborn_hellkite.txt
View File

@@ -2,7 +2,7 @@ Name:Furyborn Hellkite
ManaCost:4 R R R ManaCost:4 R R R
Types:Creature Dragon Types:Creature Dragon
PT:6/6 PT:6/6
K:Bloodthirst 6 K:Bloodthirst:6
K:Flying K:Flying
SVar:Picture:http://www.wizards.com/global/images/magic/general/furyborn_hellkite.jpg 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 Oracle:Bloodthirst 6 (If an opponent was dealt damage this turn, this creature enters the battlefield with six +1/+1 counters on it.)\nFlying

2
forge-gui/res/cardsfolder/g/ghor_clan_savage.txt
View File

@@ -2,6 +2,6 @@ Name:Ghor-Clan Savage
ManaCost:3 G G ManaCost:3 G G
Types:Creature Centaur Berserker Types:Creature Centaur Berserker
PT:2/3 PT:2/3
K:Bloodthirst 3 K:Bloodthirst:3
SVar:Picture:http://www.wizards.com/global/images/magic/general/ghor_clan_savage.jpg 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.) Oracle:Bloodthirst 3 (If an opponent was dealt damage this turn, this creature enters the battlefield with three +1/+1 counters on it.)

2
forge-gui/res/cardsfolder/g/gorehorn_minotaurs.txt
View File

@@ -2,6 +2,6 @@ Name:Gorehorn Minotaurs
ManaCost:2 R R ManaCost:2 R R
Types:Creature Minotaur Warrior Types:Creature Minotaur Warrior
PT:3/3 PT:3/3
K:Bloodthirst 2 K:Bloodthirst:2
SVar:Picture:http://www.wizards.com/global/images/magic/general/gorehorn_minotaurs.jpg 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.) Oracle:Bloodthirst 2 (If an opponent was dealt damage this turn, this creature enters the battlefield with two +1/+1 counters on it.)

2
forge-gui/res/cardsfolder/g/gristleback.txt
View File

@@ -2,7 +2,7 @@ Name:Gristleback
ManaCost:2 G ManaCost:2 G
Types:Creature Boar Beast Types:Creature Boar Beast
PT:2/2 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. 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:X:Sacrificed$CardPower
SVar:Picture:http://www.wizards.com/global/images/magic/general/gristleback.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/gristleback.jpg

2
forge-gui/res/cardsfolder/l/lurking_crocodile.txt
View File

@@ -2,7 +2,7 @@ Name:Lurking Crocodile
ManaCost:2 G ManaCost:2 G
Types:Creature Crocodile Types:Creature Crocodile
PT:2/2 PT:2/2
K:Bloodthirst 1 K:Bloodthirst:1
K:Islandwalk K:Islandwalk
SVar:Picture:http://www.wizards.com/global/images/magic/general/lurking_crocodile.jpg 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.) 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.)

2
forge-gui/res/cardsfolder/p/petrified_wood_kin.txt
View File

@@ -3,7 +3,7 @@ ManaCost:6 G
Types:Creature Elemental Warrior Types:Creature Elemental Warrior
PT:3/3 PT:3/3
K:CARDNAME can't be countered. K:CARDNAME can't be countered.
K:Bloodthirst X K:Bloodthirst:X
K:Protection:Instant:Protection from instants K:Protection:Instant:Protection from instants
SVar:Picture:http://www.wizards.com/global/images/magic/general/petrified_wood_kin.jpg 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 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

2
forge-gui/res/cardsfolder/r/rabble_rouser.txt
View File

@@ -2,7 +2,7 @@ Name:Rabble-Rouser
ManaCost:3 R ManaCost:3 R
Types:Creature Goblin Shaman Types:Creature Goblin Shaman
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: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

2
forge-gui/res/cardsfolder/s/scab_clan_mauler.txt
View File

@@ -2,7 +2,7 @@ Name:Scab-Clan Mauler
ManaCost:R G ManaCost:R G
Types:Creature Human Berserker Types:Creature Human Berserker
PT:1/1 PT:1/1
K:Bloodthirst 2 K:Bloodthirst:2
K:Trample K:Trample
SVar:Picture:http://www.wizards.com/global/images/magic/general/scab_clan_mauler.jpg 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 Oracle:Bloodthirst 2 (If an opponent was dealt damage this turn, this creature enters the battlefield with two +1/+1 counters on it.)\nTrample

2
forge-gui/res/cardsfolder/s/skarrgan_firebird.txt
View File

@@ -2,7 +2,7 @@ Name:Skarrgan Firebird
ManaCost:4 R R ManaCost:4 R R
Types:Creature Phoenix Types:Creature Phoenix
PT:3/3 PT:3/3
K:Bloodthirst 3 K:Bloodthirst:3
K:Flying 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. 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 SVar:OppDamaged:Count$TotalOppDamageThisTurn

2
forge-gui/res/cardsfolder/s/skarrgan_pit_skulk.txt
View File

@@ -2,7 +2,7 @@ Name:Skarrgan Pit-Skulk
ManaCost:G ManaCost:G
Types:Creature Human Warrior Types:Creature Human Warrior
PT:1/1 PT:1/1
K:Bloodthirst 1 K:Bloodthirst:1
K:Creatures with power less than CARDNAME's power can't block it. 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 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. 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.

2
forge-gui/res/cardsfolder/s/skarrgan_skybreaker.txt
View File

@@ -2,7 +2,7 @@ Name:Skarrgan Skybreaker
ManaCost:4 R R G ManaCost:4 R R G
Types:Creature Giant Shaman Types:Creature Giant Shaman
PT:3/3 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. 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:X:Count$CardPower
SVar:Picture:http://www.wizards.com/global/images/magic/general/skarrgan_skybreaker.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/skarrgan_skybreaker.jpg

2
forge-gui/res/cardsfolder/s/stormblood_berserker.txt
View File

@@ -2,7 +2,7 @@ Name:Stormblood Berserker
ManaCost:1 R ManaCost:1 R
Types:Creature Human Berserker Types:Creature Human Berserker
PT:1/1 PT:1/1
K:Bloodthirst 2 K:Bloodthirst:2
K:Menace K:Menace
SVar:Picture:http://www.wizards.com/global/images/magic/general/stormblood_berserker.jpg 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 Oracle:Bloodthirst 2 (If an opponent was dealt damage this turn, this creature enters the battlefield with two +1/+1 counters on it.)\nMenace

2
forge-gui/res/cardsfolder/v/vampire_outcasts.txt
View File

@@ -2,7 +2,7 @@ Name:Vampire Outcasts
ManaCost:2 B B ManaCost:2 B B
Types:Creature Vampire Types:Creature Vampire
PT:2/2 PT:2/2
K:Bloodthirst 2 K:Bloodthirst:2
K:Lifelink K:Lifelink
SVar:Picture:http://www.wizards.com/global/images/magic/general/vampire_outcasts.jpg 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.) 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.)