From aa1925051f571e60bd03b06b04b6a2360822fbca Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 8 Jan 2015 13:54:31 +0100 Subject: [PATCH] * Peat Bog, Remote Farm - Fixed that the mana ability did not work. --- .../src/mage/sets/mercadianmasques/HickoryWoodlot.java | 2 +- Mage.Sets/src/mage/sets/mercadianmasques/PeatBog.java | 5 +++-- Mage.Sets/src/mage/sets/mercadianmasques/RemoteFarm.java | 3 ++- .../src/mage/sets/mercadianmasques/SandstoneNeedle.java | 2 +- .../src/mage/sets/mercadianmasques/SaprazzanSkerry.java | 6 +----- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/HickoryWoodlot.java b/Mage.Sets/src/mage/sets/mercadianmasques/HickoryWoodlot.java index 4564b7cad75..0e1bd452e3b 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/HickoryWoodlot.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/HickoryWoodlot.java @@ -61,7 +61,7 @@ public class HickoryWoodlot extends CardImpl { // {tap}, Remove a depletion counter from Hickory Woodlot: Add {G}{G} to your mana pool. If there are no depletion counters on Hickory Woodlot, sacrifice it. Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(2), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.DEPLETION.createInstance(1))); - ability.addEffect(new ConditionalOneShotEffect(new SacrificeSourceEffect(), new SourceHasCounterCondition(CounterType.DEPLETION, 0,0), "If there are no depletion counters on Hickory Woodlot, sacrifice it")); + ability.addEffect(new ConditionalOneShotEffect(new SacrificeSourceEffect(), new SourceHasCounterCondition(CounterType.DEPLETION, 0,0), "If there are no depletion counters on {this}, sacrifice it")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/PeatBog.java b/Mage.Sets/src/mage/sets/mercadianmasques/PeatBog.java index 0a9123d6173..859c3f83d4c 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/PeatBog.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/PeatBog.java @@ -58,10 +58,11 @@ public class PeatBog extends CardImpl { // Peat Bog enters the battlefield tapped with two depletion counters on it. this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.DEPLETION.createInstance(2)))); - // {tap}, Remove a depletion counter from Peat Bog: Add {B}{B} to your mana pool. If there are no depletion counters on Peat Bog, sacrifice it. + // {T}, Remove a depletion counter from Peat Bog: Add {B}{B} to your mana pool. If there are no depletion counters on Peat Bog, sacrifice it. Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(2), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.DEPLETION.createInstance(1))); - ability.addEffect(new ConditionalOneShotEffect(new SacrificeSourceEffect(), new SourceHasCounterCondition(CounterType.DEPLETION, 0,0), "If there are no depletion counters on Peat Bog, sacrifice it")); + ability.addEffect(new ConditionalOneShotEffect(new SacrificeSourceEffect(), new SourceHasCounterCondition(CounterType.DEPLETION, 0,0), "If there are no depletion counters on {this}, sacrifice it")); + this.addAbility(ability); } public PeatBog(final PeatBog card) { diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/RemoteFarm.java b/Mage.Sets/src/mage/sets/mercadianmasques/RemoteFarm.java index b0113d297d5..b90e0c92ea3 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/RemoteFarm.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/RemoteFarm.java @@ -61,7 +61,8 @@ public class RemoteFarm extends CardImpl { // {tap}, Remove a depletion counter from Remote Farm: Add {W}{W} to your mana pool. If there are no depletion counters on Remote Farm, sacrifice it. Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(2), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.DEPLETION.createInstance(1))); - ability.addEffect(new ConditionalOneShotEffect(new SacrificeSourceEffect(), new SourceHasCounterCondition(CounterType.DEPLETION, 0,0), "If there are no depletion counters on Remote Farm, sacrifice it")); + ability.addEffect(new ConditionalOneShotEffect(new SacrificeSourceEffect(), new SourceHasCounterCondition(CounterType.DEPLETION, 0,0), "If there are no depletion counters on {this}, sacrifice it")); + this.addAbility(ability); } public RemoteFarm(final RemoteFarm card) { diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/SandstoneNeedle.java b/Mage.Sets/src/mage/sets/mercadianmasques/SandstoneNeedle.java index 49613fe3e79..6a82f31f1c3 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/SandstoneNeedle.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/SandstoneNeedle.java @@ -61,7 +61,7 @@ public class SandstoneNeedle extends CardImpl { // {tap}, Remove a depletion counter from Sandstone Needle: Add {R}{R} to your mana pool. If there are no depletion counters on Sandstone Needle, sacrifice it. Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(2), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.DEPLETION.createInstance(1))); - ability.addEffect(new ConditionalOneShotEffect(new SacrificeSourceEffect(), new SourceHasCounterCondition(CounterType.DEPLETION, 0,0), "If there are no depletion counters on Sandstone Needle, sacrifice it")); + ability.addEffect(new ConditionalOneShotEffect(new SacrificeSourceEffect(), new SourceHasCounterCondition(CounterType.DEPLETION, 0,0), "If there are no depletion counters on {this}, sacrifice it")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/SaprazzanSkerry.java b/Mage.Sets/src/mage/sets/mercadianmasques/SaprazzanSkerry.java index 1a5140cb108..9086d77bcf0 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/SaprazzanSkerry.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/SaprazzanSkerry.java @@ -30,7 +30,6 @@ package mage.sets.mercadianmasques; import java.util.UUID; import mage.Mana; import mage.abilities.Ability; -import mage.abilities.AbilityImpl; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.condition.common.SourceHasCounterCondition; @@ -39,9 +38,6 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; -import mage.abilities.mana.AnyColorManaAbility; -import mage.abilities.mana.BasicManaAbility; -import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.constants.CardType; @@ -65,7 +61,7 @@ public class SaprazzanSkerry extends CardImpl { // {tap}, Remove a depletion counter from Saprazzan Skerry: Add {U}{U} to your mana pool. If there are no depletion counters on Saprazzan Skerry, sacrifice it. Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(2), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.DEPLETION.createInstance(1))); - ability.addEffect(new ConditionalOneShotEffect(new SacrificeSourceEffect(), new SourceHasCounterCondition(CounterType.DEPLETION, 0,0), "If there are no depletion counters on Saprazzan Skerry, sacrifice it")); + ability.addEffect(new ConditionalOneShotEffect(new SacrificeSourceEffect(), new SourceHasCounterCondition(CounterType.DEPLETION, 0,0), "If there are no depletion counters on {this}, sacrifice it")); this.addAbility(ability); }