diff --git a/Mage.Sets/src/mage/sets/alliances/ArcaneDenial.java b/Mage.Sets/src/mage/sets/alliances/ArcaneDenial1.java similarity index 86% rename from Mage.Sets/src/mage/sets/alliances/ArcaneDenial.java rename to Mage.Sets/src/mage/sets/alliances/ArcaneDenial1.java index 21f5df01eb..483888568c 100644 --- a/Mage.Sets/src/mage/sets/alliances/ArcaneDenial.java +++ b/Mage.Sets/src/mage/sets/alliances/ArcaneDenial1.java @@ -33,20 +33,20 @@ import java.util.UUID; * * @author LevelX2 */ -public class ArcaneDenial extends mage.sets.commander2013.ArcaneDenial { +public class ArcaneDenial1 extends mage.sets.commander2013.ArcaneDenial { - public ArcaneDenial(UUID ownerId) { + public ArcaneDenial1(UUID ownerId) { super(ownerId); this.cardNumber = 32; this.expansionSetCode = "ALL"; } - public ArcaneDenial(final ArcaneDenial card) { + public ArcaneDenial1(final ArcaneDenial1 card) { super(card); } @Override - public ArcaneDenial copy() { - return new ArcaneDenial(this); + public ArcaneDenial1 copy() { + return new ArcaneDenial1(this); } } diff --git a/Mage.Sets/src/mage/sets/alliances/ArcaneDenial2.java b/Mage.Sets/src/mage/sets/alliances/ArcaneDenial2.java new file mode 100644 index 0000000000..ac89fc3c15 --- /dev/null +++ b/Mage.Sets/src/mage/sets/alliances/ArcaneDenial2.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.alliances; + +import java.util.UUID; + +/** + * + * @author LevelX2 + */ +public class ArcaneDenial2 extends mage.sets.commander2013.ArcaneDenial { + + public ArcaneDenial2(UUID ownerId) { + super(ownerId); + this.cardNumber = 33; + this.expansionSetCode = "ALL"; + } + + public ArcaneDenial2(final ArcaneDenial2 card) { + super(card); + } + + @Override + public ArcaneDenial2 copy() { + return new ArcaneDenial2(this); + } +} diff --git a/Mage.Sets/src/mage/sets/alliances/GorillaChieftain.java b/Mage.Sets/src/mage/sets/alliances/GorillaChieftain1.java similarity index 87% rename from Mage.Sets/src/mage/sets/alliances/GorillaChieftain.java rename to Mage.Sets/src/mage/sets/alliances/GorillaChieftain1.java index 158ab6df2a..487d2863c4 100644 --- a/Mage.Sets/src/mage/sets/alliances/GorillaChieftain.java +++ b/Mage.Sets/src/mage/sets/alliances/GorillaChieftain1.java @@ -33,20 +33,20 @@ import java.util.UUID; * * @author Quercitron */ -public class GorillaChieftain extends mage.sets.seventhedition.GorillaChieftain { +public class GorillaChieftain1 extends mage.sets.seventhedition.GorillaChieftain { - public GorillaChieftain(UUID ownerId) { + public GorillaChieftain1(UUID ownerId) { super(ownerId); this.cardNumber = 77; this.expansionSetCode = "ALL"; } - public GorillaChieftain(final GorillaChieftain card) { + public GorillaChieftain1(final GorillaChieftain1 card) { super(card); } @Override - public GorillaChieftain copy() { - return new GorillaChieftain(this); + public GorillaChieftain1 copy() { + return new GorillaChieftain1(this); } } diff --git a/Mage.Sets/src/mage/sets/alliances/GorillaChieftain2.java b/Mage.Sets/src/mage/sets/alliances/GorillaChieftain2.java new file mode 100644 index 0000000000..facc87d9df --- /dev/null +++ b/Mage.Sets/src/mage/sets/alliances/GorillaChieftain2.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.alliances; + +import java.util.UUID; + +/** + * + * @author Quercitron + */ +public class GorillaChieftain2 extends mage.sets.seventhedition.GorillaChieftain { + + public GorillaChieftain2(UUID ownerId) { + super(ownerId); + this.cardNumber = 78; + this.expansionSetCode = "ALL"; + } + + public GorillaChieftain2(final GorillaChieftain2 card) { + super(card); + } + + @Override + public GorillaChieftain2 copy() { + return new GorillaChieftain2(this); + } +} diff --git a/Mage.Sets/src/mage/sets/alliances/GuerrillaTactics.java b/Mage.Sets/src/mage/sets/alliances/GuerrillaTactics1.java similarity index 86% rename from Mage.Sets/src/mage/sets/alliances/GuerrillaTactics.java rename to Mage.Sets/src/mage/sets/alliances/GuerrillaTactics1.java index f09c089f24..c887643a77 100644 --- a/Mage.Sets/src/mage/sets/alliances/GuerrillaTactics.java +++ b/Mage.Sets/src/mage/sets/alliances/GuerrillaTactics1.java @@ -1,54 +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.alliances; - +/* + * 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; -import mage.constants.Rarity; - -/** - * - * @author dustinconrad - */ -public class GuerrillaTactics extends mage.sets.ninthedition.GuerrillaTactics { - - public GuerrillaTactics(UUID ownerId) { - super(ownerId); - this.cardNumber = 110; +import mage.constants.Rarity; + +/** + * + * @author dustinconrad + */ +public class GuerrillaTactics1 extends mage.sets.ninthedition.GuerrillaTactics { + + public GuerrillaTactics1(UUID ownerId) { + super(ownerId); + this.cardNumber = 110; this.expansionSetCode = "ALL"; - this.rarity = Rarity.COMMON; - } - - public GuerrillaTactics(final GuerrillaTactics card) { - super(card); - } - - @Override - public GuerrillaTactics copy() { - return new GuerrillaTactics(this); - } -} + this.rarity = Rarity.COMMON; + } + + public GuerrillaTactics1(final GuerrillaTactics1 card) { + super(card); + } + + @Override + public GuerrillaTactics1 copy() { + return new GuerrillaTactics1(this); + } +} diff --git a/Mage.Sets/src/mage/sets/alliances/GuerrillaTactics2.java b/Mage.Sets/src/mage/sets/alliances/GuerrillaTactics2.java new file mode 100644 index 0000000000..c8590db5f2 --- /dev/null +++ b/Mage.Sets/src/mage/sets/alliances/GuerrillaTactics2.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.alliances; + +import java.util.UUID; +import mage.constants.Rarity; + +/** + * + * @author dustinconrad + */ +public class GuerrillaTactics2 extends mage.sets.ninthedition.GuerrillaTactics { + + public GuerrillaTactics2(UUID ownerId) { + super(ownerId); + this.cardNumber = 111; + this.expansionSetCode = "ALL"; + this.rarity = Rarity.COMMON; + } + + public GuerrillaTactics2(final GuerrillaTactics2 card) { + super(card); + } + + @Override + public GuerrillaTactics2 copy() { + return new GuerrillaTactics2(this); + } +} diff --git a/Mage.Sets/src/mage/sets/alliances/Reprisal.java b/Mage.Sets/src/mage/sets/alliances/Reprisal1.java similarity index 90% rename from Mage.Sets/src/mage/sets/alliances/Reprisal.java rename to Mage.Sets/src/mage/sets/alliances/Reprisal1.java index 643407129a..9bc04ed91c 100644 --- a/Mage.Sets/src/mage/sets/alliances/Reprisal.java +++ b/Mage.Sets/src/mage/sets/alliances/Reprisal1.java @@ -34,21 +34,21 @@ import mage.constants.Rarity; * * @author Quercitron */ -public class Reprisal extends mage.sets.seventhedition.Reprisal { +public class Reprisal1 extends mage.sets.seventhedition.Reprisal { - public Reprisal(UUID ownerId) { + public Reprisal1(UUID ownerId) { super(ownerId); this.cardNumber = 144; this.expansionSetCode = "ALL"; this.rarity = Rarity.COMMON; } - public Reprisal(final Reprisal card) { + public Reprisal1(final Reprisal1 card) { super(card); } @Override - public Reprisal copy() { - return new Reprisal(this); + public Reprisal1 copy() { + return new Reprisal1(this); } } diff --git a/Mage.Sets/src/mage/sets/alliances/Reprisal2.java b/Mage.Sets/src/mage/sets/alliances/Reprisal2.java new file mode 100644 index 0000000000..80ac2f0193 --- /dev/null +++ b/Mage.Sets/src/mage/sets/alliances/Reprisal2.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.alliances; + +import java.util.UUID; +import mage.constants.Rarity; + +/** + * + * @author Quercitron + */ +public class Reprisal2 extends mage.sets.seventhedition.Reprisal { + + public Reprisal2(UUID ownerId) { + super(ownerId); + this.cardNumber = 145; + this.expansionSetCode = "ALL"; + this.rarity = Rarity.COMMON; + } + + public Reprisal2(final Reprisal2 card) { + super(card); + } + + @Override + public Reprisal2 copy() { + return new Reprisal2(this); + } +}