From b91530b799f9a85985530a7af97cda3cf9f9ca7d Mon Sep 17 00:00:00 2001 From: swordshine Date: Sat, 4 Oct 2014 09:29:19 +0000 Subject: [PATCH] - Removed duplicated codes "NumCounters" --- forge-game/src/main/java/forge/game/card/CardFactoryUtil.java | 3 --- forge-gui/res/cardsfolder/a/animar_soul_of_elements.txt | 2 +- forge-gui/res/cardsfolder/b/bloodfray_giant.txt | 2 +- forge-gui/res/cardsfolder/c/carnival_hellsteed.txt | 2 +- forge-gui/res/cardsfolder/c/chaos_imps.txt | 2 +- forge-gui/res/cardsfolder/d/dead_reveler.txt | 2 +- forge-gui/res/cardsfolder/e/exava_rakdos_blood_witch.txt | 2 +- forge-gui/res/cardsfolder/g/gideon_champion_of_justice.txt | 2 +- forge-gui/res/cardsfolder/g/gore_house_chainwalker.txt | 2 +- forge-gui/res/cardsfolder/g/grim_roustabout.txt | 2 +- forge-gui/res/cardsfolder/g/gyre_sage.txt | 2 +- forge-gui/res/cardsfolder/h/hellhole_flailer.txt | 2 +- forge-gui/res/cardsfolder/h/herald_of_war.txt | 2 +- forge-gui/res/cardsfolder/m/mycoloth.txt | 2 +- forge-gui/res/cardsfolder/p/phyrexian_marauder.txt | 2 +- forge-gui/res/cardsfolder/r/rakdos_cackler.txt | 2 +- forge-gui/res/cardsfolder/r/rakdos_drake.txt | 2 +- forge-gui/res/cardsfolder/s/slumbering_dragon.txt | 2 +- forge-gui/res/cardsfolder/s/spawn_of_rix_maadi.txt | 2 +- forge-gui/res/cardsfolder/s/splatter_thug.txt | 2 +- forge-gui/res/cardsfolder/t/thrill_kill_assassin.txt | 2 +- 21 files changed, 20 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 595c3f31418..a41acc359d8 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -1315,9 +1315,6 @@ public class CardFactoryUtil { if (sq[0].contains("TimesKicked")) { return doXMath(c.getKickerMagnitude(), m, c); } - if (sq[0].contains("NumCounters")) { - return doXMath(c.getCounters(CounterType.getType(sq[1])), m, c); - } // Count$IfMainPhase.. // 7/10 if (sq[0].contains("IfMainPhase")) { diff --git a/forge-gui/res/cardsfolder/a/animar_soul_of_elements.txt b/forge-gui/res/cardsfolder/a/animar_soul_of_elements.txt index c72d40475ce..d5c27ea4dab 100644 --- a/forge-gui/res/cardsfolder/a/animar_soul_of_elements.txt +++ b/forge-gui/res/cardsfolder/a/animar_soul_of_elements.txt @@ -7,7 +7,7 @@ K:Protection from black T:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a creature spell, put a +1/+1 counter on CARDNAME. SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 S:Mode$ ReduceCost | ValidCard$ Creature | Type$ Spell | Activator$ You | Amount$ X | Description$ Creature spells you cast cost 1 less to cast for each +1/+1 counter on CARDNAME. -SVar:X:Count$NumCounters.P1P1 +SVar:X:Count$CardCounters.P1P1 SVar:BuffedBy:Creature SVar:Picture:http://www.wizards.com/global/images/magic/general/animar_soul_of_elements.jpg Oracle:Protection from white and from black\nWhenever you cast a creature spell, put a +1/+1 counter on Animar, Soul of Elements.\nCreature spells you cast cost {1} less to cast for each +1/+1 counter on Animar. diff --git a/forge-gui/res/cardsfolder/b/bloodfray_giant.txt b/forge-gui/res/cardsfolder/b/bloodfray_giant.txt index 2a8f4701122..c6e11e5db2b 100644 --- a/forge-gui/res/cardsfolder/b/bloodfray_giant.txt +++ b/forge-gui/res/cardsfolder/b/bloodfray_giant.txt @@ -6,6 +6,6 @@ K:Trample K:ETBReplacement:Other:Unleash:Optional SVar:Unleash:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Unleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.) S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | CheckSVar$ X | SVarCompare$ GE1 | References$ X -SVar:X:Count$NumCounters.P1P1 +SVar:X:Count$CardCounters.P1P1 SVar:Picture:http://www.wizards.com/global/images/magic/general/bloodfray_giant.jpg Oracle:Trample\nUnleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.) diff --git a/forge-gui/res/cardsfolder/c/carnival_hellsteed.txt b/forge-gui/res/cardsfolder/c/carnival_hellsteed.txt index acd16ec6240..7776b14f1f6 100644 --- a/forge-gui/res/cardsfolder/c/carnival_hellsteed.txt +++ b/forge-gui/res/cardsfolder/c/carnival_hellsteed.txt @@ -7,6 +7,6 @@ K:Haste K:ETBReplacement:Other:Unleash:Optional SVar:Unleash:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Unleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.) S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | CheckSVar$ X | SVarCompare$ GE1 | References$ X -SVar:X:Count$NumCounters.P1P1 +SVar:X:Count$CardCounters.P1P1 SVar:Picture:http://www.wizards.com/global/images/magic/general/carnival_hellsteed.jpg Oracle:First strike, haste\nUnleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.) diff --git a/forge-gui/res/cardsfolder/c/chaos_imps.txt b/forge-gui/res/cardsfolder/c/chaos_imps.txt index 7cbb3865b4c..810ab8d0096 100644 --- a/forge-gui/res/cardsfolder/c/chaos_imps.txt +++ b/forge-gui/res/cardsfolder/c/chaos_imps.txt @@ -6,6 +6,6 @@ K:Flying K:ETBReplacement:Other:Unleash:Optional SVar:Unleash:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Unleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.) S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Trample | AddHiddenKeyword$ CARDNAME can't block. | CheckSVar$ X | SVarCompare$ GE1 | References$ X | Description$ CARDNAME has trample as long as it has a +1/+1 counter on it. -SVar:X:Count$NumCounters.P1P1 +SVar:X:Count$CardCounters.P1P1 SVar:Picture:http://www.wizards.com/global/images/magic/general/chaos_imps.jpg Oracle:Flying\nUnleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.)\nChaos Imps has trample as long as it has a +1/+1 counter on it. diff --git a/forge-gui/res/cardsfolder/d/dead_reveler.txt b/forge-gui/res/cardsfolder/d/dead_reveler.txt index 314390121f5..ca4fa52dcec 100644 --- a/forge-gui/res/cardsfolder/d/dead_reveler.txt +++ b/forge-gui/res/cardsfolder/d/dead_reveler.txt @@ -5,6 +5,6 @@ PT:2/3 K:ETBReplacement:Other:Unleash:Optional SVar:Unleash:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Unleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.) S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | CheckSVar$ X | SVarCompare$ GE1 | References$ X -SVar:X:Count$NumCounters.P1P1 +SVar:X:Count$CardCounters.P1P1 SVar:Picture:http://www.wizards.com/global/images/magic/general/dead_reveler.jpg Oracle:Unleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.) diff --git a/forge-gui/res/cardsfolder/e/exava_rakdos_blood_witch.txt b/forge-gui/res/cardsfolder/e/exava_rakdos_blood_witch.txt index 53c5ff9f04d..17d33a10298 100644 --- a/forge-gui/res/cardsfolder/e/exava_rakdos_blood_witch.txt +++ b/forge-gui/res/cardsfolder/e/exava_rakdos_blood_witch.txt @@ -7,7 +7,7 @@ K:Haste K:ETBReplacement:Other:Unleash:Optional SVar:Unleash:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Unleash S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | CheckSVar$ X | SVarCompare$ GE1 | References$ X -SVar:X:Count$NumCounters.P1P1 +SVar:X:Count$CardCounters.P1P1 S:Mode$ Continuous | Affected$ Creature.Other+YouCtrl+counters_GE1_P1P1 | AddKeyword$ Haste | Description$ Each other creature you control with a +1/+1 counter on it has haste. SVar:Picture:http://www.wizards.com/global/images/magic/general/exava_rakdos_blood_witch.jpg Oracle:First strike, haste\nUnleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.)\nEach other creature you control with a +1/+1 counter on it has haste. diff --git a/forge-gui/res/cardsfolder/g/gideon_champion_of_justice.txt b/forge-gui/res/cardsfolder/g/gideon_champion_of_justice.txt index c98b781de99..22c3dd43f55 100644 --- a/forge-gui/res/cardsfolder/g/gideon_champion_of_justice.txt +++ b/forge-gui/res/cardsfolder/g/gideon_champion_of_justice.txt @@ -7,7 +7,7 @@ A:AB$ Animate | Cost$ 0 | Defined$ Self | Power$ GideonPT | Toughness$ GideonPT SVar:GideonPrevent:DB$ Pump | Defined$ Self | KW$ HIDDEN Prevent all damage that would be dealt to CARDNAME. A:AB$ ChangeZoneAll | Cost$ SubCounter<15/LOYALTY> | ChangeType$ Permanent.Other | ValidDescription$ other permanent | Origin$ Battlefield | Destination$ Exile | Planeswalker$ True | Ultimate$ True | SpellDescription$ Exile all other permanents. SVar:X:TargetedPlayer$CreaturesInPlay -SVar:GideonPT:Count$NumCounters.LOYALTY +SVar:GideonPT:Count$CardCounters.LOYALTY SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/gideon_champion_of_justice.jpg Oracle:[+1] Put a loyalty counter on Gideon, Champion of Justice for each creature target opponent controls.\n[0] Until end of turn, Gideon, Champion of Justice becomes a Human Soldier creature with power and toughness each equal to the number of loyalty counters on him and gains indestructible. He's still a planeswalker. Prevent all damage that would be dealt to him this turn.\n[-15] Exile all other permanents. diff --git a/forge-gui/res/cardsfolder/g/gore_house_chainwalker.txt b/forge-gui/res/cardsfolder/g/gore_house_chainwalker.txt index a37a5177bbb..0b07c5bcd8c 100644 --- a/forge-gui/res/cardsfolder/g/gore_house_chainwalker.txt +++ b/forge-gui/res/cardsfolder/g/gore_house_chainwalker.txt @@ -5,6 +5,6 @@ PT:2/1 K:ETBReplacement:Other:Unleash:Optional SVar:Unleash:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Unleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.) S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | CheckSVar$ X | SVarCompare$ GE1 | References$ X -SVar:X:Count$NumCounters.P1P1 +SVar:X:Count$CardCounters.P1P1 SVar:Picture:http://www.wizards.com/global/images/magic/general/gore_house_chainwalker.jpg Oracle:Unleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.) diff --git a/forge-gui/res/cardsfolder/g/grim_roustabout.txt b/forge-gui/res/cardsfolder/g/grim_roustabout.txt index ab23bcff347..8fa7516cb79 100644 --- a/forge-gui/res/cardsfolder/g/grim_roustabout.txt +++ b/forge-gui/res/cardsfolder/g/grim_roustabout.txt @@ -6,6 +6,6 @@ K:ETBReplacement:Other:Unleash:Optional SVar:Unleash:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Unleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.) A:AB$ Regenerate | Cost$ 1 B | Defined$ Self | SpellDescription$ Regenerate CARDNAME. S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | CheckSVar$ X | SVarCompare$ GE1 | References$ X -SVar:X:Count$NumCounters.P1P1 +SVar:X:Count$CardCounters.P1P1 SVar:Picture:http://www.wizards.com/global/images/magic/general/grim_roustabout.jpg Oracle:Unleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.)\n{1}{B}: Regenerate Grim Roustabout. diff --git a/forge-gui/res/cardsfolder/g/gyre_sage.txt b/forge-gui/res/cardsfolder/g/gyre_sage.txt index 876e31baebb..596b533f384 100644 --- a/forge-gui/res/cardsfolder/g/gyre_sage.txt +++ b/forge-gui/res/cardsfolder/g/gyre_sage.txt @@ -4,6 +4,6 @@ Types:Creature Elf Druid PT:1/2 K:Evolve A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | References$ X | SpellDescription$ Add {G} to your mana pool for each +1/+1 counter on CARDNAME. -SVar:X:Count$NumCounters.P1P1 +SVar:X:Count$CardCounters.P1P1 SVar:Picture:http://www.wizards.com/global/images/magic/general/gyre_sage.jpg Oracle:Evolve (Whenever a creature enters the battlefield under your control, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.)\n{T}: Add {G} to your mana pool for each +1/+1 counter on Gyre Sage. diff --git a/forge-gui/res/cardsfolder/h/hellhole_flailer.txt b/forge-gui/res/cardsfolder/h/hellhole_flailer.txt index 36289ff66cd..22cf1734908 100644 --- a/forge-gui/res/cardsfolder/h/hellhole_flailer.txt +++ b/forge-gui/res/cardsfolder/h/hellhole_flailer.txt @@ -5,7 +5,7 @@ PT:3/2 K:ETBReplacement:Other:Unleash:Optional SVar:Unleash:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Unleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.) S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | CheckSVar$ NumP1P1 | SVarCompare$ GE1 | References$ NumP1P1 -SVar:NumP1P1:Count$NumCounters.P1P1 +SVar:NumP1P1:Count$CardCounters.P1P1 A:AB$ DealDamage | Cost$ 2 B R Sac<1/CARDNAME> | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ X | References$ X | SpellDescription$ CARDNAME deals damage equal to its power to target player. SVar:X:Sacrificed$CardPower SVar:Picture:http://www.wizards.com/global/images/magic/general/hellhole_flailer.jpg diff --git a/forge-gui/res/cardsfolder/h/herald_of_war.txt b/forge-gui/res/cardsfolder/h/herald_of_war.txt index bf0d7d144f0..3a3961df276 100644 --- a/forge-gui/res/cardsfolder/h/herald_of_war.txt +++ b/forge-gui/res/cardsfolder/h/herald_of_war.txt @@ -6,7 +6,7 @@ K:Flying T:Mode$ Attacks | ValidCard$ Creature.Self | Execute$ HeraldsWarCry | TriggerDescription$ Whenever CARDNAME attacks, put a +1/+1 counter on it. SVar:HeraldsWarCry:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 S:Mode$ ReduceCost | ValidCard$ Angel,Human | Type$ Spell | Activator$ You | Amount$ X | Description$ Angels and Humans you cast cost 1 less for each +1/+1 counter on CARDNAME. -SVar:X:Count$NumCounters.P1P1 +SVar:X:Count$CardCounters.P1P1 SVar:HasAttackEffect:TRUE SVar:Picture:http://www.wizards.com/global/images/magic/general/herald_of_war.jpg Oracle:Flying\nWhenever Herald of War attacks, put a +1/+1 counter on it.\nAngel spells and Human spells you cast cost {1} less to cast for each +1/+1 counter on Herald of War. diff --git a/forge-gui/res/cardsfolder/m/mycoloth.txt b/forge-gui/res/cardsfolder/m/mycoloth.txt index eeeaf8df370..fb16660bc19 100644 --- a/forge-gui/res/cardsfolder/m/mycoloth.txt +++ b/forge-gui/res/cardsfolder/m/mycoloth.txt @@ -5,6 +5,6 @@ PT:4/4 K:Devour:2 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, put a 1/1 green Saproling creature token onto the battlefield for each +1/+1 counter on CARDNAME. SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ X | References$ X | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenPower$ 1 | TokenToughness$ 1 | TokenColors$ Green | TokenImage$ g 1 1 saproling ALA -SVar:X:Count$NumCounters.P1P1 +SVar:X:Count$CardCounters.P1P1 SVar:Picture:http://www.wizards.com/global/images/magic/general/mycoloth.jpg Oracle:Devour 2 (As this enters the battlefield, you may sacrifice any number of creatures. This creature enters the battlefield with twice that many +1/+1 counters on it.)\nAt the beginning of your upkeep, put a 1/1 green Saproling creature token onto the battlefield for each +1/+1 counter on Mycoloth. diff --git a/forge-gui/res/cardsfolder/p/phyrexian_marauder.txt b/forge-gui/res/cardsfolder/p/phyrexian_marauder.txt index f10963f1cfe..c37d5ff35bf 100644 --- a/forge-gui/res/cardsfolder/p/phyrexian_marauder.txt +++ b/forge-gui/res/cardsfolder/p/phyrexian_marauder.txt @@ -6,6 +6,6 @@ K:CARDNAME can't block. S:Mode$ CantAttackUnless | ValidCard$ Card.Self | Cost$ Y | Description$ CARDNAME can't attack unless you pay 1 for each +1/+1 counter on it. K:etbCounter:P1P1:X SVar:X:Count$xPaid -SVar:Y:Count$NumCounters.P1P1 +SVar:Y:Count$CardCounters.P1P1 SVar:Picture:http://www.wizards.com/global/images/magic/general/phyrexian_marauder.jpg Oracle:Phyrexian Marauder enters the battlefield with X +1/+1 counters on it.\nPhyrexian Marauder can't block.\nPhyrexian Marauder can't attack unless you pay {1} for each +1/+1 counter on it. diff --git a/forge-gui/res/cardsfolder/r/rakdos_cackler.txt b/forge-gui/res/cardsfolder/r/rakdos_cackler.txt index 0080be715f9..c2641832616 100644 --- a/forge-gui/res/cardsfolder/r/rakdos_cackler.txt +++ b/forge-gui/res/cardsfolder/r/rakdos_cackler.txt @@ -5,6 +5,6 @@ PT:1/1 K:ETBReplacement:Other:Unleash:Optional SVar:Unleash:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Unleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.) S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | CheckSVar$ X | SVarCompare$ GE1 | References$ X -SVar:X:Count$NumCounters.P1P1 +SVar:X:Count$CardCounters.P1P1 SVar:Picture:http://www.wizards.com/global/images/magic/general/rakdos_cackler.jpg Oracle:Unleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.) diff --git a/forge-gui/res/cardsfolder/r/rakdos_drake.txt b/forge-gui/res/cardsfolder/r/rakdos_drake.txt index c5951e7db83..dee4a507f43 100644 --- a/forge-gui/res/cardsfolder/r/rakdos_drake.txt +++ b/forge-gui/res/cardsfolder/r/rakdos_drake.txt @@ -6,6 +6,6 @@ K:Flying K:ETBReplacement:Other:Unleash:Optional SVar:Unleash:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Unleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.) S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | CheckSVar$ X | SVarCompare$ GE1 | References$ X -SVar:X:Count$NumCounters.P1P1 +SVar:X:Count$CardCounters.P1P1 SVar:Picture:http://www.wizards.com/global/images/magic/general/rakdos_drake.jpg Oracle:Flying\nUnleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.) diff --git a/forge-gui/res/cardsfolder/s/slumbering_dragon.txt b/forge-gui/res/cardsfolder/s/slumbering_dragon.txt index 45c4d7086f3..5dad0414a1b 100644 --- a/forge-gui/res/cardsfolder/s/slumbering_dragon.txt +++ b/forge-gui/res/cardsfolder/s/slumbering_dragon.txt @@ -6,6 +6,6 @@ K:Flying S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack or block. | CheckSVar$ X | SVarCompare$ LT5 | References$ X | Description$ CARDNAME can't attack or block unless it has five or more +1/+1 counters on it. T:Mode$ Attacks | ValidCard$ Creature | Attacked$ You,Planeswalker.YouCtrl | TriggerZones$ Battlefield | Execute$ DragonWake | TriggerDescription$ Whenever a creature attacks you or a planeswalker you control, put a +1/+1 counter on CARDNAME. SVar:DragonWake:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 -SVar:X:Count$NumCounters.P1P1 +SVar:X:Count$CardCounters.P1P1 SVar:Picture:http://www.wizards.com/global/images/magic/general/slumbering_dragon.jpg Oracle:Flying\nSlumbering Dragon can't attack or block unless it has five or more +1/+1 counters on it.\nWhenever a creature attacks you or a planeswalker you control, put a +1/+1 counter on Slumbering Dragon. diff --git a/forge-gui/res/cardsfolder/s/spawn_of_rix_maadi.txt b/forge-gui/res/cardsfolder/s/spawn_of_rix_maadi.txt index abc5c9dc865..1d069df8861 100644 --- a/forge-gui/res/cardsfolder/s/spawn_of_rix_maadi.txt +++ b/forge-gui/res/cardsfolder/s/spawn_of_rix_maadi.txt @@ -5,6 +5,6 @@ PT:5/3 K:ETBReplacement:Other:Unleash:Optional SVar:Unleash:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Unleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.) S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | CheckSVar$ X | SVarCompare$ GE1 | References$ X -SVar:X:Count$NumCounters.P1P1 +SVar:X:Count$CardCounters.P1P1 SVar:Picture:http://www.wizards.com/global/images/magic/general/spawn_of_rix_maadi.jpg Oracle:Unleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.) diff --git a/forge-gui/res/cardsfolder/s/splatter_thug.txt b/forge-gui/res/cardsfolder/s/splatter_thug.txt index 531423c1af1..d8cdcc4eac0 100644 --- a/forge-gui/res/cardsfolder/s/splatter_thug.txt +++ b/forge-gui/res/cardsfolder/s/splatter_thug.txt @@ -6,6 +6,6 @@ K:First Strike K:ETBReplacement:Other:Unleash:Optional SVar:Unleash:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Unleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.) S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | CheckSVar$ X | SVarCompare$ GE1 | References$ X -SVar:X:Count$NumCounters.P1P1 +SVar:X:Count$CardCounters.P1P1 SVar:Picture:http://www.wizards.com/global/images/magic/general/splatter_thug.jpg Oracle:First strike\nUnleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.) diff --git a/forge-gui/res/cardsfolder/t/thrill_kill_assassin.txt b/forge-gui/res/cardsfolder/t/thrill_kill_assassin.txt index 98dd9281b7c..d1b55174baa 100644 --- a/forge-gui/res/cardsfolder/t/thrill_kill_assassin.txt +++ b/forge-gui/res/cardsfolder/t/thrill_kill_assassin.txt @@ -6,6 +6,6 @@ K:Deathtouch K:ETBReplacement:Other:Unleash:Optional SVar:Unleash:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Unleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.) S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | CheckSVar$ X | SVarCompare$ GE1 | References$ X -SVar:X:Count$NumCounters.P1P1 +SVar:X:Count$CardCounters.P1P1 SVar:Picture:http://www.wizards.com/global/images/magic/general/thrill_kill_assassin.jpg Oracle:Deathtouch\nUnleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.)