diff --git a/Mage.Sets/src/mage/sets/alliances/DeadlyInsect.java b/Mage.Sets/src/mage/sets/alliances/DeadlyInsect.java deleted file mode 100644 index a78b52a38e..0000000000 --- a/Mage.Sets/src/mage/sets/alliances/DeadlyInsect.java +++ /dev/null @@ -1,52 +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.alliances; - -import java.util.UUID; - -/** - * - * @author LevelX2 - */ -public class DeadlyInsect extends mage.sets.mercadianmasques.DeadlyInsect { - - public DeadlyInsect(UUID ownerId) { - super(ownerId); - this.cardNumber = 64; - this.expansionSetCode = "ALL"; - } - - public DeadlyInsect(final DeadlyInsect card) { - super(card); - } - - @Override - public DeadlyInsect copy() { - return new DeadlyInsect(this); - } -} diff --git a/Mage.Sets/src/mage/sets/alliances/ElvishRanger.java b/Mage.Sets/src/mage/sets/alliances/ElvishRanger.java deleted file mode 100644 index ac3c61195d..0000000000 --- a/Mage.Sets/src/mage/sets/alliances/ElvishRanger.java +++ /dev/null @@ -1,52 +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.alliances; - -import java.util.UUID; - -/** - * - * @author Plopman - */ -public class ElvishRanger extends mage.sets.portal.ElvishRanger { - - public ElvishRanger(UUID ownerId) { - super(ownerId); - this.cardNumber = 67; - this.expansionSetCode = "ALL"; - } - - public ElvishRanger(final ElvishRanger card) { - super(card); - } - - @Override - public ElvishRanger copy() { - return new ElvishRanger(this); - } -} diff --git a/Mage.Sets/src/mage/sets/alliances/ElvishRanger1.java b/Mage.Sets/src/mage/sets/alliances/ElvishRanger1.java index 4fea6246ce..8b66591b48 100644 --- a/Mage.Sets/src/mage/sets/alliances/ElvishRanger1.java +++ b/Mage.Sets/src/mage/sets/alliances/ElvishRanger1.java @@ -37,15 +37,12 @@ import mage.constants.Rarity; * * @author Backfir3 */ -public class ElvishRanger1 extends CardImpl { +public class ElvishRanger1 extends mage.sets.portal.ElvishRanger { public ElvishRanger1(UUID ownerId) { - super(ownerId, 67, "Elvish Ranger", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); + super(ownerId); + this.cardNumber = 67; this.expansionSetCode = "ALL"; - this.subtype.add("Elf"); - - this.power = new MageInt(4); - this.toughness = new MageInt(1); } public ElvishRanger1(final ElvishRanger1 card) { diff --git a/Mage.Sets/src/mage/sets/alliances/ElvishRanger2.java b/Mage.Sets/src/mage/sets/alliances/ElvishRanger2.java index c41a416127..9aa1ebd775 100644 --- a/Mage.Sets/src/mage/sets/alliances/ElvishRanger2.java +++ b/Mage.Sets/src/mage/sets/alliances/ElvishRanger2.java @@ -33,7 +33,7 @@ import java.util.UUID; * * @author Backfir3 */ -public class ElvishRanger2 extends mage.sets.alliances.ElvishRanger1 { +public class ElvishRanger2 extends mage.sets.portal.ElvishRanger { public ElvishRanger2(UUID ownerId) { super(ownerId); diff --git a/Mage.Sets/src/mage/sets/alliances/StormCrow.java b/Mage.Sets/src/mage/sets/alliances/StormCrow.java deleted file mode 100644 index fc0f90d598..0000000000 --- a/Mage.Sets/src/mage/sets/alliances/StormCrow.java +++ /dev/null @@ -1,52 +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.alliances; - -import java.util.UUID; - -/** - * - * @author LevelX2 - */ -public class StormCrow extends mage.sets.ninthedition.StormCrow { - - public StormCrow(UUID ownerId) { - super(ownerId); - this.cardNumber = 54; - this.expansionSetCode = "ALL"; - } - - public StormCrow(final StormCrow card) { - super(card); - } - - @Override - public StormCrow copy() { - return new StormCrow(this); - } -}