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

* Olivia Voldaren - Fixed some wrong tooltip wording (fixes #1868).

Browse source
This commit is contained in:
LevelX2 2016-04-14 16:29:52 +02:00
parent ce3c26ab4b
commit b415d5e116
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java
View file

@ -28,20 +28,20 @@
package mage.sets.innistrad; package mage.sets.innistrad;
import java.util.UUID; import java.util.UUID;
import mage.constants.*;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.decorator.ConditionalContinuousEffect;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DamageTargetEffect;
import mage.abilities.effects.common.continuous.AddCardSubTypeTargetEffect; import mage.abilities.effects.common.continuous.AddCardSubTypeTargetEffect;
import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect;
import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect;
import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.constants.*;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
@ -57,7 +57,7 @@ import mage.target.common.TargetCreaturePermanent;
*/ */
public class OliviaVoldaren extends CardImpl { public class OliviaVoldaren extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature");
private static final FilterCreaturePermanent vampireFilter = new FilterCreaturePermanent("Vampire"); private static final FilterCreaturePermanent vampireFilter = new FilterCreaturePermanent("Vampire");
static { static {
@ -73,8 +73,8 @@ public class OliviaVoldaren extends CardImpl {
this.power = new MageInt(3); this.power = new MageInt(3);
this.toughness = new MageInt(3); this.toughness = new MageInt(3);
String rule = "Gain control of target Vampire for as long as you control Olivia Voldaren"; String rule = "Gain control of target Vampire for as long as you control {this}";
FilterPermanent filter2 = new FilterPermanent(); FilterPermanent filter2 = new FilterPermanent();
filter2.add(new ControllerPredicate(TargetController.YOU)); filter2.add(new ControllerPredicate(TargetController.YOU));
@ -85,13 +85,16 @@ public class OliviaVoldaren extends CardImpl {
// {1}{R}: Olivia Voldaren deals 1 damage to another target creature. That creature becomes a Vampire in addition to its other types. Put a +1/+1 counter on Olivia Voldaren. // {1}{R}: Olivia Voldaren deals 1 damage to another target creature. That creature becomes a Vampire in addition to its other types. Put a +1/+1 counter on Olivia Voldaren.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}")); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}"));
ability.addTarget(new TargetCreaturePermanent(filter)); ability.addTarget(new TargetCreaturePermanent(filter));
ability.addEffect(new AddCardSubTypeTargetEffect("Vampire", Duration.WhileOnBattlefield)); Effect effect = new AddCardSubTypeTargetEffect("Vampire", Duration.WhileOnBattlefield);
effect.setText("That creature becomes a Vampire in addition to its other types");
ability.addEffect(effect);
ability.addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance())); ability.addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance()));
this.addAbility(ability); this.addAbility(ability);
// {3}{B}{B}: Gain control of target Vampire for as long as you control Olivia Voldaren. // {3}{B}{B}: Gain control of target Vampire for as long as you control Olivia Voldaren.
ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainControlTargetEffect(Duration.Custom), new PermanentsOnTheBattlefieldCondition(filter2), rule); Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD,
Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{3}{B}{B}")); new ConditionalContinuousEffect(new GainControlTargetEffect(Duration.Custom), new PermanentsOnTheBattlefieldCondition(filter2), rule),
new ManaCostsImpl("{3}{B}{B}"));
ability2.addTarget(new TargetCreaturePermanent(vampireFilter)); ability2.addTarget(new TargetCreaturePermanent(vampireFilter));
this.addAbility(ability2); this.addAbility(ability2);
} }