diff --git a/.gitattributes b/.gitattributes index d0c3e056a1a..3977bc7f929 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5423,6 +5423,7 @@ res/cardsfolder/j/jeska_warrior_adept.txt svneol=native#text/plain res/cardsfolder/j/jesters_cap.txt svneol=native#text/plain res/cardsfolder/j/jesters_mask.txt svneol=native#text/plain res/cardsfolder/j/jet_medallion.txt svneol=native#text/plain +res/cardsfolder/j/jetting_glasskite.txt -text res/cardsfolder/j/jeweled_bird.txt -text res/cardsfolder/j/jeweled_spirit.txt svneol=native#text/plain res/cardsfolder/j/jeweled_torque.txt -text @@ -7272,6 +7273,7 @@ res/cardsfolder/n/nova_chaser.txt svneol=native#text/plain res/cardsfolder/n/nova_cleric.txt svneol=native#text/plain res/cardsfolder/n/novablast_wurm.txt svneol=native#text/plain res/cardsfolder/n/novijen_heart_of_progress.txt svneol=native#text/plain +res/cardsfolder/n/novijen_sages.txt -text res/cardsfolder/n/noxious_field.txt svneol=native#text/plain res/cardsfolder/n/noxious_ghoul.txt svneol=native#text/plain res/cardsfolder/n/noxious_hatchling.txt svneol=native#text/plain @@ -9395,6 +9397,7 @@ res/cardsfolder/s/shimian_specter.txt svneol=native#text/plain res/cardsfolder/s/shimmer.txt -text res/cardsfolder/s/shimmer_myr.txt svneol=native#text/plain res/cardsfolder/s/shimmering_barrier.txt svneol=native#text/plain +res/cardsfolder/s/shimmering_glasskite.txt -text res/cardsfolder/s/shimmering_grotto.txt svneol=native#text/plain res/cardsfolder/s/shimmering_mirage.txt -text res/cardsfolder/s/shimmering_wings.txt svneol=native#text/plain diff --git a/CHANGES.txt b/CHANGES.txt index 87d5496ce5b..155027b6919 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -62,6 +62,10 @@ Goblin Assassin Chain Lightning Chain of Vapor Vision Charm +Ooze Flux +Simic Manipulator +Ashling the Pilgrim +Inner-Flame Igniter New Phenomenons: diff --git a/res/cardsfolder/a/assemble_the_legion.txt b/res/cardsfolder/a/assemble_the_legion.txt index 0f4837b65a4..1cedad0d33b 100644 --- a/res/cardsfolder/a/assemble_the_legion.txt +++ b/res/cardsfolder/a/assemble_the_legion.txt @@ -3,7 +3,7 @@ ManaCost:3 R W Types:Enchantment T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, put a muster counter on CARDNAME. Then put a 1/1 red and white Soldier creature token with haste onto the battlefield for each muster counter on CARDNAME. SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ MUSTER | CounterNum$ 1 | SubAbility$ DBToken -SVar:DBToken:DB$ Token | TokenImage$ RW 1 1 Soldier | TokenAmount$ X | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ Red,White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Haste | References$ X +SVar:DBToken:DB$ Token | TokenAmount$ X | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ Red,White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Haste | References$ X SVar:X:Count$CardCounters.MUSTER SVar:Picture:http://www.wizards.com/global/images/magic/general/assemble_the_legion.jpg Oracle:At the beginning of your upkeep, put a muster counter on Assemble the Legion. Then put a 1/1 red and white Soldier creature token with haste onto the battlefield for each muster counter on Assemble the Legion. diff --git a/res/cardsfolder/b/beckon_apparition.txt b/res/cardsfolder/b/beckon_apparition.txt index 0bf07539644..0869d1123b8 100644 --- a/res/cardsfolder/b/beckon_apparition.txt +++ b/res/cardsfolder/b/beckon_apparition.txt @@ -2,7 +2,7 @@ Name:Beckon Apparition ManaCost:WB Types:Instant A:SP$ ChangeZone | Cost$ WB | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SubAbility$ DBToken | SpellDescription$ Exile target card from a graveyard. Put a 1/1 white and black Spirit creature token with flying onto the battlefield. -SVar:DBToken:DB$Token | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White,Black | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying +SVar:DBToken:DB$Token | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White,Black | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | TokenImage$ WB 1 1 Spirit GTC SVar:Picture:http://www.wizards.com/global/images/magic/general/beckon_apparition.jpg Oracle:Exile target card from a graveyard. Put a 1/1 white and black Spirit creature token with flying onto the battlefield. SetInfo:GTC Common diff --git a/res/cardsfolder/j/jetting_glasskite.txt b/res/cardsfolder/j/jetting_glasskite.txt new file mode 100644 index 00000000000..05d8a4c982a --- /dev/null +++ b/res/cardsfolder/j/jetting_glasskite.txt @@ -0,0 +1,16 @@ +Name:Jetting Glasskite +ManaCost:4 U U +Types:Creature Spirit +PT:4/4 +K:Flying +T:Mode$ BecomesTarget | ValidTarget$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ GlasskiteCheck | SVarCompare$ EQ0 | Execute$ GlasskiteCounter | TriggerDescription$ Whenever CARDNAME becomes the target of a spell or ability for the first time in a turn, counter that spell or ability. +SVar:GlasskiteCheck:Number$0 +SVar:GlasskiteCounter:AB$ Counter | Cost$ 0 | Defined$ TriggeredSourceSA | SubAbility$ GlasskiteCheckPlus +SVar:GlasskiteCheckPlus:DB$ StoreSVar | SVar$ GlasskiteCheck | Type$ Number | Expression$ 1 +T:Mode$ Phase | Phase$ Cleanup | TriggerZones$ Battlefield | Execute$ TrigReset | Static$ True +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReset | Static$ True +SVar:TrigReset:AB$ StoreSVar | Cost$ 0 | SVar$ GlasskiteCheck | Type$ Number | Expression$ 0 +SVar:RemAIDeck:True +SVar:Picture:http://www.wizards.com/global/images/magic/general/jetting_glasskite.jpg +Oracle:Flying\nWhenever Jetting Glasskite becomes the target of a spell or ability for the first time in a turn, counter that spell or ability. +SetInfo:BOK Uncommon \ No newline at end of file diff --git a/res/cardsfolder/n/novijen_sages.txt b/res/cardsfolder/n/novijen_sages.txt new file mode 100644 index 00000000000..09ed8ebb555 --- /dev/null +++ b/res/cardsfolder/n/novijen_sages.txt @@ -0,0 +1,9 @@ +Name:Novijen Sages +ManaCost:4 U U +Types:Creature Human Advisor Mutant +PT:0/0 +K:Graft 4 +A:AB$ Draw | Cost$ 1 SubCounter<2/P1P1/Creature/among creatures you control> | NumCards$ 1 | SpellDescription$ Draw a card. +SVar:Picture:http://www.wizards.com/global/images/magic/general/novijen_sages.jpg +Oracle:Graft 4 (This creature enters the battlefield with four +1/+1 counters on it. Whenever another creature enters the battlefield, you may move a +1/+1 counter from this creature onto it.)\n{1}, Remove two +1/+1 counters from among creatures you control: Draw a card. +SetInfo:DIS Rare \ No newline at end of file diff --git a/res/cardsfolder/o/ogre_slumlord.txt b/res/cardsfolder/o/ogre_slumlord.txt index 1923f799596..adc4a14f1ff 100644 --- a/res/cardsfolder/o/ogre_slumlord.txt +++ b/res/cardsfolder/o/ogre_slumlord.txt @@ -3,7 +3,7 @@ ManaCost:3 B B Types:Creature Ogre Rogue PT:3/3 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.nonToken+Other | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever another nontoken creature dies, put a 1/1 black Rat creature token onto the battlefield. -SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Rat | TokenTypes$ Creature,Rat | TokenOwner$ You | TokenColors$ Black | TokenPower$ 1 | TokenToughness$ 1 +SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Rat | TokenTypes$ Creature,Rat | TokenOwner$ You | TokenColors$ Black | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ B 1 1 Rat GTC S:Mode$ Continuous | Affected$ Creature.Rat+YouCtrl | AddKeyword$ Deathtouch | Description$ Rats you control have deathtouch. SVar:Picture:http://www.wizards.com/global/images/magic/general/ogre_slumlord.jpg Oracle:Whenever another nontoken creature dies, you may put a 1/1 black Rat creature token onto the battlefield.\nRats you control have deathtouch. diff --git a/res/cardsfolder/s/shimmering_glasskite.txt b/res/cardsfolder/s/shimmering_glasskite.txt new file mode 100644 index 00000000000..31891b60092 --- /dev/null +++ b/res/cardsfolder/s/shimmering_glasskite.txt @@ -0,0 +1,16 @@ +Name:Shimmering Glasskite +ManaCost:3 U +Types:Creature Spirit +PT:2/3 +K:Flying +T:Mode$ BecomesTarget | ValidTarget$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ GlasskiteCheck | SVarCompare$ EQ0 | Execute$ GlasskiteCounter | TriggerDescription$ Whenever CARDNAME becomes the target of a spell or ability for the first time in a turn, counter that spell or ability. +SVar:GlasskiteCheck:Number$0 +SVar:GlasskiteCounter:AB$ Counter | Cost$ 0 | Defined$ TriggeredSourceSA | SubAbility$ GlasskiteCheckPlus +SVar:GlasskiteCheckPlus:DB$ StoreSVar | SVar$ GlasskiteCheck | Type$ Number | Expression$ 1 +T:Mode$ Phase | Phase$ Cleanup | TriggerZones$ Battlefield | Execute$ TrigReset | Static$ True +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReset | Static$ True +SVar:TrigReset:AB$ StoreSVar | Cost$ 0 | SVar$ GlasskiteCheck | Type$ Number | Expression$ 0 +SVar:RemAIDeck:True +SVar:Picture:http://www.wizards.com/global/images/magic/general/shimmering_glasskite.jpg +Oracle:Flying\nWhenever Shimmering Glasskite becomes the target of a spell or ability for the first time in a turn, counter that spell or ability. +SetInfo:BOK Common \ No newline at end of file diff --git a/res/token-images.txt b/res/token-images.txt index fce1837b712..9f1990fb7cf 100644 --- a/res/token-images.txt +++ b/res/token-images.txt @@ -9,6 +9,7 @@ b_1_1_festering_goblin.jpg http://www.cardforge.org/fpics/tokens/b_1 b_1_1_goblin_rogue.jpg http://www.cardforge.org/fpics/tokens/b_1_1_goblin_rogue.jpg b_1_1_minion.jpg http://www.cardforge.org/fpics/tokens/b_1_1_minion.jpg b_1_1_rat.jpg http://www.cardforge.org/fpics/tokens/b_1_1_rat.jpg +b_1_1_rat_gtc.jpg http://www.cardforge.org/fpics/tokens/GTC/b_1_1_rat_gtc.jpg b_1_1_skeleton.jpg http://www.cardforge.org/fpics/tokens/b_1_1_skeleton.jpg b_1_1_thrull.jpg http://www.cardforge.org/fpics/tokens/b_1_1_thrull.jpg b_1_1_vampire_dka.jpg http://www.cardforge.org/fpics/tokens/b_1_1_vampire_dka.jpg @@ -106,6 +107,7 @@ g_3_3_centaur.jpg http://www.cardforge.org/fpics/tokens/g_3 g_3_3_centaur_pro_black.jpg http://www.cardforge.org/fpics/tokens/g_3_3_centaur_pro_black.jpg g_3_3_centaur_rtr.jpg http://www.cardforge.org/fpics/tokens/RTR/g_3_3_centaur_rtr.jpg g_3_3_elephant.jpg http://www.cardforge.org/fpics/tokens/g_3_3_elephant.jpg +g_3_3_frog_lizard.jpg http://www.cardforge.org/fpics/tokens/GTC/g_3_3_frog_lizard.jpg g_4_4_beast.jpg http://www.cardforge.org/fpics/tokens/g_4_4_beast.jpg g_4_4_elemental.jpg http://www.cardforge.org/fpics/tokens/g_4_4_elemental.jpg g_4_4_rhino_rtr.jpg http://www.cardforge.org/fpics/tokens/RTR/g_4_4_rhino_rtr.jpg @@ -153,6 +155,7 @@ r_x_x_elemental.jpg http://www.cardforge.org/fpics/tokens/r_x rg_3_4_stangg_twin.jpg http://www.cardforge.org/fpics/tokens/rg_3_4_stangg_twin.jpg rg_4_4_giant_warrior.jpg http://www.cardforge.org/fpics/tokens/rg_4_4_giant_warrior.jpg rw_1_1_goblin_soldier.jpg http://www.cardforge.org/fpics/tokens/rw_1_1_goblin_soldier.jpg +rw_1_1_soldier.jpg http://www.cardforge.org/fpics/tokens/GTC/rw_1_1_soldier.jpg u_0_1_homunculus.jpg http://www.cardforge.org/fpics/tokens/u_0_1_homunculus.jpg u_0_1_plant_wall.jpg http://www.cardforge.org/fpics/tokens/u_0_1_plant_wall.jpg u_0_1_starfish.jpg http://www.cardforge.org/fpics/tokens/u_0_1_starfish.jpg @@ -172,6 +175,7 @@ u_3_3_weird.jpg http://www.cardforge.org/fpics/tokens/u_3 u_5_5_dragon_spirit.jpg http://www.cardforge.org/fpics/tokens/u_5_5_dragon_spirit.jpg u_5_5_wall.jpg http://www.cardforge.org/fpics/tokens/u_5_5_wall.jpg u_x_x_orb.jpg http://www.cardforge.org/fpics/tokens/u_x_x_orb.jpg +ub_1_1_horror.jpg http://www.cardforge.org/fpics/tokens/GTC/ub_1_1_horror.jpg ub_1_1_faerie_rogue.jpg http://www.cardforge.org/fpics/tokens/ub_1_1_faerie_rogue.jpg ub_1_1_zombie_wizard.jpg http://www.cardforge.org/fpics/tokens/ub_1_1_zombie_wizard.jpg ur_5_5_elemental.jpg http://www.cardforge.org/fpics/tokens/ur_5_5_elemental.jpg @@ -204,11 +208,14 @@ w_3_3_bird.jpg http://www.cardforge.org/fpics/tokens/w_3 w_3_3_spirit.jpg http://www.cardforge.org/fpics/tokens/w_3_3_spirit.jpg w_4_4_angel.jpg http://www.cardforge.org/fpics/tokens/w_4_4_angel.jpg w_4_4_angel_avr.jpg http://www.cardforge.org/fpics/tokens/w_4_4_angel_avr.jpg +w_4_4_angel_gtc.jpg http://www.cardforge.org/fpics/tokens/GTC/w_4_4_angel_gtc.jpg w_4_4_elemental.jpg http://www.cardforge.org/fpics/tokens/w_4_4_elemental.jpg w_5_5_giant_warrior.jpg http://www.cardforge.org/fpics/tokens/w_5_5_giant_warrior.jpg w_n_n_avatar.jpg http://www.cardforge.org/fpics/tokens/w_n_n_avatar.jpg w_x_x_reflection.jpg http://www.cardforge.org/fpics/tokens/w_x_x_reflection.jpg +wb_1_1_cleric.jpg http://www.cardforge.org/fpics/tokens/GTC/wb_1_1_cleric.jpg wb_1_1_spirit.jpg http://www.cardforge.org/fpics/tokens/wb_1_1_spirit.jpg +wb_1_1_spirit_gtc.jpg http://www.cardforge.org/fpics/tokens/GTC/wb_1_1_spirit_gtc.jpg wrg_8_8_beast.jpg http://www.cardforge.org/fpics/tokens/wrg_8_8_beast.jpg wr_1_1_goblin_soldier.jpg http://www.cardforge.org/fpics/tokens/wr_1_1_goblin_soldier.jpg wu_1_1_bird.jpg http://www.cardforge.org/fpics/tokens/wu_1_1_bird.jpg