- Reorganized Conditions of static abilities (WIP).

2025-11-20 20:58:03 +00:00 · 2012-11-24 12:19:43 +00:00
parent 580b0263fa
commit e896c91159
30 changed files with 49 additions and 46 deletions
--- a/res/cardsfolder/a/anthem_of_rakdos.txt
+++ b/res/cardsfolder/a/anthem_of_rakdos.txt
@@ -3,12 +3,12 @@ ManaCost:2 B R R
 Types:Enchantment
 Text:no text
 T:Mode$ Attacks | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ AnthemPump | TriggerDescription$ Whenever a creature you control attacks, it gets +2/+0 until end of turn and CARDNAME deals 1 damage to you.
-SVar:AnthemPump:AB$Pump | Cost$ 0 | Defined$ TriggeredAttacker | NumAtt$ 2 | SubAbility$ RakdosBurn
+SVar:AnthemPump:AB$ Pump | Cost$ 0 | Defined$ TriggeredAttacker | NumAtt$ 2 | SubAbility$ RakdosBurn
 SVar:RakdosBurn:DB$ DealDamage | Defined$ You | NumDmg$ 1
 R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card.YouCtrl | ValidTarget$ Creature,Player | Hellbent$ True | ReplaceWith$ DmgTwice | IsCombat$ False | Description$ Hellbent - As long as you have no cards in hand, if a source you control would deal damage to a creature or player, it deals double that damage to that creature or player instead.
 R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card.YouCtrl | ValidTarget$ Creature,Player | Hellbent$ True | ReplaceWith$ DmgTwiceCombat | IsCombat$ True | Secondary$ True | Description$ Hellbent - As long as you have no cards in hand, if a source you control would deal damage to a creature or player, it deals double that damage to that creature or player instead.
-SVar:DmgTwice:AB$DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
+SVar:DmgTwice:AB$ DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:DmgTwiceCombat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
+SVar:DmgTwiceCombat:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
 SVar:X:ReplaceCount$DamageAmount/Twice
 SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
--- a/res/cardsfolder/a/ardent_recruit.txt
+++ b/res/cardsfolder/a/ardent_recruit.txt
@@ -3,7 +3,7 @@ ManaCost:W
 Types:Creature Human Soldier
 Text:no text
 PT:1/1
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Metalcraft$ True | Description$ Metalcraft - CARDNAME gets +2/+2 as long as you control three or more artifacts.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Condition$ Metalcraft | Description$ Metalcraft - CARDNAME gets +2/+2 as long as you control three or more artifacts.
 SVar:BuffedBy:Artifact
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ardent_recruit.jpg
--- a/res/cardsfolder/a/auriok_edgewright.txt
+++ b/res/cardsfolder/a/auriok_edgewright.txt
@@ -3,7 +3,7 @@ ManaCost:W W
 Types:Creature Human Soldier
 Text:no text
 PT:2/2
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Double Strike | Metalcraft$ True | Description$ Metalcraft - CARDNAME has double strike as long as you control three or more artifacts.
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Double Strike | Condition$ Metalcraft | Description$ Metalcraft - CARDNAME has double strike as long as you control three or more artifacts.
 SVar:BuffedBy:Artifact
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/auriok_edgewright.jpg
--- a/res/cardsfolder/a/auriok_sunchaser.txt
+++ b/res/cardsfolder/a/auriok_sunchaser.txt
@@ -3,7 +3,7 @@ ManaCost:1 W
 Types:Creature Human Soldier
 Text:no text
 PT:1/1
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Flying | Metalcraft$ True | Description$ Metalcraft - As long as you control three or more artifacts, CARDNAME gets +2/+2 and has flying.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Flying | Condition$ Metalcraft | Description$ Metalcraft - As long as you control three or more artifacts, CARDNAME gets +2/+2 and has flying.
 SVar:BuffedBy:Artifact
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/auriok_sunchaser.jpg
--- a/res/cardsfolder/b/blade_tribe_berserkers.txt
+++ b/res/cardsfolder/b/blade_tribe_berserkers.txt
@@ -4,7 +4,7 @@ Types:Creature Human Berserker
 Text:no text
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Metalcraft$ True | Execute$ TrigPump | TriggerDescription$ Metalcraft - When CARDNAME enters the battlefield, if you control three or more artifacts, CARDNAME gets +3/+3 and gains haste until end of turn.
-SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 3 | NumDef$ 3 | KW$ Haste
+SVar:TrigPump:AB$ Pump | Cost$ 0 | Defined$ Self | NumAtt$ 3 | NumDef$ 3 | KW$ Haste
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blade_tribe_berserkers.jpg
 SetInfo:SOM|Common|http://magiccards.info/scans/en/som/84.jpg
