Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Added Sarcomancy, minor changes to some cards.

Browse source
This commit is contained in:
LevelX2 2014-10-17 14:56:53 +02:00
parent 1b7001798d
commit 4e5a3ebaee
6 changed files with 139 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Mage.Sets/src/mage/sets/avacynrestored/RainOfThorns.java
View file

@ -55,6 +55,8 @@ public class RainOfThorns extends CardImpl {
// Choose one or more - Destroy target artifact; destroy target enchantment; and/or destroy target land.
this.getSpellAbility().addEffect(new DestroyTargetEffect());
this.getSpellAbility().addTarget(new TargetArtifactPermanent());
this.getSpellAbility().getModes().setMaxModes(1);
this.getSpellAbility().getModes().setMaxModes(3);
Mode mode1 = new Mode();
mode1.getEffects().add(new DestroyTargetEffect());
@ -65,24 +67,6 @@ public class RainOfThorns extends CardImpl {
mode2.getEffects().add(new DestroyTargetEffect());
mode2.getTargets().add(new TargetPermanent(new FilterLandPermanent()));
this.getSpellAbility().addMode(mode2);
Mode mode3 = new Mode();
mode3.getEffects().add(new DestroyTargetEffect("Destroy target artifact, then destroy target enchantment"));
mode3.getTargets().add(new TargetArtifactPermanent());
mode3.getTargets().add(new TargetPermanent(new FilterEnchantment()));
this.getSpellAbility().addMode(mode3);
Mode mode4 = new Mode();
mode4.getEffects().add(new DestroyTargetEffect("Destroy target artifact, then destroy target land"));
mode4.getTargets().add(new TargetArtifactPermanent());
mode4.getTargets().add(new TargetPermanent(new FilterLandPermanent()));
this.getSpellAbility().addMode(mode4);
Mode mode5 = new Mode();
mode5.getEffects().add(new DestroyTargetEffect("Destroy target enchantment, then destroy target land"));
mode5.getTargets().add(new TargetPermanent(new FilterEnchantment()));
mode5.getTargets().add(new TargetPermanent(new FilterLandPermanent()));
this.getSpellAbility().addMode(mode5);
}
public RainOfThorns(final RainOfThorns card) {

6
Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java
View file

@ -92,10 +92,4 @@ public class ClanDefiance extends CardImpl {
return new ClanDefiance(this);
}
@Override
public List<String> getRules() {
List<String> rules = new ArrayList<String>();
rules.add("Choose one or more - Clan Defiance deals X damage to target creature with flying; Clan Defiance deals X damage to target creature without flying; and/or Clan Defiance deals X damage to target player.");
return rules;
}
}

6
Mage.Sets/src/mage/sets/mirage/AmberPrison.java
View file

@ -79,7 +79,6 @@ public class AmberPrison extends CardImpl {
ability.addTarget(new TargetPermanent(filter));
this.addAbility(ability);
this.addAbility(new AmberPrisonUntapTriggeredAbility());
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AmberPrisonRestrictionEffect()));
}
@ -179,10 +178,7 @@ class AmberPrisonUntapTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType().equals(GameEvent.EventType.UNTAPPED) && event.getTargetId().equals(this.getSourceId())) {
return true;
}
return false;
return event.getType().equals(GameEvent.EventType.UNTAPPED) && event.getTargetId().equals(this.getSourceId());
}
}

8
Mage.Sets/src/mage/sets/planarchaos/FuryCharm.java
View file

@ -83,8 +83,12 @@ public class FuryCharm extends CardImpl {
this.getSpellAbility().addTarget(new TargetArtifactPermanent());
// or target creature gets +1/+1 and gains trample until end of turn;
Mode mode = new Mode();
mode.getEffects().add(new BoostTargetEffect(1,1, Duration.EndOfTurn));
mode.getEffects().add(new GainAbilityTargetEffect(TrampleAbility.getInstance(),Duration.EndOfTurn));
Effect effect = new BoostTargetEffect(1,1, Duration.EndOfTurn);
effect.setText("target creature gets +1/+1");
mode.getEffects().add(effect);
effect = new GainAbilityTargetEffect(TrampleAbility.getInstance(),Duration.EndOfTurn);
effect.setText("and gains trample until end of turn");
mode.getEffects().add(effect);
mode.getTargets().add(new TargetCreaturePermanent());
this.getSpellAbility().getModes().addMode(mode);
// or remove two time counters from target permanent or suspended card.

76
Mage.Sets/src/mage/sets/tempest/Sarcomancy.java Normal file
View file

@ -0,0 +1,76 @@
/*
* 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.tempest;
import java.util.UUID;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
import mage.abilities.decorator.ConditionalTriggeredAbility;
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.abilities.effects.common.DamageControllerEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.filter.FilterPermanent;
import mage.filter.predicate.mageobject.NamePredicate;
import mage.game.permanent.token.ZombieToken;
/**
*
* @author LevelX2
*/
public class Sarcomancy extends CardImpl {
public Sarcomancy(UUID ownerId) {
super(ownerId, 48, "Sarcomancy", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{B}");
this.expansionSetCode = "TMP";
this.color.setBlack(true);
// When Sarcomancy enters the battlefield, put a 2/2 black Zombie creature token onto the battlefield.
this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ZombieToken(), 1), false));
// At the beginning of your upkeep, if there are no Zombies on the battlefield, Sarcomancy deals 1 damage to you.
this.addAbility(new ConditionalTriggeredAbility(
new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DamageControllerEffect(1), TargetController.YOU, false),
new PermanentsOnTheBattlefieldCondition(new FilterPermanent("Zombie", "Zombies"), PermanentsOnTheBattlefieldCondition.CountType.EQUAL_TO, 0, false),
"At the beginning of your upkeep, if there are no Zombies on the battlefield, {this} deals 1 damage to you."));
}
public Sarcomancy(final Sarcomancy card) {
super(card);
}
@Override
public Sarcomancy copy() {
return new Sarcomancy(this);
}
}

54
Mage.Sets/src/mage/sets/vintagemasters/Sarcomancy.java Normal file
View file

@ -0,0 +1,54 @@
/*
* 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.vintagemasters;
import java.util.UUID;
import mage.constants.Rarity;
/**
*
* @author LevelX2
*/
public class Sarcomancy extends mage.sets.tempest.Sarcomancy {
public Sarcomancy(UUID ownerId) {
super(ownerId);
this.cardNumber = 139;
this.expansionSetCode = "VMA";
this.rarity = Rarity.UNCOMMON;
}
public Sarcomancy(final Sarcomancy card) {
super(card);
}
@Override
public Sarcomancy copy() {
return new Sarcomancy(this);
}
}