From 447cec0ea7166a54af661f9ec16fd111898e2044 Mon Sep 17 00:00:00 2001 From: Loki Date: Sun, 6 May 2012 23:36:50 +0300 Subject: [PATCH] 2 cards, fix version bumping in .git --- .../mage/sets/eighthedition/Confiscate.java | 52 +++++++++++++ .../mage/sets/fifthdawn/VulshokSorcerer.java | 75 +++++++++++++++++++ .../mage/sets/ninthedition/Confiscate.java | 52 +++++++++++++ .../src/mage/sets/urzassaga/Confiscate.java | 75 +++++++++++++++++++ Utils/version-bump.pl | 6 +- 5 files changed, 257 insertions(+), 3 deletions(-) create mode 100644 Mage.Sets/src/mage/sets/eighthedition/Confiscate.java create mode 100644 Mage.Sets/src/mage/sets/fifthdawn/VulshokSorcerer.java create mode 100644 Mage.Sets/src/mage/sets/ninthedition/Confiscate.java create mode 100644 Mage.Sets/src/mage/sets/urzassaga/Confiscate.java diff --git a/Mage.Sets/src/mage/sets/eighthedition/Confiscate.java b/Mage.Sets/src/mage/sets/eighthedition/Confiscate.java new file mode 100644 index 0000000000..697a8b500a --- /dev/null +++ b/Mage.Sets/src/mage/sets/eighthedition/Confiscate.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.eighthedition; + +import java.util.UUID; + +/** + * + * @author Loki + */ +public class Confiscate extends mage.sets.urzassaga.Confiscate { + + public Confiscate(UUID ownerId) { + super(ownerId); + this.cardNumber = 69; + this.expansionSetCode = "8ED"; + } + + public Confiscate(final Confiscate card) { + super(card); + } + + @Override + public Confiscate copy() { + return new Confiscate(this); + } +} diff --git a/Mage.Sets/src/mage/sets/fifthdawn/VulshokSorcerer.java b/Mage.Sets/src/mage/sets/fifthdawn/VulshokSorcerer.java new file mode 100644 index 0000000000..429a34d6b8 --- /dev/null +++ b/Mage.Sets/src/mage/sets/fifthdawn/VulshokSorcerer.java @@ -0,0 +1,75 @@ +/* + * 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.fifthdawn; + +import java.util.UUID; + +import mage.Constants; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.effects.common.DamageTargetEffect; +import mage.abilities.keyword.HasteAbility; +import mage.cards.CardImpl; +import mage.target.common.TargetCreatureOrPlayer; + +/** + * + * @author Loki + */ +public class VulshokSorcerer extends CardImpl { + + public VulshokSorcerer(UUID ownerId) { + super(ownerId, 80, "Vulshok Sorcerer", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}{R}"); + this.expansionSetCode = "5DN"; + this.subtype.add("Human"); + this.subtype.add("Shaman"); + + this.color.setRed(true); + this.power = new MageInt(1); + this.toughness = new MageInt(1); + + this.addAbility(HasteAbility.getInstance()); + // {tap}: Vulshok Sorcerer deals 1 damage to target creature or player. + Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + ability.addTarget(new TargetCreatureOrPlayer()); + this.addAbility(ability); + } + + public VulshokSorcerer(final VulshokSorcerer card) { + super(card); + } + + @Override + public VulshokSorcerer copy() { + return new VulshokSorcerer(this); + } +} diff --git a/Mage.Sets/src/mage/sets/ninthedition/Confiscate.java b/Mage.Sets/src/mage/sets/ninthedition/Confiscate.java new file mode 100644 index 0000000000..e31ac3a654 --- /dev/null +++ b/Mage.Sets/src/mage/sets/ninthedition/Confiscate.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.ninthedition; + +import java.util.UUID; + +/** + * + * @author Loki + */ +public class Confiscate extends mage.sets.urzassaga.Confiscate { + + public Confiscate(UUID ownerId) { + super(ownerId); + this.cardNumber = 68; + this.expansionSetCode = "9ED"; + } + + public Confiscate(final Confiscate card) { + super(card); + } + + @Override + public Confiscate copy() { + return new Confiscate(this); + } +} diff --git a/Mage.Sets/src/mage/sets/urzassaga/Confiscate.java b/Mage.Sets/src/mage/sets/urzassaga/Confiscate.java new file mode 100644 index 0000000000..fe1898e0eb --- /dev/null +++ b/Mage.Sets/src/mage/sets/urzassaga/Confiscate.java @@ -0,0 +1,75 @@ +/* + * 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.urzassaga; + +import java.util.UUID; + +import mage.Constants; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.abilities.Ability; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.common.AttachEffect; +import mage.abilities.effects.common.continious.ControlEnchantedEffect; +import mage.abilities.keyword.EnchantAbility; +import mage.cards.CardImpl; +import mage.target.TargetPermanent; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author Loki + */ +public class Confiscate extends CardImpl { + + public Confiscate(UUID ownerId) { + super(ownerId, 66, "Confiscate", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{4}{U}{U}"); + this.expansionSetCode = "USG"; + this.subtype.add("Aura"); + + this.color.setBlue(true); + + // Enchant permanent + TargetPermanent auraTarget = new TargetCreaturePermanent(); + this.getSpellAbility().addTarget(auraTarget); + this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.AddAbility)); + Ability ability = new EnchantAbility(auraTarget.getTargetName()); + this.addAbility(ability); + // You control enchanted permanent. + this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ControlEnchantedEffect())); + } + + public Confiscate(final Confiscate card) { + super(card); + } + + @Override + public Confiscate copy() { + return new Confiscate(this); + } +} diff --git a/Utils/version-bump.pl b/Utils/version-bump.pl index 3e97ba2f84..4561884f41 100644 --- a/Utils/version-bump.pl +++ b/Utils/version-bump.pl @@ -19,13 +19,13 @@ print "Enter new version: "; my $version = ; chomp $version; -find(\&finded, ".."); +find(\&update_in_finded, ".."); update_version_in_java("../Mage.CLient/src/main/java/mage/client/MageFrame.java"); update_version_in_java("../Mage.Server/src/main/java/mage/server/Main.java"); update_version_in_java("../Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java"); -sub finded { - if (/pom\.xml$/) { +sub update_in_finded { + if (/pom\.xml$/ && !/^\.git/) { update_version($_); } }