--- a/res/cardsfolder/b/bleak_coven_vampires.txt
+++ b/res/cardsfolder/b/bleak_coven_vampires.txt
@@ -4,8 +4,8 @@ Types:Creature Vampire Warrior
 Text:no text
 PT:4/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Metalcraft$ True | Execute$ TrigDrain | TriggerDescription$ Metalcraft - When CARDNAME enters the battlefield, if you control three or more artifacts, target player loses 4 life and you gain 4 life.
-SVar:TrigDrain:AB$LoseLife | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 4 | SubAbility$ DBGainLife | IsCurse$ True | ConditionPresent$ Artifact.YouCtrl | ConditionCompare$ GE3
+SVar:TrigDrain:AB$ LoseLife | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 4 | SubAbility$ DBGainLife | IsCurse$ True | ConditionPresent$ Artifact.YouCtrl | ConditionCompare$ GE3
-SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 4
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 4
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bleak_coven_vampires.jpg
 SetInfo:SOM|Common|http://magiccards.info/scans/en/som/55.jpg
--- a/res/cardsfolder/c/carapace_forger.txt
+++ b/res/cardsfolder/c/carapace_forger.txt
@@ -3,7 +3,8 @@ ManaCost:1 G
 Types:Creature Elf Artificer
 Text:no text
 PT:2/2
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Metalcraft$ True | Description$ Metalcraft - CARDNAME gets +2/+2 as long as you control three or more artifacts.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Condition$ Metalcraft | Description$ Metalcraft - CARDNAME gets +2/+2 as long as you control three or more artifacts.
 SVar:BuffedBy:Artifact
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/carapace_forger.jpg
 SetInfo:SOM|Common|http://magiccards.info/scans/en/som/114.jpg
--- a/res/cardsfolder/c/chrome_steed.txt
+++ b/res/cardsfolder/c/chrome_steed.txt
@@ -3,7 +3,7 @@ ManaCost:4
 Types:Artifact Creature Horse
 Text:no text
 PT:2/2
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Metalcraft$ True | Description$ Metalcraft - CARDNAME gets +2/+2 as long as you control three or more artifacts.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Condition$ Metalcraft | Description$ Metalcraft - CARDNAME gets +2/+2 as long as you control three or more artifacts.
 SVar:BuffedBy:Artifact
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chrome_steed.jpg
--- a/res/cardsfolder/c/cutthroat_il_dal.txt
+++ b/res/cardsfolder/c/cutthroat_il_dal.txt
@@ -3,7 +3,7 @@ ManaCost:3 B
 Types:Creature Human Rogue
 Text:no text
 PT:4/1
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Shadow | Hellbent$ True | Description$ Hellbent - CARDNAME has shadow as long as you have no cards in hand. (It can block or be blocked by only creatures with shadow.)
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Shadow | Condition$ Hellbent | Description$ Hellbent - CARDNAME has shadow as long as you have no cards in hand. (It can block or be blocked by only creatures with shadow.)
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cutthroat_il_dal.jpg
 SetInfo:FUT|Common|http://magiccards.info/scans/en/fut/64.jpg
