From c37c0fefbe7c48a0648150a50a503ce10848484f Mon Sep 17 00:00:00 2001 From: Hellfish Date: Wed, 2 Jan 2013 07:29:28 +0000 Subject: [PATCH] *Renamed AF_CopySpell for clarity --- .gitattributes | 2 +- res/cardsfolder/a/aethertow.txt | 2 +- res/cardsfolder/b/barkshell_blessing.txt | 2 +- res/cardsfolder/b/bitter_ordeal.txt | 2 +- res/cardsfolder/b/burn_trail.txt | 2 +- res/cardsfolder/c/chandra_the_firebrand.txt | 2 +- res/cardsfolder/c/cloven_casting.txt | 2 +- res/cardsfolder/c/curse_of_echoes.txt | 2 +- res/cardsfolder/d/disturbing_plot.txt | 2 +- res/cardsfolder/d/dual_casting.txt | 2 +- res/cardsfolder/e/echo_mage.txt | 4 ++-- res/cardsfolder/f/fork.txt | 2 +- res/cardsfolder/g/ghastly_discovery.txt | 2 +- res/cardsfolder/g/giantbaiting.txt | 2 +- res/cardsfolder/g/gleeful_sabotage.txt | 2 +- res/cardsfolder/i/increasing_vengeance.txt | 4 ++-- res/cardsfolder/i/izzet_guildmage.txt | 4 ++-- res/cardsfolder/m/memory_sluice.txt | 2 +- res/cardsfolder/m/mine_excavation.txt | 2 +- res/cardsfolder/m/mirari.txt | 2 +- res/cardsfolder/m/mirror_sheen.txt | 2 +- res/cardsfolder/m/mischievous_quanar.txt | 2 +- res/cardsfolder/n/nivix_guildmage.txt | 2 +- res/cardsfolder/p/pyromancer_ascension.txt | 2 +- res/cardsfolder/r/reiterate.txt | 2 +- res/cardsfolder/r/reverberate.txt | 2 +- res/cardsfolder/r/riku_of_two_reflections.txt | 2 +- res/cardsfolder/r/rings_of_brighthearth.txt | 2 +- res/cardsfolder/s/sigil_tracer.txt | 2 +- res/cardsfolder/s/spelltwine.txt | 2 +- res/cardsfolder/t/traitors_roar.txt | 2 +- res/cardsfolder/t/twincast.txt | 2 +- res/cardsfolder/u/uyo_silent_prophet.txt | 2 +- src/main/java/forge/card/abilityfactory/AbilityFactory.java | 2 +- src/main/java/forge/card/abilityfactory/ApiType.java | 2 +- .../{CopySpellEffect.java => CopySpellAbilityEffect.java} | 2 +- 36 files changed, 39 insertions(+), 39 deletions(-) rename src/main/java/forge/card/abilityfactory/effects/{CopySpellEffect.java => CopySpellAbilityEffect.java} (96%) diff --git a/.gitattributes b/.gitattributes index e7e6b6a1275..79b7a893c36 100644 --- a/.gitattributes +++ b/.gitattributes @@ -13059,7 +13059,7 @@ src/main/java/forge/card/abilityfactory/effects/CloneEffect.java -text src/main/java/forge/card/abilityfactory/effects/ControlExchangeEffect.java -text src/main/java/forge/card/abilityfactory/effects/ControlGainEffect.java -text src/main/java/forge/card/abilityfactory/effects/CopyPermanentEffect.java -text -src/main/java/forge/card/abilityfactory/effects/CopySpellEffect.java -text +src/main/java/forge/card/abilityfactory/effects/CopySpellAbilityEffect.java -text src/main/java/forge/card/abilityfactory/effects/CounterEffect.java -text src/main/java/forge/card/abilityfactory/effects/CountersMoveEffect.java -text src/main/java/forge/card/abilityfactory/effects/CountersProliferateEffect.java -text diff --git a/res/cardsfolder/a/aethertow.txt b/res/cardsfolder/a/aethertow.txt index ebd17859612..0b5c91c97ba 100644 --- a/res/cardsfolder/a/aethertow.txt +++ b/res/cardsfolder/a/aethertow.txt @@ -5,7 +5,7 @@ Text:no text A:SP$ ChangeZone | Cost$ 3 WU | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | SpellDescription$ Put target attacking or blocking creature on top of its owner's library. K:Conspire T:Mode$ SpellCast | ValidCard$ Card.Self | Conspire$ True | Execute$ Conspire | Secondary$ True | TriggerDescription$ Copy CARDNAME if its conspire cost was paid -SVar:Conspire:AB$ CopySpell | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1 +SVar:Conspire:AB$ CopySpellAbility | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/aethertow.jpg SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/136.jpg diff --git a/res/cardsfolder/b/barkshell_blessing.txt b/res/cardsfolder/b/barkshell_blessing.txt index 8f35e24997e..6724caca4f4 100644 --- a/res/cardsfolder/b/barkshell_blessing.txt +++ b/res/cardsfolder/b/barkshell_blessing.txt @@ -5,7 +5,7 @@ Text:no text A:SP$ Pump | Cost$ GW | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Target creature gets +2/+2 until end of turn. K:Conspire T:Mode$ SpellCast | ValidCard$ Card.Self | Conspire$ True | Execute$ Conspire | Secondary$ True | TriggerDescription$ Copy CARDNAME if its conspire cost was paid -SVar:Conspire:AB$ CopySpell | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1 +SVar:Conspire:AB$ CopySpellAbility | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/barkshell_blessing.jpg SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/224.jpg diff --git a/res/cardsfolder/b/bitter_ordeal.txt b/res/cardsfolder/b/bitter_ordeal.txt index ba66c7170f5..ed1990f2eab 100644 --- a/res/cardsfolder/b/bitter_ordeal.txt +++ b/res/cardsfolder/b/bitter_ordeal.txt @@ -4,7 +4,7 @@ Types:Sorcery Text:no text A:SP$ ChangeZone | Cost$ 2 B | Origin$ Library | Destination$ Exile | ValidTgts$ Player | ChangeType$ Card | ChangeNum$ 1 | IsCurse$ True | SpellDescription$ Search target player's library for a card and exile it. Then that player shuffles his or her library. T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigGravestorm | TriggerDescription$ Gravestorm (When you cast this spell, copy it for each permanent put into a graveyard this turn. You may choose new targets for the copies.) -SVar:TrigGravestorm:AB$CopySpell | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ GravestormCount | References$ GravestormCount +SVar:TrigGravestorm:AB$CopySpellAbility | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ GravestormCount | References$ GravestormCount SVar:GravestormCount:Count$ThisTurnEntered_Graveyard_Permanent SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/bitter_ordeal.jpg diff --git a/res/cardsfolder/b/burn_trail.txt b/res/cardsfolder/b/burn_trail.txt index f85113a57c0..c1bc4af7f55 100644 --- a/res/cardsfolder/b/burn_trail.txt +++ b/res/cardsfolder/b/burn_trail.txt @@ -5,7 +5,7 @@ Text:no text A:SP$ DealDamage | Cost$ 3 R | Tgt$ TgtCP | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target creature or player. K:Conspire T:Mode$ SpellCast | ValidCard$ Card.Self | Conspire$ True | Execute$ Conspire | Secondary$ True | TriggerDescription$ Copy CARDNAME if its conspire cost was paid -SVar:Conspire:AB$ CopySpell | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1 +SVar:Conspire:AB$ CopySpellAbility | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/burn_trail.jpg SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/86.jpg diff --git a/res/cardsfolder/c/chandra_the_firebrand.txt b/res/cardsfolder/c/chandra_the_firebrand.txt index b0faa4f7efd..1717f07f1c8 100644 --- a/res/cardsfolder/c/chandra_the_firebrand.txt +++ b/res/cardsfolder/c/chandra_the_firebrand.txt @@ -7,7 +7,7 @@ A:AB$DealDamage | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Tgt$ TgtCP A:AB$Effect | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | Name$ Chandra, the Firebrand effect. | Image$ chandra_the_firebrand_effect | Triggers$ TrigCopy | SVars$ TrigCopyMain,DBCleanup | SpellDescription$ When you cast your next instant or sorcery spell this turn, copy that spell. You may choose new targets for the copy. A:AB$DealDamage | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Tgt$ TgtCP | TargetMin$ 0 | TargetMax$ 6 | NumDmg$ 6 | SpellDescription$ CARDNAME deals 6 damage to each of up to six target creatures and/or players. SVar:TrigCopy:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | Execute$ TrigCopyMain | TriggerDescription$ When you cast your next instant or sorcery spell this turn, copy that spell. You may choose new targets for the copy. -SVar:TrigCopyMain:AB$ CopySpell | Cost$ 0 | Defined$ TriggeredSpellAbility | SubAbility$ DBCleanup +SVar:TrigCopyMain:AB$ CopySpellAbility | Cost$ 0 | Defined$ TriggeredSpellAbility | SubAbility$ DBCleanup SVar:DBCleanup:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Graveyard SVar:Rarity:Mythic SVar:Picture:http://www.wizards.com/global/images/magic/general/chandra_the_firebrand.jpg diff --git a/res/cardsfolder/c/cloven_casting.txt b/res/cardsfolder/c/cloven_casting.txt index 731fa53cbbc..28e09d05610 100644 --- a/res/cardsfolder/c/cloven_casting.txt +++ b/res/cardsfolder/c/cloven_casting.txt @@ -3,7 +3,7 @@ ManaCost:5 U R Types:Enchantment Text:no text T:Mode$ SpellCast | ValidCard$ Instant.MultiColor,Sorcery.MultiColor | ValidActivatingPlayer$ You | Execute$ TrigCopy | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a multicolored instant or sorcery spell, you may pay 1. If you do, copy that spell. You may choose new targets for the copy. -SVar:TrigCopy:AB$ CopySpell | Cost$ 1 | Defined$ TriggeredSpellAbility +SVar:TrigCopy:AB$ CopySpellAbility | Cost$ 1 | Defined$ TriggeredSpellAbility SVar:RemRandomDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/cloven_casting.jpg diff --git a/res/cardsfolder/c/curse_of_echoes.txt b/res/cardsfolder/c/curse_of_echoes.txt index 539d9a9a65e..1a3569067c5 100644 --- a/res/cardsfolder/c/curse_of_echoes.txt +++ b/res/cardsfolder/c/curse_of_echoes.txt @@ -5,7 +5,7 @@ Text:no text K:Enchant player A:SP$ Attach | Cost$ 4 U | ValidTgts$ Player | AILogic$ Curse T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ Player.EnchantedBy | Execute$ TrigCopy | TriggerZones$ Battlefield | OptionalDecider$ TriggeredCardOpponent | TriggerDescription$ Whenever enchanted player casts an instant or sorcery spell, each other player may copy that spell and may choose new targets for the copy he or she controls. -SVar:TrigCopy:AB$ CopySpell | Cost$ 0 | Defined$ TriggeredSpellAbility | Controller$ TriggeredCardOpponent +SVar:TrigCopy:AB$ CopySpellAbility | Cost$ 0 | Defined$ TriggeredSpellAbility | Controller$ TriggeredCardOpponent SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/curse_of_echoes.jpg diff --git a/res/cardsfolder/d/disturbing_plot.txt b/res/cardsfolder/d/disturbing_plot.txt index ee69f7e13bf..38edd27d94b 100644 --- a/res/cardsfolder/d/disturbing_plot.txt +++ b/res/cardsfolder/d/disturbing_plot.txt @@ -5,7 +5,7 @@ Text:no text A:SP$ ChangeZone | Cost$ 1 B | ValidTgts$ Creature | TgtPrompt$ Select target creature in a graveyard to return | Origin$ Graveyard | Destination$ Hand| SpellDescription$ Return target creature card from a graveyard to its owner's hand. K:Conspire T:Mode$ SpellCast | ValidCard$ Card.Self | Conspire$ True | Execute$ Conspire | Secondary$ True | TriggerDescription$ Copy CARDNAME if its conspire cost was paid -SVar:Conspire:AB$ CopySpell | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1 +SVar:Conspire:AB$ CopySpellAbility | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/disturbing_plot.jpg SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/64.jpg diff --git a/res/cardsfolder/d/dual_casting.txt b/res/cardsfolder/d/dual_casting.txt index a47646e042d..24ca3597cdb 100644 --- a/res/cardsfolder/d/dual_casting.txt +++ b/res/cardsfolder/d/dual_casting.txt @@ -5,7 +5,7 @@ Text:no text K:Enchant creature A:SP$ Attach | Cost$ 1 R | ValidTgts$ Creature | AILogic$ Pump S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ ForkStick | Description$ Enchanted creature has "R, T: Copy target instant or sorcery spell you control. You may choose new targets for the copy." -SVar:ForkStick:AB$ CopySpell | Cost$ R T | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl | SpellDescription$ Copy target instant or sorcery spell you control. You may choose new targets for the copy. +SVar:ForkStick:AB$ CopySpellAbility | Cost$ R T | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl | SpellDescription$ Copy target instant or sorcery spell you control. You may choose new targets for the copy. SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/dual_casting.jpg diff --git a/res/cardsfolder/e/echo_mage.txt b/res/cardsfolder/e/echo_mage.txt index 3e54917aa2c..71a78a523b1 100644 --- a/res/cardsfolder/e/echo_mage.txt +++ b/res/cardsfolder/e/echo_mage.txt @@ -7,8 +7,8 @@ K:Level up:1 U K:maxLevel:4 S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 4 | AddAbility$ CopyOnce | CheckSVar$ X | SVarCompare$ EQ1 | Description$ LEVEL 2-3 2/4 CARDNAME gets U U,tap: Copy target instant or sorcery spell. You may choose new targets for the copy. S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 5 | AddAbility$ CopyTwice | CheckSVar$ Y | SVarCompare$ EQ1 | Description$ LEVEL 4+ 2/5 CARDNAME gets U U,tap:Copy target instant or sorcery spell twice. You may choose new targets for the copies. -SVar:CopyOnce:AB$CopySpell | Cost$ U U T | ValidTgts$ Instant,Sorcery | SpellDescription$ Copy target instant or sorcery spell. You may choose new targets for the copy. -SVar:CopyTwice:AB$CopySpell | Cost$ U U T | ValidTgts$ Instant,Sorcery | Amount$ 2 | SpellDescription$ Copy target instant or sorcery spell twice. You may choose new targets for the copies. +SVar:CopyOnce:AB$CopySpellAbility | Cost$ U U T | ValidTgts$ Instant,Sorcery | SpellDescription$ Copy target instant or sorcery spell. You may choose new targets for the copy. +SVar:CopyTwice:AB$CopySpellAbility | Cost$ U U T | ValidTgts$ Instant,Sorcery | Amount$ 2 | SpellDescription$ Copy target instant or sorcery spell twice. You may choose new targets for the copies. SVar:X:Count$Valid Card.Self+counters_GE2_LEVEL+counters_LT4_LEVEL SVar:Y:Count$Valid Card.Self+counters_GE4_LEVEL SVar:RemAIDeck:True diff --git a/res/cardsfolder/f/fork.txt b/res/cardsfolder/f/fork.txt index 92ee4d8174f..8a7b719d345 100644 --- a/res/cardsfolder/f/fork.txt +++ b/res/cardsfolder/f/fork.txt @@ -2,7 +2,7 @@ Name:Fork ManaCost:R R Types:Instant Text:no text -A:SP$ CopySpell | Cost$ R R | ValidTgts$ Instant,Sorcery | CopyIsColor$ Red | OverwriteColors$ True | SpellDescription$ Copy target instant or sorcery spell, except that the copy is red. You may choose new targets for the copy. +A:SP$ CopySpellAbility | Cost$ R R | ValidTgts$ Instant,Sorcery | CopyIsColor$ Red | OverwriteColors$ True | SpellDescription$ Copy target instant or sorcery spell, except that the copy is red. You may choose new targets for the copy. SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/fork.jpg diff --git a/res/cardsfolder/g/ghastly_discovery.txt b/res/cardsfolder/g/ghastly_discovery.txt index 458759fcbf0..d53727f6966 100644 --- a/res/cardsfolder/g/ghastly_discovery.txt +++ b/res/cardsfolder/g/ghastly_discovery.txt @@ -6,7 +6,7 @@ A:SP$ Draw | Cost$ 2 U | NumCards$ 2 | SpellDescription$ Draw two cards, then di SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose K:Conspire T:Mode$ SpellCast | ValidCard$ Card.Self | Conspire$ True | Execute$ Conspire | Secondary$ True | TriggerDescription$ Copy CARDNAME if its conspire cost was paid -SVar:Conspire:AB$ CopySpell | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1 +SVar:Conspire:AB$ CopySpellAbility | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/ghastly_discovery.jpg SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/39.jpg diff --git a/res/cardsfolder/g/giantbaiting.txt b/res/cardsfolder/g/giantbaiting.txt index 1361e76aaff..53f19db16d4 100644 --- a/res/cardsfolder/g/giantbaiting.txt +++ b/res/cardsfolder/g/giantbaiting.txt @@ -5,7 +5,7 @@ Text:no text A:SP$ Token | Cost$ 2 RG | TokenAmount$ 1 | TokenName$ Giant Warrior | TokenTypes$ Creature,Giant,Warrior | TokenOwner$ You | TokenColors$ Red,Green | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Haste | TokenHiddenKeywords$ At the beginning of the end step, exile CARDNAME. | SpellDescription$ Put a 4/4 red and green Giant Warrior creature token with haste onto the battlefield. Exile it at the beginning of the next end step. K:Conspire T:Mode$ SpellCast | ValidCard$ Card.Self | Conspire$ True | Execute$ Conspire | Secondary$ True | TriggerDescription$ Copy CARDNAME if its conspire cost was paid -SVar:Conspire:AB$ CopySpell | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1 +SVar:Conspire:AB$ CopySpellAbility | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/giantbaiting.jpg SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/207.jpg diff --git a/res/cardsfolder/g/gleeful_sabotage.txt b/res/cardsfolder/g/gleeful_sabotage.txt index 5087f0f3860..b31348bf5d1 100644 --- a/res/cardsfolder/g/gleeful_sabotage.txt +++ b/res/cardsfolder/g/gleeful_sabotage.txt @@ -5,7 +5,7 @@ Text:no text A:SP$ Destroy | Cost$ 1 G | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment. K:Conspire T:Mode$ SpellCast | ValidCard$ Card.Self | Conspire$ True | Execute$ Conspire | Secondary$ True | TriggerDescription$ Copy CARDNAME if its conspire cost was paid -SVar:Conspire:AB$ CopySpell | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1 +SVar:Conspire:AB$ CopySpellAbility | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/gleeful_sabotage.jpg SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/116.jpg diff --git a/res/cardsfolder/i/increasing_vengeance.txt b/res/cardsfolder/i/increasing_vengeance.txt index 89ad5884359..d9ff70784bb 100644 --- a/res/cardsfolder/i/increasing_vengeance.txt +++ b/res/cardsfolder/i/increasing_vengeance.txt @@ -3,8 +3,8 @@ ManaCost:R R Types:Instant Text:no text K:Flashback 3 R R -A:SP$ CopySpell | Cost$ R R | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl | SubAbility$ DBCopy2 | SpellDescription$ Copy target instant or sorcery spell you control. If CARDNAME was cast from a graveyard, copy that spell twice instead. You may choose new targets for the copies. -SVar:DBCopy2:DB$ CopySpell | Cost$ 0 | Defined$ Targeted | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | References$ X +A:SP$ CopySpellAbility | Cost$ R R | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl | SubAbility$ DBCopy2 | SpellDescription$ Copy target instant or sorcery spell you control. If CARDNAME was cast from a graveyard, copy that spell twice instead. You may choose new targets for the copies. +SVar:DBCopy2:DB$ CopySpellAbility | Cost$ 0 | Defined$ Targeted | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | References$ X SVar:X:Count$wasCastFromGraveyard.1.0 SVar:RemAIDeck:True SVar:Rarity:Rare diff --git a/res/cardsfolder/i/izzet_guildmage.txt b/res/cardsfolder/i/izzet_guildmage.txt index 0607cf22f50..bc66ce6006b 100644 --- a/res/cardsfolder/i/izzet_guildmage.txt +++ b/res/cardsfolder/i/izzet_guildmage.txt @@ -3,8 +3,8 @@ ManaCost:UR UR Types:Creature Human Wizard Text:no text PT:2/2 -A:AB$ CopySpell | Cost$ 2 U | ValidTgts$ Instant.YouCtrl+cmcLE2 | SpellDescription$ Copy target instant spell you control with converted mana cost 2 or less. You may choose new targets for the copy. -A:AB$ CopySpell | Cost$ 2 R | ValidTgts$ Sorcery.YouCtrl+cmcLE2 | SpellDescription$ Copy target sorcery spell you control with converted mana cost 2 or less. You may choose new targets for the copy. +A:AB$ CopySpellAbility | Cost$ 2 U | ValidTgts$ Instant.YouCtrl+cmcLE2 | SpellDescription$ Copy target instant spell you control with converted mana cost 2 or less. You may choose new targets for the copy. +A:AB$ CopySpellAbility | Cost$ 2 R | ValidTgts$ Sorcery.YouCtrl+cmcLE2 | SpellDescription$ Copy target sorcery spell you control with converted mana cost 2 or less. You may choose new targets for the copy. SVar:RemAIDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/izzet_guildmage.jpg diff --git a/res/cardsfolder/m/memory_sluice.txt b/res/cardsfolder/m/memory_sluice.txt index fc665d24fe8..aa50dc34d85 100644 --- a/res/cardsfolder/m/memory_sluice.txt +++ b/res/cardsfolder/m/memory_sluice.txt @@ -5,7 +5,7 @@ Text:no text A:SP$ Mill | Cost$ UB | NumCards$ 4 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player puts the top four cards of his or her library into his or her graveyard. K:Conspire T:Mode$ SpellCast | ValidCard$ Card.Self | Conspire$ True | Execute$ Conspire | Secondary$ True | TriggerDescription$ Copy CARDNAME if its conspire cost was paid -SVar:Conspire:AB$ CopySpell | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1 +SVar:Conspire:AB$ CopySpellAbility | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/memory_sluice.jpg SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/170.jpg diff --git a/res/cardsfolder/m/mine_excavation.txt b/res/cardsfolder/m/mine_excavation.txt index b706beed90a..25ef891c615 100644 --- a/res/cardsfolder/m/mine_excavation.txt +++ b/res/cardsfolder/m/mine_excavation.txt @@ -5,7 +5,7 @@ Text:no text A:SP$ ChangeZone | Cost$ 1 W | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment in a graveyard to return | Origin$ Graveyard | Destination$ Hand| SpellDescription$ Return target artifact or enchantment card from a graveyard to its owner's hand. K:Conspire T:Mode$ SpellCast | ValidCard$ Card.Self | Conspire$ True | Execute$ Conspire | Secondary$ True | TriggerDescription$ Copy CARDNAME if its conspire cost was paid -SVar:Conspire:AB$ CopySpell | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1 +SVar:Conspire:AB$ CopySpellAbility | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/mine_excavation.jpg SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/13.jpg diff --git a/res/cardsfolder/m/mirari.txt b/res/cardsfolder/m/mirari.txt index 486a96b1dca..38d28b73915 100644 --- a/res/cardsfolder/m/mirari.txt +++ b/res/cardsfolder/m/mirari.txt @@ -3,7 +3,7 @@ ManaCost:5 Types:Legendary Artifact Text:no text T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigCopy | TriggerDescription$ Whenever you cast an instant or sorcery spell, you may pay 3. If you do, copy that spell. You may choose new targets for the copy. -SVar:TrigCopy:AB$CopySpell | Cost$ 3 | Defined$ TriggeredSpellAbility +SVar:TrigCopy:AB$CopySpellAbility | Cost$ 3 | Defined$ TriggeredSpellAbility SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/mirari.jpg SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/303.jpg diff --git a/res/cardsfolder/m/mirror_sheen.txt b/res/cardsfolder/m/mirror_sheen.txt index 52285bb65e3..f1892eecca4 100644 --- a/res/cardsfolder/m/mirror_sheen.txt +++ b/res/cardsfolder/m/mirror_sheen.txt @@ -2,7 +2,7 @@ Name:Mirror Sheen ManaCost:1 UR UR Types:Enchantment Text:no text -A:AB$ CopySpell | Cost$ 1 UR UR | ValidTgts$ Instant,Sorcery | TargetValidTargeting$ You | SpellDescription$ Copy target instant or sorcery spell that targets you. You may choose new targets for the copy. +A:AB$ CopySpellAbility | Cost$ 1 UR UR | ValidTgts$ Instant,Sorcery | TargetValidTargeting$ You | SpellDescription$ Copy target instant or sorcery spell that targets you. You may choose new targets for the copy. SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/mirror_sheen.jpg SetInfo:EVE|Rare|http://magiccards.info/scans/en/eve/105.jpg diff --git a/res/cardsfolder/m/mischievous_quanar.txt b/res/cardsfolder/m/mischievous_quanar.txt index 9cd7843e3e1..b18d7872c41 100644 --- a/res/cardsfolder/m/mischievous_quanar.txt +++ b/res/cardsfolder/m/mischievous_quanar.txt @@ -6,7 +6,7 @@ PT:3/3 K:Morph:1 U U A:AB$ SetState | Cost$ 3 U U | Defined$ Self | Mode$ TurnFace | SpellDescription$ Turn CARDNAME face down. T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigCopy | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME is turned face up, copy target instant or sorcery spell. You may choose new targets for that copy. -SVar:TrigCopy:AB$ CopySpell | Cost$ 0 | ValidTgts$ Instant,Sorcery +SVar:TrigCopy:AB$ CopySpellAbility | Cost$ 0 | ValidTgts$ Instant,Sorcery SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/mischievous_quanar.jpg diff --git a/res/cardsfolder/n/nivix_guildmage.txt b/res/cardsfolder/n/nivix_guildmage.txt index 243bd8597b0..0115e8693bd 100644 --- a/res/cardsfolder/n/nivix_guildmage.txt +++ b/res/cardsfolder/n/nivix_guildmage.txt @@ -5,7 +5,7 @@ Text:no text PT:2/2 A:AB$ Draw | Cost$ 1 U R | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose -A:AB$ CopySpell | Cost$ 2 U R | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl | SpellDescription$ Copy target instant or sorcery spell you control. You may choose new targets for the copy. +A:AB$ CopySpellAbility | Cost$ 2 U R | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl | SpellDescription$ Copy target instant or sorcery spell you control. You may choose new targets for the copy. SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/nivix_guildmage.jpg SetInfo:RTR|Uncommon|http://magiccards.info/scans/en/rtr/182.jpg diff --git a/res/cardsfolder/p/pyromancer_ascension.txt b/res/cardsfolder/p/pyromancer_ascension.txt index b8a489367c0..4b68a4cb645 100644 --- a/res/cardsfolder/p/pyromancer_ascension.txt +++ b/res/cardsfolder/p/pyromancer_ascension.txt @@ -5,7 +5,7 @@ Text:no text T:Mode$ SpellCast | ValidCard$ Card.Instant,Card.Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | OptionalDecider$ You | TriggerDescription$ Whenever you cast an instant or sorcery spell that has the same name as a card in your graveyard, you may put a quest counter on CARDNAME. T:Mode$ SpellCast | ValidCard$ Card.Instant,Card.Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Card.Self+counters_GE2_QUEST | Execute$ TrigCopySpell | OptionalDecider$ You | TriggerDescription$ Whenever you cast an instant or sorcery spell while CARDNAME has two or more quest counters on it, you may copy that spell. You may choose new targets for the copy. SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ QUEST | CounterNum$ 1 | ConditionDefined$ TriggeredCard | ConditionPresent$ Card.sharesNameWith YourGraveyard | ConditionCompare$ GE1 -SVar:TrigCopySpell:AB$CopySpell | Cost$ 0 | Defined$ TriggeredSpellAbility +SVar:TrigCopySpell:AB$CopySpellAbility | Cost$ 0 | Defined$ TriggeredSpellAbility SVar:RemRandomDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/pyromancer_ascension.jpg diff --git a/res/cardsfolder/r/reiterate.txt b/res/cardsfolder/r/reiterate.txt index 886c80249ab..0ca64480331 100644 --- a/res/cardsfolder/r/reiterate.txt +++ b/res/cardsfolder/r/reiterate.txt @@ -3,7 +3,7 @@ ManaCost:1 R R Types:Instant Text:no text K:Buyback 3 -A:SP$ CopySpell | Cost$ 1 R R | ValidTgts$ Instant,Sorcery | SpellDescription$ Copy target instant or sorcery spell. You may choose new targets for the copy. +A:SP$ CopySpellAbility | Cost$ 1 R R | ValidTgts$ Instant,Sorcery | SpellDescription$ Copy target instant or sorcery spell. You may choose new targets for the copy. SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/reiterate.jpg diff --git a/res/cardsfolder/r/reverberate.txt b/res/cardsfolder/r/reverberate.txt index 297e6a3ec76..bd92294b0d5 100644 --- a/res/cardsfolder/r/reverberate.txt +++ b/res/cardsfolder/r/reverberate.txt @@ -2,7 +2,7 @@ Name:Reverberate ManaCost:R R Types:Instant Text:no text -A:SP$ CopySpell | Cost$ R R | ValidTgts$ Instant,Sorcery | SpellDescription$ Copy target instant or sorcery spell. You may choose new targets for the copy. +A:SP$ CopySpellAbility | Cost$ R R | ValidTgts$ Instant,Sorcery | SpellDescription$ Copy target instant or sorcery spell. You may choose new targets for the copy. SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/reverberate.jpg diff --git a/res/cardsfolder/r/riku_of_two_reflections.txt b/res/cardsfolder/r/riku_of_two_reflections.txt index 87d3991a244..fd3731afcef 100644 --- a/res/cardsfolder/r/riku_of_two_reflections.txt +++ b/res/cardsfolder/r/riku_of_two_reflections.txt @@ -5,7 +5,7 @@ Text:no text PT:2/2 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigCopySpell | TriggerDescription$ Whenever you cast an instant or sorcery spell, you may pay UR. If you do, copy that spell. You may choose new targets for the copy. T:Mode$ ChangesZone | ValidCard$ Creature.nonToken+Other+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigCopy | OptionalDecider$ You | TriggerDescription$ Whenever another nontoken creature enters the battlefield under your control, you may pay GU. If you do, put a token that's a copy of that creature onto the battlefield. -SVar:TrigCopySpell:AB$CopySpell | Cost$ U R | Defined$ TriggeredSpellAbility +SVar:TrigCopySpell:AB$CopySpellAbility | Cost$ U R | Defined$ TriggeredSpellAbility SVar:TrigCopy:AB$CopyPermanent | Cost$ G U | Defined$ TriggeredCard SVar:Rarity:Mythic Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/riku_of_two_reflections.jpg diff --git a/res/cardsfolder/r/rings_of_brighthearth.txt b/res/cardsfolder/r/rings_of_brighthearth.txt index 0503d849cc5..a23f02341fd 100644 --- a/res/cardsfolder/r/rings_of_brighthearth.txt +++ b/res/cardsfolder/r/rings_of_brighthearth.txt @@ -3,7 +3,7 @@ ManaCost:3 Types:Artifact Text:no text T:Mode$ AbilityCast | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigCopySpell | OptionalDecider$ You | TriggerDescription$ Whenever you activate an ability, if it isn't a mana ability, you may pay 2. If you do, copy that ability. You may choose new targets for the copy. -SVar:TrigCopySpell:AB$CopySpell | Cost$ 2 | Defined$ TriggeredSpellAbility +SVar:TrigCopySpell:AB$CopySpellAbility | Cost$ 2 | Defined$ TriggeredSpellAbility Oracle:Whenever you activate an ability, if it isn't a mana ability, you may pay {2}. If you do, copy that ability. You may choose new targets for the copy. SetInfo:LRW|Rare|http://magiccards.info/scans/en/lw/259.jpg End \ No newline at end of file diff --git a/res/cardsfolder/s/sigil_tracer.txt b/res/cardsfolder/s/sigil_tracer.txt index 0d41b54cf72..759e2e33af7 100644 --- a/res/cardsfolder/s/sigil_tracer.txt +++ b/res/cardsfolder/s/sigil_tracer.txt @@ -3,7 +3,7 @@ ManaCost:1 U U Types:Creature Merfolk Wizard Text:no text PT:2/2 -A:AB$CopySpell | Cost$ 1 U tapXType<2/Wizard> | ValidTgts$ Instant,Sorcery | SpellDescription$ Copy target instant or sorcery spell. You may choose new targets for the copy. +A:AB$CopySpellAbility | Cost$ 1 U tapXType<2/Wizard> | ValidTgts$ Instant,Sorcery | SpellDescription$ Copy target instant or sorcery spell. You may choose new targets for the copy. SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/sigil_tracer.jpg diff --git a/res/cardsfolder/s/spelltwine.txt b/res/cardsfolder/s/spelltwine.txt index 54c1d151903..6e770816eed 100644 --- a/res/cardsfolder/s/spelltwine.txt +++ b/res/cardsfolder/s/spelltwine.txt @@ -4,7 +4,7 @@ Types:Sorcery Text:no text A:SP$ ChangeZone | Cost$ 5 U | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target instant or sorcery card in your graveyard | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl | RememberChanged$ True | SubAbility$ TgtOpp | SpellDescription$ Exile target instant or sorcery card from your graveyard and target instant or sorcery from your opponent's graveyard. Copy those cards. Cast the copies if able without paying their mana cost. SVar:TgtOpp:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target instant or sorcery card in your opponent's graveyard | ValidTgts$ Instant.OppOwn,Sorcery.OppOwn | RememberChanged$ True | SubAbility$ CopyYou -SVar:CopyYou:DB$ CopySpell | Defined$ Remembered | SubAbility$ CopyOpp | CopyMultipleSpells$ 2 | SubAbility$ ExileSelf +SVar:CopyYou:DB$ CopySpellAbility | Defined$ Remembered | SubAbility$ CopyOpp | CopyMultipleSpells$ 2 | SubAbility$ ExileSelf SVar:ExileSelf:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | Defined$ Self | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:RemAIDeck:True diff --git a/res/cardsfolder/t/traitors_roar.txt b/res/cardsfolder/t/traitors_roar.txt index 42275facc52..a6f02867a52 100644 --- a/res/cardsfolder/t/traitors_roar.txt +++ b/res/cardsfolder/t/traitors_roar.txt @@ -7,7 +7,7 @@ SVar:DBDamage:DB$ DealDamage | Cost$ 0 | Defined$ TargetedController | DamageSou SVar:X:Targeted$CardPower K:Conspire T:Mode$ SpellCast | ValidCard$ Card.Self | Conspire$ True | Execute$ Conspire | Secondary$ True | TriggerDescription$ Copy CARDNAME if its conspire cost was paid -SVar:Conspire:AB$ CopySpell | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1 +SVar:Conspire:AB$ CopySpellAbility | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/traitors_roar.jpg SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/200.jpg diff --git a/res/cardsfolder/t/twincast.txt b/res/cardsfolder/t/twincast.txt index 51c7085f6ef..00f862d6859 100644 --- a/res/cardsfolder/t/twincast.txt +++ b/res/cardsfolder/t/twincast.txt @@ -2,7 +2,7 @@ Name:Twincast ManaCost:U U Types:Instant Text:no text -A:SP$ CopySpell | Cost$ U U | ValidTgts$ Instant,Sorcery | SpellDescription$ Copy target instant or sorcery spell. You may choose new targets for the copy. +A:SP$ CopySpellAbility | Cost$ U U | ValidTgts$ Instant,Sorcery | SpellDescription$ Copy target instant or sorcery spell. You may choose new targets for the copy. SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/twincast.jpg diff --git a/res/cardsfolder/u/uyo_silent_prophet.txt b/res/cardsfolder/u/uyo_silent_prophet.txt index d974511c11e..dc0d682f61c 100644 --- a/res/cardsfolder/u/uyo_silent_prophet.txt +++ b/res/cardsfolder/u/uyo_silent_prophet.txt @@ -4,7 +4,7 @@ Types:Legendary Creature Moonfolk Wizard Text:no text PT:4/4 K:Flying -A:AB$CopySpell | Cost$ 2 Return<2/Land> | ValidTgts$ Instant,Sorcery | SpellDescription$ Copy target instant or sorcery spell. You may choose new targets for the copy. +A:AB$CopySpellAbility | Cost$ 2 Return<2/Land> | ValidTgts$ Instant,Sorcery | SpellDescription$ Copy target instant or sorcery spell. You may choose new targets for the copy. SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/uyo_silent_prophet.jpg diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactory.java b/src/main/java/forge/card/abilityfactory/AbilityFactory.java index e0e901423a9..ff3c6beccc6 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactory.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactory.java @@ -221,7 +221,7 @@ public class AbilityFactory { // Match API keywords. These are listed in alphabetical order. - if (api == ApiType.CopySpell) { + if (api == ApiType.CopySpellAbility) { if (isTargeted) { // Since all "CopySpell" ABs copy things on the Stack no need for it to be everywhere abTgt.setZone(ZoneType.Stack); diff --git a/src/main/java/forge/card/abilityfactory/ApiType.java b/src/main/java/forge/card/abilityfactory/ApiType.java index b97a6b31480..35dc03cbefc 100644 --- a/src/main/java/forge/card/abilityfactory/ApiType.java +++ b/src/main/java/forge/card/abilityfactory/ApiType.java @@ -31,7 +31,7 @@ public enum ApiType { Cleanup (CleanUpEffect.class, AlwaysPlayAi.class), Clone (CloneEffect.class, CloneAi.class), CopyPermanent (CopyPermanentEffect.class, CopyPermanentAi.class), - CopySpell (CopySpellEffect.class, CanPlayAsDrawbackAi.class), + CopySpellAbility (CopySpellAbilityEffect.class, CanPlayAsDrawbackAi.class), Counter (CounterEffect.class, CounterAi.class), DamageAll (DamageAllEffect.class, DamageAllAi.class), DealDamage (DamageDealEffect.class, DamageDealAi.class), diff --git a/src/main/java/forge/card/abilityfactory/effects/CopySpellEffect.java b/src/main/java/forge/card/abilityfactory/effects/CopySpellAbilityEffect.java similarity index 96% rename from src/main/java/forge/card/abilityfactory/effects/CopySpellEffect.java rename to src/main/java/forge/card/abilityfactory/effects/CopySpellAbilityEffect.java index 4b1a684262d..d80793d1557 100644 --- a/src/main/java/forge/card/abilityfactory/effects/CopySpellEffect.java +++ b/src/main/java/forge/card/abilityfactory/effects/CopySpellAbilityEffect.java @@ -12,7 +12,7 @@ import forge.card.spellability.SpellAbility; import forge.game.player.Player; import forge.gui.GuiChoose; -public class CopySpellEffect extends SpellEffect { +public class CopySpellAbilityEffect extends SpellEffect { // ************************************************************************* // ************************* CopySpell *************************************