External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-24 04:09:54 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added a test.

Browse source
This commit is contained in:
LevelX2 2016-02-25 00:25:33 +01:00
parent b41c4822e9
commit 8e671fecaa
6 changed files with 134 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Mage.Sets/src/mage/sets/magic2011/SerraAscendant.java
View file

@ -1,16 +1,16 @@
/*
* 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
@ -20,22 +20,14 @@
* 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.magic2011;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.SubLayer;
import mage.constants.Zone;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
@ -43,6 +35,13 @@ import mage.abilities.effects.ContinuousEffectImpl;
import mage.abilities.keyword.FlyingAbility;
import mage.abilities.keyword.LifelinkAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.SubLayer;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -64,7 +63,7 @@ public class SerraAscendant extends CardImpl {
// Lifelink (Damage dealt by this creature also causes you to gain that much life.)
this.addAbility(LifelinkAbility.getInstance());
// As long as you have 30 or more life, Serra Ascendant gets +5/+5 and has flying.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SerraAscendantEffect()));
}
@ -99,9 +98,9 @@ class SerraAscendantEffect extends ContinuousEffectImpl {
@Override
public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
Permanent creature = game.getPermanent(source.getSourceId());
if (creature != null) {
Player player = game.getPlayer(creature.getControllerId());
if (player != null && player.getLife() >= 30) {
Player controller = game.getPlayer(source.getControllerId());
if (creature != null && controller != null) {
if (controller.getLife() >= 30) {
switch (layer) {
case PTChangingEffects_7:
if (sublayer == SubLayer.ModifyPT_7c) {
@ -111,12 +110,13 @@ class SerraAscendantEffect extends ContinuousEffectImpl {
break;
case AbilityAddingRemovingEffects_6:
if (sublayer == SubLayer.NA) {
creature.addAbility(FlyingAbility.getInstance(), game);
creature.addAbility(FlyingAbility.getInstance(), source.getSourceId(), game);
}
break;
}
return true;
}
return true;
}
return false;
}
@ -128,7 +128,7 @@ class SerraAscendantEffect extends ContinuousEffectImpl {
@Override
public boolean hasLayer(Layer layer) {
return layer == Layer.AbilityAddingRemovingEffects_6 || layer == layer.PTChangingEffects_7;
return Layer.AbilityAddingRemovingEffects_6.equals(layer) || Layer.PTChangingEffects_7.equals(layer);
}
}
}

6
Mage.Sets/src/mage/sets/timespiral/KaervekTheMerciless.java
View file

@ -98,9 +98,9 @@ class KaervekTheMercilessEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
MageObject spellCast = game.getObject(targetPointer.getFirst(game, source));
MageObject spellCast = game.getObject(getTargetPointer().getFirst(game, source));
if (spellCast instanceof Spell) {
int cost = ((Spell)spellCast).getConvertedManaCost();
int cost = ((Spell) spellCast).getConvertedManaCost();
Player target = game.getPlayer(source.getFirstTarget());
if (target != null) {
target.damage(cost, source.getSourceId(), game, false, true);
@ -108,7 +108,7 @@ class KaervekTheMercilessEffect extends OneShotEffect {
}
Permanent targetCreature = game.getPermanent(source.getFirstTarget());
if (targetCreature != null) {
targetCreature.damage(cost, source.getSourceId(), game, true, false);
targetCreature.damage(cost, source.getSourceId(), game, false, true);
return true;
}
}

5
Mage.Sets/src/mage/sets/timespiral/TemporalIsolation.java
View file

@ -57,7 +57,6 @@ public class TemporalIsolation extends CardImpl {
this.expansionSetCode = "TSP";
this.subtype.add("Aura");
// Flash
this.addAbility(FlashAbility.getInstance());
// Enchant creature
@ -65,11 +64,11 @@ public class TemporalIsolation extends CardImpl {
this.getSpellAbility().addTarget(auraTarget);
this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
Ability ability = new EnchantAbility(auraTarget.getTargetName());
this.addAbility(ability);
this.addAbility(ability);
// Enchanted creature has shadow.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShadowAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield)));
// Prevent all damage that would be dealt by enchanted creature.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", false)));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", false)));
}
public TemporalIsolation(final TemporalIsolation card) {