diff --git a/res/cardsfolder/a/assert_authority.txt b/res/cardsfolder/a/assert_authority.txt
index 8a7615a9419..1af02941e62 100644
--- a/res/cardsfolder/a/assert_authority.txt
+++ b/res/cardsfolder/a/assert_authority.txt
@@ -3,7 +3,8 @@ ManaCost:5 U U
 Types:Instant
 Text:no text
 A:SP$ Counter | Cost$ 5 U U | TargetType$ Spell | ValidTgts$ Card | Destination$ Exile | SpellDescription$ Counter target spell. If that spell is countered this way, exile it instead of putting it into its owner's graveyard.
-K:CostChange:Player:Less:1:Self:All:All:Affinity/Artifact:Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+SVar:X:Count$Valid Artifact.YouCtrl
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/assert_authority.jpg
 SetInfo:MRD|Uncommon|http://magiccards.info/scans/en/mi/30.jpg
diff --git a/res/cardsfolder/b/blasphemous_act.txt b/res/cardsfolder/b/blasphemous_act.txt
index 39ff678e1b1..406e8f2b40e 100644
--- a/res/cardsfolder/b/blasphemous_act.txt
+++ b/res/cardsfolder/b/blasphemous_act.txt
@@ -1,12 +1,12 @@
-Name:Blasphemous Act
-ManaCost:8 R
-Types:Sorcery
-Text:no text
-A:SP$ DamageAll | Cost$ 8 R | NumDmg$ 13 | ValidCards$ Creature | ValidDescription$ each creature. | SpellDescription$ CARDNAME deals 13 damage to each creature.
-K:CostChange:Player:Less:X:Self:All:All:NoSpecial:CARDNAME costs 1 less to cast for each creature on the battlefield.
-SVar:X:Count$TypeOnBattlefield.Creature
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/blasphemous_act.jpg
-SetInfo:ISD|Rare|http://magiccards.info/scans/en/isd/130.jpg
-Oracle:Blasphemous Act costs {1} less to cast for each creature on the battlefield.\nBlasphemous Act deals 13 damage to each creature.
+Name:Blasphemous Act
+ManaCost:8 R
+Types:Sorcery
+Text:no text
+A:SP$ DamageAll | Cost$ 8 R | NumDmg$ 13 | ValidCards$ Creature | ValidDescription$ each creature. | SpellDescription$ CARDNAME deals 13 damage to each creature.
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ CARDNAME costs 1 less to cast for each creature on the battlefield.
+SVar:X:Count$Valid Creature
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/blasphemous_act.jpg
+SetInfo:ISD|Rare|http://magiccards.info/scans/en/isd/130.jpg
+Oracle:Blasphemous Act costs {1} less to cast for each creature on the battlefield.\nBlasphemous Act deals 13 damage to each creature.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/b/blinkmoth_infusion.txt b/res/cardsfolder/b/blinkmoth_infusion.txt
index 12ff86835ae..9a3db501aaa 100644
--- a/res/cardsfolder/b/blinkmoth_infusion.txt
+++ b/res/cardsfolder/b/blinkmoth_infusion.txt
@@ -2,8 +2,9 @@ Name:Blinkmoth Infusion
 ManaCost:12 U U
 Types:Instant
 Text:no text
