diff --git a/res/cardsfolder/b/bant_charm.txt b/res/cardsfolder/b/bant_charm.txt index b8fa5219a8d..134001a69ff 100644 --- a/res/cardsfolder/b/bant_charm.txt +++ b/res/cardsfolder/b/bant_charm.txt @@ -5,7 +5,6 @@ Text:no text A:SP$ Destroy | Cost$ G W U | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Choose one - Destroy target artifact; A:SP$ ChangeZone | Cost$ G W U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Library | LibraryPosition$ -1 | SpellDescription$ or put target creature on the bottom of it's owner's library; A:SP$ Counter | Cost$ G W U | TargetType$ Spell | ValidTgts$ Instant | SpellDescription$ or counter target instant spell. -SVar:RemAIDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/bant_charm.jpg SetInfo:ALA|Uncommon|http://magiccards.info/scans/en/ala/155.jpg diff --git a/res/cardsfolder/c/chaos_charm.txt b/res/cardsfolder/c/chaos_charm.txt index f4d2c06545a..3bfc804fff2 100644 --- a/res/cardsfolder/c/chaos_charm.txt +++ b/res/cardsfolder/c/chaos_charm.txt @@ -5,7 +5,6 @@ Text:no text A:SP$ Destroy | Cost$ R | ValidTgts$ Wall | TgtPrompt$ Select target wall | PrecostDesc$ Choose one - | SpellDescription$ Destroy target Wall; A:SP$ DealDamage | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 1 | SpellDescription$ or CARDNAME deals 1 damage to target creature; A:SP$ Pump | Cost$ R | ValidTgts$ Creature | KW$ Haste | TgtPrompt$ Select target creature | SpellDescription$ or target creature gains haste until end of turn. -SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/chaos_charm.jpg SetInfo:MIR|Common|http://magiccards.info/scans/en/mr/163.jpg diff --git a/res/cardsfolder/c/consuming_bonfire.txt b/res/cardsfolder/c/consuming_bonfire.txt index 649ea10411a..b0abddefb02 100644 --- a/res/cardsfolder/c/consuming_bonfire.txt +++ b/res/cardsfolder/c/consuming_bonfire.txt @@ -4,7 +4,6 @@ Types:Tribal Sorcery Elemental Text:no text A:SP$ DealDamage | Cost$ 3 R R | ValidTgts$ Creature.nonElemental | NumDmg$ 4 | PrecostDesc$ Choose one - | SpellDescription$ CARDNAME deals 4 damage to target non-Elemental creature; A:SP$ DealDamage | Cost$ 3 R R | ValidTgts$ Creature.Treefolk | NumDmg$ 7 | SpellDescription$ or CARDNAME deals 7 damage to target Treefolk creature. -SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/consuming_bonfire.jpg SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/161.jpg diff --git a/res/cardsfolder/d/dawn_charm.txt b/res/cardsfolder/d/dawn_charm.txt index cdcbfd93084..8a408705264 100644 --- a/res/cardsfolder/d/dawn_charm.txt +++ b/res/cardsfolder/d/dawn_charm.txt @@ -1,13 +1,12 @@ -Name:Dawn Charm -ManaCost:1 W -Types:Instant -Text:no text -A:SP$ Fog | Cost$ 1 W | SpellDescription$ Prevent all combat damage that would be dealt this turn; | PrecostDesc$ Choose one - -A:SP$ Regenerate | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ or regenerate target creature; -A:SP$ Counter | Cost$ 1 W | TargetType$ Spell | TargetValidTargeting$ You | TgtPrompt$ Select target spell that is targeting you | ValidTgts$ Card | SpellDescription$ or counter target spell that targets you. -SVar:RemAIDeck:True -SVar:Rarity:Common -SVar:Picture:http://www.wizards.com/global/images/magic/general/dawn_charm.jpg -SetInfo:PLC|Common|http://magiccards.info/scans/en/pc/4.jpg -Oracle:Choose one - Prevent all combat damage that would be dealt this turn; or regenerate target creature; or counter target spell that targets you. +Name:Dawn Charm +ManaCost:1 W +Types:Instant +Text:no text +A:SP$ Fog | Cost$ 1 W | SpellDescription$ Prevent all combat damage that would be dealt this turn; | PrecostDesc$ Choose one - +A:SP$ Regenerate | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ or regenerate target creature; +A:SP$ Counter | Cost$ 1 W | TargetType$ Spell | TargetValidTargeting$ You | TgtPrompt$ Select target spell that is targeting you | ValidTgts$ Card | SpellDescription$ or counter target spell that targets you. +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/dawn_charm.jpg +SetInfo:PLC|Common|http://magiccards.info/scans/en/pc/4.jpg +Oracle:Choose one - Prevent all combat damage that would be dealt this turn; or regenerate target creature; or counter target spell that targets you. End \ No newline at end of file diff --git a/res/cardsfolder/g/grim_discovery.txt b/res/cardsfolder/g/grim_discovery.txt index 274e3834833..d048a58910f 100644 --- a/res/cardsfolder/g/grim_discovery.txt +++ b/res/cardsfolder/g/grim_discovery.txt @@ -1,13 +1,12 @@ -Name:Grim Discovery -ManaCost:1 B -Types:Sorcery -Text:no text -A:SP$ Charm | Cost$ 1 B | MinCharmNum$ 1 | CharmNum$ 2 | Choices$ ChangeCreature,ChangeLand | SpellDescription$ Choose one or both - Return target creature card from your graveyard to your hand; and/or return target land card from your graveyard to your hand. -SVar:ChangeCreature:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Return target creature card from your graveyard to your hand. -SVar:ChangeLand:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target land card in your graveyard | ValidTgts$ Land.YouCtrl | SpellDescription$ Return target land card from your graveyard to your hand. -SVar:RemAIDeck:True -SVar:Rarity:Common -SVar:Picture:http://www.wizards.com/global/images/magic/general/grim_discovery.jpg -SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/91.jpg -Oracle:Choose one or both - Return target creature card from your graveyard to your hand; and/or return target land card from your graveyard to your hand. +Name:Grim Discovery +ManaCost:1 B +Types:Sorcery +Text:no text +A:SP$ Charm | Cost$ 1 B | MinCharmNum$ 1 | CharmNum$ 2 | Choices$ ChangeCreature,ChangeLand | SpellDescription$ Choose one or both - Return target creature card from your graveyard to your hand; and/or return target land card from your graveyard to your hand. +SVar:ChangeCreature:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Return target creature card from your graveyard to your hand. +SVar:ChangeLand:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target land card in your graveyard | ValidTgts$ Land.YouCtrl | SpellDescription$ Return target land card from your graveyard to your hand. +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/grim_discovery.jpg +SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/91.jpg +Oracle:Choose one or both - Return target creature card from your graveyard to your hand; and/or return target land card from your graveyard to your hand. End \ No newline at end of file diff --git a/res/cardsfolder/h/hurly_burly.txt b/res/cardsfolder/h/hurly_burly.txt index ad5bf965e8d..47eca3dfcb5 100644 --- a/res/cardsfolder/h/hurly_burly.txt +++ b/res/cardsfolder/h/hurly_burly.txt @@ -4,7 +4,6 @@ Types:Sorcery Text:no text A:SP$ DamageAll | Cost$ 1 R | NumDmg$ 1 | ValidCards$ Creature.withoutFlying | ValidDescription$ each creature without flying. | PrecostDesc$ Choose one - | SpellDescription$ CARDNAME deals 1 damage to each creature without flying; A:SP$ DamageAll | Cost$ 1 R | NumDmg$ 1 | ValidCards$ Creature.withFlying | ValidDescription$ each creature with flying. | SpellDescription$ or CARDNAME deals 1 damage to each creature with flying. -SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/hurly_burly.jpg SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/177.jpg diff --git a/res/cardsfolder/p/parch.txt b/res/cardsfolder/p/parch.txt index aea99d5d02d..b0da81251f7 100644 --- a/res/cardsfolder/p/parch.txt +++ b/res/cardsfolder/p/parch.txt @@ -4,7 +4,6 @@ Types:Instant Text:no text A:SP$ DealDamage | Cost$ 1 R | NumDmg$ 2 | Tgt$ TgtCP | PrecostDesc$ Choose one - | SpellDescription$ CARDNAME deals 2 damage to target creature or player; A:SP$ DealDamage | Cost$ 1 R | NumDmg$ 4 | ValidTgts$ Creature.Blue | TgtPrompt$ Select target blue creature. | SpellDescription$ or CARDNAME deals 4 damage to target blue creature. -SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/parch.jpg SetInfo:ULG|Common|http://magiccards.info/scans/en/ul/86.jpg diff --git a/res/cardsfolder/r/remember_the_fallen.txt b/res/cardsfolder/r/remember_the_fallen.txt index 6838adc0362..f52502fdfa4 100644 --- a/res/cardsfolder/r/remember_the_fallen.txt +++ b/res/cardsfolder/r/remember_the_fallen.txt @@ -1,13 +1,12 @@ -Name:Remember the Fallen -ManaCost:2 W -Types:Sorcery -Text:no text -A:SP$ Charm | Cost$ 2 W | MinCharmNum$ 1 | CharmNum$ 2 | Choices$ ChangeCreature,ChangeArtifact | SpellDescription$ Choose one or both - Return target creature card from your graveyard to your hand; and/or return target artifact card from your graveyard to your hand. -SVar:ChangeCreature:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Return target creature card from your graveyard to your hand. -SVar:ChangeArtifact:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target artifact card in your graveyard | ValidTgts$ Artifact.YouCtrl | SpellDescription$ Return target artifact card from your graveyard to your hand. -SVar:RemAIDeck:True -SVar:Rarity:Common -SVar:Picture:http://www.wizards.com/global/images/magic/general/remember_the_fallen.jpg -SetInfo:NPH|Common|http://magiccards.info/scans/en/nph/21.jpg -Oracle:Choose one or both - Return target creature card from your graveyard to your hand; and/or return target artifact card from your graveyard to your hand. +Name:Remember the Fallen +ManaCost:2 W +Types:Sorcery +Text:no text +A:SP$ Charm | Cost$ 2 W | MinCharmNum$ 1 | CharmNum$ 2 | Choices$ ChangeCreature,ChangeArtifact | SpellDescription$ Choose one or both - Return target creature card from your graveyard to your hand; and/or return target artifact card from your graveyard to your hand. +SVar:ChangeCreature:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Return target creature card from your graveyard to your hand. +SVar:ChangeArtifact:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target artifact card in your graveyard | ValidTgts$ Artifact.YouCtrl | SpellDescription$ Return target artifact card from your graveyard to your hand. +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/remember_the_fallen.jpg +SetInfo:NPH|Common|http://magiccards.info/scans/en/nph/21.jpg +Oracle:Choose one or both - Return target creature card from your graveyard to your hand; and/or return target artifact card from your graveyard to your hand. End \ No newline at end of file diff --git a/res/cardsfolder/s/slagstorm.txt b/res/cardsfolder/s/slagstorm.txt index 45ee7268300..a0de5722c4d 100644 --- a/res/cardsfolder/s/slagstorm.txt +++ b/res/cardsfolder/s/slagstorm.txt @@ -4,7 +4,6 @@ Types:Sorcery Text:no text A:SP$ DamageAll | Cost$ 1 R R | NumDmg$ 3 | ValidCards$ Creature | ValidDescription$ each creature. | SpellDescription$ Choose one - CARDNAME deals 3 damage to each creature; A:SP$ DamageAll | Cost$ 1 R R | NumDmg$ 3 | ValidPlayers$ Each | ValidDescription$ each player. | SpellDescription$ or CARDNAME deals 3 damage to each player. -SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/slagstorm.jpg SetInfo:MBS|Rare|http://magiccards.info/scans/en/mbs/75.jpg diff --git a/res/cardsfolder/s/starke_of_rath.txt b/res/cardsfolder/s/starke_of_rath.txt index df739890ad9..204f8fe98b6 100644 --- a/res/cardsfolder/s/starke_of_rath.txt +++ b/res/cardsfolder/s/starke_of_rath.txt @@ -1,13 +1,14 @@ -Name:Starke of Rath -ManaCost:1 R R -Types:Legendary Creature Human Rogue -Text:no text -PT:2/2 -A:AB$ Destroy | Cost$ T | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature | SubAbility$ TrigControl | SpellDescription$ Destroy target artifact or creature. -SVar:TrigControl:DB$GainControl | Cost$ 0 | Defined$ Self | NewController$ TargetedController | SubAbility$ RemCombat | SpellDescription$ That permanent's controller gains control of CARDNAME. (This effect lasts indefinitely.) -SVar:RemCombat:DB$ RemoveFromCombat | Defined$ Targeted -SVar:Rarity:Rare -SVar:Picture:http://www.wizards.com/global/images/magic/general/starke_of_rath.jpg -SetInfo:TMP|Rare|http://magiccards.info/scans/en/tp/205.jpg -Oracle:{T}: Destroy target artifact or creature. That permanent's controller gains control of Starke of Rath. (This effect lasts indefinitely.) +Name:Starke of Rath +ManaCost:1 R R +Types:Legendary Creature Human Rogue +Text:no text +PT:2/2 +A:AB$ Destroy | Cost$ T | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature | SubAbility$ TrigControl | SpellDescription$ Destroy target artifact or creature. +SVar:TrigControl:DB$GainControl | Cost$ 0 | Defined$ Self | NewController$ TargetedController | SubAbility$ RemCombat | SpellDescription$ That permanent's controller gains control of CARDNAME. (This effect lasts indefinitely.) +SVar:RemCombat:DB$ RemoveFromCombat | Defined$ Targeted +SVar:RemAIDeck:True +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/starke_of_rath.jpg +SetInfo:TMP|Rare|http://magiccards.info/scans/en/tp/205.jpg +Oracle:{T}: Destroy target artifact or creature. That permanent's controller gains control of Starke of Rath. (This effect lasts indefinitely.) End \ No newline at end of file diff --git a/res/cardsfolder/s/steel_sabotage.txt b/res/cardsfolder/s/steel_sabotage.txt index 4676ffddf34..4c7f4f0fb51 100644 --- a/res/cardsfolder/s/steel_sabotage.txt +++ b/res/cardsfolder/s/steel_sabotage.txt @@ -4,7 +4,6 @@ Types:Instant Text:no text A:SP$ Counter | Cost$ U | TargetType$ Spell | TgtPrompt$ Select target Artifact spell | ValidTgts$ Artifact | PrecostDesc$ Choose one - | SpellDescription$ Counter target artifact spell; A:SP$ ChangeZone | Cost$ U | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | Origin$ Battlefield | Destination$ Hand | SpellDescription$ or return target artifact to its owner's hand. -SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/steel_sabotage.jpg SetInfo:MBS|Common|http://magiccards.info/scans/en/mbs/33.jpg diff --git a/res/cardsfolder/s/stench_of_decay.txt b/res/cardsfolder/s/stench_of_decay.txt index 13a8d7682c5..57078e6ef26 100644 --- a/res/cardsfolder/s/stench_of_decay.txt +++ b/res/cardsfolder/s/stench_of_decay.txt @@ -3,7 +3,6 @@ ManaCost:1 B B Types:Instant Text:no text A:SP$ PumpAll | Cost$ 1 B B | ValidCards$ Creature.nonArtifact | IsCurse$ True | NumAtt$ -1 | NumDef$ -1 | SpellDescription$ Nonartifact creatures get -1/-1 until end of turn. -SVar:RemRandomDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/stench_of_decay.jpg SetInfo:ALL|Common|http://magiccards.info/scans/en/ai/27.jpg|2 diff --git a/res/cardsfolder/s/stern_proctor.txt b/res/cardsfolder/s/stern_proctor.txt index 42a1f554262..2b8c21b4749 100644 --- a/res/cardsfolder/s/stern_proctor.txt +++ b/res/cardsfolder/s/stern_proctor.txt @@ -5,7 +5,6 @@ Text:no text PT:1/2 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target artifact or enchantment to its owner's hand. SVar:TrigChangeZone:DB$ChangeZone | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | Origin$ Battlefield | Destination$ Hand -SVar:RemRandomDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/Stern_Proctor.jpg SetInfo:USG|Uncommon|http://magiccards.info/scans/en/us/99.jpg diff --git a/res/cardsfolder/s/stone_seeder_hierophant.txt b/res/cardsfolder/s/stone_seeder_hierophant.txt index 6e87c64d156..f5a8f16af7a 100644 --- a/res/cardsfolder/s/stone_seeder_hierophant.txt +++ b/res/cardsfolder/s/stone_seeder_hierophant.txt @@ -3,7 +3,7 @@ ManaCost:2 G G Types:Creature Human Druid Text:no text PT:1/1 -T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | Execute$ TrigUntap | TriggerZones$ Battlefield | TriggerDescription$ Landfall - Whenever a land enters the battlefield under your control, untap CARDNAME. +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | Execute$ TrigUntap | TriggerZones$ Battlefield | TriggerDescription$ Whenever a land enters the battlefield under your control, untap CARDNAME. A:AB$ Untap | Cost$ T | ValidTgts$ Land | TgtPrompt$ Select target land | SpellDescription$ Untap target land. SVar:TrigUntap:AB$Untap | Cost$ 0 | Defined$ Self SVar:RemAIDeck:True diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index 2267cb11b27..7a158833a66 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -2611,7 +2611,7 @@ public class Card extends GameEntity implements Comparable { } if (keyword.equals("Rebound")) { sb.append(keyword) - .append("(If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)\r\n"); + .append(" (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)\r\n"); } } return sb; diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java index 11ac2cf68ce..5995268556a 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java @@ -177,6 +177,11 @@ public class AbilityFactoryDestroy { return AbilityFactoryDestroy.destroyStackDescription(af, this); } + @Override + public boolean canPlayAI() { + return AbilityFactoryDestroy.destroyCanPlayAI(af, this); + } + @Override public boolean chkAIDrawback() { return false;