github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Master Thief and Sower of Temptation - Fixed control effect duration.

Browse source
This commit is contained in:
LevelX2 2013-09-16 21:44:48 +02:00
parent 3bf75385a8
commit aa68e51e22
2 changed files with 47 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
Mage.Sets/src/mage/sets/lorwyn/SowerOfTemptation.java
View file

@ -27,24 +27,23 @@
*/
package mage.sets.lorwyn;
import mage.constants.CardType;
import mage.constants.Rarity;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.condition.common.PermanentOnBattelfieldCondition;
import mage.abilities.condition.common.PermanentOnBattlefieldControlUnchangedCondition;
import mage.abilities.decorator.ConditionalContinousEffect;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.continious.GainControlTargetEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
import mage.abilities.Mode;
import mage.abilities.effects.ContinuousEffectImpl;
import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.SubLayer;
import mage.constants.Rarity;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.common.TargetCreaturePermanent;
/**
*
@ -60,11 +59,20 @@ public class SowerOfTemptation extends CardImpl<SowerOfTemptation> {
this.color.setBlue(true);
this.power = new MageInt(2);
this.toughness = new MageInt(2);
// Flying
this.addAbility(FlyingAbility.getInstance());
// When Sower of Temptation enters the battlefield, gain control of target creature for as long as Sower of Temptation remains on the battlefield.
Ability ability = new EntersBattlefieldTriggeredAbility(new SowerOfTemptationControlEffect(Duration.WhileOnBattlefield), false);
// 10/1/2007: You retain control of the targeted creature as long as Sower of Temptation
// remains on the battlefield, even if a different player gains control of Sower of Temptation itself.
ConditionalContinousEffect effect = new ConditionalContinousEffect(
new GainControlTargetEffect(Duration.Custom, true),
new PermanentOnBattelfieldCondition(),
"gain control of target creature for as long as Sower of Temptation remains on the battlefield");
Ability ability = new EntersBattlefieldTriggeredAbility(effect, false);
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);
}
public SowerOfTemptation(final SowerOfTemptation card) {
@ -77,40 +85,29 @@ public class SowerOfTemptation extends CardImpl<SowerOfTemptation> {
}
}
class SowerOfTemptationControlEffect extends ContinuousEffectImpl<SowerOfTemptationControlEffect> {
class SowerOfTemptationGainControlEffect extends OneShotEffect<SowerOfTemptationGainControlEffect> {
public SowerOfTemptationControlEffect(Duration duration) {
super(duration, Layer.ControlChangingEffects_2, SubLayer.NA, Outcome.GainControl);
public SowerOfTemptationGainControlEffect() {
super(Outcome.GainControl);
this.staticText = "gain control of target creature for as long as Sower of Temptation remains on the battlefield";
}
public SowerOfTemptationControlEffect(final SowerOfTemptationControlEffect effect) {
public SowerOfTemptationGainControlEffect(final SowerOfTemptationGainControlEffect effect) {
super(effect);
}
@Override
public SowerOfTemptationControlEffect copy() {
return new SowerOfTemptationControlEffect(this);
public SowerOfTemptationGainControlEffect copy() {
return new SowerOfTemptationGainControlEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Permanent sourcePermanent = game.getPermanent(source.getSourceId());
if (sourcePermanent == null) {
this.discard();
return false;
}
Permanent permanent = game.getPermanent(source.getFirstTarget());
if (targetPointer != null) {
permanent = game.getPermanent(targetPointer.getFirst(game, source));
}
if (permanent != null) {
return permanent.changeControllerId(source.getControllerId(), game);
}
ConditionalContinousEffect effect = new ConditionalContinousEffect(
new GainControlTargetEffect(Duration.Custom),
new PermanentOnBattelfieldCondition(),
"gain control of target creature for as long as Sower of Temptation remains on the battlefield");
game.addEffect(effect, source);
return false;
}
@Override
public String getText(Mode mode) {
return "Gain control of target " + mode.getTargets().get(0).getTargetName() + " " + duration.toString();
}
}
}

20
Mage.Sets/src/mage/sets/magic2012/MasterThief.java
View file

@ -29,17 +29,22 @@
package mage.sets.magic2012;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.condition.common.ControlsPermanentCondition;
import mage.abilities.condition.common.PermanentOnBattlefieldControlUnchangedCondition;
import mage.abilities.decorator.ConditionalContinousEffect;
import mage.abilities.effects.common.continious.GainControlTargetEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.TargetController;
import mage.filter.FilterPermanent;
import mage.filter.predicate.mageobject.CardIdPredicate;
import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.TargetPermanent;
/**
@ -48,7 +53,6 @@ import mage.target.TargetPermanent;
public class MasterThief extends CardImpl<MasterThief> {
private static final FilterPermanent filter = new FilterPermanent("artifact");
static {
filter.add(new CardTypePredicate(CardType.ARTIFACT));
}
@ -61,7 +65,13 @@ public class MasterThief extends CardImpl<MasterThief> {
this.color.setBlue(true);
this.power = new MageInt(2);
this.toughness = new MageInt(2);
Ability ability = new EntersBattlefieldTriggeredAbility(new GainControlTargetEffect(Duration.WhileOnBattlefield), false);
// When Master Thief enters the battlefield, gain control of target artifact for as long as you control Master Thief.
ConditionalContinousEffect effect = new ConditionalContinousEffect(
new GainControlTargetEffect(Duration.Custom),
new PermanentOnBattlefieldControlUnchangedCondition(),
"gain control of target artifact for as long as you control Master Thief");
Ability ability = new EntersBattlefieldTriggeredAbility(effect, false);
ability.addTarget(new TargetPermanent(filter));
this.addAbility(ability);
}