Merge pull request #3454 from drmDev/add/welcomedeck2017

adding welcome deck 2017 (see #3453)
2024-12-24 11:50:45 +00:00 · 2017-06-03 10:31:49 +02:00 · 2017-06-03 10:31:49 +02:00 · b62a15f68e
commit b62a15f68e
parent 13ea2c33c6 1d662a0a58
12 changed files with 119 additions and 57755 deletions
--- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java
@ -38,7 +38,7 @@ public class GathererSets implements Iterable<DownloadJob> {
        "MED", "ME2", "ME3", "ME4",
        "POR", "PO2", "PTK",
        "ARC", "DD3EVG",
-        "W16"};
+        "W16", "W17"};

    private static final String[] withMythics = {"M10", "M11", "M12", "M13", "M14", "M15", "ORI",
        "ANB",
--- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java
@ -133,6 +133,7 @@ public enum MagicCardsImageSource implements CardImageSource {
            put("V16", "from-the-vault-lore");
            put("VMA", "vintage-masters");
            put("W16", "welcome-deck-2016");
+            put("W17", "welcome-deck-2017");
            put("WMCQ", "world-magic-cup-qualifier");
            put("WWK", "worldwake");
            put("ZEN", "zendikar");
--- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java
@ -42,7 +42,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.prefs.Preferences;
-
 import mage.client.MageFrame;
 import mage.client.dialog.PreferencesDialog;
 import mage.remote.Connection;
@ -247,6 +246,7 @@ public enum WizardCardsImageSource implements CardImageSource {
        setsAliases.put("VIS", "Visions");
        setsAliases.put("VMA", "Vintage Masters");
        setsAliases.put("W16", "Welcome Deck 2016");
+        setsAliases.put("W17", "Welcome Deck 2017");
        setsAliases.put("WMCQ", "World Magic Cup Qualifier");
        setsAliases.put("WTH", "Weatherlight");
        setsAliases.put("WWK", "Worldwake");
--- a/Mage.Sets/src/mage/sets/WelcomeDeck2016.java
+++ b/Mage.Sets/src/mage/sets/WelcomeDeck2016.java
@ -34,7 +34,7 @@ import mage.constants.SetType;

 /**
 *
- * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
+ * @author escplan9
 */
 public class WelcomeDeck2016 extends ExpansionSet {
    private static final WelcomeDeck2016 instance = new WelcomeDeck2016();
--- a/Mage.Sets/src/mage/sets/WelcomeDeck2017.java
+++ b/Mage.Sets/src/mage/sets/WelcomeDeck2017.java
@ -0,0 +1,82 @@
+/*
+* 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 escplan9
+ */
+public class WelcomeDeck2017 extends ExpansionSet {
+    private static final WelcomeDeck2017 instance = new WelcomeDeck2017();
+
+    public static WelcomeDeck2017 getInstance() {
+        return instance;
+    }
+
+    private WelcomeDeck2017() {
+        super("Welcome Deck 2017", "W17", ExpansionSet.buildDate(2017, 4, 15), SetType.SUPPLEMENTAL_STANDARD_LEGAL);
+        this.hasBasicLands = false;
+        this.hasBoosters = false;
+        
+        cards.add(new SetCardInfo("Divine Verdict", 1, Rarity.COMMON, mage.cards.d.DivineVerdict.class));
+        cards.add(new SetCardInfo("Glory Seeker", 2, Rarity.COMMON, mage.cards.g.GlorySeeker.class));
+        cards.add(new SetCardInfo("Serra Angel", 3, Rarity.UNCOMMON, mage.cards.s.SerraAngel.class));
+        cards.add(new SetCardInfo("Standing Troops", 4, Rarity.COMMON, mage.cards.s.StandingTroops.class));
+        cards.add(new SetCardInfo("Stormfront Pegasus", 5, Rarity.UNCOMMON, mage.cards.s.StormfrontPegasus.class));
+        cards.add(new SetCardInfo("Victory's Herald", 6, Rarity.RARE, mage.cards.v.VictorysHerald.class));
+        cards.add(new SetCardInfo("Air Elemental", 7, Rarity.UNCOMMON, mage.cards.a.AirElemental.class));
+        cards.add(new SetCardInfo("Coral Merfolk", 8, Rarity.COMMON, mage.cards.c.CoralMerfolk.class));
+        cards.add(new SetCardInfo("Drag Under", 9, Rarity.COMMON, mage.cards.d.DragUnder.class));
+        cards.add(new SetCardInfo("Inspiration", 10, Rarity.COMMON, mage.cards.i.Inspiration.class));
+        cards.add(new SetCardInfo("Sleep Paralysis", 11, Rarity.COMMON, mage.cards.s.SleepParalysis.class));
+        cards.add(new SetCardInfo("Sphinx of Magosi", 12, Rarity.RARE, mage.cards.s.SphinxOfMagosi.class));
+        cards.add(new SetCardInfo("Stealer of Secrets", 13, Rarity.COMMON, mage.cards.s.StealerOfSecrets.class));
+        cards.add(new SetCardInfo("Tricks of the Trade", 14, Rarity.COMMON, mage.cards.t.TricksOfTheTrade.class));
+        cards.add(new SetCardInfo("Bloodhunter Bat", 15, Rarity.COMMON, mage.cards.b.BloodhunterBat.class));
+        cards.add(new SetCardInfo("Certain Death", 16, Rarity.COMMON, mage.cards.c.CertainDeath.class));
+        cards.add(new SetCardInfo("Nightmare", 17, Rarity.RARE, mage.cards.n.Nightmare.class));
+        cards.add(new SetCardInfo("Raise Dead", 18, Rarity.COMMON, mage.cards.r.RaiseDead.class));
+        cards.add(new SetCardInfo("Sengir Vampire", 19, Rarity.UNCOMMON, mage.cards.s.SengirVampire.class));
+        cards.add(new SetCardInfo("Untamed Hunger", 20, Rarity.COMMON, mage.cards.u.UntamedHunger.class));
+        cards.add(new SetCardInfo("Falkenrath Reaver", 21, Rarity.COMMON, mage.cards.f.FalkenrathReaver.class));
+        cards.add(new SetCardInfo("Shivan Dragon", 22, Rarity.RARE, mage.cards.s.ShivanDragon.class));
+        cards.add(new SetCardInfo("Thundering Giant", 23, Rarity.COMMON, mage.cards.t.ThunderingGiant.class));
+        cards.add(new SetCardInfo("Garruk's Horde", 24, Rarity.RARE, mage.cards.g.GarruksHorde.class));
+        cards.add(new SetCardInfo("Oakenform", 25, Rarity.COMMON, mage.cards.o.Oakenform.class));
+        cards.add(new SetCardInfo("Rabid Bite", 26, Rarity.COMMON, mage.cards.r.RabidBite.class));
+        cards.add(new SetCardInfo("Rootwalla", 27, Rarity.COMMON, mage.cards.r.Rootwalla.class));
+        cards.add(new SetCardInfo("Stalking Tiger", 28, Rarity.COMMON, mage.cards.s.StalkingTiger.class));
+        cards.add(new SetCardInfo("Stampeding Rhino", 29, Rarity.COMMON, mage.cards.s.StampedingRhino.class));
+        cards.add(new SetCardInfo("Wing Snare", 30, Rarity.UNCOMMON, mage.cards.w.WingSnare.class));
+    }
+}
--- a/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java
+++ b/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java
@ -28,7 +28,7 @@ public enum ExpansionRepository {
    private static final String JDBC_URL = "jdbc:h2:file:./db/cards.h2;AUTO_SERVER=TRUE";
    private static final String VERSION_ENTITY_NAME = "expansion";
    private static final long EXPANSION_DB_VERSION = 5;
-    private static final long EXPANSION_CONTENT_VERSION = 12;
+    private static final long EXPANSION_CONTENT_VERSION = 13;

    private Dao<ExpansionInfo, Object> expansionDao;

--- a/Utils/known-sets.txt
+++ b/Utils/known-sets.txt
@ -181,6 +181,7 @@ Vintage Masters|VintageMasters|
 Visions|Visions|
 Weatherlight|Weatherlight|
 Welcome Deck 2016|WelcomeDeck2016|
+Welcome Deck 2017|WelcomeDeck2017|
 World Magic Cup Qualifier|WorldMagicCupQualifier|
 Worldwake|Worldwake|
 WPN Gateway|WPNGateway|
--- a/Utils/mtg-cards-data.txt
+++ b/Utils/mtg-cards-data.txt
@ -31123,3 +31123,33 @@ Desiccated Naga|Amonkhet|276|U|{2}{B}|Creature - Zombie Naga|3|2|{3}{B}: Target
 Liliana's Influence|Amonkhet|277|R|{4}{B}{B}|Sorcery|||Put a -1/-1 counter on each creature you don't control. You may search your library and/or graveyard for a card named Liliana, Death Wielder, reveal it, and put it into your hand. If you search your library this way, shuffle it.|
 Tattered Mummy|Amonkhet|278|C|{1}{B}|Creature - Zombie Jackal|1|2|When Tattered Mummy dies, each opponent loses 2 life.|
 Foul Orchard|Amonkhet|279|C||Land|||Foul Orchard enters the battlefield tapped.${T}: Add {B} or {G} to your mana pool.|
+Divine Verdict|Welcome Deck 2017|1|C|{3}{W}|Instant|||Destroy target attacking or blocking creature.|
+Glory Seeker|Welcome Deck 2017|2|C|{1}{W}|Creature - Human Soldier|2|2||
+Serra Angel|Welcome Deck 2017|3|R|{3}{W}{W}|Creature - Angel|4|4|Flying$Vigilance <i>(Attacking doesn't cause this creature to tap.)</i>|
+Standing Troops|Welcome Deck 2017|4|C|{2}{W}|Creature - Human Soldier|1|4|Vigilance|
+Stormfront Pegasus|Welcome Deck 2017|5|U|{1}{W}|Creature - Pegasus|2|1|Flying|
+Victory's Herald|Welcome Deck 2017|6|R|{3}{W}{W}{W}|Creature - Angel|4|4|Flying$Whenever Victory's Herald attacks, attacking creatures gain flying and lifelink until end of turn.|
+Air Elemental|Welcome Deck 2017|7|U|{3}{U}{U}|Creature - Elemental|4|4|Flying|
+Coral Merfolk|Welcome Deck 2017|8|C|{1}{U}|Creature - Merfolk|2|1||
+Drag Under|Welcome Deck 2017|9|C|{2}{U}|Sorcery|||Return target creature to its owner's hand.$Draw a card.|
+Inspiration|Welcome Deck 2017|10|C|{3}{U}|Instant|||Target player draws two cards.|
+Sleep Paralysis|Welcome Deck 2017|11|C|{3}{U}|Enchantment - Aura|||Enchant creature$When Sleep Paralysis enters the battlefield, tap enchanted creature.$Enchanted creature doesn't untap during its controller's untap step.|
+Sphinx of Magosi|Welcome Deck 2017|12|R|{3}{U}{U}{U}|Creature - Sphinx|6|6|Flying${2}{U}: Draw a card, then put a +1/+1 counter on Sphinx of Magosi.|
+Stealer of Secrets|Welcome Deck 2017|13|C|{2}{U}|Creature - Human Rogue|2|2|Whenever Stealer of Secrets deals combat damage to a player, draw a card.|
+Tricks of the Trade|Welcome Deck 2017|14|C|{3}{U}|Enchantment - Aura|||Enchant creature$Enchanted creature gets +2/+0 and is unblockable.|
+Bloodhunter Bat|Welcome Deck 2017|15|C|{3}{B}|Creature - Bat|2|2|Flying$When Bloodhunter Bat enters the battlefield, target player loses 2 life and you gain 2 life.|
+Certain Death|Welcome Deck 2017|16|C|{5}{B}|Sorcery|||Destroy target creature. Its controller loses 2 life and you gain 2 life.|
+Nightmare|Welcome Deck 2017|17|R|{5}{B}|Creature - Nightmare Horse|*|*|Flying$Nightmare's power and toughness are each equal to the number of Swamps you control.|
+Raise Dead|Welcome Deck 2017|18|C|{B}|Sorcery|||Return target creature card from your graveyard to your hand.|
+Sengir Vampire|Welcome Deck 2017|19|U|{3}{B}{B}|Creature - Vampire|4|4|Flying$Whenever a creature dealt damage by Sengir Vampire this turn dies, put a +1/+1 counter on Sengir Vampire.|
+Untamed Hunger|Welcome Deck 2017|20|C|{2}{B}|Enchantment - Aura|||Enchant creature$Enchanted creature gets +2/+1 and has menace. <i>(It can't be blocked except by two or more creatures.(</i>|
+Falkenrath Reaver|Welcome Deck 2017|21|C|{1}{R}|Creature - Vampire|2|2||
+Shivan Dragon|Welcome Deck 2017|22|R|{4}{R}{R}|Creature - Dragon|5|5|Flying${R}: Shivan Dragon gets +1/+0 until end of turn.|
+Thundering Giant|Welcome Deck 2017|23|U|{3}{R}{R}|Creature - Giant|4|3|Haste <i>(This creature can attack and {tap} as soon as it comes under your control.)</i>|
+Garruk's Horde|Welcome Deck 2017|24|R|{5}{G}{G}|Creature - Beast|7|7|Trample$Play with the top card of your library revealed.$You may cast the top card of your library if it's a creature card. <i>(Do this only any time you could cast that creature card. You still pay the spell's costs.)</i>|
+Oakenform|Welcome Deck 2017|25|C|{2}{G}|Enchantment - Aura|||Enchant creature$Enchanted creature gets +3/+3.|
+Rabid Bite|Welcome Deck 2017|26|C|{1}{G}|Sorcery|||Target creature you control deals damage equal to its power to target creature you don't control.|
+Rootwalla|Welcome Deck 2017|27|C|{2}{G}|Creature - Lizard|2|2|{1}{G}: Rootwalla gets +2/+2 until end of turn. Activate this ability only once each turn.|
+Stalking Tiger|Welcome Deck 2017|28|C|{3}{G}|Creature - Cat|3|3|Stalking Tiger can't be blocked by more than one creature.|
+Stampeding Rhino|Welcome Deck 2017|29|C|{4}{G}|Creature - Rhino|4|4|Trample <i>(If this creature would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker.)</i>|
+Wing Snare|Welcome Deck 2017|30|U|{2}{G}|Sorcery|||Destroy target creature with flying.|
--- a/Utils/mtg-cards-data_old.txt
+++ b/Utils/mtg-cards-data_old.txt
--- a/Utils/mtg-sets-data.txt
+++ b/Utils/mtg-sets-data.txt
@ -189,6 +189,7 @@ MTGO Vanguard|VGO|
 Visions|VIS|
 Vintage Masters|VMA|
 Welcome Deck 2016|W16|
+Welcome Deck 2017|W17|
 World Magic Cup Qualifier|WMCQ|
 Weatherlight|WTH|
 Worldwake|WWK|
--- a/Utils/newList.txt
+++ b/Utils/newList.txt
--- a/Utils/oldList.txt
+++ b/Utils/oldList.txt