rename MagicPlayerDefinition to DuelPlayerConfig.
parent
89438aa3da
commit
fbe61b36ae
|
@ -11,7 +11,7 @@ import magic.model.MagicDuel;
|
||||||
import magic.model.MagicGame;
|
import magic.model.MagicGame;
|
||||||
import magic.model.MagicRandom;
|
import magic.model.MagicRandom;
|
||||||
import magic.model.MagicDeckProfile;
|
import magic.model.MagicDeckProfile;
|
||||||
import magic.model.MagicPlayerDefinition;
|
import magic.model.DuelPlayerConfig;
|
||||||
import magic.model.player.AiProfile;
|
import magic.model.player.AiProfile;
|
||||||
import magic.data.DeckGenerators;
|
import magic.data.DeckGenerators;
|
||||||
import magic.exception.InvalidDeckException;
|
import magic.exception.InvalidDeckException;
|
||||||
|
@ -136,9 +136,9 @@ public class DeckStrCal {
|
||||||
testDuel.initialize();
|
testDuel.initialize();
|
||||||
|
|
||||||
// Create players
|
// Create players
|
||||||
final MagicPlayerDefinition[] players = new MagicPlayerDefinition[2];
|
final DuelPlayerConfig[] players = new DuelPlayerConfig[2];
|
||||||
for (int i = 0; i < 2; i++) {
|
for (int i = 0; i < 2; i++) {
|
||||||
players[i] = new MagicPlayerDefinition(
|
players[i] = new DuelPlayerConfig(
|
||||||
AiProfile.create(ai[i], str[i]),
|
AiProfile.create(ai[i], str[i]),
|
||||||
MagicDeckProfile.getDeckProfile(profile)
|
MagicDeckProfile.getDeckProfile(profile)
|
||||||
);
|
);
|
||||||
|
|
|
@ -2,8 +2,8 @@ package magic.data;
|
||||||
|
|
||||||
import magic.generator.RandomDeckGenerator;
|
import magic.generator.RandomDeckGenerator;
|
||||||
import magic.model.MagicCubeDefinition;
|
import magic.model.MagicCubeDefinition;
|
||||||
import magic.model.MagicPlayerDefinition;
|
|
||||||
|
|
||||||
|
import magic.model.DuelPlayerConfig;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -113,7 +113,7 @@ public class DeckGenerators {
|
||||||
* <p>
|
* <p>
|
||||||
* This also includes the various random theme decks (like "Fairy Horde", "Token Madness", etc).
|
* This also includes the various random theme decks (like "Fairy Horde", "Token Madness", etc).
|
||||||
*/
|
*/
|
||||||
private static void setRandomColorDeck(final MagicPlayerDefinition player) {
|
private static void setRandomColorDeck(final DuelPlayerConfig player) {
|
||||||
final MagicDeckProfile deckProfile = player.getDeckProfile();
|
final MagicDeckProfile deckProfile = player.getDeckProfile();
|
||||||
final MagicDeck deck = player.getDeck();
|
final MagicDeck deck = player.getDeck();
|
||||||
final MagicCubeDefinition cubeDefinition = CubeDefinitions.getCubeDefinition(DuelConfig.getInstance().getCube());
|
final MagicCubeDefinition cubeDefinition = CubeDefinitions.getCubeDefinition(DuelConfig.getInstance().getCube());
|
||||||
|
@ -132,7 +132,7 @@ public class DeckGenerators {
|
||||||
* <p>
|
* <p>
|
||||||
* This can be generated from scratch or an existing deck file.
|
* This can be generated from scratch or an existing deck file.
|
||||||
*/
|
*/
|
||||||
public static void setRandomDeck(final MagicPlayerDefinition player) throws InvalidDeckException {
|
public static void setRandomDeck(final DuelPlayerConfig player) throws InvalidDeckException {
|
||||||
final boolean isUnspecifiedGenerator = (getDeckGenerator(player.getDeckProfile()) == null) && (player.getDeckProfile().getNrOfColors() == 0);
|
final boolean isUnspecifiedGenerator = (getDeckGenerator(player.getDeckProfile()) == null) && (player.getDeckProfile().getNrOfColors() == 0);
|
||||||
final boolean loadRandomDeckFile = player.getDeckProfile().isPreConstructed() || isUnspecifiedGenerator;
|
final boolean loadRandomDeckFile = player.getDeckProfile().isPreConstructed() || isUnspecifiedGenerator;
|
||||||
if (loadRandomDeckFile) {
|
if (loadRandomDeckFile) {
|
||||||
|
|
|
@ -19,7 +19,7 @@ import magic.model.MagicCardDefinition;
|
||||||
import magic.model.MagicColor;
|
import magic.model.MagicColor;
|
||||||
import magic.model.MagicDeck;
|
import magic.model.MagicDeck;
|
||||||
import magic.model.MagicDeckProfile;
|
import magic.model.MagicDeckProfile;
|
||||||
import magic.model.MagicPlayerDefinition;
|
import magic.model.DuelPlayerConfig;
|
||||||
import magic.model.MagicRandom;
|
import magic.model.MagicRandom;
|
||||||
import magic.utility.MagicFileSystem;
|
import magic.utility.MagicFileSystem;
|
||||||
import magic.utility.MagicFileSystem.DataPath;
|
import magic.utility.MagicFileSystem.DataPath;
|
||||||
|
@ -224,7 +224,7 @@ public class DeckUtils {
|
||||||
return deck;
|
return deck;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void loadAndSetPlayerDeck(final String filename, final MagicPlayerDefinition player) throws InvalidDeckException {
|
public static void loadAndSetPlayerDeck(final String filename, final DuelPlayerConfig player) throws InvalidDeckException {
|
||||||
|
|
||||||
final MagicDeck deck = loadDeckFromFile(Paths.get(filename));
|
final MagicDeck deck = loadDeckFromFile(Paths.get(filename));
|
||||||
|
|
||||||
|
@ -295,7 +295,7 @@ public class DeckUtils {
|
||||||
* Load a deck randomly chosen from the "decks" directory.
|
* Load a deck randomly chosen from the "decks" directory.
|
||||||
* (includes both custom & prebuilt decks).
|
* (includes both custom & prebuilt decks).
|
||||||
*/
|
*/
|
||||||
public static void loadRandomDeckFile(final MagicPlayerDefinition player) throws InvalidDeckException {
|
public static void loadRandomDeckFile(final DuelPlayerConfig player) throws InvalidDeckException {
|
||||||
final List<File> deckFiles = new ArrayList<>();
|
final List<File> deckFiles = new ArrayList<>();
|
||||||
retrieveDeckFiles(MagicFileSystem.getDataPath(DataPath.DECKS).toFile(), deckFiles);
|
retrieveDeckFiles(MagicFileSystem.getDataPath(DataPath.DECKS).toFile(), deckFiles);
|
||||||
if (deckFiles.isEmpty()) {
|
if (deckFiles.isEmpty()) {
|
||||||
|
|
|
@ -4,7 +4,7 @@ import java.io.File;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
import magic.model.MagicDeckProfile;
|
import magic.model.MagicDeckProfile;
|
||||||
import magic.model.MagicDuel;
|
import magic.model.MagicDuel;
|
||||||
import magic.model.MagicPlayerDefinition;
|
import magic.model.DuelPlayerConfig;
|
||||||
import magic.model.player.PlayerProfile;
|
import magic.model.player.PlayerProfile;
|
||||||
import magic.model.player.PlayerProfiles;
|
import magic.model.player.PlayerProfiles;
|
||||||
import magic.utility.MagicFileSystem;
|
import magic.utility.MagicFileSystem;
|
||||||
|
@ -42,7 +42,7 @@ public class DuelConfig {
|
||||||
private int handSize = 7;
|
private int handSize = 7;
|
||||||
private int games = 7;
|
private int games = 7;
|
||||||
private String cube = CubeDefinitions.getCubeNames()[0];
|
private String cube = CubeDefinitions.getCubeNames()[0];
|
||||||
private MagicPlayerDefinition[] playerDefs = new MagicPlayerDefinition[MAX_PLAYERS];
|
private DuelPlayerConfig[] playerDefs = new DuelPlayerConfig[MAX_PLAYERS];
|
||||||
|
|
||||||
// CTR
|
// CTR
|
||||||
public DuelConfig() {
|
public DuelConfig() {
|
||||||
|
@ -51,11 +51,11 @@ public class DuelConfig {
|
||||||
// If missing then creates default profiles.
|
// If missing then creates default profiles.
|
||||||
PlayerProfiles.refreshMap();
|
PlayerProfiles.refreshMap();
|
||||||
|
|
||||||
playerDefs[0] = new MagicPlayerDefinition(
|
playerDefs[0] = new DuelPlayerConfig(
|
||||||
PlayerProfiles.getDefaultHumanPlayer(),
|
PlayerProfiles.getDefaultHumanPlayer(),
|
||||||
MagicDeckProfile.getDeckProfile(MagicDeckProfile.ANY_THREE)
|
MagicDeckProfile.getDeckProfile(MagicDeckProfile.ANY_THREE)
|
||||||
);
|
);
|
||||||
playerDefs[1] = new MagicPlayerDefinition(
|
playerDefs[1] = new DuelPlayerConfig(
|
||||||
PlayerProfiles.getDefaultAiPlayer(),
|
PlayerProfiles.getDefaultAiPlayer(),
|
||||||
MagicDeckProfile.getDeckProfile(MagicDeckProfile.ANY_THREE)
|
MagicDeckProfile.getDeckProfile(MagicDeckProfile.ANY_THREE)
|
||||||
);
|
);
|
||||||
|
@ -160,15 +160,15 @@ public class DuelConfig {
|
||||||
return (int)Math.ceil(getNrOfGames()/2.0);
|
return (int)Math.ceil(getNrOfGames()/2.0);
|
||||||
}
|
}
|
||||||
|
|
||||||
public MagicPlayerDefinition getPlayerDefinition(final int index) {
|
public DuelPlayerConfig getPlayerDefinition(final int index) {
|
||||||
return playerDefs[index];
|
return playerDefs[index];
|
||||||
}
|
}
|
||||||
|
|
||||||
public MagicPlayerDefinition[] getPlayerDefinitions() {
|
public DuelPlayerConfig[] getPlayerDefinitions() {
|
||||||
return playerDefs;
|
return playerDefs;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPlayerDefinitions(MagicPlayerDefinition[] aPlayerDefinitions) {
|
public void setPlayerDefinitions(DuelPlayerConfig[] aPlayerDefinitions) {
|
||||||
playerDefs = aPlayerDefinitions;
|
playerDefs = aPlayerDefinitions;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,7 @@ import magic.model.MagicDeckProfile;
|
||||||
import magic.model.MagicDuel;
|
import magic.model.MagicDuel;
|
||||||
import magic.model.MagicGame;
|
import magic.model.MagicGame;
|
||||||
import magic.model.MagicGameLog;
|
import magic.model.MagicGameLog;
|
||||||
import magic.model.MagicPlayerDefinition;
|
import magic.model.DuelPlayerConfig;
|
||||||
import magic.model.MagicRandom;
|
import magic.model.MagicRandom;
|
||||||
import magic.model.player.AiProfile;
|
import magic.model.player.AiProfile;
|
||||||
|
|
||||||
|
@ -107,17 +107,17 @@ public class FiremindDuelRunner {
|
||||||
|
|
||||||
final MagicDeckProfile profile = new MagicDeckProfile("bgruw");
|
final MagicDeckProfile profile = new MagicDeckProfile("bgruw");
|
||||||
|
|
||||||
final MagicPlayerDefinition player1 = new MagicPlayerDefinition(
|
final DuelPlayerConfig player1 = new DuelPlayerConfig(
|
||||||
AiProfile.create("Player1", ai1, str1),
|
AiProfile.create("Player1", ai1, str1),
|
||||||
profile
|
profile
|
||||||
);
|
);
|
||||||
|
|
||||||
final MagicPlayerDefinition player2 = new MagicPlayerDefinition(
|
final DuelPlayerConfig player2 = new DuelPlayerConfig(
|
||||||
AiProfile.create("Player2", ai2, str2),
|
AiProfile.create("Player2", ai2, str2),
|
||||||
profile
|
profile
|
||||||
);
|
);
|
||||||
|
|
||||||
testDuel.setPlayers(new MagicPlayerDefinition[] { player1, player2 });
|
testDuel.setPlayers(new DuelPlayerConfig[] { player1, player2 });
|
||||||
|
|
||||||
// Set the deck.
|
// Set the deck.
|
||||||
if (deck1.length() > 0) {
|
if (deck1.length() > 0) {
|
||||||
|
|
|
@ -7,7 +7,7 @@ import magic.model.MagicDeckProfile;
|
||||||
import magic.model.MagicDuel;
|
import magic.model.MagicDuel;
|
||||||
import magic.model.MagicGame;
|
import magic.model.MagicGame;
|
||||||
import magic.model.MagicPlayer;
|
import magic.model.MagicPlayer;
|
||||||
import magic.model.MagicPlayerDefinition;
|
import magic.model.DuelPlayerConfig;
|
||||||
import magic.model.phase.MagicMainPhase;
|
import magic.model.phase.MagicMainPhase;
|
||||||
import magic.model.player.AiProfile;
|
import magic.model.player.AiProfile;
|
||||||
import magic.model.player.HumanProfile;
|
import magic.model.player.HumanProfile;
|
||||||
|
@ -34,7 +34,7 @@ public final class GameLoader {
|
||||||
|
|
||||||
private static MagicDuel getDuelState(final GameState gameState) {
|
private static MagicDuel getDuelState(final GameState gameState) {
|
||||||
final MagicDuel duel = new MagicDuel();
|
final MagicDuel duel = new MagicDuel();
|
||||||
final MagicPlayerDefinition[] playerDefs = new MagicPlayerDefinition[2];
|
final DuelPlayerConfig[] playerDefs = new DuelPlayerConfig[2];
|
||||||
|
|
||||||
for (int i = 0; i < playerDefs.length; i++) {
|
for (int i = 0; i < playerDefs.length; i++) {
|
||||||
final PlayerProfile pp = gameState.getPlayer(i).isAi() ?
|
final PlayerProfile pp = gameState.getPlayer(i).isAi() ?
|
||||||
|
@ -47,7 +47,7 @@ public final class GameLoader {
|
||||||
gameState.getPlayer(i).getName()
|
gameState.getPlayer(i).getName()
|
||||||
);
|
);
|
||||||
final MagicDeckProfile deckProfile = new MagicDeckProfile(gameState.getPlayer(i).getDeckProfileColors());
|
final MagicDeckProfile deckProfile = new MagicDeckProfile(gameState.getPlayer(i).getDeckProfileColors());
|
||||||
playerDefs[i] = new MagicPlayerDefinition(pp, deckProfile);
|
playerDefs[i] = new DuelPlayerConfig(pp, deckProfile);
|
||||||
}
|
}
|
||||||
|
|
||||||
duel.setPlayers(playerDefs);
|
duel.setPlayers(playerDefs);
|
||||||
|
|
|
@ -2,12 +2,12 @@ package magic.game.state;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import magic.model.MagicPlayerDefinition;
|
import magic.model.DuelPlayerConfig;
|
||||||
|
|
||||||
public class GamePlayerState {
|
public class GamePlayerState {
|
||||||
GamePlayerState() {}
|
GamePlayerState() {}
|
||||||
|
|
||||||
private MagicPlayerDefinition player;
|
private DuelPlayerConfig player;
|
||||||
private final List<GameCardState> library = new ArrayList<>();
|
private final List<GameCardState> library = new ArrayList<>();
|
||||||
private final List<GameCardState> hand = new ArrayList<>();
|
private final List<GameCardState> hand = new ArrayList<>();
|
||||||
private final List<GameCardState> permanents = new ArrayList<>();
|
private final List<GameCardState> permanents = new ArrayList<>();
|
||||||
|
@ -19,11 +19,11 @@ public class GamePlayerState {
|
||||||
private String aiType = "";
|
private String aiType = "";
|
||||||
private String deckProfileColors = "";
|
private String deckProfileColors = "";
|
||||||
|
|
||||||
public void setPlayerDefinition(MagicPlayerDefinition magicPlayerDefinition) {
|
public void setPlayerDefinition(DuelPlayerConfig magicPlayerDefinition) {
|
||||||
this.player = magicPlayerDefinition;
|
this.player = magicPlayerDefinition;
|
||||||
}
|
}
|
||||||
|
|
||||||
public MagicPlayerDefinition getPlayerDefinition() {
|
public DuelPlayerConfig getPlayerDefinition() {
|
||||||
return player;
|
return player;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ import magic.model.MagicDuel;
|
||||||
import magic.model.MagicGame;
|
import magic.model.MagicGame;
|
||||||
import magic.model.MagicPermanent;
|
import magic.model.MagicPermanent;
|
||||||
import magic.model.MagicPlayer;
|
import magic.model.MagicPlayer;
|
||||||
import magic.model.MagicPlayerDefinition;
|
import magic.model.DuelPlayerConfig;
|
||||||
|
|
||||||
public final class GameStateSnapshot {
|
public final class GameStateSnapshot {
|
||||||
private GameStateSnapshot() {}
|
private GameStateSnapshot() {}
|
||||||
|
@ -32,7 +32,7 @@ public final class GameStateSnapshot {
|
||||||
|
|
||||||
private static void saveGamePlayerState(final int playerIndex, final GameState gameState, final MagicGame game) {
|
private static void saveGamePlayerState(final int playerIndex, final GameState gameState, final MagicGame game) {
|
||||||
final MagicDuel duel = game.getDuel();
|
final MagicDuel duel = game.getDuel();
|
||||||
final MagicPlayerDefinition playerDef = duel.getPlayer(playerIndex);
|
final DuelPlayerConfig playerDef = duel.getPlayer(playerIndex);
|
||||||
final GamePlayerState gamePlayerState = gameState.getPlayer(playerIndex);
|
final GamePlayerState gamePlayerState = gameState.getPlayer(playerIndex);
|
||||||
final MagicPlayer player = game.getPlayer(playerIndex);
|
final MagicPlayer player = game.getPlayer(playerIndex);
|
||||||
gamePlayerState.setName(playerDef.getName());
|
gamePlayerState.setName(playerDef.getName());
|
||||||
|
|
|
@ -4,14 +4,14 @@ import java.util.Properties;
|
||||||
import magic.data.CardDefinitions;
|
import magic.data.CardDefinitions;
|
||||||
import magic.model.player.PlayerProfile;
|
import magic.model.player.PlayerProfile;
|
||||||
|
|
||||||
public class MagicPlayerDefinition {
|
public class DuelPlayerConfig {
|
||||||
|
|
||||||
private MagicDeckProfile deckProfile;
|
private MagicDeckProfile deckProfile;
|
||||||
private final MagicDeck deck = new MagicDeck();
|
private final MagicDeck deck = new MagicDeck();
|
||||||
private PlayerProfile playerProfile;
|
private PlayerProfile playerProfile;
|
||||||
|
|
||||||
// CTR
|
// CTR
|
||||||
public MagicPlayerDefinition(final PlayerProfile aPlayerProfile, final MagicDeckProfile aDeckProfile) {
|
public DuelPlayerConfig(final PlayerProfile aPlayerProfile, final MagicDeckProfile aDeckProfile) {
|
||||||
playerProfile = aPlayerProfile;
|
playerProfile = aPlayerProfile;
|
||||||
deckProfile = aDeckProfile;
|
deckProfile = aDeckProfile;
|
||||||
}
|
}
|
|
@ -108,14 +108,14 @@ public class MagicDuel {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private MagicPlayerDefinition[] createPlayers() {
|
private DuelPlayerConfig[] createPlayers() {
|
||||||
final MagicPlayerDefinition[] players = new MagicPlayerDefinition[DuelConfig.MAX_PLAYERS];
|
final DuelPlayerConfig[] players = new DuelPlayerConfig[DuelConfig.MAX_PLAYERS];
|
||||||
players[0] =
|
players[0] =
|
||||||
new MagicPlayerDefinition(
|
new DuelPlayerConfig(
|
||||||
duelConfig.getPlayerProfile(0),
|
duelConfig.getPlayerProfile(0),
|
||||||
duelConfig.getPlayerDeckProfile(0));
|
duelConfig.getPlayerDeckProfile(0));
|
||||||
players[1] =
|
players[1] =
|
||||||
new MagicPlayerDefinition(
|
new DuelPlayerConfig(
|
||||||
duelConfig.getPlayerProfile(1),
|
duelConfig.getPlayerProfile(1),
|
||||||
duelConfig.getPlayerDeckProfile(1));
|
duelConfig.getPlayerDeckProfile(1));
|
||||||
return players;
|
return players;
|
||||||
|
@ -150,26 +150,26 @@ public class MagicDuel {
|
||||||
return duelConfig.getPlayerDefinitions().length;
|
return duelConfig.getPlayerDefinitions().length;
|
||||||
}
|
}
|
||||||
|
|
||||||
public MagicPlayerDefinition getPlayer(final int index) {
|
public DuelPlayerConfig getPlayer(final int index) {
|
||||||
return duelConfig.getPlayerDefinition(index);
|
return duelConfig.getPlayerDefinition(index);
|
||||||
}
|
}
|
||||||
|
|
||||||
public MagicPlayerDefinition[] getPlayers() {
|
public DuelPlayerConfig[] getPlayers() {
|
||||||
return duelConfig.getPlayerDefinitions();
|
return duelConfig.getPlayerDefinitions();
|
||||||
}
|
}
|
||||||
|
|
||||||
// only used by magic.test classes.
|
// only used by magic.test classes.
|
||||||
public void setPlayers(final MagicPlayerDefinition[] aPlayerDefinitions) {
|
public void setPlayers(final DuelPlayerConfig[] aPlayerDefinitions) {
|
||||||
duelConfig.setPlayerDefinitions(aPlayerDefinitions);
|
duelConfig.setPlayerDefinitions(aPlayerDefinitions);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Used by the "Generate Deck" button in DuelPanel.
|
// Used by the "Generate Deck" button in DuelPanel.
|
||||||
public void buildDeck(final MagicPlayerDefinition player) throws InvalidDeckException {
|
public void buildDeck(final DuelPlayerConfig player) throws InvalidDeckException {
|
||||||
DeckGenerators.setRandomDeck(player);
|
DeckGenerators.setRandomDeck(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void buildDecks() throws InvalidDeckException {
|
public void buildDecks() throws InvalidDeckException {
|
||||||
for (final MagicPlayerDefinition player : duelConfig.getPlayerDefinitions()) {
|
for (final DuelPlayerConfig player : duelConfig.getPlayerDefinitions()) {
|
||||||
switch (player.getDeckProfile().getDeckType()) {
|
switch (player.getDeckProfile().getDeckType()) {
|
||||||
case Random:
|
case Random:
|
||||||
DeckGenerators.setRandomDeck(player);
|
DeckGenerators.setRandomDeck(player);
|
||||||
|
@ -189,7 +189,7 @@ public class MagicDuel {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setDeckFromFile(final MagicPlayerDefinition player, final Path deckFolder) throws InvalidDeckException {
|
private void setDeckFromFile(final DuelPlayerConfig player, final Path deckFolder) throws InvalidDeckException {
|
||||||
final String deckFilename = player.getDeckProfile().getDeckValue() + DeckUtils.DECK_EXTENSION;
|
final String deckFilename = player.getDeckProfile().getDeckValue() + DeckUtils.DECK_EXTENSION;
|
||||||
player.setDeck(loadDeck(deckFolder.resolve(deckFilename)));
|
player.setDeck(loadDeck(deckFolder.resolve(deckFilename)));
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,7 +50,7 @@ public class MagicPlayer extends MagicObjectImpl implements MagicTarget, MagicMa
|
||||||
private static final int LOSING_POISON=10;
|
private static final int LOSING_POISON=10;
|
||||||
private static final long ID_FACTOR=31;
|
private static final long ID_FACTOR=31;
|
||||||
|
|
||||||
private final MagicPlayerDefinition playerDefinition;
|
private final DuelPlayerConfig playerDefinition;
|
||||||
private final int index;
|
private final int index;
|
||||||
|
|
||||||
private int life;
|
private int life;
|
||||||
|
@ -77,7 +77,7 @@ public class MagicPlayer extends MagicObjectImpl implements MagicTarget, MagicMa
|
||||||
|
|
||||||
private long[] keys;
|
private long[] keys;
|
||||||
|
|
||||||
MagicPlayer(final int aLife,final MagicPlayerDefinition aPlayerDefinition,final int aIndex) {
|
MagicPlayer(final int aLife,final DuelPlayerConfig aPlayerDefinition,final int aIndex) {
|
||||||
playerDefinition = aPlayerDefinition;
|
playerDefinition = aPlayerDefinition;
|
||||||
index = aIndex;
|
index = aIndex;
|
||||||
life = aLife;
|
life = aLife;
|
||||||
|
@ -204,7 +204,7 @@ public class MagicPlayer extends MagicObjectImpl implements MagicTarget, MagicMa
|
||||||
return set;
|
return set;
|
||||||
}
|
}
|
||||||
|
|
||||||
public MagicPlayerDefinition getPlayerDefinition() {
|
public DuelPlayerConfig getPlayerDefinition() {
|
||||||
return playerDefinition;
|
return playerDefinition;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ import magic.model.MagicPayedCost;
|
||||||
import magic.model.MagicPermanent;
|
import magic.model.MagicPermanent;
|
||||||
import magic.model.MagicPermanentState;
|
import magic.model.MagicPermanentState;
|
||||||
import magic.model.MagicPlayer;
|
import magic.model.MagicPlayer;
|
||||||
import magic.model.MagicPlayerDefinition;
|
import magic.model.DuelPlayerConfig;
|
||||||
import magic.model.action.PlayCardFromStackAction;
|
import magic.model.action.PlayCardFromStackAction;
|
||||||
import magic.model.action.PlayTokenAction;
|
import magic.model.action.PlayTokenAction;
|
||||||
import magic.model.player.AiProfile;
|
import magic.model.player.AiProfile;
|
||||||
|
@ -119,10 +119,10 @@ public abstract class TestGameBuilder {
|
||||||
final MagicDuel duel=new MagicDuel();
|
final MagicDuel duel=new MagicDuel();
|
||||||
|
|
||||||
final MagicDeckProfile profile=new MagicDeckProfile("bgruw");
|
final MagicDeckProfile profile=new MagicDeckProfile("bgruw");
|
||||||
final MagicPlayerDefinition player1=new MagicPlayerDefinition(HumanProfile.create("Player"),profile);
|
final DuelPlayerConfig player1=new DuelPlayerConfig(HumanProfile.create("Player"),profile);
|
||||||
final MagicPlayerDefinition player2=new MagicPlayerDefinition(AiProfile.create(aAiType, aAiLevel),profile);
|
final DuelPlayerConfig player2=new DuelPlayerConfig(AiProfile.create(aAiType, aAiLevel),profile);
|
||||||
|
|
||||||
duel.setPlayers(new MagicPlayerDefinition[]{player1,player2});
|
duel.setPlayers(new DuelPlayerConfig[]{player1,player2});
|
||||||
duel.setStartPlayer(0);
|
duel.setStartPlayer(0);
|
||||||
return duel;
|
return duel;
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@ import magic.data.DuelConfig;
|
||||||
import magic.model.MagicCardDefinition;
|
import magic.model.MagicCardDefinition;
|
||||||
import magic.model.MagicDeck;
|
import magic.model.MagicDeck;
|
||||||
import magic.model.MagicDuel;
|
import magic.model.MagicDuel;
|
||||||
import magic.model.MagicPlayerDefinition;
|
import magic.model.DuelPlayerConfig;
|
||||||
import magic.model.player.PlayerProfile;
|
import magic.model.player.PlayerProfile;
|
||||||
import magic.ui.duel.viewer.CardViewer;
|
import magic.ui.duel.viewer.CardViewer;
|
||||||
import magic.ui.duel.viewer.DeckDescriptionViewer;
|
import magic.ui.duel.viewer.DeckDescriptionViewer;
|
||||||
|
@ -89,7 +89,7 @@ public class DuelDecksPanel extends TexturedPanel {
|
||||||
// create tabs for each player
|
// create tabs for each player
|
||||||
tabbedPane = new JTabbedPane(JTabbedPane.TOP);
|
tabbedPane = new JTabbedPane(JTabbedPane.TOP);
|
||||||
|
|
||||||
final MagicPlayerDefinition[] players = duel.getPlayers();
|
final DuelPlayerConfig[] players = duel.getPlayers();
|
||||||
cardTables = new CardTable[players.length];
|
cardTables = new CardTable[players.length];
|
||||||
deckDescriptionViewers = new DeckDescriptionViewer[players.length];
|
deckDescriptionViewers = new DeckDescriptionViewer[players.length];
|
||||||
statsViewers = new DeckStatisticsViewer[players.length];
|
statsViewers = new DeckStatisticsViewer[players.length];
|
||||||
|
@ -97,7 +97,7 @@ public class DuelDecksPanel extends TexturedPanel {
|
||||||
|
|
||||||
for (int i = 0; i < players.length; i++) {
|
for (int i = 0; i < players.length; i++) {
|
||||||
|
|
||||||
final MagicPlayerDefinition player = players[i];
|
final DuelPlayerConfig player = players[i];
|
||||||
|
|
||||||
// deck description
|
// deck description
|
||||||
deckDescriptionViewers[i] = new DeckDescriptionViewer();
|
deckDescriptionViewers[i] = new DeckDescriptionViewer();
|
||||||
|
@ -221,7 +221,7 @@ public class DuelDecksPanel extends TexturedPanel {
|
||||||
return duel;
|
return duel;
|
||||||
}
|
}
|
||||||
|
|
||||||
public MagicPlayerDefinition getSelectedPlayer() {
|
public DuelPlayerConfig getSelectedPlayer() {
|
||||||
return duel.getPlayers()[tabbedPane.getSelectedIndex()];
|
return duel.getPlayers()[tabbedPane.getSelectedIndex()];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -231,7 +231,7 @@ public class DuelDecksPanel extends TexturedPanel {
|
||||||
|
|
||||||
public void updateDecksAfterEdit() {
|
public void updateDecksAfterEdit() {
|
||||||
for (int i = 0; i < statsViewers.length; i++) {
|
for (int i = 0; i < statsViewers.length; i++) {
|
||||||
final MagicPlayerDefinition player = duel.getPlayers()[i];
|
final DuelPlayerConfig player = duel.getPlayers()[i];
|
||||||
final MagicDeck deck = player.getDeck();
|
final MagicDeck deck = player.getDeck();
|
||||||
cardTables[i].setCards(deck);
|
cardTables[i].setCards(deck);
|
||||||
cardTables[i].setTitle(generateTitle(deck));
|
cardTables[i].setTitle(generateTitle(deck));
|
||||||
|
|
|
@ -10,7 +10,7 @@ import magic.model.MagicColor;
|
||||||
import magic.model.MagicManaType;
|
import magic.model.MagicManaType;
|
||||||
import magic.model.MagicCardDefinition;
|
import magic.model.MagicCardDefinition;
|
||||||
import magic.model.MagicPermanent;
|
import magic.model.MagicPermanent;
|
||||||
import magic.model.MagicPlayerDefinition;
|
import magic.model.DuelPlayerConfig;
|
||||||
import magic.model.player.PlayerProfile;
|
import magic.model.player.PlayerProfile;
|
||||||
import magic.ui.theme.PlayerAvatar;
|
import magic.ui.theme.PlayerAvatar;
|
||||||
import magic.utility.MagicResources;
|
import magic.utility.MagicResources;
|
||||||
|
@ -152,23 +152,23 @@ public final class IconImages {
|
||||||
throw new RuntimeException("No icon available for MagicManaType " + mtype);
|
throw new RuntimeException("No icon available for MagicManaType " + mtype);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ImageIcon getIconSize1(final MagicPlayerDefinition playerDef) {
|
public static ImageIcon getIconSize1(final DuelPlayerConfig playerDef) {
|
||||||
return getSizedAvatarImageIcon(playerDef, 1);
|
return getSizedAvatarImageIcon(playerDef, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ImageIcon getIconSize2(final MagicPlayerDefinition playerDef) {
|
public static ImageIcon getIconSize2(final DuelPlayerConfig playerDef) {
|
||||||
return getSizedAvatarImageIcon(playerDef, 2);
|
return getSizedAvatarImageIcon(playerDef, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ImageIcon getIconSize3(final MagicPlayerDefinition playerDef) {
|
public static ImageIcon getIconSize3(final DuelPlayerConfig playerDef) {
|
||||||
return getSizedAvatarImageIcon(playerDef, 3);
|
return getSizedAvatarImageIcon(playerDef, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ImageIcon getIconSize4(final MagicPlayerDefinition playerDef) {
|
public static ImageIcon getIconSize4(final DuelPlayerConfig playerDef) {
|
||||||
return getSizedAvatarImageIcon(playerDef, 4);
|
return getSizedAvatarImageIcon(playerDef, 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ImageIcon getSizedAvatarImageIcon(final MagicPlayerDefinition playerDef, final int size) {
|
private static ImageIcon getSizedAvatarImageIcon(final DuelPlayerConfig playerDef, final int size) {
|
||||||
return getPlayerAvatar(playerDef.getProfile()).getIcon(size);
|
return getPlayerAvatar(playerDef.getProfile()).getIcon(size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ import javax.swing.JPanel;
|
||||||
import javax.swing.JScrollPane;
|
import javax.swing.JScrollPane;
|
||||||
import javax.swing.JTextArea;
|
import javax.swing.JTextArea;
|
||||||
import magic.model.MagicDeck;
|
import magic.model.MagicDeck;
|
||||||
import magic.model.MagicPlayerDefinition;
|
import magic.model.DuelPlayerConfig;
|
||||||
import magic.ui.theme.ThemeFactory;
|
import magic.ui.theme.ThemeFactory;
|
||||||
import magic.ui.widget.FontsAndBorders;
|
import magic.ui.widget.FontsAndBorders;
|
||||||
import magic.ui.widget.TexturedPanel;
|
import magic.ui.widget.TexturedPanel;
|
||||||
|
@ -22,7 +22,7 @@ public class DeckDescriptionViewer extends JPanel implements FocusListener {
|
||||||
|
|
||||||
private static final Dimension PREFERRED_SIZE = new Dimension(270, 110);
|
private static final Dimension PREFERRED_SIZE = new Dimension(270, 110);
|
||||||
private final JTextArea textArea;
|
private final JTextArea textArea;
|
||||||
private MagicPlayerDefinition player;
|
private DuelPlayerConfig player;
|
||||||
private final JScrollPane scrollPane = new JScrollPane();
|
private final JScrollPane scrollPane = new JScrollPane();
|
||||||
|
|
||||||
public DeckDescriptionViewer() {
|
public DeckDescriptionViewer() {
|
||||||
|
@ -79,7 +79,7 @@ public class DeckDescriptionViewer extends JPanel implements FocusListener {
|
||||||
revalidate();
|
revalidate();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPlayer(final MagicPlayerDefinition playerDef) {
|
public void setPlayer(final DuelPlayerConfig playerDef) {
|
||||||
this.player = playerDef;
|
this.player = playerDef;
|
||||||
setDeckDescription(playerDef.getDeck().getDescription());
|
setDeckDescription(playerDef.getDeck().getDescription());
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@ import magic.data.CardStatistics;
|
||||||
import magic.ui.IconImages;
|
import magic.ui.IconImages;
|
||||||
import magic.model.MagicColor;
|
import magic.model.MagicColor;
|
||||||
import magic.model.MagicDeck;
|
import magic.model.MagicDeck;
|
||||||
import magic.model.MagicPlayerDefinition;
|
import magic.model.DuelPlayerConfig;
|
||||||
import magic.ui.theme.ThemeFactory;
|
import magic.ui.theme.ThemeFactory;
|
||||||
import magic.ui.widget.FontsAndBorders;
|
import magic.ui.widget.FontsAndBorders;
|
||||||
import magic.ui.widget.TexturedPanel;
|
import magic.ui.widget.TexturedPanel;
|
||||||
|
@ -167,6 +167,6 @@ public class DeckStatisticsViewer extends TexturedPanel implements ChangeListene
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void stateChanged(final ChangeEvent event) {
|
public void stateChanged(final ChangeEvent event) {
|
||||||
setDeck(((MagicPlayerDefinition)event.getSource()).getDeck());
|
setDeck(((DuelPlayerConfig)event.getSource()).getDeck());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,7 @@ import magic.model.MagicDeck;
|
||||||
import magic.model.MagicDeckConstructionRule;
|
import magic.model.MagicDeckConstructionRule;
|
||||||
import magic.model.MagicDeckProfile;
|
import magic.model.MagicDeckProfile;
|
||||||
import magic.model.MagicDuel;
|
import magic.model.MagicDuel;
|
||||||
import magic.model.MagicPlayerDefinition;
|
import magic.model.DuelPlayerConfig;
|
||||||
import magic.ui.DuelDecksPanel;
|
import magic.ui.DuelDecksPanel;
|
||||||
import magic.ui.MagicFrame;
|
import magic.ui.MagicFrame;
|
||||||
import magic.ui.ScreenOptionsOverlay;
|
import magic.ui.ScreenOptionsOverlay;
|
||||||
|
@ -87,7 +87,7 @@ public class DuelDecksScreen
|
||||||
return new MenuButton(getStartDuelCaption(), new AbstractAction() {
|
return new MenuButton(getStartDuelCaption(), new AbstractAction() {
|
||||||
@Override
|
@Override
|
||||||
public void actionPerformed(final ActionEvent e) {
|
public void actionPerformed(final ActionEvent e) {
|
||||||
final MagicPlayerDefinition[] players = screenContent.getDuel().getPlayers();
|
final DuelPlayerConfig[] players = screenContent.getDuel().getPlayers();
|
||||||
|
|
||||||
if (isLegalDeckAndShowErrors(players[0].getDeck(), players[0].getName()) &&
|
if (isLegalDeckAndShowErrors(players[0].getDeck(), players[0].getName()) &&
|
||||||
isLegalDeckAndShowErrors(players[1].getDeck(), players[1].getName())) {
|
isLegalDeckAndShowErrors(players[1].getDeck(), players[1].getName())) {
|
||||||
|
@ -197,7 +197,7 @@ public class DuelDecksScreen
|
||||||
*/
|
*/
|
||||||
public void swapDecks() throws InvalidDeckException {
|
public void swapDecks() throws InvalidDeckException {
|
||||||
screenContent.getDuel().restart();
|
screenContent.getDuel().restart();
|
||||||
final MagicPlayerDefinition[] players = screenContent.getDuel().getPlayers();
|
final DuelPlayerConfig[] players = screenContent.getDuel().getPlayers();
|
||||||
final MagicDeckProfile deckProfile1 = players[0].getDeckProfile();
|
final MagicDeckProfile deckProfile1 = players[0].getDeckProfile();
|
||||||
final MagicDeckProfile deckProfile2 = players[1].getDeckProfile();
|
final MagicDeckProfile deckProfile2 = players[1].getDeckProfile();
|
||||||
final MagicDeck deck1 = new MagicDeck(players[0].getDeck());
|
final MagicDeck deck1 = new MagicDeck(players[0].getDeck());
|
||||||
|
|
Loading…
Reference in New Issue