diff --git a/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java b/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java index 4f1cd95a9b3..4a85875f150 100644 --- a/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java +++ b/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java @@ -40,7 +40,8 @@ public class ConstructedFormats { "* Tempest Block", "Exodus", "Stronghold", "Tempest", "* Mirage Block", "Weatherlight", "Visions", "Mirage", "* Ice Age Block", "Coldsnap", "Alliances", "Ice Age", - "Homelands", "Fallen Empires", "The Dark", "Legends", "Antiquities", "Arabian Nights", + "Homelands", "Fallen Empires", "The Dark", "Legends", "Antiquities", "Arabian Nights", + "Magic 2015", "Magic 2014", "Magic 2013", "Magic 2012", @@ -391,6 +392,9 @@ public class ConstructedFormats { if (format.equals("Magic 2014")) { return Arrays.asList("M14"); } + if (format.equals("Magic 2015")) { + return Arrays.asList("M15"); + } if (format.equals("Planechase")) { return Arrays.asList("HOP"); } diff --git 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 index 0abc860a49a..06749e9b744 100644 --- 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 @@ -33,7 +33,7 @@ public class GathererSets implements Iterable { "SHM", "EVE", "POR", "PO2", "PTK"}; - private static final String[] withMythics = {"M10", "M11", "M12", "M13", "M14", + private static final String[] withMythics = {"M10", "M11", "M12", "M13", "M14", "M15", "DDF", "DDL", "ALA", "CON", "ARB", "ZEN", "WWK", "ROE", diff --git 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 index 9a9f91a6c6b..65a29c4ece2 100644 --- 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 @@ -51,6 +51,7 @@ public class MagicCardsImageSource implements CardImageSource { put("POR", "portal"); put("PO2", "portal-second-age"); put("PTK", "portal-three-kingdoms"); + put("M15", "magic-2015"); put("M14", "magic-2014"); put("M13", "magic-2013"); put("M12", "magic-2012"); diff --git 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 index 2e06f470897..a8f360e0105 100644 --- 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 @@ -29,6 +29,7 @@ public class WizardCardsImageSource implements CardImageSource { public WizardCardsImageSource() { sets = new HashMap<>(); setsAliases = new HashMap<>(); + setsAliases.put("M15", "magic2015coreset/cig"); setsAliases.put("CNS", "vintagemasters/cig"); setsAliases.put("CNS", "conspiracy/cig"); setsAliases.put("JOU", "journeyintonyx/cig"); diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java index f530568fba3..8dbc5775dfe 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java @@ -94,7 +94,7 @@ public class ImageCache { } TFile file = new TFile(path); if (!file.exists()) { - log.warn("File does not exist: " + file.toString()); + log.debug("File does not exist: " + file.toString()); return null; } diff --git a/Mage.Client/src/main/resources/image.url.properties b/Mage.Client/src/main/resources/image.url.properties index e02bd0ddd48..b554a3598db 100644 --- a/Mage.Client/src/main/resources/image.url.properties +++ b/Mage.Client/src/main/resources/image.url.properties @@ -64,6 +64,6 @@ dd2=jvc ddd=gvl unh=uh # Remove setname as soon as the images can be downloaded -ignore.urls=TOK,EMBLEM +ignore.urls=TOK,EMBLEM,M15 # sets ordered by release time (newest goes first) token.lookup.order=JOU,BNG,THS,DDL,M14,MMA,DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,PVC,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/Magic2015.java b/Mage.Sets/src/mage/sets/Magic2015.java new file mode 100644 index 00000000000..759de70744d --- /dev/null +++ b/Mage.Sets/src/mage/sets/Magic2015.java @@ -0,0 +1,55 @@ +/* + * 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 java.util.GregorianCalendar; +import mage.cards.ExpansionSet; +import mage.constants.SetType; + +/** + * + * @author LevelX2 + */ +public class Magic2015 extends ExpansionSet { + + private static final Magic2015 fINSTANCE = new Magic2015(); + + public static Magic2015 getInstance() { + return fINSTANCE; + } + + private Magic2015() { + super("Magic 2015", "M15", "mage.sets.magic2015", new GregorianCalendar(2014, 7, 18).getTime(), SetType.CORE); + this.hasBoosters = true; + this.numBoosterLands = 1; + this.numBoosterCommon = 10; + this.numBoosterUncommon = 3; + this.numBoosterRare = 1; + this.ratioBoosterMythic = 8; + } +} diff --git a/Mage.Sets/src/mage/sets/magic2015/AegisAngel.java b/Mage.Sets/src/mage/sets/magic2015/AegisAngel.java new file mode 100644 index 00000000000..8814006b89d --- /dev/null +++ b/Mage.Sets/src/mage/sets/magic2015/AegisAngel.java @@ -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.magic2015; + +import java.util.UUID; + +/** + * + * @author LevelX2 + */ +public class AegisAngel extends mage.sets.magic2012.AegisAngel { + + public AegisAngel(UUID ownerId) { + super(ownerId); + this.cardNumber = 270; + this.expansionSetCode = "M15"; + } + + public AegisAngel(final AegisAngel card) { + super(card); + } + + @Override + public AegisAngel copy() { + return new AegisAngel(this); + } +} diff --git a/Mage.Sets/src/mage/sets/magic2015/AjanisPridemate.java b/Mage.Sets/src/mage/sets/magic2015/AjanisPridemate.java new file mode 100644 index 00000000000..27c421d44e1 --- /dev/null +++ b/Mage.Sets/src/mage/sets/magic2015/AjanisPridemate.java @@ -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.magic2015; + +import java.util.UUID; + +/** + * + * @author LevelX2 + */ +public class AjanisPridemate extends mage.sets.magic2011.AjanisPridemate { + + public AjanisPridemate(UUID ownerId) { + super(ownerId); + this.cardNumber = 2; + this.expansionSetCode = "M15"; + } + + public AjanisPridemate(final AjanisPridemate card) { + super(card); + } + + @Override + public AjanisPridemate copy() { + return new AjanisPridemate(this); + } +} diff --git a/Mage.Sets/src/mage/sets/magic2015/DivineFavor.java b/Mage.Sets/src/mage/sets/magic2015/DivineFavor.java new file mode 100644 index 00000000000..de490ce901d --- /dev/null +++ b/Mage.Sets/src/mage/sets/magic2015/DivineFavor.java @@ -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.magic2015; + +import java.util.UUID; + +/** + * + * @author LevelX2 + */ +public class DivineFavor extends mage.sets.magic2012.DivineFavor { + + public DivineFavor(UUID ownerId) { + super(ownerId); + this.cardNumber = 10; + this.expansionSetCode = "M15"; + } + + public DivineFavor(final DivineFavor card) { + super(card); + } + + @Override + public DivineFavor copy() { + return new DivineFavor(this); + } +} diff --git a/Mage.Sets/src/mage/sets/magic2015/DivineVerdict.java b/Mage.Sets/src/mage/sets/magic2015/DivineVerdict.java new file mode 100644 index 00000000000..574da5c3679 --- /dev/null +++ b/Mage.Sets/src/mage/sets/magic2015/DivineVerdict.java @@ -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.magic2015; + +import java.util.UUID; + +/** + * + * @author LevelX2 + */ +public class DivineVerdict extends mage.sets.magic2010.DivineVerdict { + + public DivineVerdict(UUID ownerId) { + super(ownerId); + this.cardNumber = 271; + this.expansionSetCode = "M15"; + } + + public DivineVerdict(final DivineVerdict card) { + super(card); + } + + @Override + public DivineVerdict copy() { + return new DivineVerdict(this); + } +} diff --git a/Mage.Sets/src/mage/sets/magic2015/InspiredCharge.java b/Mage.Sets/src/mage/sets/magic2015/InspiredCharge.java new file mode 100644 index 00000000000..023f3e675ae --- /dev/null +++ b/Mage.Sets/src/mage/sets/magic2015/InspiredCharge.java @@ -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.magic2015; + +import java.util.UUID; + +/** + * + * @author LevelX2 + */ +public class InspiredCharge extends mage.sets.magic2011.InspiredCharge { + + public InspiredCharge(UUID ownerId) { + super(ownerId); + this.cardNumber = 272; + this.expansionSetCode = "M15"; + } + + public InspiredCharge(final InspiredCharge card) { + super(card); + } + + @Override + public InspiredCharge copy() { + return new InspiredCharge(this); + } +} diff --git a/Mage.Sets/src/mage/sets/magic2015/KinsbaileSkirmisher.java b/Mage.Sets/src/mage/sets/magic2015/KinsbaileSkirmisher.java new file mode 100644 index 00000000000..6ed328eb69a --- /dev/null +++ b/Mage.Sets/src/mage/sets/magic2015/KinsbaileSkirmisher.java @@ -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.magic2015; + +import java.util.UUID; + +/** + * + * @author LevelX2 + */ +public class KinsbaileSkirmisher extends mage.sets.lorwyn.KinsbaileSkirmisher { + + public KinsbaileSkirmisher(UUID ownerId) { + super(ownerId); + this.cardNumber = 16; + this.expansionSetCode = "M15"; + } + + public KinsbaileSkirmisher(final KinsbaileSkirmisher card) { + super(card); + } + + @Override + public KinsbaileSkirmisher copy() { + return new KinsbaileSkirmisher(this); + } +} diff --git a/Mage.Sets/src/mage/sets/magic2015/MidnightGuard.java b/Mage.Sets/src/mage/sets/magic2015/MidnightGuard.java new file mode 100644 index 00000000000..33366d9d2bb --- /dev/null +++ b/Mage.Sets/src/mage/sets/magic2015/MidnightGuard.java @@ -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.magic2015; + +import java.util.UUID; + +/** + * + * @author LevelX2 + */ +public class MidnightGuard extends mage.sets.darkascension.MidnightGuard { + + public MidnightGuard(UUID ownerId) { + super(ownerId); + this.cardNumber = 20; + this.expansionSetCode = "M15"; + } + + public MidnightGuard(final MidnightGuard card) { + super(card); + } + + @Override + public MidnightGuard copy() { + return new MidnightGuard(this); + } +} diff --git a/Mage.Sets/src/mage/sets/magic2015/OreskosSwiftclaw.java b/Mage.Sets/src/mage/sets/magic2015/OreskosSwiftclaw.java new file mode 100644 index 00000000000..83ed4330169 --- /dev/null +++ b/Mage.Sets/src/mage/sets/magic2015/OreskosSwiftclaw.java @@ -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.magic2015; + +import java.util.UUID; + +/** + * + * @author LevelX2 + */ +public class OreskosSwiftclaw extends mage.sets.journeyintonyx.OreskosSwiftclaw { + + public OreskosSwiftclaw(UUID ownerId) { + super(ownerId); + this.cardNumber = 22; + this.expansionSetCode = "M15"; + } + + public OreskosSwiftclaw(final OreskosSwiftclaw card) { + super(card); + } + + @Override + public OreskosSwiftclaw copy() { + return new OreskosSwiftclaw(this); + } +} diff --git a/Mage.Sets/src/mage/sets/magic2015/PreeminentCaptain.java b/Mage.Sets/src/mage/sets/magic2015/PreeminentCaptain.java new file mode 100644 index 00000000000..0fa712fbf67 --- /dev/null +++ b/Mage.Sets/src/mage/sets/magic2015/PreeminentCaptain.java @@ -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.magic2015; + +import java.util.UUID; + +/** + * + * @author LevelX2 + */ +public class PreeminentCaptain extends mage.sets.morningtide.PreeminentCaptain { + + public PreeminentCaptain(UUID ownerId) { + super(ownerId); + this.cardNumber = 25; + this.expansionSetCode = "M15"; + } + + public PreeminentCaptain(final PreeminentCaptain card) { + super(card); + } + + @Override + public PreeminentCaptain copy() { + return new PreeminentCaptain(this); + } +} diff --git a/Mage.Sets/src/mage/sets/magic2015/RazorfootGriffin.java b/Mage.Sets/src/mage/sets/magic2015/RazorfootGriffin.java new file mode 100644 index 00000000000..87574d8f192 --- /dev/null +++ b/Mage.Sets/src/mage/sets/magic2015/RazorfootGriffin.java @@ -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.magic2015; + +import java.util.UUID; + +/** + * + * @author LevelX2 + */ +public class RazorfootGriffin extends mage.sets.magic2010.RazorfootGriffin { + + public RazorfootGriffin(UUID ownerId) { + super(ownerId); + this.cardNumber = 27; + this.expansionSetCode = "M15"; + } + + public RazorfootGriffin(final RazorfootGriffin card) { + super(card); + } + + @Override + public RazorfootGriffin copy() { + return new RazorfootGriffin(this); + } +} diff --git a/Mage.Sets/src/mage/sets/magic2015/SerraAngel.java b/Mage.Sets/src/mage/sets/magic2015/SerraAngel.java new file mode 100644 index 00000000000..7a1fe605d3f --- /dev/null +++ b/Mage.Sets/src/mage/sets/magic2015/SerraAngel.java @@ -0,0 +1,54 @@ +/* + * 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.magic2015; + +import java.util.UUID; +import mage.constants.Rarity; + +/** + * + * @author LevelX2 + */ +public class SerraAngel extends mage.sets.tenth.SerraAngel { + + public SerraAngel(UUID ownerId) { + super(ownerId); + this.cardNumber = 273; + this.expansionSetCode = "M15"; + this.rarity = Rarity.UNCOMMON; + } + + public SerraAngel(final SerraAngel card) { + super(card); + } + + @Override + public SerraAngel copy() { + return new SerraAngel(this); + } +} diff --git a/Mage.Sets/src/mage/sets/magic2015/Soulmender.java b/Mage.Sets/src/mage/sets/magic2015/Soulmender.java new file mode 100644 index 00000000000..53ca39d28ea --- /dev/null +++ b/Mage.Sets/src/mage/sets/magic2015/Soulmender.java @@ -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.magic2015; + +import java.util.UUID; + +/** + * + * @author LevelX2 + */ +public class Soulmender extends mage.sets.magic2014.Soulmender { + + public Soulmender(UUID ownerId) { + super(ownerId); + this.cardNumber = 35; + this.expansionSetCode = "M15"; + } + + public Soulmender(final Soulmender card) { + super(card); + } + + @Override + public Soulmender copy() { + return new Soulmender(this); + } +} diff --git a/Mage.Sets/src/mage/sets/magic2015/TirelessMissionaries.java b/Mage.Sets/src/mage/sets/magic2015/TirelessMissionaries.java new file mode 100644 index 00000000000..b68da156b48 --- /dev/null +++ b/Mage.Sets/src/mage/sets/magic2015/TirelessMissionaries.java @@ -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.magic2015; + +import java.util.UUID; + +/** + * + * @author LevelX2 + */ +public class TirelessMissionaries extends mage.sets.magic2011.TirelessMissionaries { + + public TirelessMissionaries(UUID ownerId) { + super(ownerId); + this.cardNumber = 39; + this.expansionSetCode = "M15"; + } + + public TirelessMissionaries(final TirelessMissionaries card) { + super(card); + } + + @Override + public TirelessMissionaries copy() { + return new TirelessMissionaries(this); + } +} diff --git a/Utils/known-sets.txt b/Utils/known-sets.txt index d8ef71d2f87..1c9bd39e598 100644 --- a/Utils/known-sets.txt +++ b/Utils/known-sets.txt @@ -51,6 +51,7 @@ Magic 2011|magic2011| Magic 2012|magic2012| Magic 2013|magic2013| Magic 2014|magic2014| +Magic 2015|magic2015| Magic: The Gathering-Commander|commander| Magic: The Gathering-Conspiracy|conspiracy| Mercadian Masques|mercadianmasques| diff --git a/Utils/mtg-cards-data.txt b/Utils/mtg-cards-data.txt index bf5bed7d030..40c5417811f 100644 --- a/Utils/mtg-cards-data.txt +++ b/Utils/mtg-cards-data.txt @@ -23852,3 +23852,17 @@ Temporal Fissure|Vintage Masters|96|C|{4}{U}|Sorcery|||Return target permanent t Thalakos Drifters|Vintage Masters|97|U|{2}{U}{U}|Creature - Thalakos|3|3|Discard a card: Thalakos Drifters gains shadow until end of turn. (This creature can block or be blocked by only creatures with shadow.)| Tradewind Rider|Vintage Masters|98|R|{3}{U}|Creature - Spirit|1|4|Flying${tap}, Tap two untapped creatures you control: Return target permanent to its owner's hand.| Turnabout|Vintage Masters|99|U|{2}{U}{U}|Instant|||Choose artifact, creature, or land. Tap all untapped permanents of the chosen type target player controls, or untap all tapped permanents of that type that player controls.| +Ajani's Pridemate|Magic 2015|2|U|{1}{W}|Creature - Cat Soldier|2|2|Whenever you gain life, you may put a +1/+1 counter on Ajani's Pridemate. (For example, if an effect causes you to gain 3 life, you may put one +1/+1 counter on this creature.)| +Devouring Light|Magic 2015|9|U|{1}{W}{W}|Instant|||Convoke (Each creature you tap while casting this spell reduces its cost by {1} or by one mana of that creature's color.)$Exile target attacking or blocking creature.| +Divine Favor|Magic 2015|10|C|{1}{W}|Enchantment - Aura|||Enchant creature$When Divine Favor enters the battlefield, you gain 3 life.$Enchanted creature gets +1/+3.| +Kinsbaile Skirmisher|Magic 2015|16|C|{1}{W}|Creature - Kithkin Soldier|2|2|When Kinsbaile Skirmisher enters the battlefield, target creature gets +1/+1 until end of turn.| +Midnight Guard|Magic 2015|20|C|{2}{W}|Creature - Human Soldier|2|3|Whenever another creature enters the battlefield, untap Midnight Guard.| +Oreskos Swiftclaw|Magic 2015|22|C|{1}{W}|Creature - Cat Warrior|3|1|| +Preeminent Captain|Magic 2015|25|R|{2}{W}|Creature - Kithkin Soldier|2|2|First strike$Whenever Preeminent Captain attacks, you may put a Soldier creature card from your hand onto the battlefield tapped and attacking.| +Razorfoot Griffin|Magic 2015|27|C|{3}{W}|Creature - Griffin|2|2|Flying$First strike (This creature deals combat damage before creatures without first strike.)| +Soulmender|Magic 2015|35|C|{W}|Creature - Human Cleric|1|1|{T}: You gain 1 life.| +Tireless Missionaries|Magic 2015|39|C|{4}{W}|Creature - Human Cleric|2|3|When Tireless Missionaries enters the battlefield, you gain 3 life.| +Aegis Angel|Magic 2015|270|R|{4}{W}{W}|Creature - Angel|5|5|Flying$When Aegis Angel enters the battlefield, another target permanent is indestructible for as long as you control Aegis Angel. (Effects that say "destroy" don't destroy that permanent. An indestructible creature can't be destroyed by damage.)| +Divine Verdict|Magic 2015|271|C|{3}{W}|Instant|||Destroy target attacking or blocking creature.| +Inspired Charge|Magic 2015|272|C|{2}{W}{W}|Instant|||Creatures you control get +2/+1 until end of turn.| +Serra Angel|Magic 2015|273|U|{3}{W}{W}|Creature - Angel|4|4|Flying$Vigilance (Attacking doesn't cause this creature to tap.)| diff --git a/Utils/mtg-sets-data.txt b/Utils/mtg-sets-data.txt index d127c392687..8b0864fd844 100644 --- a/Utils/mtg-sets-data.txt +++ b/Utils/mtg-sets-data.txt @@ -68,6 +68,7 @@ Magic 2011|M11| Magic 2012|M12| Magic 2013|M13| Magic 2014|M14| +Magic 2015|M15| Magic: The Gathering-Commander|CMD| Magic: The Gathering-Conspiracy|CNS| Masters Edition II|ME2|