diff --git a/.gitattributes b/.gitattributes index 9c1929253e2..dd97c8f3269 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3064,6 +3064,7 @@ res/cardsfolder/lu_xun_scholar_general.txt -text svneol=native#text/plain res/cardsfolder/lucent_liminid.txt -text svneol=native#text/plain res/cardsfolder/lull.txt -text svneol=native#text/plain res/cardsfolder/lumbering_satyr.txt -text svneol=native#text/plain +res/cardsfolder/lumengrid_drake.txt -text svneol=native#text/plain res/cardsfolder/lumengrid_warden.txt -text svneol=native#text/plain res/cardsfolder/luminous_angel.txt -text svneol=native#text/plain res/cardsfolder/lunar_avenger.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/acid_web_spider.txt b/res/cardsfolder/acid_web_spider.txt index a5986a24c1f..5ecad6ba347 100644 --- a/res/cardsfolder/acid_web_spider.txt +++ b/res/cardsfolder/acid_web_spider.txt @@ -1,11 +1,11 @@ Name:Acid Web Spider ManaCost:3 G G Types:Creature Spider -Text:When Acid Web Spider enters the battlefield, you may destroy target Equipment. +Text:no text PT:3/5 K:Reach -K:etbDestroyTgt:Equipment +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, you may destroy target Equipment. +SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Equipment | TgtPrompt$ Choose target equipment. SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/acid_web_spider.jpg -SetInfo:SOM|Uncommon|http://magiccards.info/scans/en/som/108.jpg End \ No newline at end of file diff --git a/res/cardsfolder/corpse_cur.txt b/res/cardsfolder/corpse_cur.txt index aa10a01e72f..2f8f9f5fc68 100644 --- a/res/cardsfolder/corpse_cur.txt +++ b/res/cardsfolder/corpse_cur.txt @@ -1,11 +1,11 @@ Name:Corpse Cur ManaCost:4 Types:Artifact Creature Hound -Text:When Corpse Cur enters the battlefield, you may return target creature card with infect from your graveyard to your hand. +Text:no text PT:2/2 K:Infect -K:etbReturnTgt:1/MayReturn:Creature.withInfect:Hand +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | Optional$ True | TriggerDescription$ When CARDNAME enters the battlefield, you may return target creature card with infect from your graveyard to your hand. +SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.withInfect | TgtPrompt$ Choose target creature with Infect in your graveyard. SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/corpse_cur.jpg -SetInfo:SOM|Common|http://magiccards.info/scans/en/som/147.jpg End \ No newline at end of file diff --git a/res/cardsfolder/darkslick_drake.txt b/res/cardsfolder/darkslick_drake.txt index be3e4b79732..0a3f8a2324b 100644 --- a/res/cardsfolder/darkslick_drake.txt +++ b/res/cardsfolder/darkslick_drake.txt @@ -4,8 +4,8 @@ Types:Creature Drake Text:no text PT:2/4 K:Flying -K:WheneverKeyword:PermanentIntoGraveyard:Self:Graveyard:DrawCards/1:ControllingPlayer_Self:ASAP:No_Condition:No Special Condition:When Darkslick Drake is put into your graveyard from the battlefield, draw a card. +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, draw a card. +SVar:TrigDraw:AB$Draw | Cost$ 0 | NumCards$ 1 SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/darkslick_drake.jpg -SetInfo:SOM|Uncommon|http://magiccards.info/scans/en/som/30.jpg End \ No newline at end of file diff --git a/res/cardsfolder/flight_spellbomb.txt b/res/cardsfolder/flight_spellbomb.txt index ba529ebd268..42b71be2dcc 100644 --- a/res/cardsfolder/flight_spellbomb.txt +++ b/res/cardsfolder/flight_spellbomb.txt @@ -3,7 +3,8 @@ ManaCost:1 Types:Artifact Text:no text A:AB$Pump | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SpellDescription$ Target creature gains flying until end of turn. -K:WheneverKeyword:PermanentIntoGraveyard:Self:Any:DrawCards/1:ControllingPlayer_Self:ASAP:PayMana/U:No Special Condition:When Panic Spellbomb is put into a graveyard from the battlefield, you may pay U. If you do, draw a card. +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Optional$ True | Execute$ TrigDraw | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may pay U. If you do, draw a card. +SVar:TrigDraw:AB$Draw | Cost$ U | NumCards$ 1 SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/flight_spellbomb.jpg diff --git a/res/cardsfolder/golem_foundry.txt b/res/cardsfolder/golem_foundry.txt index a19a065d838..d8ff78a8ec6 100644 --- a/res/cardsfolder/golem_foundry.txt +++ b/res/cardsfolder/golem_foundry.txt @@ -2,11 +2,9 @@ Name:Golem Foundry ManaCost:3 Types:Artifact Text:no text -K:WheneverKeyword:CastSpell/Controller:Type/Artifact:Play:CustomCounter.CHARGE/1:Self:ASAP:Yes_No:No Special Condition:Whenever you cast an artifact spell, you may put a charge counter on Golem Foundry. -#K:abMakeToken SubCounter<3/CHARGE><>1<>Golem<>C 3 3 Golem<>Controller<>1<>Artifact;Creature;Golem<>3<>3<><>Put a 3/3 colorless Golem artifact creature token onto the battlefield. +T:Mode$ SpellCast | ValidCard$ Artifact.YouCtrl | Execute$ TrigPutCounter | TriggerZones$ Battlefield | Optional$ True | TriggerDescription$ Whenever you cast an artifact spell, you may put a charge counter on CARDNAME. A:AB$Token | Cost$ SubCounter<3/CHARGE> | TokenAmount$ 1 | TokenName$ Golem | TokenTypes$ Artifact,Creature,Golem | TokenOwner$ Controller | TokenColors$ Colorless | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put a 3/3 colorless Golem artifact creature token onto the battlefield. -SVar:RemAIDeck:True +SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterNum$ 1 | CounterType$ CHARGE SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/golem_foundry.jpg -SetInfo:SOM|Common|http://magiccards.info/scans/en/som/160.jpg End \ No newline at end of file diff --git a/res/cardsfolder/golems_heart.txt b/res/cardsfolder/golems_heart.txt index ae9b53835f1..c29e7b3185b 100644 --- a/res/cardsfolder/golems_heart.txt +++ b/res/cardsfolder/golems_heart.txt @@ -2,7 +2,8 @@ Name:Golem's Heart ManaCost:2 Types:Artifact Text:no text -K:WheneverKeyword:CastSpell/Any:Type/Artifact:Play:ModifyLife/1:ControllingPlayer_Self:ASAP:Yes_No:No Special Condition:Whenever a player casts an artifact spell, you may gain 1 life. +T:Mode$ SpellCast | ValidCard$ Artifact | Execute$ TrigGainLife | TriggerZones$ Battlefield | Optional$ True | TriggerDescription$ Whenever a player casts an artifact spell, you may gain 1 life. +SVar:TrigGainLife:AB$GainLife | Cost$ 0 | LifeAmount$ 1 SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/golems_heart.jpg SetInfo:SOM|Uncommon|http://magiccards.info/scans/en/som/161.jpg diff --git a/res/cardsfolder/halt_order.txt b/res/cardsfolder/halt_order.txt index fccdbdafe90..72e3f100ea5 100644 --- a/res/cardsfolder/halt_order.txt +++ b/res/cardsfolder/halt_order.txt @@ -2,7 +2,7 @@ Name:Halt Order ManaCost:2 U Types:Instant Text:no text -A:SP$Counter | Cost$ 2 U | Type$ Spell | SpellTarget$ Artifact | SubAbility$ SVar=DBDraw | SpellDescription$ Counter target artifact spell. Draw a card. +A:SP$Counter | Cost$ 2 U | Type$ Spell | CounterValid$ Artifact | SubAbility$ SVar=DBDraw | SpellDescription$ Counter target artifact spell. Draw a card. SVar:DBDraw:DB$Draw | NumCards$ 1 SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/halt_order.jpg diff --git a/res/cardsfolder/horizon_spellbomb.txt b/res/cardsfolder/horizon_spellbomb.txt index 7319981a6be..d3fb871a13f 100644 --- a/res/cardsfolder/horizon_spellbomb.txt +++ b/res/cardsfolder/horizon_spellbomb.txt @@ -3,7 +3,8 @@ ManaCost:1 Types:Artifact Text:no text A:AB$ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | ChangeType$ Land.Basic | Origin$ Library | Destination$ Hand | SpellDescription$ Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library. -K:WheneverKeyword:PermanentIntoGraveyard:Self:Any:DrawCards/1:ControllingPlayer_Self:ASAP:PayMana/G:No Special Condition:When Horizon Spellbomb is put into a graveyard from the battlefield, you may pay G. If you do, draw a card. +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Optional$ True | Execute$ TrigDraw | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may pay G. If you do, draw a card. +SVar:TrigDraw:AB$Draw | Cost$ G | NumCards$ 1 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/horizon_spellbomb.jpg SetInfo:SOM|Common|http://magiccards.info/scans/en/som/165.jpg diff --git a/res/cardsfolder/ichorclaw_myr.txt b/res/cardsfolder/ichorclaw_myr.txt index 053321fef21..6a9bf72c204 100644 --- a/res/cardsfolder/ichorclaw_myr.txt +++ b/res/cardsfolder/ichorclaw_myr.txt @@ -4,8 +4,8 @@ Types:Artifact Creature Myr Text:no text PT:1/1 K:Infect -K:WheneverKeyword:BecomesBlocked:Self:Play:StatsPumpEOT/2/2:Self:ASAP:No_Condition:No Special Condition:Whenever Ichorclaw Myr becomes blocked, it gets +2/+2 until end of turn. +T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME becomes blocked, it gets +2/+2 until end of turn. +SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 2 | NumDef$ 2 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/ichorclaw_myr.jpg -SetInfo:SOM|Common|http://magiccards.info/scans/en/som/166.jpg End \ No newline at end of file diff --git a/res/cardsfolder/kemba_kha_regent.txt b/res/cardsfolder/kemba_kha_regent.txt index 8b40154a380..e1e4c63463a 100644 --- a/res/cardsfolder/kemba_kha_regent.txt +++ b/res/cardsfolder/kemba_kha_regent.txt @@ -1,8 +1,11 @@ Name:Kemba, Kha Regent ManaCost:1 W W Types:Legendary Creature Cat Cleric -Text:At the beginning of your upkeep, put a 2/2 white Cat creature token onto the battlefield for each Equipment attached to Kemba, Kha Regent. +Text:no text PT:2/4 +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, put a 2/2 white Cat creature token onto the battlefield for each Equipment attached to CARDNAME. +SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ W 2 2 Cat | TokenName$ Cat | TokenColors$ White | TokenPower$ 2 | TokenToughness$ 2 | TokenTypes$ Creature Cat | TokenAmount$ X +SVar:X:Count$Valid Equipment.attached SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/kemba_kha_regent.jpg SetInfo:SOM|Rare|http://magiccards.info/scans/en/som/12.jpg diff --git a/res/cardsfolder/kembas_skyguard.txt b/res/cardsfolder/kembas_skyguard.txt index 2ee2b205852..9219dfc6e25 100644 --- a/res/cardsfolder/kembas_skyguard.txt +++ b/res/cardsfolder/kembas_skyguard.txt @@ -1,10 +1,11 @@ Name:Kemba's Skyguard ManaCost:1 W W Types:Creature Cat Knight -Text:When Kemba's Skyguard enters the battlefield, you gain 2 life. +Text:no text PT:2/2 K:Flying -K:etbGainLife:2 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 2 life. +SVar:TrigGainLife:AB$GainLife | Cost$ 0 | LifeAmount$ 2 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/kembas_skyguard.jpg SetInfo:SOM|Common|http://magiccards.info/scans/en/som/13.jpg diff --git a/res/cardsfolder/lifesmith.txt b/res/cardsfolder/lifesmith.txt index fdb9f754e52..9a4f3095b33 100644 --- a/res/cardsfolder/lifesmith.txt +++ b/res/cardsfolder/lifesmith.txt @@ -3,8 +3,8 @@ ManaCost:1 G Types:Creature Human Artificer Text:no text PT:2/1 -K:WheneverKeyword:CastSpell/Controller:Type/Artifact:Play:ModifyLife/3:ControllingPlayer_Self:ASAP:PayMana/1:No Special Condition:Whenever you cast an artifact spell, you may pay 1. If you do, you gain 3 life. +T:Mode$ SpellCast | ValidCard$ Artifact.YouCtrl | Execute$ TrigGainLife | TriggerZones$ Battlefield | Optional$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast an artifact spell, you may pay 1. If you do, you gain 3 life. +SVar:TrigGainLife:AB$GainLife | Cost$ 1 | Defined$ You | LifeAmount$ 3 SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/lifesmith.jpg -SetInfo:SOM|Uncommon|http://magiccards.info/scans/en/som/124.jpg End \ No newline at end of file diff --git a/res/cardsfolder/lumengrid_drake.txt b/res/cardsfolder/lumengrid_drake.txt new file mode 100644 index 00000000000..f171b0a5227 --- /dev/null +++ b/res/cardsfolder/lumengrid_drake.txt @@ -0,0 +1,11 @@ +Name:Lumengrid Drake +ManaCost:3 U +Types:Creature Drake +Text:no text +PT:2/2 +K:Flying +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBounce | Metalcraft$ True | TriggerDescription$ Metalcraft — When CARDNAME enters the battlefield, if you control three or more artifacts, return target creature to its owner's hand. +SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Tgt$ TgtC | Origin$ Battlefield | Destination$ Hand +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/lumengrid_drake.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/necrogen_scudder.txt b/res/cardsfolder/necrogen_scudder.txt index 0fca5a20844..175f3007d24 100644 --- a/res/cardsfolder/necrogen_scudder.txt +++ b/res/cardsfolder/necrogen_scudder.txt @@ -1,10 +1,11 @@ Name:Necrogen Scudder ManaCost:2 B Types:Creature Horror -Text:When CARDNAME enters the battlefield, you lose 2 life. +Text:no text PT:3/3 K:Flying -K:etbLoseLife:3 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ When CARDNAME enters the battlefield, you lose 3 life. +SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ 3 SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/necrogen_scudder.jpg SetInfo:SOM|Uncommon|http://magiccards.info/scans/en/som/71.jpg diff --git a/res/cardsfolder/origin_spellbomb.txt b/res/cardsfolder/origin_spellbomb.txt index 0845b3cb179..d0889efa4fc 100644 --- a/res/cardsfolder/origin_spellbomb.txt +++ b/res/cardsfolder/origin_spellbomb.txt @@ -3,7 +3,8 @@ ManaCost:1 Types:Artifact Text:no text A:AB$Token | Cost$ 1 T Sac<1/CARDNAME> | TokenImage$ C 1 1 Myr | TokenColors$ Colorless | TokenAmount$ 1 | TokenName$ Myr | TokenTypes$ Creature,Myr | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 colorless Myr artifact creature token onto the battlefield. -K:WheneverKeyword:PermanentIntoGraveyard:Self:Any:DrawCards/1:ControllingPlayer_Self:ASAP:PayMana/W:No Special Condition:When Origin Spellbomb is put into a graveyard from the battlefield, you may pay W. If you do, draw a card. +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Optional$ True | Execute$ TrigDraw | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may pay W. If you do, draw a card. +SVar:TrigDraw:AB$Draw | Cost$ W | NumCards$ 1 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/origin_spellbomb.jpg SetInfo:SOM|Common|http://magiccards.info/scans/en/som/189.jpg diff --git a/res/cardsfolder/oxidda_scrapmelter.txt b/res/cardsfolder/oxidda_scrapmelter.txt index 01b9f1e4bda..375eb789aad 100644 --- a/res/cardsfolder/oxidda_scrapmelter.txt +++ b/res/cardsfolder/oxidda_scrapmelter.txt @@ -1,9 +1,10 @@ Name:Oxidda Scrapmelter ManaCost:3 R Types:Creature Beast -Text:When Oxidda Scrapmelter enters the battlefield, destroy target artifact. +Text:no text PT:3/3 -K:etbDestroyTgt:Artifact +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target artifact. +SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Artifact | TgtPrompt$ Choose target artifact. SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/oxidda_scrapmelter.jpg SetInfo:SOM|Uncommon|http://magiccards.info/scans/en/som/101.jpg diff --git a/res/cardsfolder/panic_spellbomb.txt b/res/cardsfolder/panic_spellbomb.txt index 0992f3e9a45..a495ebc8e1e 100644 --- a/res/cardsfolder/panic_spellbomb.txt +++ b/res/cardsfolder/panic_spellbomb.txt @@ -3,7 +3,8 @@ ManaCost:1 Types:Artifact Text:no text A:AB$Pump | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME can't block. | IsCurse$ True | SpellDescription$ Target creature can't block this turn. -K:WheneverKeyword:PermanentIntoGraveyard:Self:Any:DrawCards/1:ControllingPlayer_Self:ASAP:PayMana/R:No Special Condition:When Panic Spellbomb is put into a graveyard from the battlefield, you may pay R. If you do, draw a card. +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Optional$ True | Execute$ TrigDraw | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may pay R. If you do, draw a card. +SVar:TrigDraw:AB$Draw | Cost$ R | NumCards$ 1 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/panic_spellbomb.jpg SetInfo:SOM|Common|http://magiccards.info/scans/en/som/191.jpg diff --git a/res/cardsfolder/skinrender.txt b/res/cardsfolder/skinrender.txt index 231f1db5b90..8654ea8c9b2 100644 --- a/res/cardsfolder/skinrender.txt +++ b/res/cardsfolder/skinrender.txt @@ -1,9 +1,10 @@ Name:Skinrender ManaCost:2 B B Types:Creature Zombie -Text:When Skinrender enters the battlefield, put three -1/-1 counters on target creature. +Text:no text PT:3/3 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, put three -1/-1 counters on target creature. +SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Tgt$ TgtC | CounterType$ M1M1 | CounterNum$ 3 SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/skinrender.jpg -SetInfo:SOM|Uncommon|http://magiccards.info/scans/en/som/78.jpg End \ No newline at end of file diff --git a/res/cardsfolder/sunblast_angel.txt b/res/cardsfolder/sunblast_angel.txt index 654a6dae521..dfb06bc0562 100644 --- a/res/cardsfolder/sunblast_angel.txt +++ b/res/cardsfolder/sunblast_angel.txt @@ -1,9 +1,11 @@ Name:Sunblast Angel ManaCost:4 W W Types:Creature Angel -Text:When Sunblast Angel enters the battlefield, destroy all tapped creatures. +Text:no text PT:4/5 K:Flying +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroyAll | TriggerDescription$ When CARDNAME enters the battlefield, destroy all tapped creatures. +SVar:TrigDestroyAll:AB$DestroyAll | Cost$ 0 | ValidCards$ Creature.tapped SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/sunblast_angel.jpg SetInfo:SOM|Rare|http://magiccards.info/scans/en/som/22.jpg diff --git a/res/cardsfolder/vensers_journal.txt b/res/cardsfolder/vensers_journal.txt index dcb25467bb5..8ba60eb120d 100644 --- a/res/cardsfolder/vensers_journal.txt +++ b/res/cardsfolder/vensers_journal.txt @@ -1,8 +1,11 @@ Name:Venser's Journal ManaCost:5 Types:Artifact -Text:You have no maximum hand size.\r\nAt the beginning of your upkeep, you gain 1 life for each card in your hand. +Text:You have no maximum hand size. K:HandSize = INF Self +T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ At the beginning of your upkeep, you gain 1 life for each card in your hand. +SVar:TrigGainLife:AB$GainLife | Cost$ 0 | LifeAmount$ X +SVar:X:Count$InYourHand SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/vensers_journal.jpg SetInfo:SOM|Rare|http://magiccards.info/scans/en/som/220.jpg diff --git a/res/cardsfolder/wurmcoil_engine.txt b/res/cardsfolder/wurmcoil_engine.txt index e3b92691adb..d61148b7a2b 100644 --- a/res/cardsfolder/wurmcoil_engine.txt +++ b/res/cardsfolder/wurmcoil_engine.txt @@ -1,10 +1,13 @@ Name:Wurmcoil Engine ManaCost:6 Types:Artifact Creature Wurm -Text:When Wurmcoil Engine is put into a graveyard from the battlefield, put a 3/3 colorless Wurm artifact creature token with deathtouch and a 3/3 colorless Wurm artifact creature token with lifelink onto the battlefield. +Text:no text PT:6/6 K:Deathtouch K:Lifelink +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, put a 3/3 colorless Wurm artifact creature token with deathtouch and a 3/3 colorless Wurm artifact creature token with lifelink onto the battlefield. +SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ C 3 3 Wurm Deathtouch | TokenColors$ Colorless | TokenAmount$ 1 | TokenName$ Wurm | TokenTypes$ Creature,Wurm | TokenPower$ 3 | TokenToughness$ 3 | TokenKeywords$ Deathtouch | SubAbility$SVar=DBToken +SVar:DBToken:DB$Token | TokenImage$ C 3 3 Wurm Lifelink | TokenColors$ Colorless | TokenAmount$ 1 | TokenName$ Wurm | TokenTypes$ Creature,Wurm | TokenPower$ 3 | TokenToughness$ 3 | TokenKeywords$ Lifelink SVar:Rarity:Mythic SVar:Picture:http://www.wizards.com/global/images/magic/general/wurmcoil_engine.jpg SetInfo:SOM|Mythic|http://magiccards.info/scans/en/som/223.jpg diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java index 388bc702cd9..2bf3dcf9f3f 100644 --- a/src/forge/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -1825,99 +1825,6 @@ public class CardFactory_Creatures { }); }//*************** END ************ END ************************** - - //*************** START *********** START ************************** - else if(cardName.equals("Skinrender")) { - - final CommandReturn getCreature = new CommandReturn() { - //get target card, may be null - public Object execute() { - CardList l = CardFactoryUtil.AI_getHumanCreature(card, true); - - CardList list = new CardList(l.toArray()); - if (list.isEmpty()) // todo: if human doesn't have a valid creature must kill own valid target - return null; - - // Sorts: Highest Attacking Flyer at the top. - CardListUtil.sortAttack(list); - CardListUtil.sortFlying(list); - - Card target = list.get(0); - // if "Best creature has 2+ Attack and flying target that. - if(2 <= target.getNetAttack() && target.getKeyword().contains("Flying")) - return target; - - if(MyRandom.percentTrue(50)) - CardListUtil.sortAttack(list); - - return target; - }//execute() - };//CommandReturn - - final SpellAbility ability = new Ability(card, "0") { - @Override - public void resolve() { - Card c = getTargetCard(); - - if(AllZone.GameAction.isCardInPlay(c) && CardFactoryUtil.canTarget(card, c)) { - c.addCounter(Counters.M1M1,3); - } - }//resolve() - };//SpellAbility - Command intoPlay = new Command() { - - private static final long serialVersionUID = 8876482925803330585L; - - public void execute() { - Input target = new Input() { - - private static final long serialVersionUID = -2760098744343748530L; - - @Override - public void showMessage() { - AllZone.Display.showMessage("Select target creature"); - ButtonUtil.disableAll(); - } - - @Override - public void selectCard(Card card, PlayerZone zone) { - if(!CardFactoryUtil.canTarget(ability, card)) { - AllZone.Display.showMessage("Cannot target this card (Shroud? Protection?)."); - } else if(card.isCreature() && zone.is(Constant.Zone.Battlefield)) { - ability.setTargetCard(card); - AllZone.Stack.add(ability); - stop(); - } - } - };//Input target - - if(card.getController().equals(AllZone.HumanPlayer)) { - //get all creatures - CardList creatures = AllZoneUtil.getTypeInPlay("Creature"); - creatures = creatures.filter(new CardListFilter(){ - public boolean addCard(Card c) - { - return CardFactoryUtil.canTarget(card, c); - } - }); - - if(creatures.size() != 0) AllZone.InputControl.setInput(target); - - } - else{ //computer - Object o = getCreature.execute(); - if(o != null)//should never happen, but just in case - { - ability.setTargetCard((Card) o); - AllZone.Stack.add(ability); - } - }//else - }//execute() - }; - card.addComesIntoPlayCommand(intoPlay); - }//*************** END ************ END ************************** - - //*************** START *********** START ************************** else if(cardName.equals("Phylactery Lich") ) { final CommandReturn getArt = new CommandReturn() { @@ -6800,41 +6707,6 @@ public class CardFactory_Creatures { card.addDestroyCommand(make3Tokens); }//*************** END ************ END ************************** - - //*************** START *********** START ************************** - else if(cardName.equals("Wurmcoil Engine")) { - final Ability ability = new Ability(card, "0") { - - @Override - public void resolve() { - makeTokens(); - }//resolve() - - void makeTokens() { - CardFactoryUtil.makeToken("Wurm", "C 3 3 Wurm Deathtouch", card.getController(), "", new String[] { - "Artifact", "Creature", "Wurm"}, 3, 3, new String[] {"Deathtouch"}); - CardFactoryUtil.makeToken("Wurm", "C 3 3 Wurm Lifelink", card.getController(), "", new String[] { - "Artifact", "Creature", "Wurm"}, 3, 3, new String[] {"Lifelink"}); - }//makeToken() - };//Ability - - Command makeTokens = new Command() { - - private static final long serialVersionUID = 8458814538376248271L; - - public void execute() { - StringBuilder sb = new StringBuilder(); - sb.append(card.getName()).append(" - put creature tokens onto the battlefield."); - ability.setStackDescription(sb.toString()); - AllZone.Stack.add(ability); - } - };//Command - - card.addDestroyCommand(makeTokens); - - }//*************** END ************ END ************************** - - //*************** START *********** START ************************** else if(cardName.equals("Solemn Simulacrum") || cardName.equals("Yavimaya Granger") || cardName.equals("Ondu Giant") || cardName.equals("Quirion Trailblazer")) { @@ -11863,36 +11735,6 @@ public class CardFactory_Creatures { card.addSpellAbility(ability); }//*************** END ************ END ************************** - - //*************** START *********** START ************************** - else if(cardName.equals("Sunblast Angel") ) { - - final SpellAbility ability = new Ability(card, "0") { - @Override - public void resolve() { - CardList tappedCreatures = AllZoneUtil.getCreaturesInPlay(); - tappedCreatures = tappedCreatures.filter(AllZoneUtil.tapped); - for(Card c:tappedCreatures) { - AllZone.GameAction.destroy(c); - } - }//resolve() - };//SpellAbility - Command intoPlay = new Command() { - private static final long serialVersionUID = -8702934390670388771L; - - public void execute() { - StringBuilder sb = new StringBuilder(); - sb.append(card).append(" - destroy all tapped creatures."); - ability.setStackDescription(sb.toString()); - - AllZone.Stack.add(ability); - }//execute() - }; - - card.addComesIntoPlayCommand(intoPlay); - }//*************** END ************ END ************************** - - //*************** START *********** START ************************** else if(cardName.equals("Thundermare") || cardName.equals("Timbermare")) { /* diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 47666c8e9f1..1ec938eb1e0 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -46,7 +46,6 @@ public class GameActionUtil { upkeep_Honden_of_Lifes_Web(); upkeep_Honden_of_Nights_Reach(); upkeep_Honden_of_Infinite_Rage(); - upkeep_Vensers_Journal(); upkeep_Dega_Sanctuary(); upkeep_Sheltered_Valley(); upkeep_Land_Tax(); @@ -65,7 +64,6 @@ public class GameActionUtil { upkeep_Curse_of_Chains(); upkeep_Festering_Wound_Counter(); upkeep_Festering_Wound_Damage(); - upkeep_Kemba_Kha_Regent(); upkeep_Greener_Pastures(); upkeep_Wort(); upkeep_Squee(); @@ -7725,32 +7723,6 @@ public class GameActionUtil { } // for } // if creatures > 0 }; - - /* - * At the beginning of your upkeep, put a 2/2 white Cat creature token - * onto the battlefield for each Equipment attached to Kemba, Kha Regent. - */ - private static void upkeep_Kemba_Kha_Regent() { - final Player player = AllZone.Phase.getPlayerTurn(); - CardList list = AllZoneUtil.getPlayerCardsInPlay(player, "Kemba, Kha Regent"); - - for(Card src:list) { - final Card regent = src; - final int equipNum = regent.getEquippedBy().size(); - Ability ability = new Ability(regent, "0") { - @Override - public void resolve() { - for(int i = 0; i < equipNum; i++) { - CardFactoryUtil.makeToken("Cat", "W 2 2 Cat", regent.getController(), "W", - new String[] {"Creature", "Cat"}, 2, 2, new String[] {}); - } - } - - };// Ability - ability.setStackDescription(regent.getName()+" - put "+equipNum+" 2/2 white Cat creature token(s) onto the battlefield."); - if(equipNum > 0) AllZone.Stack.add(ability); - } - }; private static void upkeep_Scute_Mob() { final Player player = AllZone.Phase.getPlayerTurn(); @@ -9813,29 +9785,6 @@ public class GameActionUtil { }//for }//upkeep_Planar_Collapse() - private static void upkeep_Vensers_Journal() { - final Player player = AllZone.Phase.getPlayerTurn(); - - CardList list = AllZoneUtil.getPlayerCardsInPlay(player, "Venser's Journal"); - - for(Card journal:list) { - final Card source = journal; - final Ability ability = new Ability(source, "0") { - public void resolve() { - CardList hand = AllZoneUtil.getPlayerHand(player); - player.gainLife(hand.size(), source); - } - };//Ability - - StringBuilder sb = new StringBuilder(); - sb.append(source.getName()).append(" - ").append(player); - sb.append(" gains 1 life for each card in your hand."); - ability.setStackDescription(sb.toString()); - - AllZone.Stack.add(ability); - }//for - }//upkeep_Vensers_Journal() - private static void upkeep_Dega_Sanctuary() { final Player player = AllZone.Phase.getPlayerTurn();