From 7219d51572ff0e18b4160425aa3c907f84af55c8 Mon Sep 17 00:00:00 2001 From: Thomas Hess Date: Wed, 18 Mar 2020 21:38:16 +0100 Subject: [PATCH] Removed 6th Edition cards from Starter 2000 set. These are indistinguishable from regular 6ED cards and not listed on Scryfall. --- ...lins Deck Wins TDtB ST Apr 2011.mwDeck.dck | 92 +++++++++---------- Mage.Sets/src/mage/sets/Starter2000.java | 42 +-------- .../serverside/deck/DeckValidatorTest.java | 5 - 3 files changed, 48 insertions(+), 91 deletions(-) diff --git a/Mage.Client/release/sample-decks/Decks to Beat/Goblins Deck Wins TDtB ST Apr 2011.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/Goblins Deck Wins TDtB ST Apr 2011.mwDeck.dck index 729cfcb3cb..4920e10c15 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/Goblins Deck Wins TDtB ST Apr 2011.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/Goblins Deck Wins TDtB ST Apr 2011.mwDeck.dck @@ -1,46 +1,46 @@ -1 [POR:214] Mountain -4 [MBS:64] Goblin Wardriver -1 [WWK:145] Tectonic Edge -3 [M10:139] Goblin Chieftain -1 [M12:138] Goblin Chieftain -1 [SHM:296] Mountain -1 [ARC:147] Mountain -1 [RTR:267] Mountain -1 [C13:352] Mountain -4 [ZEN:125] Goblin Bushwhacker -1 [DDE:69] Mountain -2 [ZEN:126] Goblin Guide -3 [P10:8] Burst Lightning -1 [ZEN:226] Teetering Peaks -1 [SOM:81] Arc Trail -1 [S00:102] Mountain -2 [MM2:127] Spikeshot Elder -1 [LEA:283] Mountain -1 [MMQ:345] Mountain -1 [RAV:300] Mountain -2 [PGPX:6] Goblin Guide -4 [M11:135] Ember Hauler -2 [JGP:1] Lightning Bolt -1 [M10:146] Lightning Bolt -1 [M10:243] Mountain -1 [M12:242] Mountain -2 [ROE:166] Staggershock -1 [C14:313] Tectonic Edge -1 [MIR:301] Mountain -1 [DDL:77] Mountain -2 [GRC:48] Staggershock -1 [ZEN:119] Burst Lightning -1 [DD3B:60] Mountain -3 [F11:9] Teetering Peaks -2 [SOM:104] Spikeshot Elder -1 [HOP:163] Mountain -1 [LEB:163] Lightning Bolt -1 [SOM:243] Mountain -SB: 2 [M12:151] Manic Vandal -SB: 2 [M13:141] Mark of Mutiny -SB: 1 [DDN:23] Arc Trail -SB: 1 [SOM:196] Ratchet Bomb -SB: 2 [PC2:39] Arc Trail -SB: 2 [PC2:47] Mark of Mutiny -SB: 3 [M14:215] Ratchet Bomb -SB: 2 [M11:151] Manic Vandal +1 [POR:214] Mountain +4 [MBS:64] Goblin Wardriver +1 [WWK:145] Tectonic Edge +3 [M10:139] Goblin Chieftain +1 [M12:138] Goblin Chieftain +1 [SHM:296] Mountain +1 [ARC:147] Mountain +1 [RTR:267] Mountain +1 [C13:352] Mountain +4 [ZEN:125] Goblin Bushwhacker +1 [DDE:69] Mountain +2 [ZEN:126] Goblin Guide +3 [P10:8] Burst Lightning +1 [ZEN:226] Teetering Peaks +1 [SOM:81] Arc Trail +1 [4ED:343] Mountain +2 [MM2:127] Spikeshot Elder +1 [LEA:283] Mountain +1 [MMQ:345] Mountain +1 [RAV:300] Mountain +2 [PGPX:6] Goblin Guide +4 [M11:135] Ember Hauler +2 [JGP:1] Lightning Bolt +1 [M10:146] Lightning Bolt +1 [M10:243] Mountain +1 [M12:242] Mountain +2 [ROE:166] Staggershock +1 [C14:313] Tectonic Edge +1 [MIR:301] Mountain +1 [DDL:77] Mountain +2 [GRC:48] Staggershock +1 [ZEN:119] Burst Lightning +1 [DD3B:60] Mountain +3 [F11:9] Teetering Peaks +2 [SOM:104] Spikeshot Elder +1 [HOP:163] Mountain +1 [LEB:163] Lightning Bolt +1 [SOM:243] Mountain +SB: 2 [M12:151] Manic Vandal +SB: 2 [M13:141] Mark of Mutiny +SB: 1 [DDN:23] Arc Trail +SB: 1 [SOM:196] Ratchet Bomb +SB: 2 [PC2:39] Arc Trail +SB: 2 [PC2:47] Mark of Mutiny +SB: 3 [M14:215] Ratchet Bomb +SB: 2 [M11:151] Manic Vandal diff --git a/Mage.Sets/src/mage/sets/Starter2000.java b/Mage.Sets/src/mage/sets/Starter2000.java index b412a1fdd8..089428d8b9 100644 --- a/Mage.Sets/src/mage/sets/Starter2000.java +++ b/Mage.Sets/src/mage/sets/Starter2000.java @@ -6,7 +6,6 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * Somehow, Scryfall only lists 20 cards in this set. * https://scryfall.com/sets/s00 * @author LevelX2 */ @@ -21,66 +20,29 @@ public final class Starter2000 extends ExpansionSet { private Starter2000() { super("Starter 2000", "S00", ExpansionSet.buildDate(2000, 7, 1), SetType.SUPPLEMENTAL); this.blockName = "Beginner"; - this.hasBasicLands = true; + this.hasBasicLands = false; this.hasBoosters = false; cards.add(new SetCardInfo("Angelic Blessing", 1, Rarity.COMMON, mage.cards.a.AngelicBlessing.class)); - cards.add(new SetCardInfo("Armored Pegasus", 2, Rarity.COMMON, mage.cards.a.ArmoredPegasus.class)); - cards.add(new SetCardInfo("Bog Imp", 22, Rarity.COMMON, mage.cards.b.BogImp.class)); cards.add(new SetCardInfo("Breath of Life", 3, Rarity.UNCOMMON, mage.cards.b.BreathOfLife.class)); - cards.add(new SetCardInfo("Coercion", 23, Rarity.COMMON, mage.cards.c.Coercion.class)); - cards.add(new SetCardInfo("Counterspell", 12, Rarity.COMMON, mage.cards.c.Counterspell.class)); - cards.add(new SetCardInfo("Disenchant", 4, Rarity.COMMON, mage.cards.d.Disenchant.class)); - cards.add(new SetCardInfo("Drudge Skeletons", 24, Rarity.COMMON, mage.cards.d.DrudgeSkeletons.class)); cards.add(new SetCardInfo("Durkwood Boars", 38, Rarity.COMMON, mage.cards.d.DurkwoodBoars.class)); cards.add(new SetCardInfo("Eager Cadet", 5, Rarity.COMMON, mage.cards.e.EagerCadet.class)); - cards.add(new SetCardInfo("Flame Spirit", 29, Rarity.COMMON, mage.cards.f.FlameSpirit.class)); - cards.add(new SetCardInfo("Flight", 13, Rarity.COMMON, mage.cards.f.Flight.class)); - cards.add(new SetCardInfo("Forest", 49, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Forest", 50, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Giant Growth", 39, Rarity.COMMON, mage.cards.g.GiantGrowth.class)); cards.add(new SetCardInfo("Giant Octopus", 14, Rarity.COMMON, mage.cards.g.GiantOctopus.class)); - cards.add(new SetCardInfo("Goblin Hero", 30, Rarity.COMMON, mage.cards.g.GoblinHero.class)); cards.add(new SetCardInfo("Hand of Death", 25, Rarity.COMMON, mage.cards.h.HandOfDeath.class)); - cards.add(new SetCardInfo("Hero's Resolve", 6, Rarity.COMMON, mage.cards.h.HerosResolve.class)); - cards.add(new SetCardInfo("Inspiration", 15, Rarity.COMMON, mage.cards.i.Inspiration.class)); - cards.add(new SetCardInfo("Island", 51, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Island", 52, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Knight Errant", 7, Rarity.COMMON, mage.cards.k.KnightErrant.class)); cards.add(new SetCardInfo("Lava Axe", 31, Rarity.COMMON, mage.cards.l.LavaAxe.class)); - cards.add(new SetCardInfo("Llanowar Elves", 40, Rarity.COMMON, mage.cards.l.LlanowarElves.class)); - cards.add(new SetCardInfo("Merfolk of the Pearl Trident", 16, Rarity.COMMON, mage.cards.m.MerfolkOfThePearlTrident.class)); cards.add(new SetCardInfo("Mons's Goblin Raiders", 32, Rarity.COMMON, mage.cards.m.MonssGoblinRaiders.class)); cards.add(new SetCardInfo("Monstrous Growth", 41, Rarity.COMMON, mage.cards.m.MonstrousGrowth.class)); cards.add(new SetCardInfo("Moon Sprite", 42, Rarity.UNCOMMON, mage.cards.m.MoonSprite.class)); - cards.add(new SetCardInfo("Mountain", 53, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Mountain", 54, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Obsianus Golem", 46, Rarity.UNCOMMON, mage.cards.o.ObsianusGolem.class)); cards.add(new SetCardInfo("Ogre Warrior", 33, Rarity.COMMON, mage.cards.o.OgreWarrior.class)); - cards.add(new SetCardInfo("Orcish Oriflamme", 34, Rarity.UNCOMMON, mage.cards.o.OrcishOriflamme.class)); - cards.add(new SetCardInfo("Plains", 55, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Plains", 56, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Prodigal Sorcerer", 17, Rarity.COMMON, mage.cards.p.ProdigalSorcerer.class)); - cards.add(new SetCardInfo("Python", 26, Rarity.COMMON, mage.cards.p.Python.class)); cards.add(new SetCardInfo("Rhox", 43, Rarity.RARE, mage.cards.r.Rhox.class)); - cards.add(new SetCardInfo("Rod of Ruin", 47, Rarity.UNCOMMON, mage.cards.r.RodOfRuin.class)); cards.add(new SetCardInfo("Royal Falcon", 8, Rarity.COMMON, mage.cards.r.RoyalFalcon.class)); - cards.add(new SetCardInfo("Samite Healer", 9, Rarity.COMMON, mage.cards.s.SamiteHealer.class)); - cards.add(new SetCardInfo("Scathe Zombies", 27, Rarity.COMMON, mage.cards.s.ScatheZombies.class)); cards.add(new SetCardInfo("Sea Eagle", 18, Rarity.COMMON, mage.cards.s.SeaEagle.class)); - cards.add(new SetCardInfo("Shock", 35, Rarity.COMMON, mage.cards.s.Shock.class)); - cards.add(new SetCardInfo("Soul Net", 48, Rarity.UNCOMMON, mage.cards.s.SoulNet.class)); - cards.add(new SetCardInfo("Spined Wurm", 44, Rarity.COMMON, mage.cards.s.SpinedWurm.class)); - cards.add(new SetCardInfo("Stone Rain", 36, Rarity.COMMON, mage.cards.s.StoneRain.class)); - cards.add(new SetCardInfo("Swamp", 57, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Swamp", 58, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Terror", 28, Rarity.COMMON, mage.cards.t.Terror.class)); cards.add(new SetCardInfo("Time Ebb", 19, Rarity.COMMON, mage.cards.t.TimeEbb.class)); cards.add(new SetCardInfo("Trained Orgg", 37, Rarity.RARE, mage.cards.t.TrainedOrgg.class)); - cards.add(new SetCardInfo("Venerable Monk", 10, Rarity.COMMON, mage.cards.v.VenerableMonk.class)); cards.add(new SetCardInfo("Vizzerdrix", 20, Rarity.RARE, mage.cards.v.Vizzerdrix.class)); cards.add(new SetCardInfo("Wild Griffin", 11, Rarity.COMMON, mage.cards.w.WildGriffin.class)); cards.add(new SetCardInfo("Willow Elf", 45, Rarity.COMMON, mage.cards.w.WillowElf.class)); - cards.add(new SetCardInfo("Wind Drake", 21, Rarity.COMMON, mage.cards.w.WindDrake.class)); + } } diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/deck/DeckValidatorTest.java b/Mage.Tests/src/test/java/org/mage/test/serverside/deck/DeckValidatorTest.java index c0cd480fb9..317176a718 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/deck/DeckValidatorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/deck/DeckValidatorTest.java @@ -214,11 +214,6 @@ public class DeckValidatorTest extends MageTestBase { deckList.add(new CardNameAmount("Mountain", 56)); Assert.assertFalse("Counterspell not allowed in modern", testDeckValid(new Modern(), deckList)); - deckList.clear(); - deckList.add(new CardNameAmount("S00", 12, 4)); - deckList.add(new CardNameAmount("Mountain", 56)); - Assert.assertFalse("Counterspell not allowed in modern", testDeckValid(new Modern(), deckList)); - } @Test