Merge origin/master

This commit is contained in:
LevelX2 2018-05-30 16:52:40 +02:00
commit b46259119f
5 changed files with 108 additions and 60 deletions

View file

@ -1,54 +0,0 @@
/*
* 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;
import mage.cards.ExpansionSet;
import mage.constants.SetType;
/**
*
* @author fireshoes
*/
public final class Core2019 extends ExpansionSet {
private static final Core2019 instance = new Core2019();
public static Core2019 getInstance() {
return instance;
}
private Core2019() {
super("Core 2019", "M19", ExpansionSet.buildDate(2018, 7, 20), SetType.CORE);
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 8;
}
}

View file

@ -0,0 +1,70 @@
/*
* 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;
import mage.cards.ExpansionSet;
import mage.constants.Rarity;
import mage.constants.SetType;
/**
*
* @author TheElk801
*/
public final class CoreSet2019 extends ExpansionSet {
private static final CoreSet2019 instance = new CoreSet2019();
public static CoreSet2019 getInstance() {
return instance;
}
private CoreSet2019() {
super("Core Set 2019", "M19", ExpansionSet.buildDate(2018, 7, 13), SetType.CORE);
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 8;
this.maxCardNumberInBooster = 280;
cards.add(new SetCardInfo("Act of Treason", 127, Rarity.COMMON, mage.cards.a.ActOfTreason.class));
cards.add(new SetCardInfo("Anticipate", 44, Rarity.COMMON, mage.cards.a.Anticipate.class));
cards.add(new SetCardInfo("Cancel", 48, Rarity.COMMON, mage.cards.c.Cancel.class));
cards.add(new SetCardInfo("Disperse", 50, Rarity.COMMON, mage.cards.d.Disperse.class));
cards.add(new SetCardInfo("Fire Elemental", 141, Rarity.COMMON, mage.cards.f.FireElemental.class));
cards.add(new SetCardInfo("Inspired Charge", 15, Rarity.COMMON, mage.cards.i.InspiredCharge.class));
cards.add(new SetCardInfo("Lava Axe", 150, Rarity.COMMON, mage.cards.l.LavaAxe.class));
cards.add(new SetCardInfo("Mighty Leap", 28, Rarity.COMMON, mage.cards.m.MightyLeap.class));
cards.add(new SetCardInfo("Omenspeaker", 64, Rarity.COMMON, mage.cards.o.Omenspeaker.class));
cards.add(new SetCardInfo("Oreskos Swiftclaw", 31, Rarity.COMMON, mage.cards.o.OreskosSwiftclaw.class));
cards.add(new SetCardInfo("Sure Strike", 161, Rarity.COMMON, mage.cards.s.SureStrike.class));
cards.add(new SetCardInfo("Tolarian Scholar", 80, Rarity.COMMON, mage.cards.t.TolarianScholar.class));
cards.add(new SetCardInfo("Tormenting Voice", 164, Rarity.COMMON, mage.cards.t.TormentingVoice.class));
cards.add(new SetCardInfo("Trumpet Blast", 165, Rarity.COMMON, mage.cards.t.TrumpetBlast.class));
}
}

View file

@ -29,7 +29,7 @@ Commander Anthology|CommanderAnthology|
Commander's Arsenal|CommandersArsenal|
Conflux|Conflux|
Conspiracy: Take the Crown|ConspiracyTakeTheCrown|
Core 2019|Core2019|
Core Set 2019|CoreSet2019|
Dark Ascension|DarkAscension|
Darksteel|Darksteel|
Dissension|Dissension|

View file

