diff --git a/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java b/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java index 9a11d4153a7..1c64dd6b30d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java +++ b/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java @@ -28,20 +28,20 @@ package mage.sets.innistrad; import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalContinuousEffect; +import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.continuous.AddCardSubTypeTargetEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -57,7 +57,7 @@ import mage.target.common.TargetCreaturePermanent; */ 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"); static { @@ -73,8 +73,8 @@ public class OliviaVoldaren extends CardImpl { this.power = 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(); 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. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}")); 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())); this.addAbility(ability); // {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, effect, new ManaCostsImpl("{3}{B}{B}")); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, + new ConditionalContinuousEffect(new GainControlTargetEffect(Duration.Custom), new PermanentsOnTheBattlefieldCondition(filter2), rule), + new ManaCostsImpl("{3}{B}{B}")); ability2.addTarget(new TargetCreaturePermanent(vampireFilter)); this.addAbility(ability2); }