github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 03:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

[C15] Added 11/5 spoilers and Angel of Serenity reprint, corrected Meteor Blast's translated name, and updated tokens.

Browse source
This commit is contained in:
fireshoes 2015-11-05 10:26:40 -06:00
parent 4cf957a4a9
commit 59cf816f32
5 changed files with 136 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

123
Mage.Client/src/main/resources/card-pictures-tok.txt
View file

@ -1,40 +1,65 @@
#Generate|TOK:BFZ|Dragon| #Generate|TOK:C15|Angel|
#Generate|TOK:BFZ|Eldrazi| #Generate|TOK:C15|Bear|
#Generate|TOK:BFZ|Eldrazi Scion 1| #Generate|TOK:C15|Beast|
#Generate|TOK:BFZ|Eldrazi Scion 2| #Generate|TOK:C15|Cat|
#Generate|TOK:BFZ|Eldrazi Scion 3| #Generate|TOK:C15|Dragon|
#Generate|TOK:BFZ|Elemental 1| #Generate|TOK:C15|Drake|
#Generate|TOK:BFZ|Elemental 2| #Generate|TOK:C15|Elemental Shaman|
#Generate|TOK:BFZ|Knight Ally| #Generate|TOK:C15|Elemental|
#Generate|TOK:BFZ|Kor Ally| #Generate|TOK:C15|Elephant|
#Generate|TOK:BFZ|Octopus| #Generate|TOK:C15|Frog Lizard|
#Generate|TOK:BFZ|Plant| #Generate|TOK:C15|Germ|
#|Generate|EMBLEM!:BFZ|Emblem Gideon, Ally of Zendikar| #Generate|TOK:C15|Gold|
#|Generate|EMBLEM!:BFZ|Emblem Kiora, Master of the Depths| #Generate|TOK:C15|Knight 1|
#|Generate|EMBLEM!:BFZ|Emblem Ob Nixilis Reignited| #Generate|TOK:C15|Knight 2|
#Generate|TOK:C15|Lightning Rager|
#Generate|TOK:C15|Saproling|
#Generate|TOK:C15|Shapeshifter|
#Generate|TOK:C15|Snake 1|
#Generate|TOK:C15|Snake 2|
#Generate|TOK:C15|Spider|
#Generate|TOK:C15|Spirit 1|
#Generate|TOK:C15|Spirit 2|
#Generate|TOK:C15|Wolf|
#Generate|TOK:C15|Zombie|
#Generate|TOK:DDP|Eldrazi Spawn 1| Generate|TOK:BFZ|Dragon|
#Generate|TOK:DDP|Eldrazi Spawn 2| Generate|TOK:BFZ|Eldrazi|
#Generate|TOK:DDP|Eldrazi Spawn 3| Generate|TOK:BFZ|Eldrazi Scion 1|
#Generate|TOK:DDP|Hellion| Generate|TOK:BFZ|Eldrazi Scion 2|
#Generate|TOK:DDP|Plant| Generate|TOK:BFZ|Eldrazi Scion 3|
Generate|TOK:BFZ|Elemental 1|
Generate|TOK:BFZ|Elemental 2|
Generate|TOK:BFZ|Knight Ally|
Generate|TOK:BFZ|Kor Ally|
Generate|TOK:BFZ|Octopus|
Generate|TOK:BFZ|Plant|
|Generate|EMBLEM!:BFZ|Emblem Gideon, Ally of Zendikar|
|Generate|EMBLEM!:BFZ|Emblem Kiora, Master of the Depths|
|Generate|EMBLEM!:BFZ|Emblem Ob Nixilis Reignited|
#Generate|TOK:MM2|Eldrazi Spawn 1| Generate|TOK:DDP|Eldrazi Spawn 1|
#Generate|TOK:MM2|Eldrazi Spawn 2| Generate|TOK:DDP|Eldrazi Spawn 2|
#Generate|TOK:MM2|Eldrazi Spawn 3| Generate|TOK:DDP|Eldrazi Spawn 3|
#Generate|TOK:MM2|Elephant| Generate|TOK:DDP|Hellion|
#Generate|TOK:MM2|Faerie Rogue| Generate|TOK:DDP|Plant|
#Generate|TOK:MM2|Germ|
#Generate|TOK:MM2|Golem| Generate|TOK:MM2|Eldrazi Spawn 1|
#Generate|TOK:MM2|Insect| Generate|TOK:MM2|Eldrazi Spawn 2|
#Generate|TOK:MM2|Myr| Generate|TOK:MM2|Eldrazi Spawn 3|
#Generate|TOK:MM2|Saproling| Generate|TOK:MM2|Elephant|
#Generate|TOK:MM2|Snake| Generate|TOK:MM2|Faerie Rogue|
#Generate|TOK:MM2|Soldier| Generate|TOK:MM2|Germ|
#Generate|TOK:MM2|Spirit| Generate|TOK:MM2|Golem|
#Generate|TOK:MM2|Thrull| Generate|TOK:MM2|Insect|
#Generate|TOK:MM2|Wolf| Generate|TOK:MM2|Myr|
#Generate|TOK:MM2|Wurm| Generate|TOK:MM2|Saproling|
Generate|TOK:MM2|Snake|
Generate|TOK:MM2|Soldier|
Generate|TOK:MM2|Spirit|
Generate|TOK:MM2|Thrull|
Generate|TOK:MM2|Wolf|
Generate|TOK:MM2|Wurm|
#Generate|TOK:TPR|Goblin| #Generate|TOK:TPR|Goblin|
#Generate|TOK:TPR|Pegasus| #Generate|TOK:TPR|Pegasus|
@ -47,20 +72,20 @@
#Generate|TOK:TPR|Thopter| #Generate|TOK:TPR|Thopter|
#Generate|TOK:TPR|Zombie| #Generate|TOK:TPR|Zombie|
#|Generate|TOK:ORI|Ashaya, the Awoken World| |Generate|TOK:ORI|Ashaya, the Awoken World|
#|Generate|TOK:ORI|Angel| |Generate|TOK:ORI|Angel|
#|Generate|TOK:ORI|Demon| |Generate|TOK:ORI|Demon|
#|Generate|TOK:ORI|Elemental| |Generate|TOK:ORI|Elemental|
#|Generate|TOK:ORI|Elf Warrior| |Generate|TOK:ORI|Elf Warrior|
#|Generate|TOK:ORI|Goblin| |Generate|TOK:ORI|Goblin|
#|Generate|TOK:ORI|Knight| |Generate|TOK:ORI|Knight|
#|Generate|TOK:ORI|Soldier| |Generate|TOK:ORI|Soldier|
#|Generate|TOK:ORI|Thopter 1| |Generate|TOK:ORI|Thopter 1|
#|Generate|TOK:ORI|Thopter 2| |Generate|TOK:ORI|Thopter 2|
#|Generate|TOK:ORI|Zombie| |Generate|TOK:ORI|Zombie|
#|Generate|EMBLEM!:ORI|Emblem Chandra, Roaring Flame| |Generate|EMBLEM!:ORI|Emblem Chandra, Roaring Flame|
#|Generate|EMBLEM!:ORI|Emblem Jace, Telepath Unbound| |Generate|EMBLEM!:ORI|Emblem Jace, Telepath Unbound|
#|Generate|EMBLEM!:ORI|Emblem Liliana, Defiant Necromancer| |Generate|EMBLEM!:ORI|Emblem Liliana, Defiant Necromancer|
#|Generate|TOK:PTC|Angel| #|Generate|TOK:PTC|Angel|
#|Generate|TOK:PTC|Avatar| #|Generate|TOK:PTC|Avatar|

