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

* Some minor changes.

Browse source
This commit is contained in:
LevelX2 2015-03-01 17:22:39 +01:00
parent f7924a6d92
commit 7ce1e6de19
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/TinyLeaders.java
View file

@ -155,8 +155,12 @@ public class TinyLeaders extends DeckValidator {
*/ */
if (commander == null || commander.getManaCost().convertedManaCost() > 3) { if (commander == null || commander.getManaCost().convertedManaCost() > 3) {
if (commander == null) invalid.put("Leader", "Please be sure to set your leader in the NAME field in the DECK EDITOR"); if (commander == null) {
if (commander != null && commander.getManaCost().convertedManaCost() > 3) invalid.put("Leader", "Commander CMC is Greater than 3"); invalid.put("Leader", "Please be sure to set your leader in the NAME field in the DECK EDITOR");
}
if (commander != null && commander.getManaCost().convertedManaCost() > 3) {
invalid.put("Leader", "Commander CMC is Greater than 3");
}
return false; return false;
} }
if ((commander.getCardType().contains(CardType.CREATURE) && commander.getSupertype().contains("Legendary")) if ((commander.getCardType().contains(CardType.CREATURE) && commander.getSupertype().contains("Legendary"))

3
Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
View file

@ -1286,6 +1286,9 @@ public class ComputerPlayer extends PlayerImpl implements Player {
if (card != null) { if (card != null) {
target.addTarget(card.getId(), source, game); target.addTarget(card.getId(), source, game);
cardChoices.remove(card); cardChoices.remove(card);
} else {
// We don't have any valid target to choose so stop choosing
return target.getTargets().size() < target.getNumberOfTargets();
} }
if (outcome.equals(Outcome.Neutral) && target.getTargets().size() > target.getNumberOfTargets() + (target.getMaxNumberOfTargets() - target.getNumberOfTargets()) / 2) { if (outcome.equals(Outcome.Neutral) && target.getTargets().size() > target.getNumberOfTargets() + (target.getMaxNumberOfTargets() - target.getNumberOfTargets()) / 2) {
return true; return true;

3
Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CursesTest.java
View file

@ -192,6 +192,9 @@ public class CursesTest extends CardTestPlayerBase {
@Test @Test
public void testCurseOfMisfortune1() { public void testCurseOfMisfortune1() {
removeAllCardsFromLibrary(playerA); removeAllCardsFromLibrary(playerA);
// At the beginning of your upkeep, you may search your library for a Curse card that doesn't have the same name as a
// Curse attached to enchanted player, put it onto the battlefield attached to that player, then shuffle your library.
addCard(Zone.LIBRARY, playerA, "Curse of Misfortunes", 2); addCard(Zone.LIBRARY, playerA, "Curse of Misfortunes", 2);
addCard(Zone.HAND, playerA, "Curse of Misfortunes"); addCard(Zone.HAND, playerA, "Curse of Misfortunes");
addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5); addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5);