External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-23 11:49:56 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1880 from drmDev/master

Browse source 
W16 fix. Eldrazi Obligator fix and test
This commit is contained in:
Derek M 2016-04-15 12:24:33 -04:00
commit a1550363d5
6 changed files with 64 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/WelcomeDeck2016.java
View file

@ -44,7 +44,7 @@ public class WelcomeDeck2016 extends ExpansionSet {
}
private WelcomeDeck2016() {
super("Welcome Deck 2016", "W16", "mage.sets.welcomedeck2016", new GregorianCalendar(2016, 3, 8).getTime(), SetType.SUPPLEMENTAL);
super("Welcome Deck 2016", "W16", "mage.sets.welcomedeck2016", new GregorianCalendar(2016, 3, 8).getTime(), SetType.SUPPLEMENTAL_STANDARD_LEGAL);
this.hasBasicLands = false;
this.hasBoosters = false;
}

19
Mage.Sets/src/mage/sets/oathofthegatewatch/EldraziObligator.java
View file

@ -65,15 +65,18 @@ public class EldraziObligator extends CardImpl {
// Haste
this.addAbility(HasteAbility.getInstance());
DoIfCostPaid costPaidEffect = new DoIfCostPaid(new GainControlTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}{C}"));
Effect untapEffect = new UntapTargetEffect();
untapEffect.setText("Untap that creature");
Effect hasteEffect = new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn);
hasteEffect.setText("It gains haste until end of turn");
costPaidEffect.addEffect(untapEffect);
costPaidEffect.addEffect(hasteEffect);
// When you cast Eldrazi Obligator, you may pay {1}{C}. If you do, gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn.
Ability ability = new CastSourceTriggeredAbility(new DoIfCostPaid(new GainControlTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}{C}")));
Effect effect = new UntapTargetEffect();
effect.setText("Untap that creature");
ability.addEffect(effect);
effect = new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn);
effect.setText("It gains haste until end of turn");
ability.addEffect(effect);
Ability ability = new CastSourceTriggeredAbility(costPaidEffect);
Target target = new TargetCreaturePermanent(new FilterCreaturePermanent());
ability.addTarget(target);
this.addAbility(ability);