external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 20:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

- CheckStyle.

Browse Source
This commit is contained in:
Chris
2012-11-24 14:30:56 +00:00
parent fce84984db
commit a347b39919
6 changed files with 63 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/main/java/forge/game/GameState.java
View File

@@ -60,8 +60,8 @@ import forge.game.zone.ZoneType;
public class GameState {
private final List<Player> roIngamePlayers;
private final List<Player> allPlayers;
private final List<Player> ingamePlayers = new ArrayList<Player>();
private final List<Player> ingamePlayers = new ArrayList<Player>();
private final Cleanup cleanup = new Cleanup();
private final EndOfTurn endOfTurn = new EndOfTurn();
private final EndOfCombat endOfCombat = new EndOfCombat();
@@ -76,21 +76,21 @@ public class GameState {
private final EventBus events = new EventBus();
private final GameLog gameLog = new GameLog();
private final ColorChanger colorChanger = new ColorChanger();
private boolean gameOver = false;
private final Zone stackZone = new Zone(ZoneType.Stack);
private long timestamp = 0;
private final GameAction action;
/**
* Constructor.
* @param players2
* @param players2
*/
public GameState(Iterable<LobbyPlayer> players2) { /* no more zones to map here */
List<Player> players = new ArrayList<Player>();
for(LobbyPlayer p : players2) {
for (LobbyPlayer p : players2) {
Player pl = getIngamePlayer(p);
players.add(pl);
ingamePlayers.add(pl);
@@ -100,7 +100,7 @@ public class GameState {
action = new GameAction(this);
stack = new MagicStack(this);
phaseHandler = new PhaseHandler(this);
events.register(Singletons.getControl().getSoundSystem());
events.register(gameLog);
}
@@ -121,7 +121,7 @@ public class GameState {
*/
public final List<Player> getRegisteredPlayers() {
return allPlayers;
}
}
/**
* Gets the cleanup step.
@@ -290,20 +290,20 @@ public class GameState {
*/
public void setGameOver() {
this.gameOver = true;
for(Player p : roIngamePlayers) {
for (Player p : roIngamePlayers) {
p.onGameOver();
}
}
// THESE WERE MOVED HERE FROM AllZoneUtil
// They must once become non-static members of this class
// THESE WERE MOVED HERE FROM AllZoneUtil
// They must once become non-static members of this class
public Zone getZoneOf(final Card c) {
if (getStackZone().contains(c)) {
return getStackZone();
}
for (final Player p : getPlayers()) {
for (final ZoneType z : Player.ALL_ZONES) {
final PlayerZone pz = p.getZone(z);
@@ -312,7 +312,7 @@ public class GameState {
}
}
}
return null;
}
@@ -328,7 +328,7 @@ public class GameState {
}
}
}
return false;
}
@@ -360,18 +360,19 @@ public class GameState {
return getCardsIn(ZoneType.Exile).contains(c);
}
public boolean isCardInPlay(final String cardName) {
for (final Player p : getPlayers()) {
if (p.isCardInPlay(cardName))
if (p.isCardInPlay(cardName)) {
return true;
}
}
return false;
}
public List<Card> getColoredCardsInPlay(final String color) {
final List<Card> cards = new ArrayList<Card>();
for(Player p : getPlayers()) {
for (Player p : getPlayers()) {
cards.addAll(p.getColoredCardsInPlay(color));
}
return cards;
@@ -383,7 +384,7 @@ public class GameState {
return c;
}
}
return card;
}
@@ -458,35 +459,36 @@ public class GameState {
public Player getNextPlayerAfter(final Player playerTurn) {
int iPlayer = roIngamePlayers.indexOf(playerTurn);
if( -1 == iPlayer && !roIngamePlayers.isEmpty()) // should do something if playerTurn has just lost!
{
if (-1 == iPlayer && !roIngamePlayers.isEmpty()) { // should do something if playerTurn has just lost!
int iAlive;
iPlayer = allPlayers.indexOf(playerTurn);
do{
iPlayer = ( iPlayer + 1 ) % allPlayers.size();
do {
iPlayer = (iPlayer + 1) % allPlayers.size();
iAlive = roIngamePlayers.indexOf(allPlayers.get(iPlayer));
} while(iAlive < 0);
iPlayer = iAlive;
} else { // for the case noone has died
if( iPlayer == roIngamePlayers.size() - 1)
if (iPlayer == roIngamePlayers.size() - 1) {
iPlayer = -1;
}
iPlayer++;
}
return roIngamePlayers.get(iPlayer);
}
/**
* Only game knows how to make siutable players out of just connected clients
* Only game knows how to make siutable players out of just connected clients.
* @return
*/
public Player getIngamePlayer(LobbyPlayer player) {
if ( player.getType() == PlayerType.HUMAN )
if (player.getType() == PlayerType.HUMAN) {
return new HumanPlayer(player, this);
else {
} else {
return new AIPlayer(player, this);
}
}
@@ -496,7 +498,7 @@ public class GameState {
*/
public void onPlayerLost(Player p) {
ingamePlayers.remove(p);
final Map<String, Object> runParams = new TreeMap<String, Object>();
runParams.put("Player", p);
this.getTriggerHandler().runTrigger(TriggerType.LosesGame, runParams);

10
src/main/java/forge/game/GameType.java
View File

@@ -48,15 +48,15 @@ public enum GameType {
public final boolean isLimited() {
return this.bLimited;
}
public final int getDeckMinimum() {
return this.deckMinimum;
}
public final Integer getDeckMaximum() {
return this.deckMaximum;
}
public final boolean isSingleton() {
return this.singleton;
}
@@ -64,8 +64,8 @@ public enum GameType {
GameType(final boolean isLimited, int min) {
this(isLimited, min, null, false);
}
/**
* Instantiates a new game type.
*

4
src/main/java/forge/game/GlobalRuleChange.java
View File

@@ -32,9 +32,9 @@ public enum GlobalRuleChange {
onlyOneAttackerACombat ("No more than one creature can attack each combat."),
onlyOneBlocker ("No more than one creature can block each combat."),
toughnessAssignsDamage ("Each creature assigns combat damage equal to its toughness rather than its power.");
private final String ruleText;
private GlobalRuleChange(String text) {
ruleText = text;
}

25
src/main/java/forge/game/MatchController.java
View File

@@ -49,7 +49,7 @@ public class MatchController {
private final List<GameOutcome> gamesPlayedRo;
private InputControl input;
public MatchController() {
gamesPlayedRo = Collections.unmodifiableList(gamesPlayed);
}
@@ -75,13 +75,14 @@ public class MatchController {
/**
* TODO: Write javadoc for this method.
* @param reason
* @param reason
*
* @param game
*/
public void addGamePlayed(GameEndReason reason, GameState game) {
if ( !game.isGameOver() )
if (!game.isGameOver()) {
throw new RuntimeException("Game is not over yet.");
}
GameOutcome result = new GameOutcome(reason, game.getRegisteredPlayers());
result.setTurnsPlayed(game.getPhaseHandler().getTurn());
@@ -99,10 +100,11 @@ public class MatchController {
// Instantiate AI
input = new InputControl(currentGame);
Map<Player, PlayerStartConditions> startConditions = new HashMap<Player, PlayerStartConditions>();
for (Player p : currentGame.getPlayers())
for (Player p : currentGame.getPlayers()) {
startConditions.put(p, players.get(p.getLobbyPlayer()));
}
try {
Player localHuman = Aggregates.firstFieldEquals(currentGame.getPlayers(), Player.Accessors.FN_GET_TYPE, PlayerType.HUMAN);
@@ -132,10 +134,10 @@ public class MatchController {
field.getLblLibrary().setHoverable(Preferences.DEV_MODE);
}
if (this.getPlayedGames().isEmpty()) {
if (this.getPlayedGames().isEmpty()) {
VAntes.SINGLETON_INSTANCE.clearAnteCards();
}
// per player observers were set in CMatchUI.SINGLETON_INSTANCE.initMatch
CMessage.SINGLETON_INSTANCE.updateGameInfo(this);
@@ -170,8 +172,8 @@ public class MatchController {
public void replay() {
gamesPlayed.clear();
startRound();
}
}
/**
* TODO: Write javadoc for this method.
*
@@ -214,8 +216,9 @@ public class MatchController {
}
for (int score : victories) {
if (score >= gamesToWinMatch)
if (score >= gamesToWinMatch) {
return true;
}
}
return gamesPlayed.size() >= gamesPerMatch;
}
@@ -256,7 +259,7 @@ public class MatchController {
PlayerStartConditions cond = players.get(lobbyPlayer);
return cond == null ? null : cond.getDeck();
}
public Map<LobbyPlayer, PlayerStartConditions> getPlayers() {
return players;
}

14
src/main/java/forge/game/MatchStartHelper.java
View File

@@ -12,19 +12,19 @@ import forge.game.player.LobbyPlayer;
*/
public class MatchStartHelper {
private final Map<LobbyPlayer, PlayerStartConditions> players = new HashMap<LobbyPlayer, PlayerStartConditions>();
public void addPlayer(LobbyPlayer player, PlayerStartConditions c) {
players.put(player,c);
players.put(player, c);
}
public void addPlayer(LobbyPlayer player, Deck deck) {
players.put(player, new PlayerStartConditions(deck));
}
public Map<LobbyPlayer, PlayerStartConditions> getPlayerMap()
{
public Map<LobbyPlayer, PlayerStartConditions> getPlayerMap() {
return players;
}
}

4
src/main/java/forge/game/PlayerStartConditions.java
View File

@@ -11,7 +11,7 @@ public class PlayerStartConditions {
private int startingLife = 20;
private Supplier<Iterable<Card>> cardsOnTable = null;
public PlayerStartConditions( Deck deck0 ) {
public PlayerStartConditions(Deck deck0) {
deck = deck0;
}
@@ -28,7 +28,7 @@ public class PlayerStartConditions {
public final void setStartingLife(int startingLife) {
this.startingLife = startingLife;
}
public final void setCardsOnTable(Supplier<Iterable<Card>> cardsOnTable) {
this.cardsOnTable = cardsOnTable;
}