e : main2sort) {
- final CardPrinted card = e.getKey();
- final boolean hasBadSetInfo = "???".equals(card.getEdition()) || StringUtils.isBlank(card.getEdition());
- if (hasBadSetInfo) {
- out.add(String.format("%d %s", e.getValue(), card.getName()));
- } else {
- out.add(String.format("%d %s|%s", e.getValue(), card.getName(), card.getEdition()));
- }
+ out.add(serializeSingleCard(e.getKey(), e.getValue()));
}
return out;
}
+
+ private static String serializeSingleCard(CardPrinted card, Integer n) {
+
+ final boolean hasBadSetInfo = "???".equals(card.getEdition()) || StringUtils.isBlank(card.getEdition());
+ if (hasBadSetInfo) {
+ return String.format("%d %s", n, card.getName());
+ } else {
+ return String.format("%d %s|%s", n, card.getName(), card.getEdition());
+ }
+ }
/**
*
@@ -270,6 +285,17 @@ public class Deck extends DeckBase {
out.add(String.format("%s", "[sideboard]"));
out.addAll(Deck.writeCardPool(this.getSideboard()));
+
+ if ( getCommander() != null ) {
+ out.add(String.format("%s", "[commander]"));
+ out.add(Deck.serializeSingleCard(getCommander(), 1));
+ }
+
+ out.add(String.format("%s", "[planes]"));
+ out.addAll(Deck.writeCardPool(this.getPlanes()));
+
+ out.add(String.format("%s", "[schemes]"));
+ out.addAll(Deck.writeCardPool(this.getSchemes()));
return out;
}
@@ -326,9 +352,70 @@ public class Deck extends DeckBase {
return false;
}
+ if(type == GameType.Commander)
+ {//Must contain exactly 1 legendary Commander and no sideboard.
+ //TODO:Enforce color identity
+ if ( null == getCommander())
+ return false;
+
+ if(!getCommander().getCard().getType().isLegendary())
+ return false;
+
+ //No sideboarding in Commander
+ if(!getSideboard().isEmpty())
+ return false;
+ }
+ else if(type == GameType.Planechase)
+ {//Must contain at least 10 planes/phenomenons, but max 2 phenomenons. Singleton.
+ if(getPlanes().countAll() < 10)
+ return false;
+ int phenoms = 0;
+ for(CardPrinted cp : getPlanes().toFlatList())
+ {
+ if(cp.getType().contains("Phenomenon"))
+ phenoms++;
+ if(getPlanes().count(cp) > 1)
+ return false;
+ }
+ if(phenoms > 2)
+ return false;
+ }
+ else if(type == GameType.Archenemy)
+ {//Must contain at least 20 schemes, max 2 of each.
+ if(getSchemes().countAll() < 20)
+ return false;
+
+ for(CardPrinted cp : getSchemes().toFlatList())
+ {
+ if(getSchemes().count(cp) > 2)
+ return false;
+ }
+ }
+
return true;
}
+ /**
+ * @return the commander
+ */
+ public CardPrinted getCommander() {
+ return commander;
+ }
+
+ /**
+ * @return the planes
+ */
+ public DeckSection getPlanes() {
+ return planes;
+ }
+
+ /**
+ * @return the schemes
+ */
+ public DeckSection getSchemes() {
+ return schemes;
+ }
+
public static final Function FN_NAME_SELECTOR = new Function() {
@Override
public String apply(Deck arg1) {
diff --git a/src/main/java/forge/deck/DeckRecognizer.java b/src/main/java/forge/deck/DeckRecognizer.java
index 6b236800db7..29c86a68a5b 100644
--- a/src/main/java/forge/deck/DeckRecognizer.java
+++ b/src/main/java/forge/deck/DeckRecognizer.java
@@ -245,6 +245,18 @@ public class DeckRecognizer {
if (line.toLowerCase().contains("main")) {
return true;
}
+ if (line.toLowerCase().contains("commander")) {
+ return true;
+ }
+ if (line.toLowerCase().contains("planes")) {
+ return true;
+ }
+ if (line.toLowerCase().contains("schemes")) {
+ return true;
+ }
+ if (line.toLowerCase().contains("vanguard")) {
+ return true;
+ }
return false;
}
diff --git a/src/main/java/forge/deck/generate/GenerateColoredDeckBase.java b/src/main/java/forge/deck/generate/GenerateColoredDeckBase.java
index bb450bb3263..fd34e709d75 100644
--- a/src/main/java/forge/deck/generate/GenerateColoredDeckBase.java
+++ b/src/main/java/forge/deck/generate/GenerateColoredDeckBase.java
@@ -220,7 +220,7 @@ public abstract class GenerateColoredDeckBase {
if (!Singletons.getModel().getPreferences().getPrefBoolean(FPref.DECKGEN_ARTIFACTS)) {
hasColor = Predicates.or(hasColor, GenerateDeckUtil.COLORLESS_CARDS);
}
- return Iterables.filter(CardDb.instance().getAllCards(), Predicates.compose(Predicates.and(canPlay, hasColor), CardPrinted.FN_GET_RULES));
+ return Iterables.filter(CardDb.instance().getAllTraditionalCards(), Predicates.compose(Predicates.and(canPlay, hasColor), CardPrinted.FN_GET_RULES));
}
protected static Map countLands(ItemPool outList) {
diff --git a/src/main/java/forge/game/GameNew.java b/src/main/java/forge/game/GameNew.java
index b80590fa9c1..05b684573e8 100644
--- a/src/main/java/forge/game/GameNew.java
+++ b/src/main/java/forge/game/GameNew.java
@@ -20,6 +20,7 @@ import forge.CardPredicates;
import forge.CardUtil;
import forge.GameAction;
import forge.Singletons;
+import forge.card.cardfactory.CardFactoryUtil;
import forge.card.trigger.TriggerHandler;
import forge.card.trigger.TriggerType;
import forge.control.input.InputControl;
@@ -33,6 +34,7 @@ import forge.game.player.Player;
import forge.game.zone.PlayerZone;
import forge.game.zone.ZoneType;
import forge.gui.match.views.VAntes;
+import forge.item.CardDb;
import forge.item.CardPrinted;
import forge.properties.ForgePreferences.FPref;
import forge.util.Aggregates;
@@ -53,9 +55,9 @@ public class GameNew {
for (int i = 0; i < stackOfCards.getValue(); i++) {
final Card card = cardPrinted.toForgeCard(player);
-
+
// apply random pictures for cards
- if (player.isComputer()) {
+ if ( player.isComputer() ) {
final int cntVariants = cardPrinted.getCard().getEditionInfo(cardPrinted.getEdition()).getCopiesCount();
if (cntVariants > 1) {
card.setRandomPicture(generator.nextInt(cntVariants - 1) + 1);
@@ -70,43 +72,41 @@ public class GameNew {
}
if (!useAnte && card.hasKeyword("Remove CARDNAME from your deck before playing if you're not playing for ante.")) {
- if (!removedAnteCards.containsKey(player)) {
+ if(!removedAnteCards.containsKey(player))
removedAnteCards.put(player, new ArrayList());
- }
removedAnteCards.get(player).add(card.getName());
} else {
library.add(card);
}
-
+
// mark card as difficult for AI to play
- if (player.isComputer() && card.getSVar("RemAIDeck").equals("True") && !rAICards.contains(card.getName())) {
+ if ( player.isComputer() && card.getSVar("RemAIDeck").equals("True") && !rAICards.contains(card.getName())) {
rAICards.add(card.getName());
// get card picture so that it is in the image cache
// ImageCache.getImage(card);
}
}
- }
-
+ }
+
// Shuffling
- // Ai may cheat
- if (player.isComputer() && Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_SMOOTH_LAND)) {
+ // Ai may cheat
+ if ( player.isComputer() && Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_SMOOTH_LAND) ) {
// do this instead of shuffling Computer's deck
final Iterable c1 = GameNew.smoothComputerManaCurve(player.getCardsIn(ZoneType.Library));
player.getZone(ZoneType.Library).setCards(c1);
- } else {
+ } else
player.shuffle();
- }
}
-
-
+
+
/**
* Constructor for new game allowing card lists to be put into play
* immediately, and life totals to be adjusted, for computer and human.
*
- * TODO: Accept something like match state as parameter. Match should be aware of players,
- * their decks and other special starting conditions.
+ * TODO: Accept something like match state as parameter. Match should be aware of players,
+ * their decks and other special starting conditions.
*/
- public static void newGame(final Map playersConditions, final GameState game, final boolean canRandomFoil) {
+ public static void newGame(final Map playersConditions, final GameState game, final boolean canRandomFoil ) {
Singletons.getModel().getMatch().getInput().clearInput();
Card.resetUniqueNumber();
@@ -120,15 +120,15 @@ public class GameNew {
final Map> removedAnteCards = new HashMap>();
final List rAICards = new ArrayList();
- for (Entry p : playersConditions.entrySet()) {
+ for( Entry p : playersConditions.entrySet() ) {
final Player player = p.getKey();
player.setStartingLife(p.getValue().getStartingLife());
+ player.setMaxHandSize(p.getValue().getStartingHand());
// what if I call it for AI player?
PlayerZone bf = player.getZone(ZoneType.Battlefield);
- Iterable onTable = p.getValue().getCardsOnTable();
+ Iterable onTable = p.getValue().getCardsOnBattlefield();
if (onTable != null) {
for (final Card c : onTable) {
- c.addController(player);
c.setOwner(player);
bf.add(c, false);
c.setSickness(true);
@@ -136,23 +136,36 @@ public class GameNew {
c.refreshUniqueNumber();
}
}
-
+
+ PlayerZone com = player.getZone(ZoneType.Command);
+ Iterable inCommand = p.getValue().getCardsInCommand();
+ if (inCommand != null) {
+ for (final Card c : inCommand) {
+ c.setOwner(player);
+ com.add(c, false);
+ c.refreshUniqueNumber();
+ }
+ }
+
prepareSingleLibrary(player, p.getValue().getDeck(), removedAnteCards, rAICards, canRandomFoil);
player.updateObservers();
bf.updateObservers();
player.getZone(ZoneType.Hand).updateObservers();
+ player.getZone(ZoneType.Command).updateObservers();
+ player.getZone(ZoneType.Battlefield).updateObservers();
}
-
-
+
+
+
if (rAICards.size() > 0) {
String message = buildFourColumnList("AI deck contains the following cards that it can't play or may be buggy:", rAICards);
JOptionPane.showMessageDialog(null, message, "", JOptionPane.INFORMATION_MESSAGE);
}
-
+
if (!removedAnteCards.isEmpty()) {
StringBuilder ante = new StringBuilder("The following ante cards were removed:\n\n");
- for (Entry> ants : removedAnteCards.entrySet()) {
- ante.append(buildFourColumnList("From the " + ants.getKey().getName() + "'s deck:", ants.getValue()));
+ for(Entry> ants : removedAnteCards.entrySet() ) {
+ ante.append(buildFourColumnList( "From the " + ants.getKey().getName() + "'s deck:", ants.getValue()));
}
JOptionPane.showMessageDialog(null, ante.toString(), "", JOptionPane.INFORMATION_MESSAGE);
}
@@ -162,14 +175,14 @@ public class GameNew {
public static void restartGame(final GameState game, final Player startingTurn, Map> playerLibraries) {
MatchController match = Singletons.getModel().getMatch();
-
+
Map players = match.getPlayers();
Map playersConditions = new HashMap();
-
+
for (Player p : game.getPlayers()) {
playersConditions.put(p, players.get(p.getLobbyPlayer()));
}
-
+
match.getInput().clearInput();
//Card.resetUniqueNumber();
@@ -180,18 +193,18 @@ public class GameNew {
trigHandler.clearDelayedTrigger();
trigHandler.cleanUpTemporaryTriggers();
trigHandler.suppressMode(TriggerType.ChangesZone);
-
+
game.getStack().reset();
GameAction action = game.getAction();
+
-
- for (Entry p : playersConditions.entrySet()) {
+ for( Entry p : playersConditions.entrySet() ) {
final Player player = p.getKey();
player.setStartingLife(p.getValue().getStartingLife());
player.setNumLandsPlayed(0);
// what if I call it for AI player?
PlayerZone bf = player.getZone(ZoneType.Battlefield);
- Iterable onTable = p.getValue().getCardsOnTable();
+ Iterable onTable = p.getValue().getCardsOnBattlefield();
if (onTable != null) {
for (final Card c : onTable) {
c.addController(player);
@@ -205,7 +218,7 @@ public class GameNew {
PlayerZone library = player.getZone(ZoneType.Library);
List newLibrary = playerLibraries.get(player);
- for (Card c : newLibrary) {
+ for(Card c : newLibrary) {
action.moveTo(library, c);
}
@@ -216,7 +229,7 @@ public class GameNew {
}
trigHandler.clearSuppression(TriggerType.ChangesZone);
-
+
PhaseHandler phaseHandler = game.getPhaseHandler();
phaseHandler.setPlayerTurn(startingTurn);
@@ -233,16 +246,17 @@ public class GameNew {
*/
private static void actuateGame(final GameState game, boolean isRestartedGame) {
if (!isRestartedGame) {
- // Deciding which cards go to ante
+ // Deciding which cards go to ante
if (Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_ANTE)) {
final String nl = System.getProperty("line.separator");
final StringBuilder msg = new StringBuilder();
for (final Player p : game.getPlayers()) {
+
final List lib = p.getCardsIn(ZoneType.Library);
Predicate goodForAnte = Predicates.not(CardPredicates.Presets.BASIC_LANDS);
Card ante = Aggregates.random(Iterables.filter(lib, goodForAnte));
if (ante == null) {
- throw new RuntimeException(p + " library is empty.");
+ throw new RuntimeException(p + " library is empty.");
}
game.getGameLog().add("Ante", p + " anted " + ante, 0);
VAntes.SINGLETON_INSTANCE.addAnteCard(p, ante);
@@ -252,7 +266,7 @@ public class GameNew {
JOptionPane.showMessageDialog(null, msg, "Ante", JOptionPane.INFORMATION_MESSAGE);
}
- GameOutcome lastGameOutcome = Singletons.getModel().getMatch().getLastGameOutcome();
+ GameOutcome lastGameOutcome = Singletons.getModel().getMatch().getLastGameOutcome();
// Only cut/coin toss if it's the first game of the match
if (lastGameOutcome == null) {
GameNew.seeWhoPlaysFirstDice();
@@ -263,18 +277,17 @@ public class GameNew {
}
}
- // Draw 7 cards
+ // Draw cards
for (final Player p : game.getPlayers()) {
- // Should this be p.getMaxHandSize() for Vanguard compatibility?
- p.drawCards(7);
+ p.drawCards(p.getMaxHandSize());
}
-
+
game.getPhaseHandler().setPhaseState(PhaseType.MULLIGAN);
InputControl control = Singletons.getModel().getMatch().getInput();
control.setInput(new InputMulligan());
} // newGame()
-
- private static String buildFourColumnList(String firstLine, List cAnteRemoved) {
+
+ private static String buildFourColumnList(String firstLine, List cAnteRemoved ) {
StringBuilder sb = new StringBuilder(firstLine);
sb.append("\n");
for (int i = 0; i < cAnteRemoved.size(); i++) {
@@ -353,34 +366,33 @@ public class GameNew {
private static void seeWhoPlaysFirstDice() {
int playerDie = 0;
int computerDie = 0;
-
+
while (playerDie == computerDie) {
playerDie = MyRandom.getRandom().nextInt(20);
computerDie = MyRandom.getRandom().nextInt(20);
}
-
+
// Play the Flip Coin sound
Singletons.getModel().getGame().getEvents().post(new FlipCoinEvent());
-
+
List allPlayers = Singletons.getModel().getGame().getPlayers();
setPlayersFirstTurn(allPlayers.get(MyRandom.getRandom().nextInt(allPlayers.size())), true);
}
-
+
private static void setPlayersFirstTurn(Player goesFirst, boolean firstGame) {
StringBuilder sb = new StringBuilder(goesFirst.toString());
if (firstGame) {
sb.append(" has won the coin toss.");
}
else {
- sb.append(" lost the last game.");
+ sb.append(" lost the last game.");
}
- if (goesFirst.isHuman()) {
- if (!humanPlayOrDraw(sb.toString())) {
+ if ( goesFirst.isHuman() ) {
+ if( !humanPlayOrDraw(sb.toString()) )
goesFirst = goesFirst.getOpponent();
- }
} else {
sb.append("\nComputer Going First");
- JOptionPane.showMessageDialog(null, sb.toString(),
+ JOptionPane.showMessageDialog(null, sb.toString(),
"Play or Draw?", JOptionPane.INFORMATION_MESSAGE);
}
Singletons.getModel().getGame().getPhaseHandler().setPlayerTurn(goesFirst);
@@ -388,11 +400,11 @@ public class GameNew {
private static boolean humanPlayOrDraw(String message) {
final String[] possibleValues = { "Play", "Draw" };
-
- final Object playDraw = JOptionPane.showOptionDialog(null, message + "\n\nWould you like to play or draw?",
- "Play or Draw?", JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, null,
+
+ final Object playDraw = JOptionPane.showOptionDialog(null, message + "\n\nWould you like to play or draw?",
+ "Play or Draw?", JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, null,
possibleValues, possibleValues[0]);
-
+
return !playDraw.equals(1);
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/forge/game/GameState.java b/src/main/java/forge/game/GameState.java
index 7b26fe21c4c..c758e17e4c4 100644
--- a/src/main/java/forge/game/GameState.java
+++ b/src/main/java/forge/game/GameState.java
@@ -434,6 +434,7 @@ public class GameState {
all.addAll(player.getZone(ZoneType.Library).getCards());
all.addAll(player.getZone(ZoneType.Battlefield).getCards(false));
all.addAll(player.getZone(ZoneType.Exile).getCards());
+ all.addAll(player.getZone(ZoneType.Command).getCards());
}
all.addAll(getStackZone().getCards());
return all;
diff --git a/src/main/java/forge/game/GameType.java b/src/main/java/forge/game/GameType.java
index 202fa4f6427..7454a3a4b4f 100644
--- a/src/main/java/forge/game/GameType.java
+++ b/src/main/java/forge/game/GameType.java
@@ -32,6 +32,12 @@ public enum GameType {
Commander(false, 100, 100, true),
/** The Quest. */
Quest(true, 40),
+ /** The Vanguard. */
+ Vanguard(false, 60),
+ /** The Planechase. */
+ Planechase(false, 60),
+ /** The Archenemy. */
+ Archenemy(false, 60),
/** */
Gauntlet(true, 40);
diff --git a/src/main/java/forge/game/MatchStartHelper.java b/src/main/java/forge/game/MatchStartHelper.java
index df075061a3d..df4947ad72a 100644
--- a/src/main/java/forge/game/MatchStartHelper.java
+++ b/src/main/java/forge/game/MatchStartHelper.java
@@ -1,10 +1,17 @@
package forge.game;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import com.google.common.base.Supplier;
+
+import forge.Card;
+import forge.card.CardRules;
import forge.deck.Deck;
import forge.game.player.LobbyPlayer;
+import forge.item.CardPrinted;
/**
* TODO: Write javadoc for this type.
@@ -13,18 +20,39 @@ import forge.game.player.LobbyPlayer;
public class MatchStartHelper {
private final Map players = new HashMap();
- public void addPlayer(LobbyPlayer player, PlayerStartConditions c) {
- players.put(player, c);
+ public void addPlayer(final LobbyPlayer player, final PlayerStartConditions c) {
+ players.put(player,c);
}
-
- public void addPlayer(LobbyPlayer player, Deck deck) {
- players.put(player, new PlayerStartConditions(deck));
+
+ public void addPlayer(final LobbyPlayer player, final Deck deck) {
+ PlayerStartConditions start = new PlayerStartConditions(deck);
+ players.put(player, start);
}
+
+ public void addVanguardPlayer(final LobbyPlayer player, final Deck deck, final CardPrinted avatar)
+ {
+ PlayerStartConditions start = new PlayerStartConditions(deck);
+
+ start.setStartingLife(start.getStartingLife() + avatar.getCard().getLife());
+ start.setStartingHand(start.getStartingHand() + avatar.getCard().getHand());
+
+ start.setCardsInCommand(new Supplier>() {
- public Map getPlayerMap() {
-
+ @Override
+ public Iterable get() {
+ List res = new ArrayList();
+ res.add(avatar.toForgeCard());
+ return res;
+ }
+
+ });
+
+ players.put(player, start);
+ }
+
+ public Map getPlayerMap()
+ {
return players;
}
-
}
diff --git a/src/main/java/forge/game/PlayerStartConditions.java b/src/main/java/forge/game/PlayerStartConditions.java
index ba9f330fef1..a7f225dea3e 100644
--- a/src/main/java/forge/game/PlayerStartConditions.java
+++ b/src/main/java/forge/game/PlayerStartConditions.java
@@ -3,13 +3,17 @@ package forge.game;
import com.google.common.base.Supplier;
import forge.Card;
+import forge.card.CardRules;
import forge.deck.Deck;
+import forge.item.CardPrinted;
public class PlayerStartConditions {
private final Deck deck;
private int startingLife = 20;
- private Supplier> cardsOnTable = null;
+ private int startingHand = 7;
+ private Supplier> cardsOnBattlefield = null;
+ private Supplier> cardsInCommand = null;
public PlayerStartConditions(Deck deck0) {
deck = deck0;
@@ -21,16 +25,44 @@ public class PlayerStartConditions {
public final int getStartingLife() {
return startingLife;
}
- public final Iterable getCardsOnTable() {
- return cardsOnTable == null ? null : cardsOnTable.get();
+ public final Iterable getCardsOnBattlefield() {
+ return cardsOnBattlefield == null ? null : cardsOnBattlefield.get();
}
public final void setStartingLife(int startingLife) {
this.startingLife = startingLife;
}
- public final void setCardsOnTable(Supplier> cardsOnTable) {
- this.cardsOnTable = cardsOnTable;
+ public final void setCardsOnBattlefield(Supplier> cardsOnTable) {
+ this.cardsOnBattlefield = cardsOnTable;
+ }
+
+ /**
+ * @return the startingHand
+ */
+ public int getStartingHand() {
+ return startingHand;
+ }
+
+ /**
+ * @param startingHand0 the startingHand to set
+ */
+ public void setStartingHand(int startingHand0) {
+ this.startingHand = startingHand0;
+ }
+
+ /**
+ * @return the cardsInCommand
+ */
+ public Iterable getCardsInCommand() {
+ return cardsInCommand == null ? null : cardsInCommand.get();
+ }
+
+ /**
+ * @param cardsInCommand0 the cardsInCommand to set
+ */
+ public void setCardsInCommand(Supplier> cardsInCommand0) {
+ this.cardsInCommand = cardsInCommand0;
}
diff --git a/src/main/java/forge/game/phase/CombatUtil.java b/src/main/java/forge/game/phase/CombatUtil.java
index 254a772bcba..e1fd2b4507a 100644
--- a/src/main/java/forge/game/phase/CombatUtil.java
+++ b/src/main/java/forge/game/phase/CombatUtil.java
@@ -960,7 +960,7 @@ public class CombatUtil {
}
// CantBeActivated static abilities
- for (final Card ca : Singletons.getModel().getGame().getCardsIn(ZoneType.Battlefield)) {
+ for (final Card ca : Singletons.getModel().getGame().getCardsIn(ZoneType.listValueOf("Battlefield,Command"))) {
final ArrayList staticAbilities = ca.getStaticAbilities();
for (final StaticAbility stAb : staticAbilities) {
if (stAb.applyAbility("CantAttack", c, defender)) {
diff --git a/src/main/java/forge/game/player/ComputerAIGeneral.java b/src/main/java/forge/game/player/ComputerAIGeneral.java
index 2f10983be59..a9bcff7234b 100644
--- a/src/main/java/forge/game/player/ComputerAIGeneral.java
+++ b/src/main/java/forge/game/player/ComputerAIGeneral.java
@@ -139,6 +139,7 @@ public class ComputerAIGeneral implements Computer {
all.addAll(player.getCardsIn(ZoneType.Battlefield));
all.addAll(player.getCardsIn(ZoneType.Exile));
all.addAll(player.getCardsIn(ZoneType.Graveyard));
+ all.addAll(player.getCardsIn(ZoneType.Command));
if (!player.getCardsIn(ZoneType.Library).isEmpty()) {
all.add(player.getCardsIn(ZoneType.Library).get(0));
}
diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java
index a97f5df3f54..e5832e4fbe9 100644
--- a/src/main/java/forge/game/player/Player.java
+++ b/src/main/java/forge/game/player/Player.java
@@ -679,7 +679,7 @@ public abstract class Player extends GameEntity implements Comparable {
}
// Prevent Damage static abilities
- for (final Card ca : game.getCardsIn(ZoneType.Battlefield)) {
+ for (final Card ca : game.getCardsIn(ZoneType.listValueOf("Battlefield,Command"))) {
final ArrayList staticAbilities = ca.getStaticAbilities();
for (final StaticAbility stAb : staticAbilities) {
restDamage = stAb.applyAbility("PreventDamage", source, this, restDamage, isCombat);
@@ -1898,7 +1898,7 @@ public abstract class Player extends GameEntity implements Comparable {
}
// CantBeCast static abilities
- for (final Card ca : game.getCardsIn(ZoneType.Battlefield)) {
+ for (final Card ca : game.getCardsIn(ZoneType.listValueOf("Battlefield,Command"))) {
final ArrayList staticAbilities = ca.getStaticAbilities();
for (final StaticAbility stAb : staticAbilities) {
if (stAb.applyAbility("CantPlayLand", null, this)) {
diff --git a/src/main/java/forge/game/zone/PlayerZoneBattlefield.java b/src/main/java/forge/game/zone/PlayerZoneBattlefield.java
index ae86483c86a..3f0ed46b928 100644
--- a/src/main/java/forge/game/zone/PlayerZoneBattlefield.java
+++ b/src/main/java/forge/game/zone/PlayerZoneBattlefield.java
@@ -84,7 +84,7 @@ public class PlayerZoneBattlefield extends PlayerZone {
c.setTapped(true);
} else {
// ETBTapped static abilities
- for (final Card ca : Singletons.getModel().getGame().getCardsIn(ZoneType.Battlefield)) {
+ for (final Card ca : Singletons.getModel().getGame().getCardsIn(ZoneType.listValueOf("Battlefield,Command"))) {
for (final StaticAbility stAb : ca.getStaticAbilities()) {
if (stAb.applyAbility("ETBTapped", c)) {
// it enters the battlefield this way, and should
diff --git a/src/main/java/forge/game/zone/ZoneType.java b/src/main/java/forge/game/zone/ZoneType.java
index d074768308a..143690851fc 100644
--- a/src/main/java/forge/game/zone/ZoneType.java
+++ b/src/main/java/forge/game/zone/ZoneType.java
@@ -34,7 +34,7 @@ public enum ZoneType {
/** Ante. */
Ante(false);
- public static final List STATIC_ABILITIES_SOURCE_ZONES = Arrays.asList(new ZoneType[]{Battlefield, Graveyard, Exile/*, Hand*/});
+ public static final List STATIC_ABILITIES_SOURCE_ZONES = Arrays.asList(new ZoneType[]{Battlefield, Graveyard, Exile, Command/*, Hand*/});
private final boolean holdsHiddenInfo;
private ZoneType(boolean holdsHidden) {
diff --git a/src/main/java/forge/gui/GuiMigrateLocalMWSSetPicturesHQ.java b/src/main/java/forge/gui/GuiMigrateLocalMWSSetPicturesHQ.java
index 03a9ebc0684..150ac42e7c2 100644
--- a/src/main/java/forge/gui/GuiMigrateLocalMWSSetPicturesHQ.java
+++ b/src/main/java/forge/gui/GuiMigrateLocalMWSSetPicturesHQ.java
@@ -491,7 +491,7 @@ public final class GuiMigrateLocalMWSSetPicturesHQ extends DefaultBoundedRangeMo
final String urlBase = "C:\\MTGForge\\HQPICS\\";
String imgFN = "";
- for (final CardPrinted cp : CardDb.instance().getAllCards())
+ for (final CardPrinted cp : CardDb.instance().getAllTraditionalCards())
{
// String url = c.getSVar("Picture");
// String[] URLs = url.split("\\\\");
diff --git a/src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java b/src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java
index a3249903465..1e2395c4a7c 100644
--- a/src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java
+++ b/src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java
@@ -121,7 +121,7 @@ public final class CEditorConstructed extends ACEditorBase {
@Override
public void resetTables() {
// Constructed mode can use all cards, no limitations.
- this.getTableCatalog().setDeck(ItemPool.createFrom(CardDb.instance().getAllCards(), CardPrinted.class));
+ this.getTableCatalog().setDeck(ItemPool.createFrom(CardDb.instance().getAllTraditionalCards(), CardPrinted.class));
this.getTableDeck().setDeck(this.controller.getModel().getMain());
}
diff --git a/src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java b/src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java
index 6c1b14d85d6..46965cc4020 100644
--- a/src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java
+++ b/src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java
@@ -22,6 +22,8 @@ import java.util.ArrayList;
import org.apache.commons.lang3.StringUtils;
+import com.google.common.collect.Iterables;
+
import forge.CardUtil;
import forge.Singletons;
import forge.card.CardEdition;
@@ -90,7 +92,9 @@ public class GuiDownloadSetPicturesLQ extends GuiDownloader {
// read token names and urls
final ArrayList cList = new ArrayList();
- for (final CardPrinted c : CardDb.instance().getAllCards()) {
+ Iterable allPrinted = Iterables.concat(CardDb.instance().getAllTraditionalCards(),CardDb.instance().getAllNonTraditionalCards());
+
+ for (final CardPrinted c : allPrinted) {
final String setCode3 = c.getEdition();
if (StringUtils.isBlank(setCode3) || "???".equals(setCode3)) {
continue; // we don't want cards from unknown sets
diff --git a/src/main/java/forge/gui/framework/EDocID.java b/src/main/java/forge/gui/framework/EDocID.java
index fbecafe3c2c..fe9e7c20851 100644
--- a/src/main/java/forge/gui/framework/EDocID.java
+++ b/src/main/java/forge/gui/framework/EDocID.java
@@ -15,7 +15,6 @@ import forge.gui.home.gauntlet.VSubmenuGauntletBuild;
import forge.gui.home.gauntlet.VSubmenuGauntletContests;
import forge.gui.home.gauntlet.VSubmenuGauntletLoad;
import forge.gui.home.gauntlet.VSubmenuGauntletQuick;
-import forge.gui.home.multiplayer.VSubmenuArchenemy;
import forge.gui.home.quest.VSubmenuChallenges;
import forge.gui.home.quest.VSubmenuDuels;
import forge.gui.home.quest.VSubmenuQuestData;
@@ -27,6 +26,8 @@ import forge.gui.home.sanctioned.VSubmenuSealed;
import forge.gui.home.settings.VSubmenuAvatars;
import forge.gui.home.settings.VSubmenuDownloaders;
import forge.gui.home.settings.VSubmenuPreferences;
+import forge.gui.home.variant.VSubmenuArchenemy;
+import forge.gui.home.variant.VSubmenuVanguard;
import forge.gui.match.views.VAntes;
import forge.gui.match.views.VCombat;
import forge.gui.match.views.VDetail;
@@ -74,6 +75,7 @@ public enum EDocID { /** */
HOME_CONSTRUCTED (VSubmenuConstructed.SINGLETON_INSTANCE), /** */
HOME_DRAFT (VSubmenuDraft.SINGLETON_INSTANCE), /** */
HOME_SEALED (VSubmenuSealed.SINGLETON_INSTANCE), /** */
+ HOME_VANGUARD (VSubmenuVanguard.SINGLETON_INSTANCE), /** */
REPORT_MESSAGE (VMessage.SINGLETON_INSTANCE), /** */
REPORT_STACK (VStack.SINGLETON_INSTANCE), /** */
@@ -98,7 +100,16 @@ public enum EDocID { /** */
HAND_0 (null), /** */
HAND_1 (null), /** */
HAND_2 (null), /** */
- HAND_3 (null);
+ HAND_3 (null), /** */
+
+ COMMAND_0 (null), /** */
+ COMMAND_1 (null), /** */
+ COMMAND_2 (null), /** */
+ COMMAND_3 (null), /** */
+ COMMAND_4 (null), /** */
+ COMMAND_5 (null), /** */
+ COMMAND_6 (null), /** */
+ COMMAND_7 (null); /** */
// End enum declarations, start enum methods.
private IVDoc vDoc;
diff --git a/src/main/java/forge/gui/home/EMenuGroup.java b/src/main/java/forge/gui/home/EMenuGroup.java
index d86f494e2a5..b705cb6b935 100644
--- a/src/main/java/forge/gui/home/EMenuGroup.java
+++ b/src/main/java/forge/gui/home/EMenuGroup.java
@@ -11,7 +11,7 @@ public enum EMenuGroup { /** */
SANCTIONED ("Sanctioned Formats"), /** */
QUEST ("Quest Mode"), /** */
GAUNTLET ("Gauntlets"), /** */
- MULTIPLAYER ("Multiplayer"), /** */
+ VARIANT ("Variant"), /** */
SETTINGS ("Game Settings");
private final String strTitle;
diff --git a/src/main/java/forge/gui/home/VHomeUI.java b/src/main/java/forge/gui/home/VHomeUI.java
index 592e89237ac..f2913f807d4 100644
--- a/src/main/java/forge/gui/home/VHomeUI.java
+++ b/src/main/java/forge/gui/home/VHomeUI.java
@@ -43,7 +43,6 @@ import forge.gui.home.gauntlet.VSubmenuGauntletBuild;
import forge.gui.home.gauntlet.VSubmenuGauntletContests;
import forge.gui.home.gauntlet.VSubmenuGauntletLoad;
import forge.gui.home.gauntlet.VSubmenuGauntletQuick;
-import forge.gui.home.multiplayer.VSubmenuArchenemy;
import forge.gui.home.quest.VSubmenuChallenges;
import forge.gui.home.quest.VSubmenuDuels;
import forge.gui.home.quest.VSubmenuQuestData;
@@ -55,6 +54,8 @@ import forge.gui.home.sanctioned.VSubmenuSealed;
import forge.gui.home.settings.VSubmenuAvatars;
import forge.gui.home.settings.VSubmenuDownloaders;
import forge.gui.home.settings.VSubmenuPreferences;
+import forge.gui.home.variant.VSubmenuArchenemy;
+import forge.gui.home.variant.VSubmenuVanguard;
import forge.gui.toolbox.ExperimentalLabel;
import forge.gui.toolbox.FLabel;
import forge.gui.toolbox.FSkin;
@@ -118,6 +119,8 @@ public enum VHomeUI implements IVTopLevelUI {
//allSubmenus.add(VSubmenuExit.SINGLETON_INSTANCE);
allSubmenus.add(VSubmenuArchenemy.SINGLETON_INSTANCE);
+
+ allSubmenus.add(VSubmenuVanguard.SINGLETON_INSTANCE);
// For each group: init its panel
final SortedMap allGroupPanels = new TreeMap();
diff --git a/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java b/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java
index 78863254074..61aa6f691d7 100644
--- a/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java
+++ b/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java
@@ -321,9 +321,9 @@ public class SSubmenuQuestUtil {
humanStart.setStartingLife(qData.getAssets().getLife(qData.getMode()) + extraLifeHuman);
aiStart.setStartingLife(lifeAI);
- humanStart.setCardsOnTable(new Supplier>() {
+ humanStart.setCardsOnBattlefield(new Supplier>() {
@Override public Iterable get() { return QuestUtil.getHumanStartingCards(qData, event); } });
- aiStart.setCardsOnTable(new Supplier>() {
+ aiStart.setCardsOnBattlefield(new Supplier>() {
@Override public Iterable get() { return QuestUtil.getComputerStartingCards(event); } });
} // End isFantasy
diff --git a/src/main/java/forge/gui/home/multiplayer/CSubmenuArchenemy.java b/src/main/java/forge/gui/home/variant/CSubmenuArchenemy.java
similarity index 98%
rename from src/main/java/forge/gui/home/multiplayer/CSubmenuArchenemy.java
rename to src/main/java/forge/gui/home/variant/CSubmenuArchenemy.java
index 62f415a81e4..7064fc64fdd 100644
--- a/src/main/java/forge/gui/home/multiplayer/CSubmenuArchenemy.java
+++ b/src/main/java/forge/gui/home/variant/CSubmenuArchenemy.java
@@ -1,4 +1,4 @@
-package forge.gui.home.multiplayer;
+package forge.gui.home.variant;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
diff --git a/src/main/java/forge/gui/home/variant/CSubmenuVanguard.java b/src/main/java/forge/gui/home/variant/CSubmenuVanguard.java
new file mode 100644
index 00000000000..4ac46cf4ac6
--- /dev/null
+++ b/src/main/java/forge/gui/home/variant/CSubmenuVanguard.java
@@ -0,0 +1,200 @@
+package forge.gui.home.variant;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import javax.swing.SwingUtilities;
+import javax.swing.SwingWorker;
+
+import com.google.common.collect.Iterables;
+
+import forge.Command;
+import forge.GameActionUtil;
+import forge.Singletons;
+import forge.control.Lobby;
+import forge.deck.Deck;
+import forge.game.GameType;
+import forge.game.MatchController;
+import forge.game.MatchStartHelper;
+import forge.game.PlayerStartConditions;
+import forge.game.player.LobbyPlayer;
+import forge.game.player.PlayerType;
+import forge.gui.SOverlayUtils;
+import forge.gui.framework.ICDoc;
+import forge.gui.toolbox.FDeckChooser;
+import forge.gui.toolbox.FList;
+import forge.item.CardPrinted;
+import forge.properties.ForgePreferences;
+import forge.properties.ForgePreferences.FPref;
+
+/**
+ * Controls the constructed submenu in the home UI.
+ *
+ * (C at beginning of class name denotes a control class.)
+ *
+ */
+public enum CSubmenuVanguard implements ICDoc {
+ /** */
+ SINGLETON_INSTANCE;
+ private final VSubmenuVanguard view = VSubmenuVanguard.SINGLETON_INSTANCE;
+
+
+ /* (non-Javadoc)
+ * @see forge.gui.home.ICSubmenu#initialize()
+ */
+ @Override
+ public void update() {
+ // Nothing to see here...
+ }
+
+ /* (non-Javadoc)
+ * @see forge.gui.home.ICSubmenu#initialize()
+ */
+ @Override
+ public void initialize() {
+ final ForgePreferences prefs = Singletons.getModel().getPreferences();
+ for(FDeckChooser fdc : view.getDeckChoosers())
+ {
+ fdc.initialize();
+ }
+
+ // Checkbox event handling
+ view.getBtnStart().addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(final ActionEvent arg0) {
+ startGame();
+ }
+ });
+
+ // Checkbox event handling
+ view.getCbSingletons().addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(final ActionEvent arg0) {
+ prefs.setPref(FPref.DECKGEN_SINGLETONS,
+ String.valueOf(view.getCbSingletons().isSelected()));
+ prefs.save();
+ }
+ });
+
+ view.getCbArtifacts().addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(final ActionEvent arg0) {
+ prefs.setPref(
+ FPref.DECKGEN_ARTIFACTS, String.valueOf(view.getCbArtifacts().isSelected()));
+ prefs.save();
+ }
+ });
+
+ view.getCbRemoveSmall().addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(final ActionEvent arg0) {
+ prefs.setPref(
+ FPref.DECKGEN_NOSMALL, String.valueOf(view.getCbRemoveSmall().isSelected()));
+ prefs.save();
+ }
+ });
+
+ // Pre-select checkboxes
+ view.getCbSingletons().setSelected(prefs.getPrefBoolean(FPref.DECKGEN_SINGLETONS));
+ view.getCbArtifacts().setSelected(prefs.getPrefBoolean(FPref.DECKGEN_ARTIFACTS));
+ view.getCbRemoveSmall().setSelected(prefs.getPrefBoolean(FPref.DECKGEN_NOSMALL));
+ }
+
+
+
+ /** @param lists0 {@link java.util.List}<{@link javax.swing.JList}> */
+ private void startGame() {
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ SOverlayUtils.startGameOverlay();
+ SOverlayUtils.showOverlay();
+ }
+ });
+
+ final SwingWorker worker = new SwingWorker() {
+ @Override
+ public Object doInBackground() {
+ Random rnd = new Random();
+
+ List playerDecks = new ArrayList();
+ for(int i=0;i playerAvatars = new ArrayList();
+ for(int i=0;i {
*/
@Override
public EMenuGroup getGroupEnum() {
- return EMenuGroup.MULTIPLAYER;
+ return EMenuGroup.VARIANT;
}
/* (non-Javadoc)
diff --git a/src/main/java/forge/gui/home/variant/VSubmenuVanguard.java b/src/main/java/forge/gui/home/variant/VSubmenuVanguard.java
new file mode 100644
index 00000000000..50a4810216f
--- /dev/null
+++ b/src/main/java/forge/gui/home/variant/VSubmenuVanguard.java
@@ -0,0 +1,352 @@
+package forge.gui.home.variant;
+
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Vector;
+
+import javax.swing.AbstractButton;
+import javax.swing.ButtonGroup;
+import javax.swing.ButtonModel;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
+import javax.swing.ScrollPaneConstants;
+import javax.swing.SwingConstants;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
+
+import net.miginfocom.swing.MigLayout;
+import forge.card.CardCoreType;
+import forge.card.CardRules;
+import forge.card.CardRulesPredicates;
+import forge.game.player.PlayerType;
+import forge.gui.framework.DragCell;
+import forge.gui.framework.DragTab;
+import forge.gui.framework.EDocID;
+import forge.gui.home.EMenuGroup;
+import forge.gui.home.IVSubmenu;
+import forge.gui.home.LblHeader;
+import forge.gui.home.StartButton;
+import forge.gui.home.VHomeUI;
+import forge.gui.toolbox.FCheckBox;
+import forge.gui.toolbox.FDeckChooser;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FList;
+import forge.gui.toolbox.FPanel;
+import forge.gui.toolbox.FRadioButton;
+import forge.gui.toolbox.FScrollPane;
+import forge.gui.toolbox.FSkin;
+import forge.item.CardDb;
+import forge.item.CardPrinted;
+
+/**
+ * Assembles Swing components of constructed submenu singleton.
+ *
+ * (V at beginning of class name denotes a view class.)
+ *
+ */
+public enum VSubmenuVanguard implements IVSubmenu {
+ /** */
+ SINGLETON_INSTANCE;
+
+ // Fields used with interface IVDoc
+ private DragCell parentCell;
+ private final DragTab tab = new DragTab("Vanguard Mode");
+
+ /** */
+ private final LblHeader lblTitle = new LblHeader("Variant: Vanguard");
+
+ private final JPanel pnlStart = new JPanel(new MigLayout("insets 0, gap 0, wrap 2"));
+
+ private final StartButton btnStart = new StartButton();
+
+ private final JCheckBox cbSingletons = new FCheckBox("Singleton Mode");
+ private final JCheckBox cbArtifacts = new FCheckBox("Remove Artifacts");
+ private final JCheckBox cbRemoveSmall = new FCheckBox("Remove Small Creatures");
+
+ private final Iterable allAvatars = Iterables.filter(CardDb.instance().getAllNonTraditionalCards(), CardPrinted.Predicates.type("Vanguard"));
+ private final List allAiAvatars = new ArrayList();
+
+ //////////////////////////////
+
+ private final JTabbedPane tabPane = new JTabbedPane();
+ private final List playerPanels = new ArrayList();
+ private final List deckChoosers = new ArrayList();
+ private final List avatarLists = new ArrayList();
+
+ private final List fieldRadios = new ArrayList();
+ private final ButtonGroup grpFields = new ButtonGroup();
+ private int currentNumTabsShown = 8;
+
+ //////////////////////////////
+
+ private VSubmenuVanguard() {
+
+ lblTitle.setBackground(FSkin.getColor(FSkin.Colors.CLR_THEME2));
+
+ Vector humanListData = new Vector();
+ Vector aiListData = new Vector();
+ humanListData.add("Random");
+ aiListData.add("Random");
+ for(CardPrinted cp : allAvatars)
+ {
+ humanListData.add(cp);
+ if(!cp.getCard().getRemAIDecks())
+ {
+ aiListData.add(cp);
+ allAiAvatars.add(cp);
+ }
+ }
+
+ //This listener will look for any of the radio buttons being selected
+ //and call the method that shows/hides tabs appropriately.
+ ItemListener iListener = new ItemListener() {
+
+ @Override
+ public void itemStateChanged(ItemEvent arg0) {
+ FRadioButton aButton = (FRadioButton)arg0.getSource();
+
+ if(arg0.getStateChange() == ItemEvent.SELECTED)
+ {
+ changeTabs(Integer.parseInt(aButton.getText()));
+ }
+ }
+
+ };
+
+ //Create all 8 player settings panel
+ FRadioButton tempRadio = null;
+ FPanel tempPanel;
+ FDeckChooser tempChooser;
+ FList tempList;
+
+ //Settings panel
+ FPanel settingsPanel = new FPanel();
+ FPanel radioPane = new FPanel();
+ radioPane.setLayout(new MigLayout("wrap 1"));
+ radioPane.setOpaque(false);
+ for (int i = 1; i < 8; i++) {
+ tempRadio = new FRadioButton();
+ tempRadio.setText(String.valueOf(i));
+ fieldRadios.add(tempRadio);
+ grpFields.add(tempRadio);
+ tempRadio.setSelected(true);
+ tempRadio.addItemListener(iListener);
+ radioPane.add(tempRadio,"wrap");
+ }
+ settingsPanel.add(radioPane);
+ settingsPanel.add(new FLabel.Builder().text("Set number of opponents").build());
+ tabPane.add("Settings",settingsPanel);
+
+ //Player panels (Human + 7 AIs)
+ for (int i = 0; i < 8;i++) {
+ tempPanel = new FPanel();
+ tempPanel.setLayout(new MigLayout("insets 0, gap 0 , wrap 2"));
+
+ tempChooser = new FDeckChooser("Select deck:", i == 0 ? PlayerType.HUMAN : PlayerType.COMPUTER);
+ tempChooser.initialize();
+
+ tempList = new FList();
+
+ tempList.setListData(i == 0 ? humanListData : aiListData);
+ tempList.setSelectedIndex(0);
+ tempList.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
+
+ deckChoosers.add(tempChooser);
+ avatarLists.add(tempList);
+
+ tempPanel.add(tempChooser,"span 1 2, w 44%!, gap 0 0 20px 20px, growy, pushy");
+
+ tempPanel.add(new FLabel.Builder().text("Select Avatar:").build());
+
+ JScrollPane scrAvatar = new FScrollPane(tempList, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+ tempPanel.add(scrAvatar,"h 90%!");
+
+ playerPanels.add(tempPanel);
+ tabPane.add("Player " + (i+1), tempPanel);
+ }
+
+ final String strCheckboxConstraints = "w 200px!, h 30px!, gap 0 20px 0 0";
+ pnlStart.setOpaque(false);
+ pnlStart.add(cbSingletons, strCheckboxConstraints);
+ pnlStart.add(btnStart, "span 1 3, growx, pushx, align center");
+ pnlStart.add(cbArtifacts, strCheckboxConstraints);
+ pnlStart.add(cbRemoveSmall, strCheckboxConstraints);
+ }
+
+ private void changeTabs(int toShow)
+ {
+ if(toShow < currentNumTabsShown)
+ {
+ for(int i=currentNumTabsShown;i>toShow+1;i--)
+ {
+ tabPane.remove(i);
+ }
+ currentNumTabsShown = tabPane.getComponentCount()-1;
+ }
+ else
+ {
+ for(int i=currentNumTabsShown;i<=toShow;i++)
+ {
+ tabPane.add("Player " + (i+1),playerPanels.get(i));
+ }
+ currentNumTabsShown = tabPane.getComponentCount()-1;
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see forge.gui.home.IVSubmenu#getGroupEnum()
+ */
+ @Override
+ public EMenuGroup getGroupEnum() {
+ return EMenuGroup.VARIANT;
+ }
+
+ /* (non-Javadoc)
+ * @see forge.gui.home.IVSubmenu#getMenuTitle()
+ */
+ @Override
+ public String getMenuTitle() {
+ return "Vanguard";
+ }
+
+ /* (non-Javadoc)
+ * @see forge.gui.home.IVSubmenu#getItemEnum()
+ */
+ @Override
+ public EDocID getItemEnum() {
+ return EDocID.HOME_VANGUARD;
+ }
+
+ /* (non-Javadoc)
+ * @see forge.gui.home.IVSubmenu#populate()
+ */
+ @Override
+ public void populate() {
+ VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().removeAll();
+ VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().setLayout(new MigLayout("insets 0, gap 0, wrap 1, ax right"));
+
+ VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().add(lblTitle, "w 80%!, h 40px!, gap 0 0 15px 15px, span 2, ax right");
+
+ for(FDeckChooser fdc : deckChoosers)
+ {
+ fdc.populate();
+ }
+
+ VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().add(tabPane, "gap 0 0 50px 50px, growx, growy");
+
+ VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().add(pnlStart, "span 1, ax center");
+
+ VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().revalidate();
+ VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().repaintSelf();
+
+ }
+
+
+ /** @return {@link javax.swing.JButton} */
+ public JButton getBtnStart() {
+ return this.btnStart;
+ }
+
+
+ /** @return {@link javax.swing.JCheckBox} */
+ public JCheckBox getCbSingletons() {
+ return cbSingletons;
+ }
+
+ /** @return {@link javax.swing.JCheckBox} */
+ public JCheckBox getCbArtifacts() {
+ return cbArtifacts;
+ }
+
+ /** @return {@link javax.swing.JCheckBox} */
+ public JCheckBox getCbRemoveSmall() {
+ return cbRemoveSmall;
+ }
+
+ //========== Overridden from IVDoc
+
+ /* (non-Javadoc)
+ * @see forge.gui.framework.IVDoc#getDocumentID()
+ */
+ @Override
+ public EDocID getDocumentID() {
+ return EDocID.HOME_VANGUARD;
+ }
+
+ /* (non-Javadoc)
+ * @see forge.gui.framework.IVDoc#getTabLabel()
+ */
+ @Override
+ public DragTab getTabLabel() {
+ return tab;
+ }
+
+ /* (non-Javadoc)
+ * @see forge.gui.framework.IVDoc#getLayoutControl()
+ */
+ @Override
+ public CSubmenuVanguard getLayoutControl() {
+ return CSubmenuVanguard.SINGLETON_INSTANCE;
+ }
+
+ /* (non-Javadoc)
+ * @see forge.gui.framework.IVDoc#setParentCell(forge.gui.framework.DragCell)
+ */
+ @Override
+ public void setParentCell(DragCell cell0) {
+ this.parentCell = cell0;
+ }
+
+ /* (non-Javadoc)
+ * @see forge.gui.framework.IVDoc#getParentCell()
+ */
+ @Override
+ public DragCell getParentCell() {
+ return parentCell;
+ }
+
+ /**
+ *
+ * @return a deckchooser for every player
+ */
+ public List getDeckChoosers()
+ {
+ return deckChoosers;
+ }
+
+ public List getAvatarLists()
+ {
+ return avatarLists;
+ }
+
+ public int getNumPlayers()
+ {
+ return currentNumTabsShown;
+ }
+
+ /**
+ * @return the allAvatars
+ */
+ public Iterable getAllAvatars() {
+ return allAvatars;
+ }
+
+ /**
+ * @return the allAiAvatars
+ */
+ public List getAllAiAvatars() {
+ return allAiAvatars;
+ }
+}
diff --git a/src/main/java/forge/gui/match/CMatchUI.java b/src/main/java/forge/gui/match/CMatchUI.java
index 347a22ef5b0..57476486767 100644
--- a/src/main/java/forge/gui/match/CMatchUI.java
+++ b/src/main/java/forge/gui/match/CMatchUI.java
@@ -35,6 +35,7 @@ import forge.gui.match.controllers.CDetail;
import forge.gui.match.controllers.CMessage;
import forge.gui.match.controllers.CPicture;
import forge.gui.match.nonsingleton.CField;
+import forge.gui.match.nonsingleton.VCommand;
import forge.gui.match.nonsingleton.VField;
import forge.gui.match.nonsingleton.VHand;
import forge.gui.toolbox.FSkin;
@@ -87,12 +88,15 @@ public enum CMatchUI implements CardContainer {
// Instantiate all required field slots (user at 0) <-- that's not guaranteed
final List fields = new ArrayList();
+ final List commands = new ArrayList();
VField humanField = new VField(EDocID.valueOf("FIELD_0"), localPlayer);
+ VCommand humanCommand = new VCommand(EDocID.COMMAND_0, localPlayer);
fields.add(0, humanField);
+ commands.add(0, humanCommand);
setAvatar(humanField, FSkin.getAvatars().get(Integer.parseInt(indices[0])));
humanField.getLayoutControl().initialize();
-
+ humanCommand.getLayoutControl().initialize();
int i = 1;
for (Player p : players) {
@@ -103,6 +107,9 @@ public enum CMatchUI implements CardContainer {
setAvatar(f, getPlayerAvatar(p, Integer.parseInt(indices[i%2])));
f.getLayoutControl().initialize();
fields.add(f);
+ VCommand c = new VCommand(EDocID.valueOf("COMMAND_" + i), p);
+ c.getLayoutControl().initialize();
+ commands.add(c);
i++;
}
@@ -121,6 +128,7 @@ public enum CMatchUI implements CardContainer {
// }
// Replace old instances
+ VMatchUI.SINGLETON_INSTANCE.setCommandViews(commands);
VMatchUI.SINGLETON_INSTANCE.setFieldViews(fields);
VMatchUI.SINGLETON_INSTANCE.setHandViews(hands);
}
diff --git a/src/main/java/forge/gui/match/VMatchUI.java b/src/main/java/forge/gui/match/VMatchUI.java
index 62baffb0d3f..0eb183e5f8d 100644
--- a/src/main/java/forge/gui/match/VMatchUI.java
+++ b/src/main/java/forge/gui/match/VMatchUI.java
@@ -13,6 +13,7 @@ import forge.gui.framework.IVTopLevelUI;
import forge.gui.framework.SLayoutIO;
import forge.gui.framework.SRearrangingUtil;
import forge.gui.framework.VEmptyDoc;
+import forge.gui.match.nonsingleton.VCommand;
import forge.gui.match.nonsingleton.VField;
import forge.gui.match.nonsingleton.VHand;
import forge.gui.match.views.VDev;
@@ -31,6 +32,7 @@ public enum VMatchUI implements IVTopLevelUI {
/** */
SINGLETON_INSTANCE;
+ private List lstCommands = new ArrayList();
private List lstFields = new ArrayList();
private List lstHands = new ArrayList();
@@ -43,6 +45,12 @@ public enum VMatchUI implements IVTopLevelUI {
EDocID.valueOf("FIELD_" + i).setDoc(
new VEmptyDoc(EDocID.valueOf("FIELD_" + i)));
}
+
+ // Create empty docs for all field slots
+ for (int i = 0; i < 8; i++) {
+ EDocID.valueOf("COMMAND_" + i).setDoc(
+ new VEmptyDoc(EDocID.valueOf("COMMAND_" + i)));
+ }
// Create empty docs for all hand slots
for (int i = 0; i < 4; i++) {
@@ -95,6 +103,21 @@ public enum VMatchUI implements IVTopLevelUI {
lstFields.get(1).getParentCell().addDoc(lstFields.get(i));
}
}
+
+ // Add extra players alternatively to existing user/AI field panels.
+ for (int i = 2; i < lstCommands.size(); i++) {
+ // If already in layout, no need to add again.
+ if (lstCommands.get(i).getParentCell() != null) {
+ continue;
+ }
+
+ if (i % 2 == 0) {
+ lstCommands.get(0).getParentCell().addDoc(lstCommands.get(i));
+ }
+ else {
+ lstCommands.get(1).getParentCell().addDoc(lstCommands.get(i));
+ }
+ }
// Add extra hands to existing hand panel.
for (int i = 0; i < lstHands.size(); i++) {
@@ -156,4 +179,18 @@ public enum VMatchUI implements IVTopLevelUI {
public JButton getBtnOK() {
return VMessage.SINGLETON_INSTANCE.getBtnOK();
}
+
+ /**
+ * @return the lstCommands
+ */
+ public List getCommandViews() {
+ return lstCommands;
+ }
+
+ /**
+ * @param lstCommands0 the lstCommands to set
+ */
+ public void setCommandViews(List lstCommands0) {
+ this.lstCommands = lstCommands0;
+ }
}
diff --git a/src/main/java/forge/gui/match/nonsingleton/CCommand.java b/src/main/java/forge/gui/match/nonsingleton/CCommand.java
new file mode 100644
index 00000000000..8950652d1f1
--- /dev/null
+++ b/src/main/java/forge/gui/match/nonsingleton/CCommand.java
@@ -0,0 +1,132 @@
+/*
+ * Forge: Play Magic: the Gathering.
+ * Copyright (C) 2011 Forge Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see (V at beginning of class name denotes a view class.)
+ */
+public class VCommand implements IVDoc {
+ // Fields used with interface IVDoc
+ private final CCommand control;
+ private DragCell parentCell;
+ private final EDocID docID;
+ private final DragTab tab = new DragTab("Command");
+
+ // Other fields
+ private Player player = null;
+
+ // Top-level containers
+ private final JScrollPane scroller = new JScrollPane();
+ private final PlayArea tabletop;
+
+ //========= Constructor
+ /**
+ * Assembles Swing components of a player field instance.
+ *
+ * @param player0 {@link forge.game.player.Player}
+ * @param id0 {@link forge.gui.framework.EDocID}
+ */
+ public VCommand(final EDocID id0, final Player player0) {
+ this.docID = id0;
+ id0.setDoc(this);
+
+ this.player = player0;
+ if (player0 != null) { tab.setText(player0.getName() + " Command"); }
+ else { tab.setText("NO PLAYER FOR " + docID.toString()); }
+
+ // TODO player is hard-coded into tabletop...should be dynamic
+ // (haven't looked into it too deeply). Doublestrike 12-04-12
+ tabletop = new PlayArea(scroller, id0 == EDocID.COMMAND_0 );
+
+ control = new CCommand(player, this);
+
+ tabletop.setBorder(new MatteBorder(0, 1, 0, 0,
+ FSkin.getColor(FSkin.Colors.CLR_BORDERS)));
+ tabletop.setOpaque(false);
+
+ scroller.setViewportView(this.tabletop);
+ scroller.setOpaque(false);
+ scroller.getViewport().setOpaque(false);
+ scroller.setBorder(null);
+
+ }
+
+ //========= Overridden methods
+
+ /* (non-Javadoc)
+ * @see forge.gui.framework.IVDoc#populate()
+ */
+ @Override
+ public void populate() {
+ final JPanel pnl = parentCell.getBody();
+ pnl.setLayout(new MigLayout("insets 0, gap 0"));
+
+ pnl.add(scroller, "w 85%!, h 100%!, span 1 2, wrap");
+ }
+
+ /* (non-Javadoc)
+ * @see forge.gui.framework.IVDoc#getDocumentID()
+ */
+ @Override
+ public EDocID getDocumentID() {
+ return docID;
+ }
+
+ /* (non-Javadoc)
+ * @see forge.gui.framework.IVDoc#getTabLabel()
+ */
+ @Override
+ public DragTab getTabLabel() {
+ return tab;
+ }
+
+ /* (non-Javadoc)
+ * @see forge.gui.framework.IVDoc#getLayoutControl()
+ */
+ @Override
+ public CCommand getLayoutControl() {
+ return control;
+ }
+
+ /* (non-Javadoc)
+ * @see forge.gui.framework.IVDoc#setParentCell()
+ */
+ @Override
+ public void setParentCell(final DragCell cell0) {
+ this.parentCell = cell0;
+ }
+
+ /* (non-Javadoc)
+ * @see forge.gui.framework.IVDoc#getParentCell()
+ */
+ @Override
+ public DragCell getParentCell() {
+ return this.parentCell;
+ }
+
+ //========= Retrieval methods
+ /**
+ * Gets the player currently associated with this field.
+ * @return {@link forge.game.player.Player}
+ */
+ public Player getPlayer() {
+ return this.player;
+ }
+
+ /**
+ * Gets the tabletop.
+ *
+ * @return PlayArea where cards for this field are in play
+ */
+ public PlayArea getTabletop() {
+ return this.tabletop;
+ }
+}
diff --git a/src/main/java/forge/item/CardDb.java b/src/main/java/forge/item/CardDb.java
index 24e5bb5bd42..6d1605dba6f 100644
--- a/src/main/java/forge/item/CardDb.java
+++ b/src/main/java/forge/item/CardDb.java
@@ -93,7 +93,9 @@ public final class CardDb {
// need this to obtain cardReference by name+set+artindex
private final Map> allCardsBySet = new Hashtable>();
// this is the same list in flat storage
- private final List allCardsFlat = new ArrayList();
+ private final List allTraditionalCardsFlat = new ArrayList();
+
+ private final List allNonTraditionalCardsFlat = new ArrayList();
// Lambda to get rules for selects from list of printed cards
/** The Constant fnGetCardPrintedByForgeCard. */
@@ -167,7 +169,11 @@ public final class CardDb {
setMap.put(cardName, cardCopies);
for (int i = 0; i < count; i++) {
lastAdded = CardPrinted.build(card, set, s.getValue().getRarity(), i);
- this.allCardsFlat.add(lastAdded);
+ if(lastAdded.isTraditional()) {
+ this.allTraditionalCardsFlat.add(lastAdded);
+ } else {
+ this.allNonTraditionalCardsFlat.add(lastAdded);
+ }
cardCopies[i] = lastAdded;
}
@@ -214,6 +220,8 @@ public final class CardDb {
* @return true, if is card supported
*/
public boolean isCardSupported(final String cardName0) {
+ if ( null == cardName0 ) return false; // obviously
+
final boolean isFoil = this.isFoil(cardName0);
final String cardName = isFoil ? this.removeFoilSuffix(cardName0) : cardName0;
final ImmutablePair nameWithSet = CardDb.splitCardName(cardName);
@@ -360,8 +368,12 @@ public final class CardDb {
*
* @return the all cards
*/
- public Iterable getAllCards() {
- return this.allCardsFlat;
+ public Iterable getAllTraditionalCards() {
+ return this.allTraditionalCardsFlat;
+ }
+
+ public Iterable getAllNonTraditionalCards() {
+ return this.allNonTraditionalCardsFlat;
}
/**
@@ -391,7 +403,7 @@ public final class CardDb {
} else {
// OK, plain name here
final Predicate predicate = CardPrinted.Predicates.name(nameWithSet.left);
- final Iterable namedCards = Iterables.filter(this.allCardsFlat, predicate);
+ final Iterable namedCards = Iterables.filter(this.allTraditionalCardsFlat, predicate);
// Find card with maximal set index
result = Aggregates.itemWithMax(namedCards, CardPrinted.FN_GET_EDITION_INDEX);
if (null == result) {
diff --git a/src/main/java/forge/item/CardPrinted.java b/src/main/java/forge/item/CardPrinted.java
index 4cf96159e33..e2a01e53070 100644
--- a/src/main/java/forge/item/CardPrinted.java
+++ b/src/main/java/forge/item/CardPrinted.java
@@ -110,6 +110,10 @@ public final class CardPrinted implements Comparable, InventoryItem
public boolean isFoil() {
return this.foiled;
}
+
+ public boolean isTraditional() {
+ return !getCard().getType().isVanguard();
+ }
/**
* Gets the card.
@@ -318,6 +322,16 @@ public final class CardPrinted implements Comparable, InventoryItem
* Number of filters based on CardPrinted values.
*/
public abstract static class Predicates {
+
+ /**
+ * Type.
+ * @param t
+ * the type to search for
+ * @return
+ */
+ public static Predicate type(final String t) {
+ return new PredicateType(t);
+ }
/**
* Rarity.
@@ -426,6 +440,21 @@ public final class CardPrinted implements Comparable, InventoryItem
this.mustContain = shouldContain;
}
}
+
+ private static class PredicateType implements Predicate {
+ private final String operand;
+
+ @Override
+ public boolean apply(final CardPrinted card) {
+ return card.getType().contains(operand);
+ }
+
+
+ public PredicateType(final String op) {
+ operand = op;
+ }
+
+ }
private static class PredicateName extends PredicateString {
private final String operand;
@@ -489,6 +518,10 @@ public final class CardPrinted implements Comparable, InventoryItem
/** The Constant exceptLands. */
public static final Predicate EXCEPT_LANDS = Predicates.rarity(false, CardRarity.BasicLand);
+
+ public static final Predicate NONTRADITIONAL = com.google.common.base.Predicates.or(Predicates.type("Vanguard"),Predicates.type("Scheme"),Predicates.type("Plane"));
+
+ public static final Predicate TRADITIONAL = com.google.common.base.Predicates.not(Presets.NONTRADITIONAL);
}
}
}
diff --git a/src/main/java/forge/item/OpenablePack.java b/src/main/java/forge/item/OpenablePack.java
index e970e38d4d6..c4789a25bc1 100644
--- a/src/main/java/forge/item/OpenablePack.java
+++ b/src/main/java/forge/item/OpenablePack.java
@@ -175,7 +175,7 @@ public abstract class OpenablePack implements InventoryItemFromSet {
Predicate cardsRule = Predicates.and(
CardPrinted.Predicates.printedInSets(setCode),
Predicates.compose(CardRulesPredicates.Presets.IS_BASIC_LAND, CardPrinted.FN_GET_RULES));
- return Aggregates.random(Iterables.filter(CardDb.instance().getAllCards(), cardsRule), count);
+ return Aggregates.random(Iterables.filter(CardDb.instance().getAllTraditionalCards(), cardsRule), count);
}
}
diff --git a/src/main/java/forge/properties/ForgePreferences.java b/src/main/java/forge/properties/ForgePreferences.java
index 564985d0a46..1f89540f29b 100644
--- a/src/main/java/forge/properties/ForgePreferences.java
+++ b/src/main/java/forge/properties/ForgePreferences.java
@@ -76,7 +76,7 @@ public class ForgePreferences {
SUBMENU_CURRENTMENU (EMenuItem.CONSTRUCTED.toString()), /** */
SUBMENU_SANCTIONED ("false"), /** */
SUBMENU_GAUNTLET ("false"), /** */
- SUBMENU_MULTIPLAYER ("false"), /** */
+ SUBMENU_VARIANT ("false"), /** */
SUBMENU_QUEST ("false"), /** */
SUBMENU_SETTINGS ("false"), /** */
SUBMENU_UTILITIES ("false"), /** */
diff --git a/src/main/java/forge/quest/BoosterUtils.java b/src/main/java/forge/quest/BoosterUtils.java
index cfd0f87a7df..01877c5f5db 100644
--- a/src/main/java/forge/quest/BoosterUtils.java
+++ b/src/main/java/forge/quest/BoosterUtils.java
@@ -88,7 +88,7 @@ public final class BoosterUtils {
}
// This will save CPU time when sets are limited
- final List cardpool = Lists.newArrayList(Iterables.filter(CardDb.instance().getAllCards(), filter));
+ final List cardpool = Lists.newArrayList(Iterables.filter(CardDb.instance().getAllTraditionalCards(), filter));
final Predicate pCommon = CardPrinted.Predicates.Presets.IS_COMMON;
cards.addAll(BoosterUtils.generateDefinetlyColouredCards(cardpool, pCommon, numCommon, colorFilters));
@@ -180,7 +180,7 @@ public final class BoosterUtils {
* @return the list
*/
public static List generateDistinctCards(final Predicate filter, final int cntNeeded) {
- return BoosterUtils.generateDistinctCards(CardDb.instance().getAllCards(), filter, cntNeeded);
+ return BoosterUtils.generateDistinctCards(CardDb.instance().getAllTraditionalCards(), filter, cntNeeded);
}
/**
diff --git a/src/main/java/forge/quest/QuestUtilCards.java b/src/main/java/forge/quest/QuestUtilCards.java
index 29088a6ed23..22c8282f0ef 100644
--- a/src/main/java/forge/quest/QuestUtilCards.java
+++ b/src/main/java/forge/quest/QuestUtilCards.java
@@ -189,7 +189,7 @@ public final class QuestUtilCards {
final Predicate myFilter = applyFormatFilter(QuestUtilCards.RARE_PREDICATE);
- final CardPrinted card = Aggregates.random(Iterables.filter(CardDb.instance().getAllCards(), myFilter));
+ final CardPrinted card = Aggregates.random(Iterables.filter(CardDb.instance().getAllTraditionalCards(), myFilter));
this.addSingleCard(card);
return card;
}
@@ -204,7 +204,7 @@ public final class QuestUtilCards {
public List addRandomRare(final int n) {
final Predicate myFilter = applyFormatFilter(QuestUtilCards.RARE_PREDICATE);
- final List newCards = Aggregates.random(Iterables.filter(CardDb.instance().getAllCards(), myFilter), n);
+ final List newCards = Aggregates.random(Iterables.filter(CardDb.instance().getAllTraditionalCards(), myFilter), n);
this.addAllCards(newCards);
return newCards;
}
@@ -486,9 +486,9 @@ public final class QuestUtilCards {
Iterable cardList = null;
if (qc.getFormat() == null) {
- cardList = CardDb.instance().getAllCards(); }
+ cardList = CardDb.instance().getAllTraditionalCards(); }
else {
- cardList = Iterables.filter(CardDb.instance().getAllCards(), qc.getFormat().getFilterPrinted());
+ cardList = Iterables.filter(CardDb.instance().getAllTraditionalCards(), qc.getFormat().getFilterPrinted());
}
final BoosterGenerator pack = new BoosterGenerator(cardList);