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

* Opal Palace - Fixed that a commander casr with opal palace did not get a +1/+1 counter.

Browse source
This commit is contained in:
LevelX2 2015-05-30 01:44:47 +02:00
parent 4aca9b6e94
commit 04d555d339
3 changed files with 77 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Mage.Sets/src/mage/sets/commander2013/OpalPalace.java
View file

@ -64,12 +64,12 @@ public class OpalPalace extends CardImpl {
super(ownerId, 310, "Opal Palace", Rarity.COMMON, new CardType[]{CardType.LAND}, "");
this.expansionSetCode = "C13";
// {tap}: Add {1} to your mana pool.
// {T}: Add {1} to your mana pool.
this.addAbility(new ColorlessManaAbility());
// {1}, {tap}: Add to your mana pool one mana of any color in your commander's color identity. If you spend this mana to cast your commander, it enters the battlefield with a number of +1/+1 counters on it equal to the number of times it's been cast from the command zone this game.
Ability ability = new CommanderColorIdentityManaAbility(new GenericManaCost(1));
ability.addCost(new TapSourceCost());
this.addAbility(ability, new OpalPalaceWatcher());
this.addAbility(ability, new OpalPalaceWatcher(ability.getOriginalId().toString()));
ability = new SimpleStaticAbility(Zone.ALL, new OpalPalaceEntersBattlefieldEffect());
ability.setRuleVisible(false);
@ -90,13 +90,17 @@ public class OpalPalace extends CardImpl {
class OpalPalaceWatcher extends Watcher {
public List<UUID> commanderId = new ArrayList<>();
public OpalPalaceWatcher() {
private final String originalId;
public OpalPalaceWatcher(String originalId) {
super("ManaPaidFromOpalPalaceWatcher", WatcherScope.CARD);
this.originalId = originalId;
}
public OpalPalaceWatcher(final OpalPalaceWatcher watcher) {
super(watcher);
this.commanderId.addAll(watcher.commanderId);
this.originalId = watcher.originalId;
}
@Override
@ -107,7 +111,7 @@ class OpalPalaceWatcher extends Watcher {
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.MANA_PAYED) {
if (event.getSourceId().equals(this.getSourceId()) && event.getFlag()) { // flag indicates that mana was produced with second ability
if (event.getData() != null && event.getData().equals(originalId)) {
Spell spell = game.getStack().getSpell(event.getTargetId());
if (spell != null) {
Card card = spell.getCard();

1
Mage.Tests/src/test/java/org/mage/test/commander/duel/CastCommanderTest.java
View file

@ -29,7 +29,6 @@ package org.mage.test.commander.duel;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Ignore;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestCommanderDuelBase;

68
Mage.Tests/src/test/java/org/mage/test/commander/duel/OpalPalaceTest.java Normal file
View file

@ -0,0 +1,68 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package org.mage.test.commander.duel;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.counters.CounterType;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestCommanderDuelBase;
/**
*
* @author LevelX2
*/
public class OpalPalaceTest extends CardTestCommanderDuelBase {
/**
* I cast my commander with Opal Palace's second ability and it did not receive a +1/+1 counter
* the first time it was cast (rulings say it should on the first time cast).
*/
@Test
public void testFirstAbility() {
addCard(Zone.BATTLEFIELD, playerA, "Swamp", 1);
addCard(Zone.BATTLEFIELD, playerA, "Forest", 4);
// {T}: Add {1} to your mana pool.
// {1}, {T}: Add to your mana pool one mana of any color in your commander's color identity.
// If you spend this mana to cast your commander, it enters the battlefield with a number of +1/+1 counters on it
// equal to the number of times it's been cast from the command zone this game.
addCard(Zone.BATTLEFIELD, playerA, "Opal Palace", 1);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ob Nixilis of the Black Oath");
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertLife(playerA, 40);
assertLife(playerB, 40);
assertPermanentCount(playerA, "Ob Nixilis of the Black Oath", 1);
assertCounterCount("Ob Nixilis of the Black Oath", CounterType.P1P1, 1);
}
}