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

* Jeering Instigator - Fixed that the condition was wrongly checked on effect level instead of not triggering if it#s not the turn of the controller.

Browse source
This commit is contained in:
LevelX2 2014-12-02 08:24:59 +01:00
parent 07d8280cd4
commit e6c4be6b5b
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Mage.Sets/src/mage/sets/khansoftarkir/JeeringInstigator.java
View file

@ -33,7 +33,7 @@ import mage.abilities.Ability;
import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility; import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility;
import mage.abilities.condition.common.MyTurnCondition; import mage.abilities.condition.common.MyTurnCondition;
import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.decorator.ConditionalTriggeredAbility;
import mage.abilities.effects.Effect; import mage.abilities.effects.Effect;
import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.UntapTargetEffect;
import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect;
@ -73,7 +73,10 @@ public class JeeringInstigator extends CardImpl {
this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{R}"))); this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{R}")));
// When Jeering Instigator is turned face up, if it's your turn, gain control of another target creature until end of turn. Untap it. That creature gains haste until end of turn. // When Jeering Instigator is turned face up, if it's your turn, gain control of another target creature until end of turn. Untap it. That creature gains haste until end of turn.
Ability ability = new TurnedFaceUpSourceTriggeredAbility(new ConditionalContinousEffect(new GainControlTargetEffect(Duration.EndOfTurn), MyTurnCondition.getInstance(), "if it's your turn, gain control of another target creature until end of turn")); Ability ability = new ConditionalTriggeredAbility(
new TurnedFaceUpSourceTriggeredAbility(new GainControlTargetEffect(Duration.EndOfTurn),false, false),
MyTurnCondition.getInstance(),
"When {this} is turned face up, if it's your turn, gain control of another target creature until end of turn.");
Effect effect = new UntapTargetEffect(); Effect effect = new UntapTargetEffect();
effect.setText("Untap that creature"); effect.setText("Untap that creature");
ability.addEffect(effect); ability.addEffect(effect);