From 2d1c01fd84e7fdf7e89948580e91f2327bb91847 Mon Sep 17 00:00:00 2001 From: spjspj Date: Sat, 7 Jan 2017 12:55:09 +1100 Subject: [PATCH 1/2] Fix for github tracking issue for new cards in sets --- Utils/gen-existing-cards-by-set.pl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Utils/gen-existing-cards-by-set.pl b/Utils/gen-existing-cards-by-set.pl index b48ab6866d..14bf041a8f 100755 --- a/Utils/gen-existing-cards-by-set.pl +++ b/Utils/gen-existing-cards-by-set.pl @@ -177,6 +177,8 @@ foreach $name_collectorid (sort @setCards) my $className = toCamelCase($cardName); my $setId = lc($cardName); $setId =~ s/^(.).*/$1/; + my $googleSetName = $setName; + $googleSetName =~ s/ /+/img; my $fn = "..\\Mage.Sets\\src\\mage\\cards\\$setId\\$className.java"; my $str = " cards.add(new SetCardInfo(\"$cardName\", $cardNr, Rarity." . getRarity ($cards{$cardName}{$setName}[3], $cardName) . ", mage.cards.$setId.$className.class));\n"; my $plus_cardName = $cardName; @@ -188,18 +190,18 @@ foreach $name_collectorid (sort @setCards) # Go Looking for the existing implementation.. if (-e $fn) { $implementedButNotInSetYet {$str} = 1; - $githubTask {"- [ ] Implemented but have to add to set -- [$cardName](https://www.google.com.au/search?q=$plus_cardName+$setName+mtg&source=lnms&tbm=isch)\n"} = 1; + $githubTask {"- [ ] Implemented but have to add to set -- [$cardName](https://www.google.com.au/search?q=$plus_cardName+$googleSetName+mtg&source=lnms&tbm=isch)\n"} = 1; } else { $unimplemented {"$str"} = 1; - $githubTask {"- [ ] Not done -- [$cardName](https://www.google.com.au/search?q=$plus_cardName+$setName+mtg&source=lnms&tbm=isch)\n"} = 1; + $githubTask {"- [ ] Not done -- [$cardName](https://www.google.com.au/search?q=$plus_cardName+$googleSetName+mtg&source=lnms&tbm=isch)\n"} = 1; } } else { if (-e $fn) { $implemented {$str} = 1; - $githubTask {"- [x] Done -- [$cardName](https://www.google.com.au/search?q=$plus_cardName+$setName+mtg&source=lnms&tbm=isch)\n"} = 1; + $githubTask {"- [x] Done -- [$cardName](https://www.google.com.au/search?q=$plus_cardName+$googleSetName+mtg&source=lnms&tbm=isch)\n"} = 1; } else { $unimplemented {$str} = 1; - $githubTask {"- [ ] Not Done -- [$cardName](https://www.google.com.au/search?q=$plus_cardName+$setName+mtg&source=lnms&tbm=isch)\n"} = 1; + $githubTask {"- [ ] Not Done -- [$cardName](https://www.google.com.au/search?q=$plus_cardName+$googleSetName+mtg&source=lnms&tbm=isch)\n"} = 1; } } } From fee6fcec78be41c5c201a8441a7325804dee6546 Mon Sep 17 00:00:00 2001 From: spjspj Date: Sat, 7 Jan 2017 15:38:00 +1100 Subject: [PATCH 2/2] spjspj - Add Chandra's Revolution and Bastion Inventor [AER] --- .../src/mage/cards/b/BastionInventor.java | 66 ++++++++++ .../src/mage/cards/c/ChandrasRevolution.java | 113 ++++++++++++++++++ Mage.Sets/src/mage/sets/AetherRevolt.java | 2 + 3 files changed, 181 insertions(+) create mode 100644 Mage.Sets/src/mage/cards/b/BastionInventor.java create mode 100644 Mage.Sets/src/mage/cards/c/ChandrasRevolution.java diff --git a/Mage.Sets/src/mage/cards/b/BastionInventor.java b/Mage.Sets/src/mage/cards/b/BastionInventor.java new file mode 100644 index 0000000000..0bca7c1ceb --- /dev/null +++ b/Mage.Sets/src/mage/cards/b/BastionInventor.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.cards.b; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.keyword.ImproviseAbility; +import mage.abilities.keyword.HexproofAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; + +/** + * + * @author spjspj + */ +public class BastionInventor extends CardImpl { + + public BastionInventor(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{U}"); + + this.subtype.add("Vedalken"); + this.subtype.add("Artificer"); + this.power = new MageInt(4); + this.toughness = new MageInt(4); + + // Improvise + this.addAbility(new ImproviseAbility()); + // Hexproof + this.addAbility(HexproofAbility.getInstance()); + } + + public BastionInventor(final BastionInventor card) { + super(card); + } + + @Override + public BastionInventor copy() { + return new BastionInventor(this); + } +} diff --git a/Mage.Sets/src/mage/cards/c/ChandrasRevolution.java b/Mage.Sets/src/mage/cards/c/ChandrasRevolution.java new file mode 100644 index 0000000000..36facecd20 --- /dev/null +++ b/Mage.Sets/src/mage/cards/c/ChandrasRevolution.java @@ -0,0 +1,113 @@ +/* + * 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.cards.c; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.effects.ContinuousEffect; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.filter.common.FilterLandPermanent; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.target.Target; +import mage.target.common.TargetCreaturePermanent; +import mage.target.common.TargetLandPermanent; +import mage.target.targetpointer.FixedTarget; + +/** + * + * @author spjspj + */ +public class ChandrasRevolution extends CardImpl { + + public ChandrasRevolution(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{R}"); + + // Chandra's Revolution deals 4 damage to target creature. + Target target = new TargetCreaturePermanent(); + this.getSpellAbility().addTarget(target); + + // Tap target land. That land doesn't untap during its controller's next untap step. + Target target2 = new TargetLandPermanent(new FilterLandPermanent()); + this.getSpellAbility().addTarget(target2); + this.getSpellAbility().addEffect(new ChandrasRevolutionEffect()); + } + + public ChandrasRevolution(final ChandrasRevolution card) { + super(card); + } + + @Override + public ChandrasRevolution copy() { + return new ChandrasRevolution(this); + } +} + +class ChandrasRevolutionEffect extends OneShotEffect { + + public ChandrasRevolutionEffect() { + super(Outcome.Damage); + this.staticText = "{this} deals 4 damage to target creature. Tap target land. That land doesn't untap during its controller's next untap step"; + } + + public ChandrasRevolutionEffect(final ChandrasRevolutionEffect effect) { + super(effect); + } + + @Override + public ChandrasRevolutionEffect copy() { + return new ChandrasRevolutionEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + boolean applied = false; + + // Chandra's Revolution deals 4 damage to target creature. + Permanent permanent = game.getPermanent(source.getTargets().get(0).getFirstTarget()); + if (permanent != null) { + applied |= permanent.damage(4, source.getSourceId(), game, false, true) > 0; + } + + permanent = game.getPermanent(source.getTargets().get(1).getFirstTarget()); + if (permanent != null) { + // Tap target land. That land doesn't untap during its controller's next untap step. + permanent.tap(game); + ContinuousEffect effect = new DontUntapInControllersNextUntapStepTargetEffect("that land"); + effect.setTargetPointer(new FixedTarget(permanent, game)); + game.addEffect(effect, source); + } + + return applied; + } +} diff --git a/Mage.Sets/src/mage/sets/AetherRevolt.java b/Mage.Sets/src/mage/sets/AetherRevolt.java index 6b0f4b2af8..4f14d35311 100644 --- a/Mage.Sets/src/mage/sets/AetherRevolt.java +++ b/Mage.Sets/src/mage/sets/AetherRevolt.java @@ -90,9 +90,11 @@ public class AetherRevolt extends ExpansionSet { cards.add(new SetCardInfo("Baral, Chief of Compliance", 28, Rarity.RARE, mage.cards.b.BaralChiefOfCompliance.class)); cards.add(new SetCardInfo("Barricade Breaker", 144, Rarity.UNCOMMON, mage.cards.b.BarricadeBreaker.class)); cards.add(new SetCardInfo("Bastion Enforcer", 8, Rarity.COMMON, mage.cards.b.BastionEnforcer.class)); + cards.add(new SetCardInfo("Bastion Inventor", 30, Rarity.COMMON, mage.cards.b.BastionInventor.class)); cards.add(new SetCardInfo("Battle at the Bridge", 53, Rarity.RARE, mage.cards.b.BattleAtTheBridge.class)); cards.add(new SetCardInfo("Call for Unity", 9, Rarity.RARE, mage.cards.c.CallForUnity.class)); cards.add(new SetCardInfo("Caught in the Brights", 10, Rarity.COMMON, mage.cards.c.CaughtInTheBrights.class)); + cards.add(new SetCardInfo("Chandra's Revolution", 77, Rarity.COMMON, mage.cards.c.ChandrasRevolution.class)); cards.add(new SetCardInfo("Consulate Crackdown", 11, Rarity.RARE, mage.cards.c.ConsulateCrackdown.class)); cards.add(new SetCardInfo("Consulate Dreadnought", 146, Rarity.UNCOMMON, mage.cards.c.ConsulateDreadnought.class)); cards.add(new SetCardInfo("Consulate Turret", 147, Rarity.COMMON, mage.cards.c.ConsulateTurret.class));