github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 03:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

New commander types support:

Browse source 
* [KHM] fixed legendary status of mdf cards (closes #7370, #7404, #7465, #7481);
* Game: added support of split cards as commander (signature spell);
* Game: added support of adventure cards as commander;
* Game: added support of modal double faces cards as commander;
This commit is contained in:
Oleg Agafonov 2021-02-02 06:40:49 +04:00
parent bc72384f0d
commit 50e5809a79
9 changed files with 314 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/l/LiesaShroudOfDusk.java
View file

@ -65,7 +65,7 @@ public final class LiesaShroudOfDusk extends CardImpl {
@Override
public boolean commanderCost(Game game, Ability source, Ability abilityToModify) {
CommanderPlaysCountWatcher watcher = game.getState().getWatcher(CommanderPlaysCountWatcher.class);
int castCount = watcher.getPlaysCount(getId());
int castCount = watcher.getPlaysCount(getMainCard().getId());
if (castCount > 0) {
abilityToModify.addCost(new PayLifeCost(2 * castCount));
}

228
Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersCastTest.java
View file

@ -1,8 +1,11 @@
package org.mage.test.cards.continuous;
import mage.abilities.dynamicvalue.common.CommanderCastCountValue;
import mage.abilities.keyword.FirstStrikeAbility;
import mage.cards.AdventureCard;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestCommander4Players;
@ -11,9 +14,10 @@ import org.mage.test.serverside.base.CardTestCommander4Players;
*/
public class CommandersCastTest extends CardTestCommander4Players {
// Player order: A -> D -> C -> B
@Test
public void test_CastToBattlefieldOneTime() {
// Player order: A -> D -> C -> B
addCard(Zone.COMMAND, playerA, "Balduvian Bears", 1); // {1}{G}, 2/2, commander
addCard(Zone.BATTLEFIELD, playerA, "Forest", 2);
@ -32,6 +36,7 @@ public class CommandersCastTest extends CardTestCommander4Players {
@Test
public void test_CastToBattlefieldTwoTimes() {
// Player order: A -> D -> C -> B
addCard(Zone.COMMAND, playerA, "Balduvian Bears", 1); // {1}{G}, 2/2, commander
addCard(Zone.BATTLEFIELD, playerA, "Forest", 6); // 2 + 4
//
@ -67,6 +72,8 @@ public class CommandersCastTest extends CardTestCommander4Players {
@Test
public void test_PlayAsLandOneTime() {
// Player order: A -> D -> C -> B
addCard(Zone.COMMAND, playerA, "Academy Ruins", 1);
playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Academy Ruins");
@ -314,4 +321,223 @@ public class CommandersCastTest extends CardTestCommander4Players {
assertCommandZoneCount(playerA, "Balduvian Bears", 1);
}
@Test
public void test_SplitCard() {
// Player order: A -> D -> C -> B
// use case:
// cast left side
// return to command zone
// cast right side with commander cost
// Fire, {1}{R}
// Fire deals 2 damage divided as you choose among one or two target creatures and/or players.
// Ice, {1}{U}
// Tap target permanent.
// Draw a card.
addCard(Zone.COMMAND, playerA, "Fire // Ice", 1);
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2);
addCard(Zone.BATTLEFIELD, playerA, "Island", 2);
// both sides are playable
checkCommandCardCount("before cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Fire // Ice", 1);
checkPlayableAbility("before cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Fire", true);
checkPlayableAbility("before cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Ice", true);
// turn 1 - cast left
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Fire");
addTargetAmount(playerA, playerB, 2);
setChoice(playerA, "Yes"); // return commander
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
// can't cast due commander cost added
checkCommandCardCount("after first cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Fire // Ice", 1);
checkPlayableAbility("after first cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Fire", false);
checkPlayableAbility("after first cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Ice", false);
// turn 5 - can cost again
checkPlayableAbility("before second cast", 5, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Fire", true);
checkPlayableAbility("before second cast", 5, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Ice", true);
// cast right and use all mana (4 = card + commander cost)
castSpell(5, PhaseStep.PRECOMBAT_MAIN, playerA, "Ice");
addTarget(playerA, "Mountain"); // tap target
setChoice(playerA, "Yes"); // move to commander
waitStackResolved(5, PhaseStep.PRECOMBAT_MAIN);
checkCommandCardCount("after second cast", 5, PhaseStep.PRECOMBAT_MAIN, playerA, "Fire // Ice", 1);
checkPlayableAbility("after second cast", 5, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Fire", false);
checkPlayableAbility("after second cast", 5, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Ice", false);
// must used all mana
checkPermanentTapped("after second cast", 5, PhaseStep.PRECOMBAT_MAIN, playerA, "Mountain", true, 2);
checkPermanentTapped("after second cast", 5, PhaseStep.PRECOMBAT_MAIN, playerA, "Island", true, 2);
setStrictChooseMode(true);
setStopAt(5, PhaseStep.END_TURN);
execute();
assertAllCommandsUsed();
}
@Test
public void test_AdventureCard() {
// Player order: A -> D -> C -> B
addCustomEffect_TargetDamage(playerA, 10); // kill creature
// use case:
// cast adventure spell from command zone and keep it in exile (inc next command cost)
// cast card from exile (do not inc next command cost)
// return commander to command zone
// cast as adventure spell (with x1 command cost)
// Curious Pair, creature, {1}{G}, 1/3
// Treats to Share, sorcery, {G}
// Create a Food token.
addCard(Zone.COMMAND, playerA, "Curious Pair", 1);
addCard(Zone.BATTLEFIELD, playerA, "Forest", 3);
addCard(Zone.HAND, playerA, "Forest", 3); // for commander cost test
// commander tax: 0
// both sides are playable
checkCommandCardCount("before cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Curious Pair", 1);
checkPlayableAbility("before cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Curious Pair", true);
checkPlayableAbility("before cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Treats to Share", true);
// cast adventure spell
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Treats to Share");
setChoice(playerA, "Yes"); // return commander
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
checkCommandCardCount("after first cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Curious Pair", 1);
checkPermanentCount("after first cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Food", 1);
// commander tax: 1x
// can't cast due commander cost added (we stil have 2x mana)
checkPlayableAbility("after first cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Curious Pair", false);
checkPlayableAbility("after first cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Treats to Share", false);
// commander tax: 1x
// play land number 1 and give extra {G}, so total 3x
playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Forest");
checkPlayableAbility("after mana add", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Curious Pair", false);
checkPlayableAbility("after mana add", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Treats to Share", true);
// play adventure spell, but keep it
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Treats to Share");
setChoice(playerA, "No"); // do not return commander
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
checkPermanentCount("after second cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Food", 2);
checkPlayableAbility("after second cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Curious Pair", false);
checkPlayableAbility("after second cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Treats to Share", false);
// wait next turn
// commander tax: 2x BUT it doesn't apply to exile zone (e.g. must use 2x mana instead 6x)
// it doesn't add commander tax too
castSpell(5, PhaseStep.PRECOMBAT_MAIN, playerA, "Curious Pair");
waitStackResolved(5, PhaseStep.PRECOMBAT_MAIN);
checkPermanentCount("after exile cast", 5, PhaseStep.PRECOMBAT_MAIN, playerA, "Curious Pair", 1);
checkPermanentTapped("after exile cast", 5, PhaseStep.PRECOMBAT_MAIN, playerA, "Forest", true, 4 - 2);
// return commander to command zone
activateAbility(5, PhaseStep.PRECOMBAT_MAIN, playerA, "target damage 10", "Curious Pair");
setChoice(playerA, "Yes"); // return to command zone
// can't cast - only {2} mana, but need {G} + {2} + {2}
checkPlayableAbility("after return 2", 5, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Curious Pair", false);
checkPlayableAbility("after return 2", 5, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Treats to Share", false);
// turn 9
// commander tax: 2x
// mana: {G}{G}{G}{G}
// can't cast adventure spell for {G} + {2} + {2}
// can't cast creature spell for {G}{G} + {2} + {2}
runCode("check commander tax 2x", 9, PhaseStep.PRECOMBAT_MAIN, playerA, (info, player, game) -> {
AdventureCard card = (AdventureCard) game.getCommanderCardsFromCommandZone(player).stream().findFirst().get();
Assert.assertEquals(2, CommanderCastCountValue.instance.calculate(game, card.getSpellAbility(), null));
Assert.assertEquals(2, CommanderCastCountValue.instance.calculate(game, card.getSpellCard().getSpellAbility(), null));
});
checkPlayableAbility("before last cast 1", 9, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Curious Pair", false);
checkPlayableAbility("before last cast 1", 9, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Treats to Share", false);
// play land number 2 - can play adventure spell
playLand(9, PhaseStep.PRECOMBAT_MAIN, playerA, "Forest");
// commander tax: 2x
// mana: {G}{G}{G}{G}{G}
checkPlayableAbility("before last cast 2", 9, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Curious Pair", false);
checkPlayableAbility("before last cast 2", 9, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Treats to Share", true);
// turn 13
// play land number 3 - can play all parts
playLand(13, PhaseStep.PRECOMBAT_MAIN, playerA, "Forest");
// commander tax: 2x
// mana: {G}{G}{G}{G}{G}{G}
checkPlayableAbility("before last cast 3", 13, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Curious Pair", true);
checkPlayableAbility("before last cast 3", 13, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Treats to Share", true);
// cast creature
castSpell(13, PhaseStep.PRECOMBAT_MAIN, playerA, "Curious Pair");
waitStackResolved(13, PhaseStep.PRECOMBAT_MAIN);
checkPermanentCount("after last cast", 13, PhaseStep.PRECOMBAT_MAIN, playerA, "Curious Pair", 1);
checkPermanentTapped("after last cast", 13, PhaseStep.PRECOMBAT_MAIN, playerA, "Forest", true, 2 + 2 + 2);
runCode("check commander tax 3x", 13, PhaseStep.PRECOMBAT_MAIN, playerA, (info, player, game) -> {
AdventureCard card = (AdventureCard) game.getCard(game.getCommandersIds(player).stream().findFirst().get());
Assert.assertEquals(3, CommanderCastCountValue.instance.calculate(game, card.getSpellAbility(), null));
Assert.assertEquals(3, CommanderCastCountValue.instance.calculate(game, card.getSpellCard().getSpellAbility(), null));
});
setStrictChooseMode(true);
setStopAt(13, PhaseStep.END_TURN);
execute();
assertAllCommandsUsed();
}
@Test
public void test_ModalDoubleFacesCard() {
// Player order: A -> D -> C -> B
// use case:
// cast left side as commander
// return to command zone
// cast right side as commander with commander cost
// Tergrid, God of Fright, {3}{B}{B}, creature
// Tergrid's Lantern, {3}{B}, artifact
addCard(Zone.COMMAND, playerA, "Tergrid, God of Fright", 1);
addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5);
//
// Exile target creature or enchantment.
addCard(Zone.HAND, playerA, "Angelic Edict", 1); // {4}{W}
addCard(Zone.BATTLEFIELD, playerA, "Plains", 5);
// both sides are playable
checkCommandCardCount("before cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Tergrid, God of Fright", 1);
checkPlayableAbility("before cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Tergrid, God of Fright", true);
checkPlayableAbility("before cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Tergrid's Lantern", true);
// cast left side
activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {B}", 5);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Tergrid, God of Fright");
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
checkPermanentCount("after cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Tergrid, God of Fright", 1);
// exile and return
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Angelic Edict", "Tergrid, God of Fright");
setChoice(playerA, "Yes"); // return to command
// turn 5 - check commander cost
checkPlayableAbility("before second cast 1", 5, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Tergrid, God of Fright", true);
checkPlayableAbility("before second cast 1", 5, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Tergrid's Lantern", true);
// turn 5 - remove angelic's mana, so it can cast only one part
activateManaAbility(5, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {B}", 5 - 1);
checkPlayableAbility("before second cast 2", 5, PhaseStep.POSTCOMBAT_MAIN, playerA, "Cast Tergrid, God of Fright", false);
checkPlayableAbility("before second cast 2", 5, PhaseStep.POSTCOMBAT_MAIN, playerA, "Cast Tergrid's Lantern", true);
// turn 5 - cast right side
castSpell(5, PhaseStep.POSTCOMBAT_MAIN, playerA, "Tergrid's Lantern");
waitStackResolved(5, PhaseStep.POSTCOMBAT_MAIN);
checkPermanentCount("after second cast", 5, PhaseStep.POSTCOMBAT_MAIN, playerA, "Tergrid's Lantern", 1);
// must used all mana
checkPermanentTapped("after second cast", 5, PhaseStep.POSTCOMBAT_MAIN, playerA, "Swamp", true, 5);
checkPermanentTapped("after second cast", 5, PhaseStep.POSTCOMBAT_MAIN, playerA, "Plains", true, 5);
setStrictChooseMode(true);
setStopAt(5, PhaseStep.END_TURN);
execute();
assertAllCommandsUsed();
}
}

16
Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsTest.java
View file

@ -239,19 +239,29 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase {
// Akoum Teeth - land
addCard(Zone.HAND, playerA, "Akoum Warrior");
// mdf and legendary
addCard(Zone.HAND, playerA, "Halvar, God of Battle");
setStrictChooseMode(true);
setStopAt(1, PhaseStep.END_TURN);
execute();
assertAllCommandsUsed();
// stats in hand
Assert.assertEquals(1, getHandCards(playerA).size());
Card card = getHandCards(playerA).get(0);
Assert.assertEquals(2, getHandCards(playerA).size());
// stats in hand - normal
Card card = getHandCards(playerA).stream().filter(c -> CardUtil.haveSameNames(c, "Akoum Warrior", currentGame)).findFirst().get();
Assert.assertFalse("must be non land", card.isLand());
Assert.assertTrue("must be creature", card.isCreature());
Assert.assertTrue("must be minotaur", card.hasSubtype(SubType.MINOTAUR, currentGame));
Assert.assertEquals("power", 4, card.getPower().getValue());
Assert.assertEquals("toughness", 5, card.getToughness().getValue());
// stats in hand - mdf
card = getHandCards(playerA).stream().filter(c -> CardUtil.haveSameNames(c, "Halvar, God of Battle", currentGame)).findFirst().get();
Assert.assertTrue("must be legendary", card.isLegendary());
Assert.assertTrue("must be creature", card.isCreature());
Assert.assertTrue("must be god", card.hasSubtype(SubType.GOD, currentGame));
}
@Test

20
Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestPlayerBase.java
View file

@ -5,8 +5,11 @@ import mage.abilities.Abilities;
import mage.abilities.AbilitiesImpl;
import mage.abilities.Ability;
import mage.abilities.SpellAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.DamageTargetEffect;
import mage.abilities.effects.common.cost.SpellsCostIncreasingAllEffect;
import mage.abilities.effects.common.cost.SpellsCostReductionAllEffect;
import mage.cards.Card;
@ -29,6 +32,7 @@ import mage.server.util.ConfigWrapper;
import mage.server.util.PluginClassLoader;
import mage.server.util.config.GamePlugin;
import mage.server.util.config.Plugin;
import mage.target.common.TargetAnyTarget;
import mage.util.Copier;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
@ -443,6 +447,22 @@ public abstract class MageTestPlayerBase {
new SimpleStaticAbility(effect)
);
}
/**
* Add target damage ability that can be called by text: "target damage xxx"
*
* @param controller
* @param damageAmount
*/
protected void addCustomEffect_TargetDamage(TestPlayer controller, int damageAmount) {
Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(damageAmount).setText("target damage " + damageAmount), new ManaCostsImpl(""));
ability.addTarget(new TargetAnyTarget());
addCustomCardWithAbility(
"target damage " + damageAmount + " for " + controller.getName(),
controller,
ability
);
}
}
// custom card with global abilities list to init (can contains abilities per card name)

7
Mage/src/main/java/mage/abilities/effects/common/cost/CommanderCostModification.java
View file

@ -41,7 +41,12 @@ public class CommanderCostModification extends CostModificationEffectImpl {
@Override
public boolean applies(Ability abilityToModify, Ability source, Game game) {
return commander.getId().equals(abilityToModify.getSourceId())
Card cardToCheck = game.getCard(abilityToModify.getSourceId()); // split/mdf cards support
if (cardToCheck == null) {
return false;
}
return commander.getId().equals(cardToCheck.getMainCard().getId())
&& (abilityToModify instanceof CastCommanderAbility
|| abilityToModify instanceof PlayLandAsCommanderAbility);
}

20
Mage/src/main/java/mage/cards/Card.java
View file

@ -86,13 +86,13 @@ public interface Card extends MageObject {
* @param zone
* @param source ability which calls that move, can be null
* @param game
* @param flag If zone
* <ul>
* <li>LIBRARY: <ul><li>true - put on top</li><li>false - put on
* bottom</li></ul></li>
* <li>BATTLEFIELD: <ul><li>true - tapped</li><li>false -
* untapped</li></ul></li>
* </ul>
* @param flag If zone
* <ul>
* <li>LIBRARY: <ul><li>true - put on top</li><li>false - put on
* bottom</li></ul></li>
* <li>BATTLEFIELD: <ul><li>true - tapped</li><li>false -
* untapped</li></ul></li>
* </ul>
* @return true if card was moved to zone
*/
boolean moveToZone(Zone zone, Ability source, Game game, boolean flag);
@ -102,8 +102,8 @@ public interface Card extends MageObject {
/**
* Moves the card to an exile zone
*
* @param exileId set to null for generic exile zone
* @param name used for exile zone with the specified exileId
* @param exileId set to null for generic exile zone
* @param name used for exile zone with the specified exileId
* @param source
* @param game
* @return true if card was moved to zone
@ -183,7 +183,7 @@ public interface Card extends MageObject {
default boolean commanderCost(Game game, Ability source, Ability abilityToModify) {
CommanderPlaysCountWatcher watcher = game.getState().getWatcher(CommanderPlaysCountWatcher.class);
int castCount = watcher.getPlaysCount(getId());
int castCount = watcher.getPlaysCount(getMainCard().getId());
if (castCount > 0) {
abilityToModify.getManaCostsToPay().add(ManaUtil.createManaCost(2 * castCount, false));
}

13
Mage/src/main/java/mage/cards/ModalDoubleFacesCard.java
View file

@ -13,8 +13,8 @@ import mage.util.CardUtil;
import mage.util.SubTypes;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
/**
@ -127,6 +127,12 @@ public abstract class ModalDoubleFacesCard extends CardImpl {
}
}
@Override
public Set<SuperType> getSuperType() {
// CardImpl's constructor can call some code on init, so you must check left/right before
// it's a bad workaround
return leftHalfCard != null ? leftHalfCard.getSuperType() : supertype;
}
@Override
public ArrayList<CardType> getCardType() {
@ -154,11 +160,6 @@ public abstract class ModalDoubleFacesCard extends CardImpl {
return leftHalfCard.hasSubtype(subtype, game);
}
@Override
public EnumSet<SuperType> getSuperType() {
return EnumSet.noneOf(SuperType.class);
}
@Override
public Abilities<Ability> getAbilities() {
return getInnerAbilities(false);

29
Mage/src/main/java/mage/game/command/Commander.java
View file

@ -12,7 +12,6 @@ import mage.abilities.text.TextPart;
import mage.cards.Card;
import mage.cards.FrameStyle;
import mage.constants.CardType;
import mage.constants.SpellAbilityType;
import mage.constants.SubType;
import mage.constants.SuperType;
import mage.game.Game;
@ -36,16 +35,30 @@ public class Commander implements CommandObject {
this.sourceObject = card;
// replace spell ability by commander cast spell (to cast from command zone)
if (card.getSpellAbility() != null) {
abilities.add(new CastCommanderAbility(card, card.getSpellAbility()));
}
// replace alternative spell abilities by commander cast spell (to cast from command zone)
for (Ability ability : card.getAbilities()) {
if (ability instanceof SpellAbility) {
SpellAbility spellAbility = (SpellAbility) ability;
if (spellAbility.getSpellAbilityType() == SpellAbilityType.BASE_ALTERNATE) {
abilities.add(new CastCommanderAbility(card, spellAbility));
switch (spellAbility.getSpellAbilityType()) {
case BASE:
case BASE_ALTERNATE:
case SPLIT:
case SPLIT_FUSED:
case SPLIT_LEFT:
case SPLIT_RIGHT:
case MODAL:
case MODAL_LEFT:
case MODAL_RIGHT:
case ADVENTURE_SPELL:
// can be used from command zone
abilities.add(new CastCommanderAbility(card, spellAbility));
break;
case FACE_DOWN_CREATURE: // dynamic added spell for alternative cost like cast as face down
case SPLICE: // only from hand
case SPLIT_AFTERMATH: // only from graveyard
// can't use from command zone
break;
default:
throw new IllegalArgumentException("Error, unknown spell type in commander card: " + spellAbility.getSpellAbilityType() + " from " + card.getName());
}
}
}

14
Mage/src/main/java/mage/watchers/common/CommanderPlaysCountWatcher.java
View file

@ -5,6 +5,7 @@ import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
import mage.util.CardUtil;
import mage.watchers.Watcher;
import java.util.*;
@ -12,7 +13,7 @@ import java.util.*;
/**
* Calcs commanders play count only from command zone (spell or land)
* Cards like Remand can put command to hand and cast it without commander tax increase
*
* <p>
* Warning, if your code can be called in non commander games then you must watcher in your ability
* (example: you are using watcher in trigger, hint or effect, but do not checking another things like commander source or cost)
*
@ -33,14 +34,17 @@ public class CommanderPlaysCountWatcher extends Watcher {
&& event.getType() != EventType.SPELL_CAST) {
return;
}
// must control main cards (split/mdf cards support)
final UUID objectId;
if (event.getType() == EventType.LAND_PLAYED) {
objectId = event.getTargetId();
objectId = CardUtil.getMainCardId(game, event.getTargetId());
} else if (event.getType() == EventType.SPELL_CAST) {
objectId = event.getSourceId();
objectId = CardUtil.getMainCardId(game, event.getSourceId());
} else {
objectId = null;
}
boolean isCommanderObject = game
.getPlayerList()
.stream()
@ -51,8 +55,8 @@ public class CommanderPlaysCountWatcher extends Watcher {
if (!isCommanderObject || event.getZone() != Zone.COMMAND) {
return;
}
playsCount.putIfAbsent(event.getSourceId(), 0);
playsCount.computeIfPresent(event.getSourceId(), (u, i) -> i + 1);
playsCount.putIfAbsent(objectId, 0);
playsCount.computeIfPresent(objectId, (u, i) -> i + 1);
playerCount.putIfAbsent(event.getPlayerId(), 0);
playerCount.compute(event.getPlayerId(), (u, i) -> i + 1);
}