github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 19:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1411 from Poddo/master

Browse source 
Added Mercurial Kite, Consuming Bonfire, grammar fixes
This commit is contained in:
LevelX2 2015-12-07 11:06:44 +01:00
commit 37ba7c4a02
5 changed files with 157 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/antiquities/ArgivianBlacksmith.java
View file

@ -48,7 +48,7 @@ import mage.target.TargetPermanent;
*/
public class ArgivianBlacksmith extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("target artifact creature");
private static final FilterPermanent filter = new FilterPermanent("artifact creature");
static {
filter.add(new CardTypePredicate(CardType.ARTIFACT));

2
Mage.Sets/src/mage/sets/dragonsoftarkir/MonasteryLoremaster.java
View file

@ -48,7 +48,7 @@ import mage.target.common.TargetCardInYourGraveyard;
*/
public class MonasteryLoremaster extends CardImpl {
private static final FilterCard filter = new FilterCard("target noncreature, nonland card from your graveyard");
private static final FilterCard filter = new FilterCard("noncreature, nonland card from your graveyard");
static {
filter.add(Predicates.not(new CardTypePredicate(CardType.CREATURE)));

83
Mage.Sets/src/mage/sets/lorwyn/ConsumingBonfire.java Normal file
View file

@ -0,0 +1,83 @@
/*
* 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.lorwyn;
import java.util.UUID;
import mage.abilities.Mode;
import mage.abilities.effects.common.DamageTargetEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.filter.FilterPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.target.TargetPermanent;
/**
*
* @author Poddo
*/
public class ConsumingBonfire extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("non-Elemental creature");
private static final FilterPermanent filter2 = new FilterPermanent("Treefolk creature");
static {
filter.add(new CardTypePredicate(CardType.CREATURE));
filter.add(Predicates.not(new SubtypePredicate("Elemental")));
filter2.add(new CardTypePredicate(CardType.CREATURE));
filter2.add(new SubtypePredicate("Treefolk"));
}
public ConsumingBonfire(UUID ownerId) {
super(ownerId, 161, "Consuming Bonfire", Rarity.COMMON, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{3}{R}{R}");
this.expansionSetCode = "LRW";
this.subtype.add("Elemental");
// Choose one - Consuming Bonfire deals 4 damage to target non-Elemental creature;
this.getSpellAbility().addTarget(new TargetPermanent(filter));
this.getSpellAbility().addEffect(new DamageTargetEffect(4));
//or Consuming Bonfire deals 7 damage to target Treefolk creature.
Mode mode = new Mode();
mode.getEffects().add(new DamageTargetEffect(7));
mode.getTargets().add(new TargetPermanent(filter2));
this.getSpellAbility().addMode(mode);
}
public ConsumingBonfire(final ConsumingBonfire card) {
super(card);
}
@Override
public ConsumingBonfire copy() {
return new ConsumingBonfire(this);
}
}

2
Mage.Sets/src/mage/sets/planarchaos/SerendibSorcerer.java
View file

@ -48,7 +48,7 @@ import mage.target.common.TargetCreaturePermanent;
*/
public class SerendibSorcerer extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("target creature other than {this}");
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature other than {this}");
static {
filter.add(new AnotherPredicate());

71
Mage.Sets/src/mage/sets/scourge/MercurialKite.java Normal file
View file

@ -0,0 +1,71 @@
/*
* 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.scourge;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.DealsDamageToACreatureTriggeredAbility;
import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect;
import mage.abilities.effects.common.TapTargetEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Rarity;
/**
*
* @author Poddo
*/
public class MercurialKite extends CardImpl {
public MercurialKite(UUID ownerId) {
super(ownerId, 39, "Mercurial Kite", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}");
this.expansionSetCode = "SCG";
this.subtype.add("Bird");
this.power = new MageInt(2);
this.toughness = new MageInt(2);
// Flying
this.addAbility(FlyingAbility.getInstance());
// Whenever Mercurial Kite deals combat damage to a creature, tap that creature. That creature doesn't untap during its controller's next untap step.
Ability ability;
ability = new DealsDamageToACreatureTriggeredAbility(new TapTargetEffect("that creature"), true, false, true);
ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect("and it"));
this.addAbility(ability);
}
public MercurialKite(final MercurialKite card) {
super(card);
}
@Override
public MercurialKite copy() {
return new MercurialKite(this);
}
}