From eaae3cc9b03a182c00e5888a78963482046916ae Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 20 Apr 2016 13:34:32 +0200 Subject: [PATCH] * Time Spiral storage duals lands - Fixed that the activated ability to remove the counters was not defnied as mana ability. --- Mage.Sets/src/mage/sets/commander/DreadshipReef.java | 5 +++-- Mage.Sets/src/mage/sets/commander/FungalReaches.java | 5 +++-- Mage.Sets/src/mage/sets/commander2013/MoltenSlagheap.java | 5 +++-- Mage.Sets/src/mage/sets/commander2013/SaltcrustedSteppe.java | 5 +++-- Mage.Sets/src/mage/sets/oathofthegatewatch/VileRedeemer.java | 4 +++- Mage.Sets/src/mage/sets/timespiral/CalciformPools.java | 5 +++-- 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/Mage.Sets/src/mage/sets/commander/DreadshipReef.java b/Mage.Sets/src/mage/sets/commander/DreadshipReef.java index e121b59e4e..cf95d65c13 100644 --- a/Mage.Sets/src/mage/sets/commander/DreadshipReef.java +++ b/Mage.Sets/src/mage/sets/commander/DreadshipReef.java @@ -37,6 +37,7 @@ import mage.abilities.dynamicvalue.common.RemovedCountersForCostValue; import mage.abilities.effects.common.AddManaInAnyCombinationEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.mana.ColorlessManaAbility; +import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; @@ -57,11 +58,11 @@ public class DreadshipReef extends CardImpl { // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); // {1}, {tap}: Put a storage counter on Dreadship Reef. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()),new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {1}, Remove X storage counters from Dreadship Reef: Add X mana in any combination of {U} and/or {B} to your mana pool. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaInAnyCombinationEffect(new RemovedCountersForCostValue(), ColoredManaSymbol.U, ColoredManaSymbol.B), new GenericManaCost(1)); ability.addCost(new RemoveVariableCountersSourceCost(CounterType.STORAGE.createInstance())); diff --git a/Mage.Sets/src/mage/sets/commander/FungalReaches.java b/Mage.Sets/src/mage/sets/commander/FungalReaches.java index 4be3a004ec..5932fc05f4 100644 --- a/Mage.Sets/src/mage/sets/commander/FungalReaches.java +++ b/Mage.Sets/src/mage/sets/commander/FungalReaches.java @@ -37,6 +37,7 @@ import mage.abilities.dynamicvalue.common.RemovedCountersForCostValue; import mage.abilities.effects.common.AddManaInAnyCombinationEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.mana.ColorlessManaAbility; +import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; @@ -58,12 +59,12 @@ public class FungalReaches extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}, {tap}: Put a storage counter on Fungal Reaches. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()),new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {1}, Remove X storage counters from Fungal Reaches: Add X mana in any combination of {R} and/or {G} to your mana pool. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaInAnyCombinationEffect(new RemovedCountersForCostValue(), ColoredManaSymbol.R, ColoredManaSymbol.G), new GenericManaCost(1)); ability.addCost(new RemoveVariableCountersSourceCost(CounterType.STORAGE.createInstance())); diff --git a/Mage.Sets/src/mage/sets/commander2013/MoltenSlagheap.java b/Mage.Sets/src/mage/sets/commander2013/MoltenSlagheap.java index 7b7a554e7b..9dbfa3b39c 100644 --- a/Mage.Sets/src/mage/sets/commander2013/MoltenSlagheap.java +++ b/Mage.Sets/src/mage/sets/commander2013/MoltenSlagheap.java @@ -37,6 +37,7 @@ import mage.abilities.dynamicvalue.common.RemovedCountersForCostValue; import mage.abilities.effects.common.AddManaInAnyCombinationEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.mana.ColorlessManaAbility; +import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; @@ -57,11 +58,11 @@ public class MoltenSlagheap extends CardImpl { // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); // {1}, {tap}: Put a storage counter on Molten Slagheap. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()),new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {1}, Remove X storage counters from Molten Slagheap: Add X mana in any combination of {B} and/or {R} to your mana pool. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaInAnyCombinationEffect(new RemovedCountersForCostValue(), ColoredManaSymbol.B, ColoredManaSymbol.R), new GenericManaCost(1)); ability.addCost(new RemoveVariableCountersSourceCost(CounterType.STORAGE.createInstance())); diff --git a/Mage.Sets/src/mage/sets/commander2013/SaltcrustedSteppe.java b/Mage.Sets/src/mage/sets/commander2013/SaltcrustedSteppe.java index 44343b0889..8d74964963 100644 --- a/Mage.Sets/src/mage/sets/commander2013/SaltcrustedSteppe.java +++ b/Mage.Sets/src/mage/sets/commander2013/SaltcrustedSteppe.java @@ -37,6 +37,7 @@ import mage.abilities.dynamicvalue.common.RemovedCountersForCostValue; import mage.abilities.effects.common.AddManaInAnyCombinationEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.mana.ColorlessManaAbility; +import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; @@ -57,11 +58,11 @@ public class SaltcrustedSteppe extends CardImpl { // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); // {1}, {tap}: Put a storage counter on Saltcrusted Steppe. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()),new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {1}, Remove X storage counters from Saltcrusted Steppe: Add X mana in any combination of {G} and/or {W} to your mana pool. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaInAnyCombinationEffect(new RemovedCountersForCostValue(), ColoredManaSymbol.G, ColoredManaSymbol.W), new GenericManaCost(1)); ability.addCost(new RemoveVariableCountersSourceCost(CounterType.STORAGE.createInstance())); diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/VileRedeemer.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/VileRedeemer.java index 1412d9a969..b879db59eb 100644 --- a/Mage.Sets/src/mage/sets/oathofthegatewatch/VileRedeemer.java +++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/VileRedeemer.java @@ -137,7 +137,8 @@ class VileRedeemerNonTokenCreaturesDiedWatcher extends Watcher { if (zEvent.isDiesEvent() && zEvent.getTarget() != null && zEvent.getTarget().getCardType().contains(CardType.CREATURE) && !(zEvent.getTarget() instanceof PermanentToken)) { - int count = amountOfCreaturesThatDied.containsKey(zEvent.getTarget().getControllerId()) ? amountOfCreaturesThatDied.get(zEvent.getTarget().getControllerId()) : 0; + int count = amountOfCreaturesThatDied.containsKey(zEvent.getTarget().getControllerId()) + ? amountOfCreaturesThatDied.get(zEvent.getTarget().getControllerId()) : 0; amountOfCreaturesThatDied.put(zEvent.getTarget().getControllerId(), ++count); } } @@ -145,6 +146,7 @@ class VileRedeemerNonTokenCreaturesDiedWatcher extends Watcher { @Override public void reset() { + super.reset(); amountOfCreaturesThatDied.clear(); } diff --git a/Mage.Sets/src/mage/sets/timespiral/CalciformPools.java b/Mage.Sets/src/mage/sets/timespiral/CalciformPools.java index 12a3dc3af7..14d38a0e44 100644 --- a/Mage.Sets/src/mage/sets/timespiral/CalciformPools.java +++ b/Mage.Sets/src/mage/sets/timespiral/CalciformPools.java @@ -37,6 +37,7 @@ import mage.abilities.dynamicvalue.common.RemovedCountersForCostValue; import mage.abilities.effects.common.AddManaInAnyCombinationEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.mana.ColorlessManaAbility; +import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; @@ -57,11 +58,11 @@ public class CalciformPools extends CardImpl { // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); // {1}, {tap}: Put a storage counter on Calciform Pools. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()),new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {1}, Remove X storage counters from Calciform Pools: Add X mana in any combination of {W} and/or {U} to your mana pool. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaInAnyCombinationEffect(new RemovedCountersForCostValue(), ColoredManaSymbol.W, ColoredManaSymbol.U), new GenericManaCost(1)); ability.addCost(new RemoveVariableCountersSourceCost(CounterType.STORAGE.createInstance()));