--- a/res/cardsfolder/d/demons_jester.txt
+++ b/res/cardsfolder/d/demons_jester.txt
@@ -4,7 +4,7 @@ Types:Creature Imp
 Text:no text
 PT:2/2
 K:Flying
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 1 | Hellbent$ True | Description$ Hellbent - CARDNAME gets +2/+1 as long as you have no cards in hand.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 1 | Condition$ Hellbent | Description$ Hellbent - CARDNAME gets +2/+1 as long as you have no cards in hand.
 SVar:BuffedBy:Card
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/demons_jester.jpg
--- a/res/cardsfolder/e/etched_champion.txt
+++ b/res/cardsfolder/e/etched_champion.txt
@@ -3,7 +3,7 @@ ManaCost:3
 Types:Artifact Creature Soldier
 Text:no text
 PT:2/2
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Protection from white & Protection from blue & Protection from black & Protection from red & Protection from green | Metalcraft$ True | Description$ Metalcraft - CARDNAME has protection from all colors as long as you control three or more artifacts.
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Protection from white & Protection from blue & Protection from black & Protection from red & Protection from green | Condition$ Metalcraft | Description$ Metalcraft - CARDNAME has protection from all colors as long as you control three or more artifacts.
 SVar:BuffedBy:Artifact
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/etched_champion.jpg
--- a/res/cardsfolder/e/ezuris_brigade.txt
+++ b/res/cardsfolder/e/ezuris_brigade.txt
@@ -3,7 +3,8 @@ ManaCost:2 G G
 Types:Creature Elf Warrior
 Text:no text
 PT:4/4
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 4 | AddToughness$ 4 | AddKeyword$ Trample | Metalcraft$ True | Description$ Metalcraft - As long as you control three or more artifacts, CARDNAME gets +4/+4 and has trample.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 4 | AddToughness$ 4 | AddKeyword$ Trample | Condition$ Metalcraft | Description$ Metalcraft - As long as you control three or more artifacts, CARDNAME gets +4/+4 and has trample.
 SVar:BuffedBy:Artifact
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ezuris_brigade.jpg
 SetInfo:SOM|Rare|http://magiccards.info/scans/en/som/121.jpg
--- a/res/cardsfolder/g/gathan_raiders.txt
+++ b/res/cardsfolder/g/gathan_raiders.txt
@@ -4,7 +4,7 @@ Types:Creature Human Warrior
 Text:no text
 PT:3/3
 K:Morph:Discard<1/Card>
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Hellbent$ True | CheckSVar$ X | SVarCompare$ EQ1 | Description$ Hellbent - CARDNAME gets +2/+2 as long as you have no cards in hand.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Condition$ Hellbent | CheckSVar$ X | SVarCompare$ EQ1 | Description$ Hellbent - CARDNAME gets +2/+2 as long as you have no cards in hand.
 SVar:X:Count$Valid Card.Self+faceUp
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gathan_raiders.jpg
--- a/res/cardsfolder/g/ghalmas_warden.txt
+++ b/res/cardsfolder/g/ghalmas_warden.txt
@@ -3,7 +3,7 @@ ManaCost:3 W
 Types:Creature Elephant Soldier
 Text:no text
 PT:2/4
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Metalcraft$ True | Description$ Metalcraft - CARDNAME gets +2/+2 as long as you control three or more artifacts.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Condition$ Metalcraft | Description$ Metalcraft - CARDNAME gets +2/+2 as long as you control three or more artifacts.
 SVar:BuffedBy:Artifact
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ghalmas_warden.jpg
--- a/res/cardsfolder/g/gibbering_descent.txt
+++ b/res/cardsfolder/g/gibbering_descent.txt
@@ -3,7 +3,7 @@ ManaCost:4 B B
 Types:Enchantment
 Text:no text
 K:Madness:2 B B
-S:Mode$ Continuous | Affected$ You | Hellbent$ True | AddKeyword$ Skip your upkeep step. | Description$ Hellbent - Skip your upkeep step if you have no cards in hand.
+S:Mode$ Continuous | Affected$ You | Condition$ Hellbent | AddKeyword$ Skip your upkeep step. | Description$ Hellbent - Skip your upkeep step if you have no cards in hand.
 T:Mode$ Phase | Phase$ Upkeep | Execute$ TrigLoseLifeDiscard | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's upkeep, that player loses 1 life and discards a card.
 SVar:TrigLoseLifeDiscard:AB$LoseLife | Cost$ 0 | Defined$ TriggeredPlayer | LifeAmount$ 1 | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ TriggeredPlayer | NumCards$ 1 | Mode$ TgtChoose
