mirror of
https://github.com/correl/mage.git
synced 2024-11-24 19:19:56 +00:00
* Novijen Sages - Fixed that it was not possible to pay the activated ability with the counters of Novijen Sages.
This commit is contained in:
parent
5b57a5b6ee
commit
b58d2e88ea
5 changed files with 75 additions and 4 deletions
|
@ -288,6 +288,13 @@ public class ComputerPlayer extends PlayerImpl implements Player {
|
||||||
} else {
|
} else {
|
||||||
targets = threats(opponentId, sourceId, ((TargetPermanent) target).getFilter(), game, target.getTargets());
|
targets = threats(opponentId, sourceId, ((TargetPermanent) target).getFilter(), game, target.getTargets());
|
||||||
}
|
}
|
||||||
|
if (targets.isEmpty() && target.isRequired()) {
|
||||||
|
if (!outcome.isGood()) {
|
||||||
|
targets = threats(abilityControllerId, sourceId, ((TargetPermanent) target).getFilter(), game, target.getTargets());
|
||||||
|
} else {
|
||||||
|
targets = threats(opponentId, sourceId, ((TargetPermanent) target).getFilter(), game, target.getTargets());
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
for (Permanent permanent : targets) {
|
for (Permanent permanent : targets) {
|
||||||
if (((TargetPermanent) target).canTarget(abilityControllerId, permanent.getId(), null, game) && !target.getTargets().contains(permanent.getId())) {
|
if (((TargetPermanent) target).canTarget(abilityControllerId, permanent.getId(), null, game) && !target.getTargets().contains(permanent.getId())) {
|
||||||
|
|
|
@ -244,8 +244,8 @@ public class HumanPlayer extends PlayerImpl {
|
||||||
}
|
}
|
||||||
while (!abort) {
|
while (!abort) {
|
||||||
Set<UUID> targetIds = target.possibleTargets(sourceId, abilityControllerId, game);
|
Set<UUID> targetIds = target.possibleTargets(sourceId, abilityControllerId, game);
|
||||||
if (targetIds == null || targetIds.isEmpty()) {
|
if (targetIds == null || targetIds.isEmpty()) {
|
||||||
return false;
|
return target.getTargets().size() >= target.getNumberOfTargets();
|
||||||
}
|
}
|
||||||
boolean required = target.isRequired(sourceId, game);
|
boolean required = target.isRequired(sourceId, game);
|
||||||
if (target.getTargets().size() >= target.getNumberOfTargets()) {
|
if (target.getTargets().size() >= target.getNumberOfTargets()) {
|
||||||
|
|
|
@ -48,7 +48,6 @@ public class MightOfOldKrosa extends CardImpl {
|
||||||
super(ownerId, 204, "Might of Old Krosa", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{G}");
|
super(ownerId, 204, "Might of Old Krosa", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{G}");
|
||||||
this.expansionSetCode = "TSP";
|
this.expansionSetCode = "TSP";
|
||||||
|
|
||||||
|
|
||||||
// Target creature gets +2/+2 until end of turn. If you cast this spell during your main phase, that creature gets +4/+4 until end of turn instead.
|
// Target creature gets +2/+2 until end of turn. If you cast this spell during your main phase, that creature gets +4/+4 until end of turn instead.
|
||||||
this.getSpellAbility().addEffect(new ConditionalContinuousEffect(
|
this.getSpellAbility().addEffect(new ConditionalContinuousEffect(
|
||||||
new BoostTargetEffect(4,4, Duration.EndOfTurn),
|
new BoostTargetEffect(4,4, Duration.EndOfTurn),
|
||||||
|
|
|
@ -0,0 +1,65 @@
|
||||||
|
/*
|
||||||
|
* 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.cards.cost.additional;
|
||||||
|
|
||||||
|
import mage.constants.PhaseStep;
|
||||||
|
import mage.constants.Zone;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.mage.test.serverside.base.CardTestPlayerBase;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @author LevelX2
|
||||||
|
*/
|
||||||
|
|
||||||
|
public class RemoveCounterCostTest extends CardTestPlayerBase {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testNovijenSages() {
|
||||||
|
addCard(Zone.BATTLEFIELD, playerA, "Island", 7);
|
||||||
|
// Graft 4
|
||||||
|
// {1}, Remove two +1/+1 counters from among creatures you control: Draw a card.
|
||||||
|
addCard(Zone.HAND, playerA, "Novijen Sages");
|
||||||
|
|
||||||
|
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Novijen Sages");
|
||||||
|
|
||||||
|
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{1},Remove two +1/+1 counters");
|
||||||
|
setChoice(playerA, "X=2");
|
||||||
|
setStopAt(1, PhaseStep.BEGIN_COMBAT);
|
||||||
|
execute();
|
||||||
|
|
||||||
|
assertPermanentCount(playerA, "Novijen Sages", 1);
|
||||||
|
assertPowerToughness(playerA, "Novijen Sages", 2, 2);
|
||||||
|
|
||||||
|
assertHandCount(playerA, 1);
|
||||||
|
|
||||||
|
assertLife(playerA, 20);
|
||||||
|
assertLife(playerB, 20);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -123,7 +123,7 @@ public class RemoveCounterCost extends CostImpl {
|
||||||
int numberOfCountersSelected = 1;
|
int numberOfCountersSelected = 1;
|
||||||
if (countersLeft > 1 && countersOnPermanent > 1) {
|
if (countersLeft > 1 && countersOnPermanent > 1) {
|
||||||
numberOfCountersSelected = controller.getAmount(1, Math.min(countersLeft, countersOnPermanent),
|
numberOfCountersSelected = controller.getAmount(1, Math.min(countersLeft, countersOnPermanent),
|
||||||
new StringBuilder("Remove how many counters from ").append(permanent.getLogName()).toString(), game);
|
new StringBuilder("Remove how many counters from ").append(permanent.getIdName()).toString(), game);
|
||||||
}
|
}
|
||||||
permanent.removeCounters(counterName, numberOfCountersSelected, game);
|
permanent.removeCounters(counterName, numberOfCountersSelected, game);
|
||||||
if (permanent.getCounters().getCount(counterName) == 0 ){
|
if (permanent.getCounters().getCount(counterName) == 0 ){
|
||||||
|
|
Loading…
Reference in a new issue