2
Mage.Client/src/main/resources/image.url.properties
View file

@ -64,6 +64,6 @@ ddd=gvl
unh=uh unh=uh
dde=pvc dde=pvc
# Remove setname as soon as the images can be downloaded # Remove setname as soon as the images can be downloaded
ignore.urls=TOK, OGW, C15 ignore.urls=TOK, OGW
# sets ordered by release time (newest goes first) # sets ordered by release time (newest goes first)
token.lookup.order=C15,OGW,EXP,DDP,BFZ,FVD,FVE,FVL,FVR,V12,V13,V14,V15,TPR,MPRP,DD3,DDO,ORI,MM2,PTC,DTK,FRF,KTK,M15,VMA,CNS,JOU,BNG,THS,DDL,M14,MMA,DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,DDE,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK,GRC token.lookup.order=C15,OGW,EXP,DDP,BFZ,FVD,FVE,FVL,FVR,V12,V13,V14,V15,TPR,MPRP,DD3,DDO,ORI,MM2,PTC,DTK,FRF,KTK,M15,VMA,CNS,JOU,BNG,THS,DDL,M14,MMA,DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,DDE,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK,GRC

52
Mage.Sets/src/mage/sets/commander2015/AngelOfSerenity.java Normal file
View file

@ -0,0 +1,52 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.sets.commander2015;
import java.util.UUID;
/**
*
* @author fireshoes
*/
public class AngelOfSerenity extends mage.sets.returntoravnica.AngelOfSerenity {
public AngelOfSerenity(UUID ownerId) {
super(ownerId);
this.cardNumber = 58;
this.expansionSetCode = "C15";
}
public AngelOfSerenity(final AngelOfSerenity card) {
super(card);
}
@Override
public AngelOfSerenity copy() {
return new AngelOfSerenity(this);
}
}