--- a/res/cardsfolder/g/gobhobbler_rats.txt
+++ b/res/cardsfolder/g/gobhobbler_rats.txt
@@ -3,8 +3,8 @@ ManaCost:B R
 Types:Creature Rat
 Text:no text
 PT:2/2
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddAbility$ Pump | Hellbent$ True | Description$ Hellbent - As long as you have no cards in hand, CARDNAME gets +1/+0 and has "B: Regenerate CARDNAME."
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddAbility$ Pump | Condition$ Hellbent | Description$ Hellbent - As long as you have no cards in hand, CARDNAME gets +1/+0 and has "B: Regenerate CARDNAME."
-SVar:Pump:AB$Regenerate | Cost$ B | SpellDescription$ Regenerate CARDNAME.
+SVar:Pump:AB$ Regenerate | Cost$ B | SpellDescription$ Regenerate CARDNAME.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gobhobbler_rats.jpg
 SetInfo:DIS|Common|http://magiccards.info/scans/en/di/111.jpg
--- a/res/cardsfolder/i/indomitable_archangel.txt
+++ b/res/cardsfolder/i/indomitable_archangel.txt
@@ -4,7 +4,7 @@ Types:Creature Angel
 Text:no text
 PT:4/4
 K:Flying
-S:Mode$ Continuous | Affected$ Artifact.YouCtrl | AddKeyword$ Shroud | Metalcraft$ True | Description$ Metalcraft - Artifacts you control have shroud as long as you control three or more artifacts.
+S:Mode$ Continuous | Affected$ Artifact.YouCtrl | AddKeyword$ Shroud | Condition$ Metalcraft | Description$ Metalcraft - Artifacts you control have shroud as long as you control three or more artifacts.
 SVar:BuffedBy:Artifact
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/indomitable_archangel.jpg
--- a/res/cardsfolder/j/jor_kadeen_the_prevailer.txt
+++ b/res/cardsfolder/j/jor_kadeen_the_prevailer.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Human Warrior
 Text:no text
 PT:5/4
 K:First Strike
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddPower$ 3 | Metalcraft$ True | Description$ Metalcraft - Creatures you control get +3/+0 as long as you control three or more artifacts.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddPower$ 3 | Condition$ Metalcraft | Description$ Metalcraft - Creatures you control get +3/+0 as long as you control three or more artifacts.
 SVar:BuffedBy:Artifact
 SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
--- a/res/cardsfolder/l/lumengrid_drake.txt
+++ b/res/cardsfolder/l/lumengrid_drake.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:2/2
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBounce | Metalcraft$ True | TriggerDescription$ Metalcraft - When CARDNAME enters the battlefield, if you control three or more artifacts, return target creature to its owner's hand.
-SVar:TrigBounce:DB$ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand
+SVar:TrigBounce:DB$ ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lumengrid_drake.jpg
 SetInfo:SOM|Common|http://magiccards.info/scans/en/som/36.jpg
--- a/res/cardsfolder/p/puresteel_paladin.txt
+++ b/res/cardsfolder/p/puresteel_paladin.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:2/2
 T:Mode$ ChangesZone | ValidCard$ Equipment.YouCtrl | Origin$ Any | Destination$ Battlefield | Execute$ TrigDraw | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever an Equipment enters the battlefield under your control, you may draw a card.
 SVar:TrigDraw:AB$ Draw | Cost$ 0 | NumCards$ 1
-S:Mode$ Continuous | Affected$ Equipment.YouCtrl | AddAbility$ ABAttach | Metalcraft$ True | Description$ Metalcraft - Equipment you control have equip 0 as long as you control three or more artifacts.
+S:Mode$ Continuous | Affected$ Equipment.YouCtrl | AddAbility$ ABAttach | Condition$ Metalcraft | Description$ Metalcraft - Equipment you control have equip 0 as long as you control three or more artifacts.
 SVar:ABAttach:AB$ Attach | Cost$ 0 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SorcerySpeed$ True | PrecostDesc$ Equip - | SpellDescription$ Attach CARDNAME to target creature you control.
 SVar:Rarity:Rare
 SVar:Picture:http://serv4.tcgimages.eu/img/cards/New_Phyrexia/puresteel_paladin.jpg
