diff --git a/Mage.Sets/src/mage/sets/alarareborn/MarisisTwinclaws.java b/Mage.Sets/src/mage/sets/alarareborn/MarisisTwinclaws.java new file mode 100644 index 0000000000..f68b420be3 --- /dev/null +++ b/Mage.Sets/src/mage/sets/alarareborn/MarisisTwinclaws.java @@ -0,0 +1,66 @@ +/* + * 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.alarareborn; + +import java.util.UUID; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.MageInt; +import mage.abilities.keyword.DoubleStrikeAbility; +import mage.cards.CardImpl; + +/** + * + * @author Loki + */ +public class MarisisTwinclaws extends CardImpl { + + public MarisisTwinclaws (UUID ownerId) { + super(ownerId, 140, "Marisi's Twinclaws", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}R/W{G}"); + this.expansionSetCode = "ARB"; + this.subtype.add("Cat"); + this.subtype.add("Warrior"); + this.color.setWhite(true); + this.color.setRed(true); + this.color.setGreen(true); + this.power = new MageInt(2); + this.toughness = new MageInt(4); + this.addAbility(DoubleStrikeAbility.getInstance()); + } + + public MarisisTwinclaws (final MarisisTwinclaws card) { + super(card); + } + + @Override + public MarisisTwinclaws copy() { + return new MarisisTwinclaws(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/mirrodin/VulshokBattlegear.java b/Mage.Sets/src/mage/sets/mirrodin/VulshokBattlegear.java new file mode 100644 index 0000000000..202bd58d1d --- /dev/null +++ b/Mage.Sets/src/mage/sets/mirrodin/VulshokBattlegear.java @@ -0,0 +1,65 @@ +/* + * 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.mirrodin; + +import java.util.UUID; + +import mage.Constants; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.effects.common.continious.BoostEquippedEffect; +import mage.abilities.keyword.EquipAbility; +import mage.cards.CardImpl; + +/** + * + * @author Loki + */ +public class VulshokBattlegear extends CardImpl { + + public VulshokBattlegear (UUID ownerId) { + super(ownerId, 272, "Vulshok Battlegear", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); + this.expansionSetCode = "MRD"; + this.subtype.add("Equipment"); + this.addAbility(new EquipAbility(Constants.Outcome.BoostCreature, new GenericManaCost(3))); + this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(3, 3))); + } + + public VulshokBattlegear (final VulshokBattlegear card) { + super(card); + } + + @Override + public VulshokBattlegear copy() { + return new VulshokBattlegear(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/mirrodin/WeldingJar.java b/Mage.Sets/src/mage/sets/mirrodin/WeldingJar.java new file mode 100644 index 0000000000..a543c74aff --- /dev/null +++ b/Mage.Sets/src/mage/sets/mirrodin/WeldingJar.java @@ -0,0 +1,67 @@ +/* + * 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.mirrodin; + +import java.util.UUID; + +import mage.Constants; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.abilities.Abilities; +import mage.abilities.Ability; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.common.SacrificeSourceCost; +import mage.abilities.effects.common.RegenerateTargetEffect; +import mage.cards.CardImpl; +import mage.target.common.TargetArtifactPermanent; + +/** + * + * @author Loki + */ +public class WeldingJar extends CardImpl { + + public WeldingJar (UUID ownerId) { + super(ownerId, 274, "Welding Jar", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{0}"); + this.expansionSetCode = "MRD"; + Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateTargetEffect(), new SacrificeSourceCost()); + ability.addTarget(new TargetArtifactPermanent()); + this.addAbility(ability); + } + + public WeldingJar (final WeldingJar card) { + super(card); + } + + @Override + public WeldingJar copy() { + return new WeldingJar(this); + } + +} diff --git a/Utils/gen-card.pl b/Utils/gen-card.pl index 4aeacf88ab..6e84286de1 100755 --- a/Utils/gen-card.pl +++ b/Utils/gen-card.pl @@ -250,6 +250,7 @@ $mana{'Black or Green'} = 'B/G'; $mana{'Black or Red'} = 'B/R'; $mana{'Blue or Red'} = 'U/R'; $mana{'Red or Green'} = 'R/G'; +$mana{'Red or White'} = 'R/W'; my %manatocolor; $manatocolor{'Black'} = " this.color.setBlack(true);"; @@ -257,6 +258,7 @@ $manatocolor{'Blue'} = " this.color.setBlue(true);"; $manatocolor{'Green'} = " this.color.setGreen(true);"; $manatocolor{'Red'} = " this.color.setRed(true);"; $manatocolor{'White'} = " this.color.setWhite(true);"; +$manatocolor{'Red or White'} = " this.color.setWhite(true);\n this.color.setRed(true);"; my %cardtypes; $cardtypes{'Artifact'} = "CardType.ARTIFACT";