diff --git a/Mage.Sets/src/mage/sets/magic2012/BloodlordOfVaasgoth.java b/Mage.Sets/src/mage/sets/magic2012/BloodlordOfVaasgoth.java index 3012037c521..a95a4001a78 100644 --- a/Mage.Sets/src/mage/sets/magic2012/BloodlordOfVaasgoth.java +++ b/Mage.Sets/src/mage/sets/magic2012/BloodlordOfVaasgoth.java @@ -115,7 +115,7 @@ class BloodlordOfVaasgothEffect extends ContinuousEffectImpl { if (object != null) { Permanent permanent = game.getPermanent(object.getSourceId()); if (permanent != null) { - permanent.addAbility(ability, game); + permanent.addAbility(ability, source.getSourceId(), game); return true; } } else { diff --git a/Mage.Sets/src/mage/sets/theros/XenagosTheReveler.java b/Mage.Sets/src/mage/sets/theros/XenagosTheReveler.java index 9e9b01e6a5f..4c7863f9932 100644 --- a/Mage.Sets/src/mage/sets/theros/XenagosTheReveler.java +++ b/Mage.Sets/src/mage/sets/theros/XenagosTheReveler.java @@ -140,6 +140,7 @@ class XenagosManaEffect extends OneShotEffect { } player.getManaPool().addMana(mana, game, source); } + return true; } return false; } diff --git a/Mage/src/mage/abilities/decorator/ConditionalActivatedAbility.java b/Mage/src/mage/abilities/decorator/ConditionalActivatedAbility.java index 824eaaaa534..1fa66798fec 100644 --- a/Mage/src/mage/abilities/decorator/ConditionalActivatedAbility.java +++ b/Mage/src/mage/abilities/decorator/ConditionalActivatedAbility.java @@ -24,7 +24,7 @@ import mage.game.Game; public class ConditionalActivatedAbility extends ActivatedAbilityImpl { private Condition condition; - private String ruleText = ""; + private String ruleText = null; private static final Effects emptyEffects = new Effects(); @@ -75,6 +75,9 @@ public class ConditionalActivatedAbility extends ActivatedAbilityImpl(If an opponent was dealt damage this turn, this creature enters the battlefield with "); + if (amount == 1) { + sb.append("a +1/+1 counter"); + } else { + sb.append(CardUtil.numberToText(amount)).append(" counters"); + } + sb.append(" on it.)"); + return sb.toString(); } } @@ -44,7 +53,7 @@ class BloodthirstEffect extends OneShotEffect { BloodthirstEffect(int amount) { super(Outcome.BoostCreature); this.amount = amount; - staticText = "this permanent comes into play with " + amount + " +1/+1 counters on it"; + staticText = new StringBuilder("this permanent comes into play with ").append(this.amount).append(" +1/+1 counters on it").toString(); } BloodthirstEffect(final BloodthirstEffect effect) { @@ -61,8 +70,10 @@ class BloodthirstEffect extends OneShotEffect { Permanent p = game.getPermanent(source.getSourceId()); if (p != null) { p.addCounters(CounterType.P1P1.createInstance(amount), game); + } } + return true; } return false; }