10
Mage.Sets/src/mage/sets/commander2015/MeteorVolley.java → Mage.Sets/src/mage/sets/commander2015/MeteorBlast.java
View file

@ -44,9 +44,9 @@ import mage.target.common.TargetCreatureOrPlayer;
* *
* @author fireshoes * @author fireshoes
*/ */
public class MeteorVolley extends CardImpl { public class MeteorBlast extends CardImpl {
public MeteorVolley(UUID ownerId) { public MeteorBlast(UUID ownerId) {
super(ownerId, 28, "Meteor Volley", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{X}{R}{R}{R}"); super(ownerId, 28, "Meteor Volley", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{X}{R}{R}{R}");
this.expansionSetCode = "C15"; this.expansionSetCode = "C15";
@ -54,7 +54,7 @@ public class MeteorVolley extends CardImpl {
this.getSpellAbility().addEffect(new MeteorVolleyEffect()); this.getSpellAbility().addEffect(new MeteorVolleyEffect());
} }
public MeteorVolley(final MeteorVolley card) { public MeteorBlast(final MeteorBlast card) {
super(card); super(card);
} }
@ -68,8 +68,8 @@ public class MeteorVolley extends CardImpl {
} }
@Override @Override
public MeteorVolley copy() { public MeteorBlast copy() {
return new MeteorVolley(this); return new MeteorBlast(this);
} }
} }

5
Utils/mtg-cards-data.txt
View file