@ -33381,7 +33381,7 @@ Proud Mentor|Battlebond|20|U|{2}{W}|Creature - Human Warrior|1|1|Partner with Im
Ley Weaver|Battlebond|21|U|{3}{G}|Creature - Human Druid|2|2|Partner with Lore Weaver (When this creature enters the battlefield, target player may put Lore Weaver into their hand from their library, then shuffle.)${T}: Untap two target lands.|
Lore Weaver|Battlebond|22|U|{3}{U}|Creature - Human Wizard|2|2|Partner with Ley Weaver (When this creature enters the battlefield, target player may put Ley Weaver into their hand from their library, then shuffle.)${5}{U}{U}: Target player draws two cards.|
Arena Rector|Battlebond|23|M|{3}{W}|Creature - Human Cleric|1|2|When Arena Rector dies, you may exile it. If you do, search your library for a planeswalker card, put it onto the battlefield, then shuffle your library.|
Aurora Champion|Battlebond|24|C|{2}{W}|Creature - Elf Warrior|3|2|Whenever Aurora Champion attacks, if you team controls another Warrior, tap target creature.|
Aurora Champion|Battlebond|24|C|{2}{W}|Creature - Elf Warrior|3|2|Whenever Aurora Champion attacks, if your team controls another Warrior, tap target creature.|
Brightling|Battlebond|25|M|{1}{W}{W}|Creature - Shapeshifter|3|3|{W}: Brightling gains vigilance until end of turn.${W}: Brightling gains lifelink until end of turn.${W}: Return Brightling to its owner's hand.${1}: Brightling gets +1/-1 or -1/+1 until end of turn.|
Bring Down|Battlebond|26|U|{3}{W}|Sorcery|||Assist$Destroy target creature with power 4 or greater.|
Dwarven Lightsmith|Battlebond|27|C|{5}{W}|Creature - Dwarf Cleric|3|4|Assist$When Dwarven Lightsmith enters the battlefield, creatures your team controls get +1/+1 until end of turn.|
@ -33394,7 +33394,7 @@ Arcane Artisan|Battlebond|33|M|{2}{U}|Creature - Human Wizard|0|3|{2}{U}, {T}: T
Fumble|Battlebond|34|U|{1}{U}|Instant|||Return target creature to its owner's hand. Gain control of all Auras and Equipment that were attached to it, then attach them to another creature.|
Game Plan|Battlebond|35|R|{5}{U}|Sorcery|||Assist$Each player shuffles their hand and graveyard into their library, then draws seven cards. Exile Game Plan.|
Huddle Up|Battlebond|36|C|{2}{U}|Sorcery|||Assist$Two target players each draw a card.|
Nimbus Champion|Battlebond|37|U|{5}{U}|Creature - Avatar Warrior|4|4|Flying$Whenever Nimbus Champion attacks, you may return target creature to its owner's hand if that creature's power is less than or equal to the number of Warriors you control.|
Nimbus Champion|Battlebond|37|U|{5}{U}|Creature - Avatar Warrior|4|4|Flying$Whenever Nimbus Champion attacks, you may return target creature to its owner's hand if that creature's power is less than or equal to the number of Warriors your team controls.|
Out of Bounds|Battlebond|38|U|{3}{U}|Instant|||Assist$Counter target spell.|
Saltwater Stalwart|Battlebond|39|C|{3}{U}|Creature - Merfolk Warrior|2|4|Whenever Saltwater Stalwart deals damage to an opponent, target player draws a card.|
Soaring Show-Off|Battlebond|40|C|{2}{U}|Creature - Bird Warrior|2|2|Flying$When Soaring Show-Off enters the battlefield, each player draws a card.|
@ -33543,7 +33543,7 @@ Pathmaker Initiate|Battlebond|182|C|{1}{R}|Creature - Human Wizard|2|1|{T}: Targ
Reckless Reveler|Battlebond|183|C|{1}{R}|Creature - Satyr|2|1|{R}, Sacrifice Reckless Reveler: Destroy target artifact.|
Shock|Battlebond|184|C|{R}|Instant|||Shock deals 2 damage to any target.|
Thunder Strike|Battlebond|185|C|{1}{R}|Instant|||Target creature gets +2/+0 and gains first strike until end of turn. (It deals combat damage before creatures without first strike.)|
Trumpet Blast|Battlebond|186|C|{2}{R}|Instant|||Attacking creatures get +2/+0 until end of turn.|
Trumpet Blast|Battlebond|186|U|{2}{R}|Instant|||Attacking creatures get +2/+0 until end of turn.|
War's Toll|Battlebond|187|R|{3}{R}|Enchantment|||Whenever an opponent taps a land for mana, tap all lands that player controls.$If a creature an opponent controls attacks, all creatures that opponent controls attack if able.|
Wrap in Flames|Battlebond|188|C|{3}{R}|Sorcery|||Wrap in Flames deals 1 damage to each of up to three target creatures. Those creatures can't block this turn.|
Aim High|Battlebond|189|U|{1}{G}|Instant|||Untap target creature. It gets +2/+2 and gains reach until end of turn. (It can block creatures with flying.)|
@ -33556,7 +33556,7 @@ Doubling Season|Battlebond|195|M|{4}{G}|Enchantment|||If an effect would create
Elvish Visionary|Battlebond|196|C|{1}{G}|Creature - Elf Shaman|1|1|When Elvish Visionary enters the battlefield, draw a card.|
Feral Hydra|Battlebond|197|U|{X}{G}|Creature - Hydra Beast|0|0|Feral Hydra enters the battlefield with X +1/+1 counters on it.${3}: Put a +1/+1 counter on Feral Hydra. Any player may activate this ability.|
Fertile Ground|Battlebond|198|C|{1}{G}|Enchantment - Aura|||Enchant land$Whenever enchanted land is tapped for mana, its controller adds an additional one mana of any color.|
Fertilid|Battlebond|199|C|{2}{G}|Creature - Elemental|0|0|Fertilid enters the battlefield with two +1/+1 counters on it.${1}{G}, Remove a +1/+1 counter from Fertilid: Target player searches their library for a basic land card and puts it onto the battlefield tapped. Then that player shuffles their library.|
Fertilid|Battlebond|199|U|{2}{G}|Creature - Elemental|0|0|Fertilid enters the battlefield with two +1/+1 counters on it.{1}{G}, Remove a +1/+1 counter from Fertilid: Target player searches their library for a basic land card and puts it onto the battlefield tapped. Then that player shuffles their library.|
Giant Growth|Battlebond|200|C|{G}|Instant|||Target creature gets +3/+3 until end of turn.|
Greater Good|Battlebond|201|R|{2}{G}{G}|Enchantment|||Sacrifice a creature: Draw cards equal to the sacrificed creature's power, then discard three cards.|
Hunted Wumpus|Battlebond|202|U|{3}{G}|Creature - Beast|6|6|When Hunted Wumpus enters the battlefield, each other player may put a creature card from their hand onto the battlefield.|
@ -33612,3 +33612,35 @@ Island|Battlebond|251|C||Basic Land - Island|||({T}: Add {U}.)|
Swamp|Battlebond|252|C||Basic Land - Swamp|||({T}: Add {B}.)|
Mountain|Battlebond|253|C||Basic Land - Mountain|||({T}: Add {R}.)|
Forest|Battlebond|254|C||Basic Land - Forest|||({T}: Add {G}.)|
Daybreak Chaplain|Core Set 2019|10|C|{1}{W}|Creature - Human Cleric|1|3|Lifelink (Damage dealt by this creature also causes you to gain that much life.)|
Dwarven Priest|Core Set 2019|11|C|{3}{W}|Creature - Dwarf Cleric|2|4|When Dwarven Priest enters the battlefield, you gain 1 life for each creature you control.|
Inspired Charge|Core Set 2019|15|C|{2}{W}{W}|Instant|||Creatures you control get +2/+1 until end of turn.|
Knight of the Tusk|Core Set 2019|18|C|{4}{W}{W}|Creature - Human Knight|3|7|Vigilance (Attacking doesn't cause this creature to tap.)|
Knight's Pledge|Core Set 2019|19|C|{1}{W}|Enchantment - Aura|||Enchant creature$Enchanted creature gets +2/+2.|
Loxodon Line Breaker|Core Set 2019|24|C|{2}{W}|Creature - Elephant Soldier|3|2||
Mighty Leap|Core Set 2019|28|C|{1}{W}|Instant|||Target creature gets +2/+2 and gains flying until end of turn.|
Oreskos Swiftclaw|Core Set 2019|31|C|{1}{W}|Creature - Cat Warrior|3|1||
Revitalize|Core Set 2019|35|C|{1}{W}|Instant|||You gain 3 life.$Draw a card.|
Rustwing Falcon|Core Set 2019|36|C|{W}|Creature - Bird|1|2|Flying|
Trusty Packbeast|Core Set 2019|41|C|{2}{W}|Creature - Beast|2|3|When Trusty Packbeast enters the battlefield, return target artifact card from your graveyard to your hand.|
Anticipate|Core Set 2019|44|C|{1}{U}|Instant|||Look at the top three cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order.|
Cancel|Core Set 2019|48|C|{1}{U}{U}|Instant|||Counter target spell.|
Disperse|Core Set 2019|50|C|{1}{U}|Instant|||Return target nonland permanent to its owner's hand.|
Dwindle|Core Set 2019|53|C|{2}{U}|Enchantment - Aura|||Enchant creature$Enchanted creature gets -6/-0.$When enchanted creature blocks, destroy it. (The attacking creature remains blocked.)|
Frilled Sea Serpent|Core Set 2019|56|C|{4}{U}{U}|Creature - Serpent|4|6|{5}{U}{U}: Frilled Sea Serpent can't be blocked this turn.|
Gearsmith Prodigy|Core Set 2019|57|C|{U}|Creature - Human Artificer|1|2|Gearsmith Prodigy gets +1/+0 as long as you control an artifact.|
Omenspeaker|Core Set 2019|64|C|{1}{U}|Creature - Human Wizard|1|3|When Omenspeaker enters the battlefield, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)|
Scholar of Stars|Core Set 2019|71|C|{3}{U}|Creature - Human Artificer|3|2|When Scholar of Stars enters the battlefield, if you control an artifact, draw a card.|
Tolarian Scholar|Core Set 2019|80|C|{2}{U}|Creature - Human Wizard|2|3||
Uncomfortable Chill|Core Set 2019|82|C|{2}{U}|Instant|||Creatures your opponents control get -2/-0 until end of turn.$Draw a card.|
Act of Treason|Core Set 2019|127|C|{2}{R}|Sorcery|||Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn. (It can attack and {T} this turn.)|
Catalyst Elemental|Core Set 2019|132|C|{2}{R}|Creature - Elemental|2|2|Sacrifice Catalyst Elemental: Add {R}{R}.|
Fire Elemental|Core Set 2019|141|C|{3}{R}{R}|Creature - Elemental|5|4||
Goblin Instigator|Core Set 2019|142|C|{1}{R}|Creature - Goblin Rogue|1|1|When Goblin Instigator enters the battlefield, create a 1/1 red Goblin creature token.|
Goblin Motivator|Core Set 2019|143|C|{R}|Creature - Goblin Warrior|1|1|{T}: Target creature gains haste until end of turn. (It can attack and {T} this turn.)|
Hostile Minotaur|Core Set 2019|147|C|{3}{R}|Creature - Minotaur|3|3|Haste (This creature can attack and {T} as soon as it comes under your control.)|
Lava Axe|Core Set 2019|150|C|{4}{R}|Sorcery|||Lava Axe deals 5 damage to target player or planeswalker.|
Onakke Ogre|Core Set 2019|153|C|{2}{R}|Creature - Ogre Warrior|4|2||
Sure Strike|Core Set 2019|161|C|{1}{R}|Instant|||Target creature gets +3/+0 and gains first strike until end of turn.|
Tormenting Voice|Core Set 2019|164|C|{1}{R}|Sorcery|||As an additional cost to cast this spell, discard a card.$Draw two cards.|
Trumpet Blast|Core Set 2019|165|C|{2}{R}|Instant|||Attacking creatures get +2/+0 until end of turn.|

View file

@ -118,7 +118,7 @@ Magic 2012|M12|
Magic 2013|M13|
Magic 2014|M14|
Magic 2015|M15|
Core 2019|M19|
Core Set 2019|M19|
Masters 25|A25|
Magic: The Gathering-Commander|CMD|
Magic: The Gathering-Conspiracy|CNS|