From 2a9d8edee885158911a9fdf4adc4c783c47cf9e8 Mon Sep 17 00:00:00 2001 From: "Saga\\Robert" Date: Mon, 7 Aug 2017 01:28:17 +0200 Subject: [PATCH 1/8] - added Autobot and Dinosaur Subtypes - added TransformedPredicate(checks isTransformed()) --- .../src/main/java/mage/constants/SubType.java | 2 + .../permanent/TransformedPredicate.java | 49 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 Mage/src/main/java/mage/filter/predicate/permanent/TransformedPredicate.java diff --git a/Mage/src/main/java/mage/constants/SubType.java b/Mage/src/main/java/mage/constants/SubType.java index bb7a8e8f9b..92618afc59 100644 --- a/Mage/src/main/java/mage/constants/SubType.java +++ b/Mage/src/main/java/mage/constants/SubType.java @@ -56,6 +56,7 @@ public enum SubType { ATOG("Atog", SubTypeSet.CreatureType, false), ATAT("AT-AT", SubTypeSet.CreatureType, true), AUROCHS("Aurochs", SubTypeSet.CreatureType, false), + AUTOBOT("Autobot", SubTypeSet.CreatureType, false), AVATAR("Avatar", SubTypeSet.CreatureType, false), // B BADGER("Badger", SubTypeSet.CreatureType, false), @@ -99,6 +100,7 @@ public enum SubType { DEMON("Demon", SubTypeSet.CreatureType, false), DESERTER("Deserter", SubTypeSet.CreatureType, false), DEVIL("Devil", SubTypeSet.CreatureType, false), + DINOSAUR("Dinosaur", SubTypeSet.CreatureType, false), DJINN("Djinn", SubTypeSet.CreatureType, false), DRAGON("Dragon", SubTypeSet.CreatureType, false), DRAKE("Drake", SubTypeSet.CreatureType, false), diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/TransformedPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/TransformedPredicate.java new file mode 100644 index 0000000000..a3b5ae63e9 --- /dev/null +++ b/Mage/src/main/java/mage/filter/predicate/permanent/TransformedPredicate.java @@ -0,0 +1,49 @@ +/* + * 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.filter.predicate.permanent; + +import mage.filter.predicate.Predicate; +import mage.game.Game; +import mage.game.permanent.Permanent; + +/** + * + * @author Saga + */ +public class TransformedPredicate implements Predicate { + + @Override + public boolean apply(Permanent input, Game game) { + return input.isTransformed(); + } + + @Override + public String toString() { + return "Transformed" ; + } +} \ No newline at end of file From e1dd26f7998094fa967356d4625f9d1ca3d9d86e Mon Sep 17 00:00:00 2001 From: "Saga\\Robert" Date: Mon, 7 Aug 2017 01:28:37 +0200 Subject: [PATCH 2/8] - added Grimlock, Dinobot Leader (including Grimlock, Ferocious King) - added Grimlock to H17 set --- .../mage/cards/g/GrimlockDinobotLeader.java | 98 +++++++++++++++++++ .../mage/cards/g/GrimlockFerociousKing.java | 79 +++++++++++++++ Mage.Sets/src/mage/sets/HasconPromo2017.java | 2 + 3 files changed, 179 insertions(+) create mode 100644 Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java create mode 100644 Mage.Sets/src/mage/cards/g/GrimlockFerociousKing.java diff --git a/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java b/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java new file mode 100644 index 0000000000..14fb96a756 --- /dev/null +++ b/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java @@ -0,0 +1,98 @@ +/* + * 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.g; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.common.TransformSourceEffect; +import mage.abilities.effects.common.continuous.BoostControlledEffect; +import mage.abilities.keyword.TransformAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.SubType; +import mage.constants.SuperType; +import mage.constants.Zone; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.mageobject.AbilityPredicate; +import mage.filter.predicate.mageobject.SubtypePredicate; +import mage.filter.predicate.permanent.TransformedPredicate; + + +/** + * + * @author Saga + */ +public class GrimlockDinobotLeader extends CardImpl{ + + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Dinosaurs and Vehicles"); + static { + filter.add(Predicates.or(new SubtypePredicate(SubType.DINOSAUR), new SubtypePredicate(SubType.VEHICLE))); + } + + private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Transformers creatures"); + static { + filter2.add(Predicates.not(new SubtypePredicate(SubType.DINOSAUR))); + filter2.add(Predicates.not(new SubtypePredicate(SubType.VEHICLE))); + filter2.add(Predicates.or(new AbilityPredicate(TransformAbility.class), new TransformedPredicate())); + } + + public GrimlockDinobotLeader(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT,CardType.CREATURE}, "{1}{R}{G}{W}"); + this.addSuperType(SuperType.LEGENDARY); + this.subtype.add("Autobot"); + this.power = new MageInt(4); + this.toughness = new MageInt(4); + + this.transformable = true; + this.secondSideCardClazz = GrimlockFerociousKing.class; + + // Dinosaurs, Vehicles and other Transformers creatures you control get +2/+0. + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield, filter2, true))); + + // {2}: Grimlock, Dinobot Leader becomes Grimlock, Ferocious King. + this.addAbility(new TransformAbility()); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(true), new ManaCostsImpl("{2}"))); + } + + public GrimlockDinobotLeader(final GrimlockDinobotLeader card) { + super(card); + } + + @Override + public GrimlockDinobotLeader copy() { + return new GrimlockDinobotLeader(this); + } + +} diff --git a/Mage.Sets/src/mage/cards/g/GrimlockFerociousKing.java b/Mage.Sets/src/mage/cards/g/GrimlockFerociousKing.java new file mode 100644 index 0000000000..62b1662b15 --- /dev/null +++ b/Mage.Sets/src/mage/cards/g/GrimlockFerociousKing.java @@ -0,0 +1,79 @@ +/* + * 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.g; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.common.TransformSourceEffect; +import mage.abilities.keyword.TrampleAbility; +import mage.abilities.keyword.TransformAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; +import mage.constants.Zone; + +/** + * + * @author Saga + */ +public class GrimlockFerociousKing extends CardImpl{ + + public GrimlockFerociousKing(UUID ownerId, CardSetInfo setInfo) { + super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},""); + this.addSuperType(SuperType.LEGENDARY); + this.subtype.add("Dinosaur"); + this.power = new MageInt(8); + this.toughness = new MageInt(8); + this.color.setRed(true); + this.color.setGreen(true); + this.color.setWhite(true); + + this.transformable = true; + this.nightCard = true; + + // Trample + this.addAbility(TrampleAbility.getInstance()); + + // {2}: Grimlock, Ferocious King becomes Grimlock, Dinobot Leader. + this.addAbility(new TransformAbility()); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(false), new ManaCostsImpl("{2}"))); + } + + public GrimlockFerociousKing(final GrimlockFerociousKing card) { + super(card); + } + + @Override + public GrimlockFerociousKing copy() { + return new GrimlockFerociousKing(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/HasconPromo2017.java b/Mage.Sets/src/mage/sets/HasconPromo2017.java index 7b83761826..ad69eeeff8 100644 --- a/Mage.Sets/src/mage/sets/HasconPromo2017.java +++ b/Mage.Sets/src/mage/sets/HasconPromo2017.java @@ -44,6 +44,8 @@ public class HasconPromo2017 extends ExpansionSet { private HasconPromo2017() { super("HASCON Promo 2017", "H17", ExpansionSet.buildDate(2017, 9, 8), SetType.JOKESET); + cards.add(new ExpansionSet.SetCardInfo("Grimlock, Dinobot Leader", 1, Rarity.MYTHIC, mage.cards.g.GrimlockDinobotLeader.class)); + cards.add(new ExpansionSet.SetCardInfo("Grimlock, Ferocious King", 1, Rarity.MYTHIC, mage.cards.g.GrimlockFerociousKing.class)); cards.add(new ExpansionSet.SetCardInfo("Sword of Dungeons & Dragons", 3, Rarity.MYTHIC, mage.cards.s.SwordOfDungeonsAndDragons.class)); } } From c99c3f1765782f42797ebf6982c1a435157395c9 Mon Sep 17 00:00:00 2001 From: "Saga\\Robert" Date: Mon, 7 Aug 2017 17:02:29 +0200 Subject: [PATCH 3/8] - added Balan, Wandering Knight - added Balan to C17 --- .../mage/cards/b/BalanWanderingKnight.java | 125 ++++++++++++++++++ Mage.Sets/src/mage/sets/Commander2017.java | 1 + 2 files changed, 126 insertions(+) create mode 100644 Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java diff --git a/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java b/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java new file mode 100644 index 0000000000..bea551f55f --- /dev/null +++ b/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java @@ -0,0 +1,125 @@ +/* + * 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.Ability;; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.condition.common.EquippedMultipleSourceCondition; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.decorator.ConditionalContinuousEffect; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; +import mage.abilities.keyword.DoubleStrikeAbility; +import mage.abilities.keyword.FirstStrikeAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.SubType; +import mage.constants.SuperType; +import mage.constants.Zone; +import mage.filter.FilterPermanent; +import mage.filter.predicate.mageobject.SubtypePredicate; +import mage.game.Game; +import mage.game.permanent.Permanent; + +/** + * + * @author Saga + */ +public class BalanWanderingKnight extends CardImpl { + + private static final String rule = "{this} has double strike as long as two or more Equipment are attached to it."; + + public BalanWanderingKnight(UUID ownerId, CardSetInfo setInfo) { + super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}"); + this.addSuperType(SuperType.LEGENDARY); + this.subtype.add("Cat"); + this.subtype.add("Knight"); + this.power = new MageInt(3); + this.toughness = new MageInt(3); + + // First Strike + this.addAbility(FirstStrikeAbility.getInstance()); + + // Balan, Wandering Knight has double strike as long as two or more Equipment are attached to it. + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance()), EquippedMultipleSourceCondition.instance, rule); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + + // {1}{W}: Attach all Equipment you control to Balan. + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BalanWanderingKnightEffect(), new ManaCostsImpl("{1}{W}"))); + } + + public BalanWanderingKnight(final BalanWanderingKnight card) { + super(card); + } + + @Override + public BalanWanderingKnight copy() { + return new BalanWanderingKnight(this); + } + + static class BalanWanderingKnightEffect extends OneShotEffect { + + public BalanWanderingKnightEffect() { + super(Outcome.Benefit); + this.staticText = "Attach all Equipment you control to {this}."; + } + + public BalanWanderingKnightEffect(final BalanWanderingKnightEffect effect) { + super(effect); + } + + @Override + public BalanWanderingKnightEffect copy() { + return new BalanWanderingKnightEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Permanent balan = game.getPermanent(source.getSourceId()); + if (balan != null) { + FilterPermanent filter = new FilterPermanent(); + filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + for (Permanent equipment : game.getBattlefield().getAllActivePermanents(filter, source.getControllerId(),game)) { + if (equipment != null) { + //If an Equipment can’t equip, it isn’t attached, and it doesn’t become unattached (if it’s attached to a creature). + if (!balan.cantBeAttachedBy(equipment, game)) { + balan.addAttachment(equipment.getId(), game); + } + } + } + return true; + } + return false; + } + } +} \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/Commander2017.java b/Mage.Sets/src/mage/sets/Commander2017.java index cc123715bf..d0955136af 100644 --- a/Mage.Sets/src/mage/sets/Commander2017.java +++ b/Mage.Sets/src/mage/sets/Commander2017.java @@ -47,6 +47,7 @@ public class Commander2017 extends ExpansionSet { super("Commander 2017 Edition", "C17", ExpansionSet.buildDate(2017, 8, 25), SetType.SUPPLEMENTAL); this.blockName = "Command Zone"; + cards.add(new SetCardInfo("Balan, Wandering Knight", 2, Rarity.RARE, mage.cards.b.BalanWanderingKnight.class)); cards.add(new SetCardInfo("O-Kagachi, Vengeful Kami", 3, Rarity.MYTHIC, mage.cards.o.OKagachiVengefulKami.class)); cards.add(new SetCardInfo("Ramos, Dragon Engine", 55, Rarity.MYTHIC, mage.cards.r.RamosDragonEngine.class)); cards.add(new SetCardInfo("Taigam, Ojutai Master", 46, Rarity.MYTHIC, mage.cards.t.TaigamOjutaiMaster.class)); From 21b892a9b442877a03c0986b734e60b7ff4065fc Mon Sep 17 00:00:00 2001 From: "Saga\\Robert" Date: Mon, 7 Aug 2017 17:03:21 +0200 Subject: [PATCH 4/8] -added EquippedMultipleSourceCondition (to check if permanent has 2 or more Equipments attached) --- .../EquippedMultipleSourceCondition.java | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 Mage/src/main/java/mage/abilities/condition/common/EquippedMultipleSourceCondition.java diff --git a/Mage/src/main/java/mage/abilities/condition/common/EquippedMultipleSourceCondition.java b/Mage/src/main/java/mage/abilities/condition/common/EquippedMultipleSourceCondition.java new file mode 100644 index 0000000000..3524942743 --- /dev/null +++ b/Mage/src/main/java/mage/abilities/condition/common/EquippedMultipleSourceCondition.java @@ -0,0 +1,69 @@ +/* + * 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.abilities.condition.common; + +import mage.abilities.Ability; +import mage.abilities.condition.Condition; +import mage.game.Game; +import mage.game.permanent.Permanent; + +import java.util.UUID; + +/** + * Describes condition when creature is equipped with more than one Equipment. + * + * @author Saga + */ +public enum EquippedMultipleSourceCondition implements Condition { + + instance; + + @Override + public boolean apply(Game game, Ability source) { + Permanent permanent = game.getBattlefield().getPermanent(source.getSourceId()); + int countEquipped = 0; + if (permanent != null) { + for (UUID uuid : permanent.getAttachments()) { + Permanent attached = game.getBattlefield().getPermanent(uuid); + if (attached != null && attached.getSubtype(game).contains("Equipment")) { + countEquipped++; + if (countEquipped >= 2) { + return true; + } + } + } + } + return false; + } + + @Override + public String toString() { + return "has multiple Equipments attached"; + } + +} \ No newline at end of file From 05f5b99a99136d061ea90556c7a96ec45a8ae76f Mon Sep 17 00:00:00 2001 From: "Saga\\Robert" Date: Mon, 7 Aug 2017 22:35:08 +0200 Subject: [PATCH 5/8] - changed Autobot and Dinosaur to fantasy types --- .../mage/cards/b/BalanWanderingKnight.java | 125 ------------------ .../src/main/java/mage/constants/SubType.java | 11 +- 2 files changed, 6 insertions(+), 130 deletions(-) delete mode 100644 Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java diff --git a/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java b/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java deleted file mode 100644 index bea551f55f..0000000000 --- a/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * 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.Ability;; -import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.EquippedMultipleSourceCondition; -import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.decorator.ConditionalContinuousEffect; -import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; -import mage.abilities.keyword.DoubleStrikeAbility; -import mage.abilities.keyword.FirstStrikeAbility; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SubType; -import mage.constants.SuperType; -import mage.constants.Zone; -import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.game.Game; -import mage.game.permanent.Permanent; - -/** - * - * @author Saga - */ -public class BalanWanderingKnight extends CardImpl { - - private static final String rule = "{this} has double strike as long as two or more Equipment are attached to it."; - - public BalanWanderingKnight(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}"); - this.addSuperType(SuperType.LEGENDARY); - this.subtype.add("Cat"); - this.subtype.add("Knight"); - this.power = new MageInt(3); - this.toughness = new MageInt(3); - - // First Strike - this.addAbility(FirstStrikeAbility.getInstance()); - - // Balan, Wandering Knight has double strike as long as two or more Equipment are attached to it. - ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance()), EquippedMultipleSourceCondition.instance, rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); - - // {1}{W}: Attach all Equipment you control to Balan. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BalanWanderingKnightEffect(), new ManaCostsImpl("{1}{W}"))); - } - - public BalanWanderingKnight(final BalanWanderingKnight card) { - super(card); - } - - @Override - public BalanWanderingKnight copy() { - return new BalanWanderingKnight(this); - } - - static class BalanWanderingKnightEffect extends OneShotEffect { - - public BalanWanderingKnightEffect() { - super(Outcome.Benefit); - this.staticText = "Attach all Equipment you control to {this}."; - } - - public BalanWanderingKnightEffect(final BalanWanderingKnightEffect effect) { - super(effect); - } - - @Override - public BalanWanderingKnightEffect copy() { - return new BalanWanderingKnightEffect(this); - } - - @Override - public boolean apply(Game game, Ability source) { - Permanent balan = game.getPermanent(source.getSourceId()); - if (balan != null) { - FilterPermanent filter = new FilterPermanent(); - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); - for (Permanent equipment : game.getBattlefield().getAllActivePermanents(filter, source.getControllerId(),game)) { - if (equipment != null) { - //If an Equipment can’t equip, it isn’t attached, and it doesn’t become unattached (if it’s attached to a creature). - if (!balan.cantBeAttachedBy(equipment, game)) { - balan.addAttachment(equipment.getId(), game); - } - } - } - return true; - } - return false; - } - } -} \ No newline at end of file diff --git a/Mage/src/main/java/mage/constants/SubType.java b/Mage/src/main/java/mage/constants/SubType.java index 92618afc59..1bb17a3a62 100644 --- a/Mage/src/main/java/mage/constants/SubType.java +++ b/Mage/src/main/java/mage/constants/SubType.java @@ -3,6 +3,7 @@ package mage.constants; import mage.util.SubTypeList; import java.util.Arrays; +import java.util.EnumSet; import java.util.Set; import java.util.stream.Collectors; @@ -56,7 +57,7 @@ public enum SubType { ATOG("Atog", SubTypeSet.CreatureType, false), ATAT("AT-AT", SubTypeSet.CreatureType, true), AUROCHS("Aurochs", SubTypeSet.CreatureType, false), - AUTOBOT("Autobot", SubTypeSet.CreatureType, false), + AUTOBOT("Autobot", SubTypeSet.CreatureType, true), // H17, Grimlock AVATAR("Avatar", SubTypeSet.CreatureType, false), // B BADGER("Badger", SubTypeSet.CreatureType, false), @@ -100,7 +101,7 @@ public enum SubType { DEMON("Demon", SubTypeSet.CreatureType, false), DESERTER("Deserter", SubTypeSet.CreatureType, false), DEVIL("Devil", SubTypeSet.CreatureType, false), - DINOSAUR("Dinosaur", SubTypeSet.CreatureType, false), + DINOSAUR("Dinosaur", SubTypeSet.CreatureType, true), // only Grimlock right now, until Ixalan DJINN("Djinn", SubTypeSet.CreatureType, false), DRAGON("Dragon", SubTypeSet.CreatureType, false), DRAKE("Drake", SubTypeSet.CreatureType, false), @@ -420,10 +421,10 @@ public enum SubType { return subTypeSet; } - public static SubTypeList getCreatureTypes(boolean customSet) { - SubTypeList subTypes = new SubTypeList(); + public static Set getCreatureTypes(boolean customSet) { + Set subTypes = EnumSet.noneOf(SubType.class); for (SubType s : values()) { - if (!s.customSet) { + if (s.customSet == customSet && s.getSubTypeSet() == SubTypeSet.CreatureType) { subTypes.add(s); } } From 8819d8abaed7fc2bf956f71577bf4851fffe14a2 Mon Sep 17 00:00:00 2001 From: "Saga\\Robert" Date: Mon, 7 Aug 2017 22:37:01 +0200 Subject: [PATCH 6/8] - changed to new SubType.add method --- Mage.Sets/src/mage/cards/g/GrimlockFerociousKing.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/cards/g/GrimlockFerociousKing.java b/Mage.Sets/src/mage/cards/g/GrimlockFerociousKing.java index 62b1662b15..7b301c4f98 100644 --- a/Mage.Sets/src/mage/cards/g/GrimlockFerociousKing.java +++ b/Mage.Sets/src/mage/cards/g/GrimlockFerociousKing.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; @@ -49,7 +50,7 @@ public class GrimlockFerociousKing extends CardImpl{ public GrimlockFerociousKing(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},""); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add("Dinosaur"); + this.subtype.add(SubType.DINOSAUR); this.power = new MageInt(8); this.toughness = new MageInt(8); this.color.setRed(true); From dbda9eb4b2f32df2dcbf9e6782e59fa2addaaf52 Mon Sep 17 00:00:00 2001 From: "Saga\\Robert" Date: Mon, 7 Aug 2017 22:37:23 +0200 Subject: [PATCH 7/8] - changed to new SubType.add method --- Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java b/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java index 14fb96a756..664360080e 100644 --- a/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java +++ b/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java @@ -70,7 +70,7 @@ public class GrimlockDinobotLeader extends CardImpl{ public GrimlockDinobotLeader(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT,CardType.CREATURE}, "{1}{R}{G}{W}"); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add("Autobot"); + this.subtype.add(SubType.AUTOBOT); this.power = new MageInt(4); this.toughness = new MageInt(4); From 53c31d4a8140f3760889de1652513c7b97c7edd7 Mon Sep 17 00:00:00 2001 From: "Saga\\Robert" Date: Mon, 7 Aug 2017 22:38:42 +0200 Subject: [PATCH 8/8] - changed to new SubType.add method --- .../mage/cards/b/BalanWanderingKnight.java | 124 ++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java diff --git a/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java b/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java new file mode 100644 index 0000000000..27c266242e --- /dev/null +++ b/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java @@ -0,0 +1,124 @@ +/* + * 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.Ability;; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.condition.common.EquippedMultipleSourceCondition; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.decorator.ConditionalContinuousEffect; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; +import mage.abilities.keyword.DoubleStrikeAbility; +import mage.abilities.keyword.FirstStrikeAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.SubType; +import mage.constants.SuperType; +import mage.constants.Zone; +import mage.filter.FilterPermanent; +import mage.filter.predicate.mageobject.SubtypePredicate; +import mage.game.Game; +import mage.game.permanent.Permanent; + +/** + * + * @author Saga + */ +public class BalanWanderingKnight extends CardImpl { + + private static final String rule = "{this} has double strike as long as two or more Equipment are attached to it."; + + public BalanWanderingKnight(UUID ownerId, CardSetInfo setInfo) { + super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}"); + this.addSuperType(SuperType.LEGENDARY); + this.subtype.add(SubType.CAT, SubType.KNIGHT); + this.power = new MageInt(3); + this.toughness = new MageInt(3); + + // First Strike + this.addAbility(FirstStrikeAbility.getInstance()); + + // Balan, Wandering Knight has double strike as long as two or more Equipment are attached to it. + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance()), EquippedMultipleSourceCondition.instance, rule); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + + // {1}{W}: Attach all Equipment you control to Balan. + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BalanWanderingKnightEffect(), new ManaCostsImpl("{1}{W}"))); + } + + public BalanWanderingKnight(final BalanWanderingKnight card) { + super(card); + } + + @Override + public BalanWanderingKnight copy() { + return new BalanWanderingKnight(this); + } + + static class BalanWanderingKnightEffect extends OneShotEffect { + + public BalanWanderingKnightEffect() { + super(Outcome.Benefit); + this.staticText = "Attach all Equipment you control to {this}."; + } + + public BalanWanderingKnightEffect(final BalanWanderingKnightEffect effect) { + super(effect); + } + + @Override + public BalanWanderingKnightEffect copy() { + return new BalanWanderingKnightEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Permanent balan = game.getPermanent(source.getSourceId()); + if (balan != null) { + FilterPermanent filter = new FilterPermanent(); + filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + for (Permanent equipment : game.getBattlefield().getAllActivePermanents(filter, source.getControllerId(),game)) { + if (equipment != null) { + //If an Equipment can’t equip, it isn’t attached, and it doesn’t become unattached (if it’s attached to a creature). + if (!balan.cantBeAttachedBy(equipment, game)) { + balan.addAttachment(equipment.getId(), game); + } + } + } + return true; + } + return false; + } + } +}