From 7dba8932c4f4280412d3498d2eb2736a529a693f Mon Sep 17 00:00:00 2001 From: Sloth Date: Tue, 31 Jul 2012 17:12:04 +0000 Subject: [PATCH] - Updated some SVars. --- res/cardsfolder/b/broken_ambitions.txt | 1 - res/cardsfolder/c/crushing_vines.txt | 1 - res/cardsfolder/g/grafdiggers_cage.txt | 1 + res/cardsfolder/o/overrule.txt | 1 - res/cardsfolder/p/power_sink.txt | 1 - res/cardsfolder/s/syncopate.txt | 1 - res/cardsfolder/s/syphon_flesh.txt | 1 - res/cardsfolder/s/syphon_mind.txt | 1 - .../forge/card/abilityfactory/AbilityFactoryCounterMagic.java | 2 +- 9 files changed, 2 insertions(+), 8 deletions(-) diff --git a/res/cardsfolder/b/broken_ambitions.txt b/res/cardsfolder/b/broken_ambitions.txt index 540848ec1eb..750b2aea63e 100644 --- a/res/cardsfolder/b/broken_ambitions.txt +++ b/res/cardsfolder/b/broken_ambitions.txt @@ -6,7 +6,6 @@ A:SP$ Counter | Cost$ X U | TargetType$ Spell | TgtPrompt$ Select target spell | SVar:DBClash:DB$Clash | WinSubAbility$ DBMill SVar:DBMill:DB$Mill | Defined$ TargetedController | NumCards$ 4 SVar:X:Count$xPaid -SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/broken_ambitions.jpg SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/54.jpg diff --git a/res/cardsfolder/c/crushing_vines.txt b/res/cardsfolder/c/crushing_vines.txt index cfd63c4cb38..8f5be3832b6 100644 --- a/res/cardsfolder/c/crushing_vines.txt +++ b/res/cardsfolder/c/crushing_vines.txt @@ -4,7 +4,6 @@ Types:Instant Text:no text A:SP$ Destroy | Cost$ 2 G | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target flying creature. | PrecostDesc$ Choose one - | SpellDescription$ Destroy target creature with flying, A:SP$ Destroy | Cost$ 2 G | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ or destroy target artifact. -SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/crushing_vines.jpg SetInfo:DKA|Common|http://magiccards.info/scans/en/dka/110.jpg Oracle:Choose one - Destroy target creature with flying; or destroy target artifact. diff --git a/res/cardsfolder/g/grafdiggers_cage.txt b/res/cardsfolder/g/grafdiggers_cage.txt index 343e92cb00b..f53b840cee9 100644 --- a/res/cardsfolder/g/grafdiggers_cage.txt +++ b/res/cardsfolder/g/grafdiggers_cage.txt @@ -6,6 +6,7 @@ R:Event$Moved | Origin$ Graveyard | Destination$ Battlefield | ValidCard$ Creatu R:Event$Moved | Origin$ Library | Destination$ Battlefield | ValidCard$ Creature | Prevent$ True S:Mode$ CantBeCast | Origin$ Graveyard | Description$ Players can't cast cards in graveyards or libraries. S:Mode$ CantBeCast | Origin$ Library +SVar:RemRandomDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/grafdiggers_cage.jpg SetInfo:DKA|Rare|http://magiccards.info/scans/en/dka/149.jpg diff --git a/res/cardsfolder/o/overrule.txt b/res/cardsfolder/o/overrule.txt index faf2ab82954..39f687c4536 100644 --- a/res/cardsfolder/o/overrule.txt +++ b/res/cardsfolder/o/overrule.txt @@ -5,7 +5,6 @@ Text:no text A:SP$ Counter | Cost$ X W U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ X | References$ X | SubAbility$ DBGainLife | SpellDescription$ Counter target spell unless its controller pays X. You gain X life. SVar:DBGainLife:DB$GainLife | LifeAmount$ X | References$ X SVar:X:Count$xPaid -SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/overrule.jpg SetInfo:DIS|Common|http://magiccards.info/scans/en/di/120.jpg diff --git a/res/cardsfolder/p/power_sink.txt b/res/cardsfolder/p/power_sink.txt index c3a761a1295..a84ab16dde7 100644 --- a/res/cardsfolder/p/power_sink.txt +++ b/res/cardsfolder/p/power_sink.txt @@ -4,7 +4,6 @@ Types:Instant Text:no text A:SP$ Counter | Cost$ X U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ X | References$ X | PowerSink$ True | SpellDescription$ Counter target spell unless its controller pays X. If he or she doesn't, that player taps all lands with mana abilities he or she controls and empties his or her mana pool. SVar:X:Count$xPaid -SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/power_sink.jpg SetInfo:USG|Common|http://magiccards.info/scans/en/us/89.jpg diff --git a/res/cardsfolder/s/syncopate.txt b/res/cardsfolder/s/syncopate.txt index 959220021d7..c9ea688a504 100644 --- a/res/cardsfolder/s/syncopate.txt +++ b/res/cardsfolder/s/syncopate.txt @@ -4,7 +4,6 @@ Types:Instant Text:no text A:SP$ Counter | Cost$ X U | References$ X | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | Destination$ Exile | UnlessCost$ X | SpellDescription$ Counter target spell unless its controller pays X. If that spell is countered this way, exile it instead of putting it into its owner's graveyard. SVar:X:Count$xPaid -SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/syncopate.jpg SetInfo:ODY|Common|http://magiccards.info/scans/en/od/103.jpg diff --git a/res/cardsfolder/s/syphon_flesh.txt b/res/cardsfolder/s/syphon_flesh.txt index 9972dbe18e6..1e1ed1d0a85 100644 --- a/res/cardsfolder/s/syphon_flesh.txt +++ b/res/cardsfolder/s/syphon_flesh.txt @@ -6,7 +6,6 @@ A:SP$ Sacrifice | Cost$ 4 B | Defined$ Opponent | SacValid$ Creature | SacMessag SVar:DBToken:DB$Token | TokenImage$ B 2 2 Zombie | TokenName$ Zombie | TokenColors$ Black | TokenTypes$ Creature,Zombie | TokenPower$ 2 | TokenToughness$ 2 | TokenOwner$ You | TokenAmount$ X | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:X:Remembered$Amount -SVar:RemAIDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/syphon_flesh.jpg SetInfo:COM|Uncommon|http://magiccards.info/scans/en/cmd/103.jpg diff --git a/res/cardsfolder/s/syphon_mind.txt b/res/cardsfolder/s/syphon_mind.txt index fd371630c04..a14c5da7682 100644 --- a/res/cardsfolder/s/syphon_mind.txt +++ b/res/cardsfolder/s/syphon_mind.txt @@ -6,7 +6,6 @@ A:SP$ Discard | Cost$ 3 B | Defined$ Opponent | NumCards$ 1 | Mode$ TgtChoose | SVar:DBDraw:DB$ Draw | Cost$ 0 | NumCards$ X | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:X:Remembered$Amount -SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/syphon_mind.jpg SetInfo:ONS|Common|http://magiccards.info/scans/en/on/175.jpg diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounterMagic.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounterMagic.java index 07c3e7660a1..4924daf8ace 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounterMagic.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounterMagic.java @@ -299,7 +299,7 @@ public class AbilityFactoryCounterMagic { if (toPay <= usableManaSources) { // If this is a reusable Resource, feel free to play it most of // the time - if (!sa.getPayCosts().isReusuableResource() || (MyRandom.getRandom().nextFloat() < .4)) { + if (!sa.getPayCosts().isReusuableResource() || sa.isSpell()) { return false; } }