--- a/res/cardsfolder/r/rakdos_pit_dragon.txt
+++ b/res/cardsfolder/r/rakdos_pit_dragon.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:3/3
 A:AB$ Pump | Cost$ R R | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
 A:AB$ Pump | Cost$ R | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Double Strike | Hellbent$ True | Description$ Hellbent - CARDNAME has double strike as long as you have no cards in hand.
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Double Strike | Condition$ Hellbent | Description$ Hellbent - CARDNAME has double strike as long as you have no cards in hand.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rakdos_pit_dragon.jpg
 SetInfo:DIS|Rare|http://magiccards.info/scans/en/di/69.jpg
--- a/res/cardsfolder/r/razorfield_rhino.txt
+++ b/res/cardsfolder/r/razorfield_rhino.txt
@@ -3,7 +3,7 @@ ManaCost:6
 Types:Artifact Creature Rhino
 Text:no text
 PT:4/4
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Metalcraft$ True | Description$ Metalcraft - CARDNAME gets +2/+2 as long as you control three or more artifacts.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Condition$ Metalcraft | Description$ Metalcraft - CARDNAME gets +2/+2 as long as you control three or more artifacts.
 SVar:BuffedBy:Artifact
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/razorfield_rhino.jpg
--- a/res/cardsfolder/r/rusted_relic.txt
+++ b/res/cardsfolder/r/rusted_relic.txt
@@ -2,7 +2,8 @@ Name:Rusted Relic
 ManaCost:4
 Types:Artifact
 Text:no text
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 5 | SetToughness$ 5 | AddType$ Artifact & Creature & Golem | Metalcraft$ True | Description$ Metalcraft - CARDNAME is a 5/5 Golem artifact creature as long as you control three or more artifacts.
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 5 | SetToughness$ 5 | AddType$ Artifact & Creature & Golem | Condition$ Metalcraft | Description$ Metalcraft - CARDNAME is a 5/5 Golem artifact creature as long as you control three or more artifacts.
 SVar:BuffedBy:Artifact
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rusted_relic.jpg
 SetInfo:SOM|Uncommon|http://magiccards.info/scans/en/som/199.jpg
--- a/res/cardsfolder/s/slaughterhouse_bouncer.txt
+++ b/res/cardsfolder/s/slaughterhouse_bouncer.txt
@@ -4,7 +4,7 @@ Types:Creature Ogre Warrior
 Text:no text
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigPump | Hellbent$ True | TriggerDescription$ Hellbent - When CARDNAME is put into a graveyard from play, if you have no cards in hand, target creature gets -3/-3 until end of turn.
-SVar:TrigPump:AB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -3 | NumDef$ -3 | IsCurse$ True
+SVar:TrigPump:AB$ Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -3 | NumDef$ -3 | IsCurse$ True
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/dis/en-us/card97073.jpg
 SetInfo:DIS|Common|http://magiccards.info/scans/en/di/54.jpg
