From 638c3d6ff2204aa89e5ce99f9e5189d515b0cd94 Mon Sep 17 00:00:00 2001 From: Jason Wall Date: Thu, 12 Mar 2015 14:11:48 -0600 Subject: [PATCH 1/4] make gen card executable --- Utils/gen-card.pl | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Utils/gen-card.pl diff --git a/Utils/gen-card.pl b/Utils/gen-card.pl old mode 100644 new mode 100755 From b79344ab27d184285dea69f3ad7af994775e28d7 Mon Sep 17 00:00:00 2001 From: Jason Wall Date: Thu, 12 Mar 2015 21:17:12 -0600 Subject: [PATCH 2/4] initial cut of treetopbracers impl --- .../src/mage/sets/nemesis/TreetopBracers.java | 112 ++++++++++++++++++ .../sets/ninthedition/TreetopBracers.java | 53 +++++++++ .../src/mage/sets/tenth/TreetopBracers.java | 53 +++++++++ 3 files changed, 218 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/nemesis/TreetopBracers.java create mode 100644 Mage.Sets/src/mage/sets/ninthedition/TreetopBracers.java create mode 100644 Mage.Sets/src/mage/sets/tenth/TreetopBracers.java diff --git a/Mage.Sets/src/mage/sets/nemesis/TreetopBracers.java b/Mage.Sets/src/mage/sets/nemesis/TreetopBracers.java new file mode 100644 index 0000000000..eed2521a24 --- /dev/null +++ b/Mage.Sets/src/mage/sets/nemesis/TreetopBracers.java @@ -0,0 +1,112 @@ +/* + * 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.nemesis; + +import java.util.UUID; + +import mage.abilities.Abilities; +import mage.abilities.Ability; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.ContinuousEffect; +import mage.abilities.effects.RestrictionEffect; +import mage.abilities.effects.common.AttachEffect; +import mage.abilities.effects.common.continuous.BoostEnchantedEffect; +import mage.abilities.keyword.EnchantAbility; +import mage.abilities.keyword.FlyingAbility; +import mage.cards.CardImpl; +import mage.constants.*; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.target.TargetPermanent; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author Jason E. Wall + + */ +public class TreetopBracers extends CardImpl { + + public TreetopBracers(UUID ownerId) { + super(ownerId, 123, "Treetop Bracers", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); + this.expansionSetCode = "NMS"; + this.subtype.add("Aura"); + + // Enchant creature + TargetPermanent auraTarget = new TargetCreaturePermanent(); + this.getSpellAbility().addTarget(auraTarget); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); + Ability ability = new EnchantAbility(auraTarget.getTargetName()); + this.addAbility(ability); + + // Enchanted creature gets +1/+1 and can't be blocked except by creatures with flying. + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TreetopBracersEffect())); + } + + public TreetopBracers(final TreetopBracers card) { + super(card); + } + + @Override + public TreetopBracers copy() { + return new TreetopBracers(this); + } +} + +class TreetopBracersEffect extends RestrictionEffect { + + public TreetopBracersEffect() { + super(Duration.WhileOnBattlefield); + staticText = "Enchanted creature can't be blocked except by creatures with flying."; + } + + public TreetopBracersEffect(final TreetopBracersEffect effect) { + super(effect); + } + + @Override + public boolean applies(Permanent permanent, Ability source, Game game) { + Permanent aura = game.getPermanent(source.getSourceId()); + if(aura != null && aura.getAttachedTo() != null) { + Permanent enchanted = game.getPermanent(aura.getAttachedTo()); + return permanent.getId().equals(enchanted.getId()); + } + return false; + } + + @Override + public boolean canBeBlocked(Permanent attacker, Permanent blocker, Ability source, Game game) { + return blocker.getAbilities().contains(FlyingAbility.getInstance()); + } + + @Override + public TreetopBracersEffect copy() { + return new TreetopBracersEffect(this); + } +} diff --git a/Mage.Sets/src/mage/sets/ninthedition/TreetopBracers.java b/Mage.Sets/src/mage/sets/ninthedition/TreetopBracers.java new file mode 100644 index 0000000000..669bac91e5 --- /dev/null +++ b/Mage.Sets/src/mage/sets/ninthedition/TreetopBracers.java @@ -0,0 +1,53 @@ +/* + * 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 Jason E. Wall + + */ +public class TreetopBracers extends mage.sets.nemesis.TreetopBracers { + + public TreetopBracers(UUID ownerId) { + super(ownerId); + this.cardNumber = 276; + this.expansionSetCode = "9ED"; + } + + public TreetopBracers(final TreetopBracers card) { + super(card); + } + + @Override + public TreetopBracers copy() { + return new TreetopBracers(this); + } +} diff --git a/Mage.Sets/src/mage/sets/tenth/TreetopBracers.java b/Mage.Sets/src/mage/sets/tenth/TreetopBracers.java new file mode 100644 index 0000000000..4a7b402dc2 --- /dev/null +++ b/Mage.Sets/src/mage/sets/tenth/TreetopBracers.java @@ -0,0 +1,53 @@ +/* + * 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.tenth; + +import java.util.UUID; + +/** + * + * @author Jason E. Wall + + */ +public class TreetopBracers extends mage.sets.nemesis.TreetopBracers { + + public TreetopBracers(UUID ownerId) { + super(ownerId); + this.cardNumber = 304; + this.expansionSetCode = "10E"; + } + + public TreetopBracers(final TreetopBracers card) { + super(card); + } + + @Override + public TreetopBracers copy() { + return new TreetopBracers(this); + } +} From be5d568da69a4f65a7b4a2ad9c15534eaaca11ae Mon Sep 17 00:00:00 2001 From: Jason Wall Date: Sat, 14 Mar 2015 12:24:44 -0600 Subject: [PATCH 3/4] clean up treetop bracers impl --- .../src/mage/sets/nemesis/TreetopBracers.java | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/Mage.Sets/src/mage/sets/nemesis/TreetopBracers.java b/Mage.Sets/src/mage/sets/nemesis/TreetopBracers.java index eed2521a24..11ff0b84df 100644 --- a/Mage.Sets/src/mage/sets/nemesis/TreetopBracers.java +++ b/Mage.Sets/src/mage/sets/nemesis/TreetopBracers.java @@ -31,15 +31,20 @@ import java.util.UUID; import mage.abilities.Abilities; import mage.abilities.Ability; +import mage.abilities.StaticAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffect; +import mage.abilities.effects.Effect; import mage.abilities.effects.RestrictionEffect; import mage.abilities.effects.common.AttachEffect; +import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesAttachedEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.constants.*; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.AbilityPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -65,8 +70,7 @@ public class TreetopBracers extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1 and can't be blocked except by creatures with flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TreetopBracersEffect())); + this.addAbility(new TreetopBracersAbility()); } public TreetopBracers(final TreetopBracers card) { @@ -79,34 +83,30 @@ public class TreetopBracers extends CardImpl { } } -class TreetopBracersEffect extends RestrictionEffect { +class TreetopBracersAbility extends StaticAbility { + private static FilterCreaturePermanent onlyFlyingCreatures = new FilterCreaturePermanent("except by creatures with flying"); - public TreetopBracersEffect() { - super(Duration.WhileOnBattlefield); - staticText = "Enchanted creature can't be blocked except by creatures with flying."; + static { + onlyFlyingCreatures.add(new AbilityPredicate(FlyingAbility.class)); } - public TreetopBracersEffect(final TreetopBracersEffect effect) { - super(effect); + public TreetopBracersAbility() { + super(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); + Effect cantBeBlocked = new CantBeBlockedByCreaturesAttachedEffect(Duration.WhileOnBattlefield, onlyFlyingCreatures, AttachmentType.AURA); + cantBeBlocked.setText("and can't be blocked except by creatures with flying."); } + public TreetopBracersAbility(TreetopBracersAbility ability) { + super(ability); + } + + /** + * Creates a fresh copy of this ability. + * + * @return A new copy of this ability. + */ @Override - public boolean applies(Permanent permanent, Ability source, Game game) { - Permanent aura = game.getPermanent(source.getSourceId()); - if(aura != null && aura.getAttachedTo() != null) { - Permanent enchanted = game.getPermanent(aura.getAttachedTo()); - return permanent.getId().equals(enchanted.getId()); - } - return false; - } - - @Override - public boolean canBeBlocked(Permanent attacker, Permanent blocker, Ability source, Game game) { - return blocker.getAbilities().contains(FlyingAbility.getInstance()); - } - - @Override - public TreetopBracersEffect copy() { - return new TreetopBracersEffect(this); + public TreetopBracersAbility copy() { + return new TreetopBracersAbility(this); } } From b7a870d4077e5f00382ee586520c11a74e32d9a0 Mon Sep 17 00:00:00 2001 From: Jason Wall Date: Sat, 14 Mar 2015 17:06:04 -0600 Subject: [PATCH 4/4] actually make it work the way it's supposed to --- .../src/mage/sets/nemesis/TreetopBracers.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Mage.Sets/src/mage/sets/nemesis/TreetopBracers.java b/Mage.Sets/src/mage/sets/nemesis/TreetopBracers.java index 11ff0b84df..94bd57b6af 100644 --- a/Mage.Sets/src/mage/sets/nemesis/TreetopBracers.java +++ b/Mage.Sets/src/mage/sets/nemesis/TreetopBracers.java @@ -27,15 +27,9 @@ */ package mage.sets.nemesis; -import java.util.UUID; - -import mage.abilities.Abilities; import mage.abilities.Ability; import mage.abilities.StaticAbility; -import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.Effect; -import mage.abilities.effects.RestrictionEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesAttachedEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; @@ -44,12 +38,13 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.game.Game; -import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Jason E. Wall @@ -87,13 +82,14 @@ class TreetopBracersAbility extends StaticAbility { private static FilterCreaturePermanent onlyFlyingCreatures = new FilterCreaturePermanent("except by creatures with flying"); static { - onlyFlyingCreatures.add(new AbilityPredicate(FlyingAbility.class)); + onlyFlyingCreatures.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); } public TreetopBracersAbility() { super(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); Effect cantBeBlocked = new CantBeBlockedByCreaturesAttachedEffect(Duration.WhileOnBattlefield, onlyFlyingCreatures, AttachmentType.AURA); cantBeBlocked.setText("and can't be blocked except by creatures with flying."); + addEffect(cantBeBlocked); } public TreetopBracersAbility(TreetopBracersAbility ability) {