@ -27641,6 +27641,7 @@ Broodbirth Viper|Commander 2015|10|U|{4}{U}|Creature - Snake|3|3|Myriad <i>(When
Gigantoplasm|Commander 2015|11|R|{3}{U}|Creature - Shapeshifter|0|0|You may have Gigantoplasm enter the battlefield as a copy of any creature on the battlefield except it gains "{X}: This creature has base power and toughness X/X."| Gigantoplasm|Commander 2015|11|R|{3}{U}|Creature - Shapeshifter|0|0|You may have Gigantoplasm enter the battlefield as a copy of any creature on the battlefield except it gains "{X}: This creature has base power and toughness X/X."|
Illusory Ambusher|Commander 2015|12|U|{4}{U}|Creature - Cat Illusion|4|1|Flash <i>(You may cast this spell any time you could cast an instant.)</i>$Whenever Illusory Ambusher is dealt damage, draw that many cards.| Illusory Ambusher|Commander 2015|12|U|{4}{U}|Creature - Cat Illusion|4|1|Flash <i>(You may cast this spell any time you could cast an instant.)</i>$Whenever Illusory Ambusher is dealt damage, draw that many cards.|
Mirror Match|Commander 2015|13|U|{4}{U}{U}|Instant|||Cast Mirror Match only during the declare blockers step.$For each creature attacking you or a planeswalker you control, put a token that's a copy of that creature onto the battlefield blocking that creature. Exile those tokens at end of combat.| Mirror Match|Commander 2015|13|U|{4}{U}{U}|Instant|||Cast Mirror Match only during the declare blockers step.$For each creature attacking you or a planeswalker you control, put a token that's a copy of that creature onto the battlefield blocking that creature. Exile those tokens at end of combat.|
Mystic Confluence|Commander 2015|14|R|{3}{U}{U}|Instant|||Choose three. You may choose the same mode more than once. - Counter target spell unless its controller pays {3}; Return target creature to its owner's hand; Draw a card.|
Synthetic Destiny|COmmander 2015|15|R|{4}{U}{U}|Instant|||Exile all creatures you control. At the beginning of the next end step, reveal cards from the top of your library until you reveal that many creature cards, put all creature cards revealed this way onto the battlefield, then shuffle the rest of the revealed cards into your library.| Synthetic Destiny|COmmander 2015|15|R|{4}{U}{U}|Instant|||Exile all creatures you control. At the beginning of the next end step, reveal cards from the top of your library until you reveal that many creature cards, put all creature cards revealed this way onto the battlefield, then shuffle the rest of the revealed cards into your library.|
Banshee of the Dread Choir|Commander 2015|16|U|{3}{B}{B}|Creature - Spirit|4|4|Myriad <i>(Whenever this creature attacks, for each opponent other than defending player, you may put a token that's a copy of this creature onto the battlefield tapped and attacking that player or a planeswalker he or she controls. Exile the tokens at end of combat.)</i>$Whenever Banshee of the Dread Choir deals combat damage to a player, that player discards a card.| Banshee of the Dread Choir|Commander 2015|16|U|{3}{B}{B}|Creature - Spirit|4|4|Myriad <i>(Whenever this creature attacks, for each opponent other than defending player, you may put a token that's a copy of this creature onto the battlefield tapped and attacking that player or a planeswalker he or she controls. Exile the tokens at end of combat.)</i>$Whenever Banshee of the Dread Choir deals combat damage to a player, that player discards a card.|
Daxos's Torment|Commander 2015|18|R|{3}{B}|Enchantment|||Constellation - Whenever Daxos's Torment or another enchantment enters the battlefield under your control, Daxos's Torment becomes a 5/5 Demon creature with flying and haste until end of turn in addition to its other types.| Daxos's Torment|Commander 2015|18|R|{3}{B}|Enchantment|||Constellation - Whenever Daxos's Torment or another enchantment enters the battlefield under your control, Daxos's Torment becomes a 5/5 Demon creature with flying and haste until end of turn in addition to its other types.|
@ -27648,7 +27649,7 @@ Deadly Tempest|Commander 2015|19|R|{4}{B}{B}|Sorcery|||Destroy all creatures. Ea
Dread Summons|Commander 2015|20|R|{X}{B}{B}|Sorcery|||Each player puts the top X cards of his or her library into his or her graveyard. For each creature card put into a graveyard this way, you put a 2/2 black Zombie creature token onto the battlefield tapped.| Dread Summons|Commander 2015|20|R|{X}{B}{B}|Sorcery|||Each player puts the top X cards of his or her library into his or her graveyard. For each creature card put into a graveyard this way, you put a 2/2 black Zombie creature token onto the battlefield tapped.|
Scourge of Nel Toth|Commander 2015|21|R|{5}{B}{B}|Creature - Zombie Dragon|6|6|Flying$You may cast Scourge of Nel Toth from your graveyard by paying {B}{B} and sacrificing two creatures rather than paying its mana cost.| Scourge of Nel Toth|Commander 2015|21|R|{5}{B}{B}|Creature - Zombie Dragon|6|6|Flying$You may cast Scourge of Nel Toth from your graveyard by paying {B}{B} and sacrificing two creatures rather than paying its mana cost.|
Awaken the Sky Tyrant|Commander 2015|24|R|{3}{R}|Enchantment|||When a source an oppponent controls deals damage to you, sacrifice Awaken the Sky Tyrant. If you do, put a 5/5 red Dragon creature token with flying onto the battlefield.| Awaken the Sky Tyrant|Commander 2015|24|R|{3}{R}|Enchantment|||When a source an oppponent controls deals damage to you, sacrifice Awaken the Sky Tyrant. If you do, put a 5/5 red Dragon creature token with flying onto the battlefield.|
Dream Pillager|Commander 2015|25|R|{5}{R}{R}|Creature - Dragon|4|4|Flying$Whenever Dream Pillager deals combat damage to a player, exile that many cards from the top of your library. Until end of turn, you may play nonland cards exiled this way.| Dream Pillager|Commander 2015|25|R|{5}{R}{R}|Creature - Dragon|4|4|Flying$Whenever Dream Pillager deals combat damage to a player, exile that many cards from the top of your library. Until end of turn, you may cast nonland cards exiled this way.|
Fiery Confluence|Commander 2015|26|R|{2}{R}{R}|Sorcery|||Choose three. You may choose the same mode more than once. - Fiery Confluence deals 1 damage to each creature; Fiery Confluence deals 2 damage to each opponent; Destroy target artifact.| Fiery Confluence|Commander 2015|26|R|{2}{R}{R}|Sorcery|||Choose three. You may choose the same mode more than once. - Fiery Confluence deals 1 damage to each creature; Fiery Confluence deals 2 damage to each opponent; Destroy target artifact.|
Magus of the Wheel|Commander 2015|27|R|{2}{R}|Creature - Human Wizard|3|3|{1}{R}, {T}, Sacrifice Magus of the Wheel: Each player discards his or her hand, then draws seven cards.| Magus of the Wheel|Commander 2015|27|R|{2}{R}|Creature - Human Wizard|3|3|{1}{R}, {T}, Sacrifice Magus of the Wheel: Each player discards his or her hand, then draws seven cards.|
Meteor Volley|Commander 2015|28|U|{X}{R}{R}{R}|Sorcery|||Meteor Volley deals 4 damage to each of X target creatures and/or players.| Meteor Volley|Commander 2015|28|U|{X}{R}{R}{R}|Sorcery|||Meteor Volley deals 4 damage to each of X target creatures and/or players.|
@ -27677,6 +27678,8 @@ Scytheclaw|Commander 2015|53|R|{5}|Artifact - Equipment|||Living weapon <i>(When
Seal of the Guildpact|Commander 2015|54|R|{5}|Artifact|||As Seal of the Guildpact enters the battlefield, choose two colors.$Each spell you cast costs {1} less to cast for each of the chosen colors it is.| Seal of the Guildpact|Commander 2015|54|R|{5}|Artifact|||As Seal of the Guildpact enters the battlefield, choose two colors.$Each spell you cast costs {1} less to cast for each of the chosen colors it is.|
Thought Vessel|Commander 2015|55|C|{2}|Artifact|||You have no maximum hand size.${T}: Add {1} to your mana pool.| Thought Vessel|Commander 2015|55|C|{2}|Artifact|||You have no maximum hand size.${T}: Add {1} to your mana pool.|
Command Beacon|Commander 2015|56|R||Land|||{T}: Add {1} to your mana pool.${T}, Sacrifice Command Beacon: Put your commander into your hand from the command zone.| Command Beacon|Commander 2015|56|R||Land|||{T}: Add {1} to your mana pool.${T}, Sacrifice Command Beacon: Put your commander into your hand from the command zone.|
Angel of Serenity|Commander 2015|58|M|{4}{W}{W}{W}|Creature - Angel|5|6|Flying$When Angel of Serenity enters the battlefield, you may exile up to three other target creatures from the battlefield and/or creature cards from graveyards.$When Angel of Serenity leaves the battlefield, return the exiled cards to their owners' hands.|
Karmic Justic|Commander 2015|72|R|{2}{W}|Enchantment|||Whenever a spell or ability an opponent controls destroys a noncreature permanent you control, you may destroy target permanent that opponent controls.|
Black Market|Commander 2015|116|R|{3}{B}{B}|Enchantment|||Whenever a creature dies, put a charge counter on Black Market.$At the beginning of your precombat main phase, add {B} to your mana pool for each charge counter on Black Market.| Black Market|Commander 2015|116|R|{3}{B}{B}|Enchantment|||Whenever a creature dies, put a charge counter on Black Market.$At the beginning of your precombat main phase, add {B} to your mana pool for each charge counter on Black Market.|
Eternal Witness|Commander 2015|183|U|{1}{G}{G}|Creature - Human Shaman|2|1|When Eternal Witness enters the battlefield, you may return target card from your graveyard to your hand.| Eternal Witness|Commander 2015|183|U|{1}{G}{G}|Creature - Human Shaman|2|1|When Eternal Witness enters the battlefield, you may return target card from your graveyard to your hand.|
Spider Spawning|Commander 2015|202|U|{4}{G}|Sorcery|||Put a 1/2 green Spider creature token with reach onto the battlefield for each creature card in your graveyard.$Flashback {6}{B} <i>(You may cast this card from your graveyard for its flashback cost. Then exile it.)</i>| Spider Spawning|Commander 2015|202|U|{4}{G}|Sorcery|||Put a 1/2 green Spider creature token with reach onto the battlefield for each creature card in your graveyard.$Flashback {6}{B} <i>(You may cast this card from your graveyard for its flashback cost. Then exile it.)</i>|