-K:CostChange:Player:Less:1:Self:All:All:Affinity/Artifact:Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
 A:SP$ UntapAll | Cost$ 12 U U | ValidCards$ Artifact | SpellDescription$ Untap all artifacts.
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+SVar:X:Count$Valid Artifact.YouCtrl
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/b/broodstar.txt b/res/cardsfolder/b/broodstar.txt
index 2fb46c0e21b..441d58fc78a 100644
--- a/res/cardsfolder/b/broodstar.txt
+++ b/res/cardsfolder/b/broodstar.txt
@@ -4,8 +4,8 @@ Types:Creature Beast
 Text:no text
 PT:*/*
 K:Flying
-K:CostChange:Player:Less:1:Self:All:All:Affinity/Artifact:Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
 S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of artifacts you control.
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
 SVar:X:Count$Valid Artifact.YouCtrl
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/c/chromescale_drake.txt b/res/cardsfolder/c/chromescale_drake.txt
index 33d482ea787..c6df56eae67 100644
--- a/res/cardsfolder/c/chromescale_drake.txt
+++ b/res/cardsfolder/c/chromescale_drake.txt
@@ -4,9 +4,10 @@ Types:Creature Drake
 Text:no text
 PT:3/4
 K:Flying
-K:CostChange:Player:Less:1:Self:All:All:Affinity/Artifact:Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters the battlefield, reveal the top three cards of your library. Put all artifact cards revealed this way into your hand and the rest into your graveyard.
 SVar:TrigDig:AB$Dig | Cost$ 0 | DigNum$ 3 | Reveal$ True | ChangeNum$ All | ChangeValid$ Artifact | DestinationZone2$ Graveyard
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+SVar:X:Count$Valid Artifact.YouCtrl
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chromescale_drake.jpg
diff --git a/res/cardsfolder/d/dross_golem.txt b/res/cardsfolder/d/dross_golem.txt
index e1ad5227f16..614110eee66 100644
--- a/res/cardsfolder/d/dross_golem.txt
+++ b/res/cardsfolder/d/dross_golem.txt
@@ -4,7 +4,8 @@ Types:Artifact Creature Golem
 Text:no text
 PT:3/2
 K:Fear
-K:CostChange:Player:Less:1:Self:All:All:Affinity/Swamp:Affinity for Swamps (This spell costs 1 less to cast for each Swamp you control.)
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ Affinity for Swamps (This spell costs 1 less to cast for each Swamp you control.)
+SVar:X:Count$Valid Swamp.YouCtrl
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dross_golem.jpg
 SetInfo:DST|Common|http://magiccards.info/scans/en/ds/119.jpg
diff --git a/res/cardsfolder/f/frogmite.txt b/res/cardsfolder/f/frogmite.txt
index c68533e1a93..611855e49a4 100644
--- a/res/cardsfolder/f/frogmite.txt
+++ b/res/cardsfolder/f/frogmite.txt
@@ -3,7 +3,8 @@ ManaCost:4
 Types:Artifact Creature Frog
 Text:no text
 PT:2/2
-K:CostChange:Player:Less:1:Self:All:All:Affinity/Artifact:Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+SVar:X:Count$Valid Artifact.YouCtrl
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/frogmite.jpg
 SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/172.jpg
diff --git a/res/cardsfolder/f/furnace_dragon.txt b/res/cardsfolder/f/furnace_dragon.txt
index 61e4eb8bb8e..2a23c8ec7fb 100644
--- a/res/cardsfolder/f/furnace_dragon.txt
+++ b/res/cardsfolder/f/furnace_dragon.txt
@@ -4,9 +4,10 @@ Types:Creature Dragon
 Text:no text
 PT:5/5
 K:Flying
-K:CostChange:Player:Less:1:Self:All:All:Affinity/Artifact:Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
 T:Mode$ ChangesZone | ValidCard$ Card.wasCastFromHand+Self | Destination$ Battlefield | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it from your hand, exile all artifacts.
 SVar:TrigExile:AB$ChangeZoneAll | Cost$ 0 | ChangeType$ Artifact | Origin$ Battlefield | Destination$ Exile
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+SVar:X:Count$Valid Artifact.YouCtrl
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/furnace_dragon.jpg
 SetInfo:DST|Rare|http://magiccards.info/scans/en/ds/62.jpg
diff --git a/res/cardsfolder/i/into_thin_air.txt b/res/cardsfolder/i/into_thin_air.txt
index c6983406c27..6e311d9120b 100644
--- a/res/cardsfolder/i/into_thin_air.txt
+++ b/res/cardsfolder/i/into_thin_air.txt
@@ -3,7 +3,8 @@ ManaCost:5 U
 Types:Instant
 Text:no text
 A:SP$ ChangeZone | Cost$ 5 U | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target artifact to its owner's hand.
-K:CostChange:Player:Less:1:Self:All:All:Affinity/Artifact:Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+SVar:X:Count$Valid Artifact.YouCtrl
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/into_thin_air.jpg
 SetInfo:5DN|Common|http://magiccards.info/scans/en/5dn/33.jpg
diff --git a/res/cardsfolder/m/mycosynth_golem.txt b/res/cardsfolder/m/mycosynth_golem.txt
index 28e786b57c1..13cfbcd7b24 100644
--- a/res/cardsfolder/m/mycosynth_golem.txt
+++ b/res/cardsfolder/m/mycosynth_golem.txt
@@ -3,8 +3,9 @@ ManaCost:11
 Types:Artifact Creature Golem
 Text:no text
 PT:4/5
-K:CostChange:Player:Less:1:Self:All:All:Affinity/Artifact:Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
-K:CostChange:Player:Less:1:Spell:All:Artifact/Creature:Affinity/Artifact/All Conditions:Artifact creature spells you cast have affinity for artifacts. (They cost 1 less to cast for each artifact you control.)
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+S:Mode$ ReduceCost | ValidCard$ Artifact.Creature | Type$ Spell | Amount$ X | Activator$ You | Description$ Artifact creature spells you cast have affinity for artifacts. (They cost 1 less to cast for each artifact you control.)
+SVar:X:Count$Valid Artifact.YouCtrl
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mycosynth_golem.jpg
 SetInfo:5DN|Rare|http://magiccards.info/scans/en/5dn/137.jpg
diff --git a/res/cardsfolder/m/myr_enforcer.txt b/res/cardsfolder/m/myr_enforcer.txt
index dc2eca9f63e..1100e596d00 100644
--- a/res/cardsfolder/m/myr_enforcer.txt
+++ b/res/cardsfolder/m/myr_enforcer.txt
@@ -3,7 +3,8 @@ ManaCost:7
 Types:Artifact Creature Myr
 Text:no text
 PT:4/4
-K:CostChange:Player:Less:1:Self:All:All:Affinity/Artifact:Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+SVar:X:Count$Valid Artifact.YouCtrl
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/myr_enforcer.jpg
 SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/211.jpg
diff --git a/res/cardsfolder/o/oxidda_golem.txt b/res/cardsfolder/o/oxidda_golem.txt
index 3a06375a89f..eaddd19efcd 100644
--- a/res/cardsfolder/o/oxidda_golem.txt
+++ b/res/cardsfolder/o/oxidda_golem.txt
@@ -4,7 +4,8 @@ Types:Artifact Creature Golem
 Text:no text
 PT:3/2
 K:Haste
-K:CostChange:Player:Less:1:Self:All:All:Affinity/Mountain:Affinity for Mountains (This spell costs 1 less to cast for each Mountain you control.)
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ Affinity for Mountains (This spell costs 1 less to cast for each Mountain you control.)
+SVar:X:Count$Valid Mountain.YouCtrl
 SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oxidda_golem.jpg
diff --git a/res/cardsfolder/q/quicksilver_behemoth.txt b/res/cardsfolder/q/quicksilver_behemoth.txt
index 5d00910442c..fde6fd85cc1 100644
--- a/res/cardsfolder/q/quicksilver_behemoth.txt
+++ b/res/cardsfolder/q/quicksilver_behemoth.txt
@@ -2,12 +2,13 @@ Name:Quicksilver Behemoth
 ManaCost:6 U
 Types:Creature Beast
 Text:no text
-K:CostChange:Player:Less:1:Self:All:All:Affinity/Artifact:Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
 PT:4/5
 T:Mode$ Attacks | ValidCard$ Card.Self | DelayedTrigger$ DelayedTrig | TriggerDescription$ When CARDNAME attacks or blocks, return it to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
 T:Mode$ Blocks | ValidCard$ Card.Self | DelayedTrigger$ DelayedTrig | Secondary$ True | TriggerDescription$ When CARDNAME attacks or blocks, return it to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
 SVar:DelayedTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigReturn | TriggerDescription$ Return CARDNAME to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Battlefield | Destination$ Hand
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+SVar:X:Count$Valid Artifact.YouCtrl
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/quicksilver_behemoth.jpg
 SetInfo:DST|Common|http://magiccards.info/scans/en/ds/30.jpg
diff --git a/res/cardsfolder/q/qumulox.txt b/res/cardsfolder/q/qumulox.txt
index a5f8d54e081..ae99fa77008 100644
--- a/res/cardsfolder/q/qumulox.txt
+++ b/res/cardsfolder/q/qumulox.txt
@@ -4,7 +4,8 @@ Types:Creature Beast
 Text:no text
 PT:5/4
 K:Flying
-K:CostChange:Player:Less:1:Self:All:All:Affinity/Artifact:Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+SVar:X:Count$Valid Artifact.YouCtrl
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/qumulox.jpg
 SetInfo:5DN|Uncommon|http://magiccards.info/scans/en/5dn/35.jpg
diff --git a/res/cardsfolder/r/razor_golem.txt b/res/cardsfolder/r/razor_golem.txt
index cfee72a8b17..82e672179f6 100644
--- a/res/cardsfolder/r/razor_golem.txt
+++ b/res/cardsfolder/r/razor_golem.txt
@@ -4,7 +4,8 @@ Types:Artifact Creature Golem
 Text:no text
 PT:3/4
 K:Vigilance
-K:CostChange:Player:Less:1:Self:All:All:Affinity/Plains:Affinity for Plains (This spell costs 1 less to cast for each Plains you control.)
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ Affinity for Plains (This spell costs 1 less to cast for each Plains you control.)
+SVar:X:Count$Valid Plains.YouCtrl
 SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/razor_golem.jpg
diff --git a/res/cardsfolder/s/scale_of_chiss_goria.txt b/res/cardsfolder/s/scale_of_chiss_goria.txt
index bcc18ee3b53..880cfa8efc5 100644
--- a/res/cardsfolder/s/scale_of_chiss_goria.txt
+++ b/res/cardsfolder/s/scale_of_chiss_goria.txt
@@ -4,7 +4,8 @@ Types:Artifact
 Text:no text
 K:Flash
 A:AB$ Pump | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDef$ +1 | SpellDescription$ Target creature gets +0/+1 until end of turn.
-K:CostChange:Player:Less:1:Self:All:All:Affinity/Artifact:Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+SVar:X:Count$Valid Artifact.YouCtrl
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scale_of_chiss_goria.jpg
 SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/236.jpg
diff --git a/res/cardsfolder/s/somber_hoverguard.txt b/res/cardsfolder/s/somber_hoverguard.txt
index aeae0bcea28..0b9560ac309 100644
--- a/res/cardsfolder/s/somber_hoverguard.txt
+++ b/res/cardsfolder/s/somber_hoverguard.txt
@@ -4,7 +4,8 @@ Types:Creature Drone
 Text:no text
 PT:3/2
 K:Flying
-K:CostChange:Player:Less:1:Self:All:All:Affinity/Artifact:Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+SVar:X:Count$Valid Artifact.YouCtrl
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/somber_hoverguard.jpg
 SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/51.jpg
diff --git a/res/cardsfolder/s/spire_golem.txt b/res/cardsfolder/s/spire_golem.txt
index 1f08bbb90f9..2cb816525a8 100644
--- a/res/cardsfolder/s/spire_golem.txt
+++ b/res/cardsfolder/s/spire_golem.txt
@@ -4,7 +4,8 @@ Types:Artifact Creature Golem
 Text:no text
 PT:2/4
 K:Flying
-K:CostChange:Player:Less:1:Self:All:All:Affinity/Island:Affinity for Islands (This spell costs 1 less to cast for each Island you control.)
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ Affinity for Islands (This spell costs 1 less to cast for each Island you control.)
+SVar:X:Count$Valid Island.YouCtrl
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spire_golem.jpg
 SetInfo:DST|Common|http://magiccards.info/scans/en/ds/145.jpg
diff --git a/res/cardsfolder/t/tangle_golem.txt b/res/cardsfolder/t/tangle_golem.txt
index e522d08d484..3cfb1678120 100644
--- a/res/cardsfolder/t/tangle_golem.txt
+++ b/res/cardsfolder/t/tangle_golem.txt
@@ -3,7 +3,8 @@ ManaCost:7
 Types:Artifact Creature Golem
 Text:no text
 PT:5/4
-K:CostChange:Player:Less:1:Self:All:All:Affinity/Forest:Affinity for Forests (This spell costs 1 less to cast for each Forest you control.)
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ Affinity for Forests (This spell costs 1 less to cast for each Forest you control.)
+SVar:X:Count$Valid Forest.YouCtrl
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tangle_golem.jpg
 SetInfo:DST|Common|http://magiccards.info/scans/en/ds/151.jpg
diff --git a/res/cardsfolder/t/thoughtcast.txt b/res/cardsfolder/t/thoughtcast.txt
index 0f958c5e9f7..8923ebefa0f 100644
--- a/res/cardsfolder/t/thoughtcast.txt
+++ b/res/cardsfolder/t/thoughtcast.txt
@@ -3,7 +3,8 @@ ManaCost:4 U
 Types:Sorcery
 Text:no text
 A:SP$ Draw | Cost$ 4 U | NumCards$ 2 | SpellDescription$ Draw two cards.
-K:CostChange:Player:Less:1:Self:All:All:Affinity/Artifact:Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+SVar:X:Count$Valid Artifact.YouCtrl
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thoughtcast.jpg
 SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/54.jpg
diff --git a/res/cardsfolder/t/tooth_of_chiss_goria.txt b/res/cardsfolder/t/tooth_of_chiss_goria.txt
index 005897da5a2..63fcb259d8a 100644
--- a/res/cardsfolder/t/tooth_of_chiss_goria.txt
+++ b/res/cardsfolder/t/tooth_of_chiss_goria.txt
@@ -4,7 +4,8 @@ Types:Artifact
 Text:no text
 K:Flash
 A:AB$ Pump | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | SpellDescription$ Target creature gets +1/+0 until end of turn.
-K:CostChange:Player:Less:1:Self:All:All:Affinity/Artifact:Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
+SVar:X:Count$Valid Artifact.YouCtrl
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tooth_of_chiss_goria.jpg
 SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/264.jpg
diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java
index fbe10f40898..e073354972d 100644
--- a/src/main/java/forge/GameAction.java
+++ b/src/main/java/forge/GameAction.java
@@ -2017,7 +2017,6 @@ public class GameAction {
                 return false;
             }
         });
-        final CardList playerPlay = controller.getCardsIn(ZoneType.Battlefield);
         final CardList playerHand = controller.getCardsIn(ZoneType.Hand);
         int xBonus = 0;
         final int max = 25;
@@ -2298,14 +2297,6 @@ public class GameAction {
                                     k[3] = "0";
                                 }
                             }
-                            if (k[7].contains("Affinity")) {
-                                final String spilt = k[7];
-                                final String[] colorSpilt = spilt.split("/");
-                                k[7] = colorSpilt[1];
-                                CardList playerList = controller.getCardsIn(ZoneType.Battlefield);
-                                playerList = playerList.getType(k[7]);
-                                k[3] = String.valueOf(playerList.size());
-                            }
 
                             final String[] numbers = new String[max];
                             if (!"WUGRB".contains(k[3])) {