From f7fdd0edde6d3124b4708fe18344bb1b62592d83 Mon Sep 17 00:00:00 2001 From: zweistecken Date: Wed, 20 May 2015 09:01:43 +0200 Subject: [PATCH 1/4] fixed AttackedByCreatureTriggeredAbility to behave as before adding SetTargetPointer --- .../abilities/common/AttackedByCreatureTriggeredAbility.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage/src/mage/abilities/common/AttackedByCreatureTriggeredAbility.java b/Mage/src/mage/abilities/common/AttackedByCreatureTriggeredAbility.java index 5b4e3053bf..456d02029c 100644 --- a/Mage/src/mage/abilities/common/AttackedByCreatureTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/AttackedByCreatureTriggeredAbility.java @@ -51,7 +51,7 @@ public class AttackedByCreatureTriggeredAbility extends TriggeredAbilityImpl { } public AttackedByCreatureTriggeredAbility(Effect effect, boolean optional) { - this(effect, optional, SetTargetPointer.PERMANENT); + this(effect, optional, SetTargetPointer.NONE); } public AttackedByCreatureTriggeredAbility(Effect effect, boolean optional, SetTargetPointer setTargetPointer) { From 15f1d14d5643ef07afe4e4c62baf2b5f6db247fc Mon Sep 17 00:00:00 2001 From: lopho Date: Wed, 20 May 2015 15:23:21 +0200 Subject: [PATCH 2/4] Added Plague Rats (LEA, LEB, 2ED, 3ED, 4ED, 5ED) --- .../mage/sets/fifthedition/PlagueRats.java | 52 +++++++++++++ .../mage/sets/fourthedition/PlagueRats.java | 52 +++++++++++++ .../mage/sets/limitedalpha/PlagueRats.java | 52 +++++++++++++ .../src/mage/sets/limitedbeta/PlagueRats.java | 52 +++++++++++++ .../mage/sets/revisededition/PlagueRats.java | 52 +++++++++++++ .../sets/unlimitededition/PlagueRats.java | 75 +++++++++++++++++++ 6 files changed, 335 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/fifthedition/PlagueRats.java create mode 100644 Mage.Sets/src/mage/sets/fourthedition/PlagueRats.java create mode 100644 Mage.Sets/src/mage/sets/limitedalpha/PlagueRats.java create mode 100644 Mage.Sets/src/mage/sets/limitedbeta/PlagueRats.java create mode 100644 Mage.Sets/src/mage/sets/revisededition/PlagueRats.java create mode 100644 Mage.Sets/src/mage/sets/unlimitededition/PlagueRats.java diff --git a/Mage.Sets/src/mage/sets/fifthedition/PlagueRats.java b/Mage.Sets/src/mage/sets/fifthedition/PlagueRats.java new file mode 100644 index 0000000000..cd68055664 --- /dev/null +++ b/Mage.Sets/src/mage/sets/fifthedition/PlagueRats.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.fifthedition; + +import java.util.UUID; + +/** + * + * @author lopho + */ +public class PlagueRats extends mage.sets.unlimitededition.PlagueRats { + + public PlagueRats(UUID ownerId) { + super(ownerId); + this.cardNumber = 50; + this.expansionSetCode = "5ED"; + } + + public PlagueRats(final PlagueRats card) { + super(card); + } + + @Override + public PlagueRats copy() { + return new PlagueRats(this); + } +} diff --git a/Mage.Sets/src/mage/sets/fourthedition/PlagueRats.java b/Mage.Sets/src/mage/sets/fourthedition/PlagueRats.java new file mode 100644 index 0000000000..bc3b1611e0 --- /dev/null +++ b/Mage.Sets/src/mage/sets/fourthedition/PlagueRats.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.fourthedition; + +import java.util.UUID; + +/** + * + * @author lopho + */ +public class PlagueRats extends mage.sets.unlimitededition.PlagueRats { + + public PlagueRats(UUID ownerId) { + super(ownerId); + this.cardNumber = 38; + this.expansionSetCode = "4ED"; + } + + public PlagueRats(final PlagueRats card) { + super(card); + } + + @Override + public PlagueRats copy() { + return new PlagueRats(this); + } +} diff --git a/Mage.Sets/src/mage/sets/limitedalpha/PlagueRats.java b/Mage.Sets/src/mage/sets/limitedalpha/PlagueRats.java new file mode 100644 index 0000000000..20cd7073d3 --- /dev/null +++ b/Mage.Sets/src/mage/sets/limitedalpha/PlagueRats.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.limitedalpha; + +import java.util.UUID; + +/** + * + * @author lopho + */ +public class PlagueRats extends mage.sets.unlimitededition.PlagueRats { + + public PlagueRats(UUID ownerId) { + super(ownerId); + this.cardNumber = 30; + this.expansionSetCode = "LEA"; + } + + public PlagueRats(final PlagueRats card) { + super(card); + } + + @Override + public PlagueRats copy() { + return new PlagueRats(this); + } +} diff --git a/Mage.Sets/src/mage/sets/limitedbeta/PlagueRats.java b/Mage.Sets/src/mage/sets/limitedbeta/PlagueRats.java new file mode 100644 index 0000000000..e09f249219 --- /dev/null +++ b/Mage.Sets/src/mage/sets/limitedbeta/PlagueRats.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.limitedbeta; + +import java.util.UUID; + +/** + * + * @author lopho + */ +public class PlagueRats extends mage.sets.unlimitededition.PlagueRats { + + public PlagueRats(UUID ownerId) { + super(ownerId); + this.cardNumber = 30; + this.expansionSetCode = "LEB"; + } + + public PlagueRats(final PlagueRats card) { + super(card); + } + + @Override + public PlagueRats copy() { + return new PlagueRats(this); + } +} diff --git a/Mage.Sets/src/mage/sets/revisededition/PlagueRats.java b/Mage.Sets/src/mage/sets/revisededition/PlagueRats.java new file mode 100644 index 0000000000..5cc601ab76 --- /dev/null +++ b/Mage.Sets/src/mage/sets/revisededition/PlagueRats.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.revisededition; + +import java.util.UUID; + +/** + * + * @author lopho + */ +public class PlagueRats extends mage.sets.unlimitededition.PlagueRats { + + public PlagueRats(UUID ownerId) { + super(ownerId); + this.cardNumber = 31; + this.expansionSetCode = "3ED"; + } + + public PlagueRats(final PlagueRats card) { + super(card); + } + + @Override + public PlagueRats copy() { + return new PlagueRats(this); + } +} diff --git a/Mage.Sets/src/mage/sets/unlimitededition/PlagueRats.java b/Mage.Sets/src/mage/sets/unlimitededition/PlagueRats.java new file mode 100644 index 0000000000..8d25054eb0 --- /dev/null +++ b/Mage.Sets/src/mage/sets/unlimitededition/PlagueRats.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.unlimitededition; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.dynamicvalue.DynamicValue; +import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; +import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.NamePredicate; + +/** + * + * @author lopho + */ +public class PlagueRats extends CardImpl { + + private static final FilterCreaturePermanent plagueRatsFilter = new FilterCreaturePermanent("Plague Rats on the battlefield"); + static { + plagueRatsFilter.add(new NamePredicate("Plague Rats")); + } + + public PlagueRats(UUID ownerId) { + super(ownerId, 30, "Plague Rats", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); + this.expansionSetCode = "2ED"; + this.subtype.add("Rat"); + this.power = new MageInt(0); + this.toughness = new MageInt(0); + + // Plague Rats's power and toughness are each equal to the number of creatures named Plague Rats on the battlefield. + DynamicValue amount = new PermanentsOnBattlefieldCount(plagueRatsFilter); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(amount, Duration.EndOfGame))); + } + + public PlagueRats(final PlagueRats card) { + super(card); + } + + @Override + public PlagueRats copy() { + return new PlagueRats(this); + } +} From 486083ba059565e3de6fe47ec431949143113cdb Mon Sep 17 00:00:00 2001 From: lopho Date: Wed, 20 May 2015 15:25:04 +0200 Subject: [PATCH 3/4] Fixed Altar Golem, p/t counts also when not on battlefield --- Mage.Sets/src/mage/sets/eventide/AltarGolem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/sets/eventide/AltarGolem.java b/Mage.Sets/src/mage/sets/eventide/AltarGolem.java index 6484ed5af5..eb96c79df0 100644 --- a/Mage.Sets/src/mage/sets/eventide/AltarGolem.java +++ b/Mage.Sets/src/mage/sets/eventide/AltarGolem.java @@ -75,7 +75,7 @@ public class AltarGolem extends CardImpl { // Altar Golem's power and toughness are each equal to the number of creatures on the battlefield. DynamicValue amount = new PermanentsOnBattlefieldCount(new FilterCreaturePermanent("creatures in play")); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetPowerToughnessSourceEffect(amount, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(amount, Duration.EndOfGame))); // Altar Golem doesn't untap during your untap step. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); From ccdbcfd0196f8cc5e6c43f6b3eb84e5685cad40a Mon Sep 17 00:00:00 2001 From: lopho Date: Wed, 20 May 2015 15:25:41 +0200 Subject: [PATCH 4/4] fixed classicsixthedition for gen-card.pl --- Utils/known-sets.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Utils/known-sets.txt b/Utils/known-sets.txt index dccc840c67..3397c42b57 100644 --- a/Utils/known-sets.txt +++ b/Utils/known-sets.txt @@ -8,7 +8,7 @@ Avacyn Restored|avacynrestored| Betrayers of Kamigawa|betrayersofkamigawa| Born of the Gods|bornofthegods| Champions of Kamigawa|championsofkamigawa| -Classic Sixth Edition|sixthedition| +Classic Sixth Edition|classicsixthedition| Coldsnap|coldsnap| Commander 2013 Edition|commander2013| Commander 2014 Edition|commander2014| @@ -132,4 +132,4 @@ Weatherlight|weatherlight| World Magic Cup Qualifier|worldmagiccupqualifier| Worldwake|worldwake| WPN Gateway|wpngateway| -Zendikar|zendikar| \ No newline at end of file +Zendikar|zendikar|