--- a/res/cardsfolder/s/slithering_shade.txt
+++ b/res/cardsfolder/s/slithering_shade.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:0/1
 K:Defender
 A:AB$ Pump | Cost$ B | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN CARDNAME can attack as though it didn't have defender. | Hellbent$ True | Description$ Hellbent - CARDNAME can attack as though it didn't have defender as long as you have no cards in hand.
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN CARDNAME can attack as though it didn't have defender. | Condition$ Hellbent | Description$ Hellbent - CARDNAME can attack as though it didn't have defender as long as you have no cards in hand.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/slithering_shade.jpg
--- a/res/cardsfolder/s/snapsail_glider.txt
+++ b/res/cardsfolder/s/snapsail_glider.txt
@@ -3,7 +3,7 @@ ManaCost:3
 Types:Artifact Creature Construct
 Text:no text
 PT:2/2
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Flying | Metalcraft$ True | Description$ Metalcraft - CARDNAME has flying as long as you control three or more artifacts.
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Flying | Condition$ Metalcraft | Description$ Metalcraft - CARDNAME has flying as long as you control three or more artifacts.
 SVar:BuffedBy:Artifact
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/snapsail_glider.jpg
--- a/res/cardsfolder/s/spiraling_duelist.txt
+++ b/res/cardsfolder/s/spiraling_duelist.txt
@@ -3,7 +3,7 @@ ManaCost:2 R R
 Types:Creature Human Berserker
 Text:no text
 PT:3/1
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Double Strike | Metalcraft$ True | Description$ Metalcraft - CARDNAME has double strike as long as you control three or more artifacts.
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Double Strike | Condition$ Metalcraft | Description$ Metalcraft - CARDNAME has double strike as long as you control three or more artifacts.
 SVar:BuffedBy:Artifact
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spiraling_duelist.jpg
--- a/res/cardsfolder/s/spire_serpent.txt
+++ b/res/cardsfolder/s/spire_serpent.txt
@@ -4,7 +4,7 @@ Types:Creature Serpent
 Text:no text
 PT:3/5
 K:Defender
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | AddHiddenKeyword$ HIDDEN CARDNAME can attack as though it didn't have defender. | Metalcraft$ True | Description$ Metalcraft - As long as you control three or more artifacts, CARDNAME gets +2/+2 and can attack as though it didn't have defender.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | AddHiddenKeyword$ HIDDEN CARDNAME can attack as though it didn't have defender. | Condition$ Metalcraft | Description$ Metalcraft - As long as you control three or more artifacts, CARDNAME gets +2/+2 and can attack as though it didn't have defender.
 SVar:BuffedBy:Artifact
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spire_serpent.jpg
--- a/res/cardsfolder/t/taste_for_mayhem.txt
+++ b/res/cardsfolder/t/taste_for_mayhem.txt
@@ -5,7 +5,7 @@ Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ R | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | Description$ Enchanted creature gets +2/+0.
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | Hellbent$ True | Description$ Hellbent - Enchanted creature gets an additional +2/+0 as long as you have no cards in hand.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | Condition$ Hellbent | Description$ Hellbent - Enchanted creature gets an additional +2/+0 as long as you have no cards in hand.
 SVar:BuffedBy:Card
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/taste_for_mayhem.jpg
--- a/src/main/java/forge/card/staticability/StaticAbility.java
+++ b/src/main/java/forge/card/staticability/StaticAbility.java
@@ -496,7 +496,19 @@ public class StaticAbility {
        }
        if (params.containsKey("Condition")) {
-            if (params.get("Condition").equals("PermanentOfEachColor")) {
+            if (params.get("Condition").equals("Threshold")) {
                if (!controller.hasThreshold()) {
                    return false;
                }
            } else if (params.get("Condition").equals("Hellbent")) {
                if (!controller.hasHellbent()) {
                    return false;
                }
            } else if (params.get("Condition").equals("Metalcraft")) {
                if (!controller.hasMetalcraft()) {
                    return false;
                }
            } else if (params.get("Condition").equals("PermanentOfEachColor")) {
                if ((controller.getColoredCardsInPlay(Constant.Color.BLACK).isEmpty()
                        || controller.getColoredCardsInPlay(Constant.Color.BLUE).isEmpty()
                        || controller.getColoredCardsInPlay(Constant.Color.GREEN).isEmpty()
@@ -508,21 +520,9 @@ public class StaticAbility {
                if (controller.getLife() > 5) {
                    return false;
                }
            } else if (params.get("Condition").equals("Threshold")) {
                if (!controller.hasThreshold()) {
                    return false;
                }
            }
        }
        if (this.params.containsKey("Hellbent") && !controller.hasHellbent()) {
            return false;
        }
        if (this.params.containsKey("Metalcraft") && !controller.hasMetalcraft()) {
            return false;
        }
        if (this.params.containsKey("PlayerTurn") && !Singletons.getModel().getGame().getPhaseHandler().isPlayerTurn(controller)) {
            return false;
        }