Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

* Vanishing - some changes to tooltip text.

Browse source
This commit is contained in:
LevelX2 2013-11-03 20:58:51 +01:00
parent 7db40252d1
commit 47e8bd24cc
4 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/planarchaos/Calciderm.java
View file

@ -58,7 +58,7 @@ public class Calciderm extends CardImpl<Calciderm> {
this.addAbility(ShroudAbility.getInstance());
// Vanishing 4
this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.TIME.createInstance(4))));
this.addAbility(new VanishingUpkeepAbility());
this.addAbility(new VanishingUpkeepAbility(4));
this.addAbility(new VanishingSacrificeAbility());
}

2
Mage.Sets/src/mage/sets/planarchaos/KeldonMarauders.java
View file

@ -61,7 +61,7 @@ public class KeldonMarauders extends CardImpl<KeldonMarauders> {
// Vanishing 2
this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.TIME.createInstance(2))));
this.addAbility(new VanishingUpkeepAbility());
this.addAbility(new VanishingUpkeepAbility(2));
this.addAbility(new VanishingSacrificeAbility());
// When Keldon Marauders enters the battlefield or leaves the battlefield, it deals 1 damage to target player.
Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(1), false);

7
Mage/src/mage/abilities/keyword/VanishingSacrificeAbility.java
View file

@ -11,6 +11,7 @@ import mage.game.permanent.Permanent;
public class VanishingSacrificeAbility extends TriggeredAbilityImpl<VanishingSacrificeAbility> {
public VanishingSacrificeAbility() {
super(Zone.BATTLEFIELD, new SacrificeSourceEffect());
this.setRuleVisible(false);
}
public VanishingSacrificeAbility(final VanishingSacrificeAbility ability) {
@ -32,9 +33,5 @@ public class VanishingSacrificeAbility extends TriggeredAbilityImpl<VanishingSac
public VanishingSacrificeAbility copy() {
return new VanishingSacrificeAbility(this);
}
@Override
public String getRule() {
return "";
}
}

15
Mage/src/mage/abilities/keyword/VanishingUpkeepAbility.java
View file

@ -8,14 +8,20 @@ import mage.constants.TargetController;
import mage.counters.CounterType;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.util.CardUtil;
public class VanishingUpkeepAbility extends BeginningOfUpkeepTriggeredAbility {
public VanishingUpkeepAbility() {
private int vanishingAmount;
public VanishingUpkeepAbility(int vanishingEffect) {
super(new VanishingEffect(), TargetController.YOU, false);
this.vanishingAmount = vanishingEffect;
}
public VanishingUpkeepAbility(final VanishingUpkeepAbility ability) {
super(ability);
this.vanishingAmount = ability.vanishingAmount;
}
@Override
@ -25,7 +31,10 @@ public class VanishingUpkeepAbility extends BeginningOfUpkeepTriggeredAbility {
@Override
public String getRule() {
return "Vanishing (This permanent enters the battlefield with time counters on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.)";
return new StringBuilder("Vanishing ")
.append(vanishingAmount)
.append(" <i>(This permanent enters the battlefield with ").append(CardUtil.numberToText(vanishingAmount))
.append(" time counters on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.)<i>").toString();
}
}
@ -56,4 +65,4 @@ class VanishingEffect extends OneShotEffect<VanishingEffect> {
public VanishingEffect copy() {
return new VanishingEffect(this);
}
}
}