Menu
▾
▴
[Rails-commits] 2 commits - data/1835 rails/game
|
From: Erik V. <ev...@us...> - 2011-10-13 21:21:41
|
data/1835/CompanyManager.xml | 2
rails/game/GameManager.java | 2
rails/game/StartRound_1835.java | 274 ------------------------
rails/game/action/PossibleActions.java | 11 -
rails/game/specific/_1835/StartRound_1835.java | 275 +++++++++++++++++++++++++
5 files changed, 284 insertions(+), 280 deletions(-)
New commits:
commit 1893c34a2ea53e78be3bd4828ccff1e675018e0c
Author: Erik Vos <eri...@xs...>
Date: Thu Oct 13 22:30:03 2011 +0200
In 1835 Start Round, removed popups that reported forced passes.
Also removed some redundant/ineffective code.
diff --git a/rails/game/GameManager.java b/rails/game/GameManager.java
index 8507931..b7f9859 100644
--- a/rails/game/GameManager.java
+++ b/rails/game/GameManager.java
@@ -893,9 +893,11 @@ public class GameManager implements ConfigurableComponentI, GameManagerI {
getCurrentRound().setPossibleActions();
// only pass available => execute automatically
+ /*
if (!isGameOver() && possibleActions.containsOnlyPass()) {
result = process(possibleActions.getList().get(0));
}
+ */
// moveStack closing is done here to allow state changes to occur
// when setting possible actions
diff --git a/rails/game/action/PossibleActions.java b/rails/game/action/PossibleActions.java
index 3126948..8eabf5d 100644
--- a/rails/game/action/PossibleActions.java
+++ b/rails/game/action/PossibleActions.java
@@ -27,7 +27,7 @@ public class PossibleActions {
private List<PossibleAction> possibleActions;
protected static Logger log =
- Logger.getLogger(PossibleActions.class.getPackage().getName());
+ Logger.getLogger(PossibleActions.class.getPackage().getName());
/**
* This class can only be instantiated locally.
@@ -82,7 +82,8 @@ public class PossibleActions {
public boolean isEmpty() {
return possibleActions.isEmpty();
}
-
+
+ /* OBSOLETE
public boolean containsOnlyPass() {
if (possibleActions.size() != 1) return false;
PossibleAction action = possibleActions.get(0);
@@ -91,7 +92,7 @@ public class PossibleActions {
} else {
return false;
}
- }
+ }*/
/** Check if a given action exists in the current list of possible actions */
public boolean validate(PossibleAction checkedAction) {
@@ -99,8 +100,8 @@ public class PossibleActions {
// Some actions are always allowed
if (checkedAction instanceof GameAction
&& (((GameAction)checkedAction).getMode() == GameAction.SAVE
- || ((GameAction)checkedAction).getMode() == GameAction.RELOAD
- || ((GameAction)checkedAction).getMode() == GameAction.EXPORT)) {
+ || ((GameAction)checkedAction).getMode() == GameAction.RELOAD
+ || ((GameAction)checkedAction).getMode() == GameAction.EXPORT)) {
return true;
}
diff --git a/rails/game/specific/_1835/StartRound_1835.java b/rails/game/specific/_1835/StartRound_1835.java
index cfca1c1..0768fce 100644
--- a/rails/game/specific/_1835/StartRound_1835.java
+++ b/rails/game/specific/_1835/StartRound_1835.java
@@ -128,7 +128,7 @@ public class StartRound_1835 extends StartRound {
LocalText.getText("CannotBuyAnything",
currentPlayer.getName());
ReportBuffer.add(message);
- DisplayBuffer.add(message);
+ //DisplayBuffer.add(message);
numPasses.add(1);
if (numPasses.intValue() >= numPlayers) {
/*
commit b5cb481a353309e04d48c49b9ca363f4f9e6c532
Author: Erik Vos <eri...@xs...>
Date: Thu Oct 13 21:15:53 2011 +0200
Moved StartRound_1835 to the game-specific package.
diff --git a/data/1835/CompanyManager.xml b/data/1835/CompanyManager.xml
index dc0030a..dcc124d 100644
--- a/data/1835/CompanyManager.xml
+++ b/data/1835/CompanyManager.xml
@@ -214,7 +214,7 @@
<Trains limit="4,4,3"/>
</Company>
- <StartPacket roundClass="rails.game.StartRound_1835" variant="Snake">
+ <StartPacket roundClass="rails.game.specific._1835.StartRound_1835" variant="Snake">
<Item name="NF" type="Private" basePrice="100" row="1">
<SubItem name="Bay" type="Major"/>
</Item>
diff --git a/rails/game/StartRound_1835.java b/rails/game/StartRound_1835.java
deleted file mode 100644
index 80710e7..0000000
--- a/rails/game/StartRound_1835.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/* $Header: /Users/blentz/rails_rcs/cvs/18xx/rails/game/StartRound_1835.java,v 1.26 2010/03/30 21:59:03 evos Exp $ */
-package rails.game;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import rails.common.DisplayBuffer;
-import rails.common.LocalText;
-import rails.game.action.*;
-import rails.game.state.IntegerState;
-
-/**
- * Implements an 1835-style startpacket sale.
- */
-public class StartRound_1835 extends StartRound {
-
- /* To control the player sequence in the Clemens and Snake variants */
- private static IntegerState turn = new IntegerState("TurnNumber", 0);
-
- private static IntegerState startRoundNumber =
- new IntegerState("StartRoundNumber", 0);
-
- /* Additional variants */
- public static final String CLEMENS_VARIANT = "Clemens";
- public static final String SNAKE_VARIANT = "Snake";
-
- /**
- * Constructor, only to be used in dynamic instantiation.
- */
- public StartRound_1835(GameManagerI gameManager) {
- super(gameManager);
- hasBidding = false;
- }
-
- /**
- * Start the 1835-style start round.
- *
- * @param startPacket The startpacket to be sold in this start round.
- */
- @Override
- public void start() {
- super.start();
- startRoundNumber.add(1);
-
- if (variant.equalsIgnoreCase(CLEMENS_VARIANT)) {
- setCurrentPlayerIndex (numPlayers-1);
- }
-
-
- if (!setPossibleActions()) {
- /*
- * If nobody can do anything, keep executing Operating and Start
- * rounds until someone has got enough money to buy one of the
- * remaining items. The game mechanism ensures that this will
- * ultimately be possible.
- */
- //gameManager.nextRound(this);
- finishRound();
- }
-
- }
-
- @Override
- public boolean setPossibleActions() {
-
- List<StartItem> startItems = startPacket.getItems();
- List<StartItem> buyableItems = new ArrayList<StartItem>();
- int row;
- boolean buyable;
- int items = 0;
- int minRow = 0;
-
- /*
- * First, mark which items are buyable. Once buyable, they always remain
- * so until bought, so there is no need to check is an item is still
- * buyable.
- */
- for (StartItem item : startItems) {
- buyable = false;
-
- if (item.isSold()) {
- // Already sold: skip
- } else if (variant.equalsIgnoreCase(CLEMENS_VARIANT)) {
- buyable = true;
- } else {
- row = item.getRow();
- if (minRow == 0) minRow = row;
- if (row == minRow) {
- // Allow all items in the top row.
- buyable = true;
- } else if (row == minRow + 1 && items == 1) {
- // Allow the first item in the next row if the
- // top row has only one item.
- buyable = true;
- }
- }
- if (buyable) {
- items++;
- item.setStatus(StartItem.BUYABLE);
- buyableItems.add(item);
- }
- }
- possibleActions.clear();
-
- /*
- * Repeat until we have found a player with enough money to buy some
- * item
- */
- while (possibleActions.isEmpty()) {
-
- Player currentPlayer = getCurrentPlayer();
- if (currentPlayer == startPlayer) ReportBuffer.add("");
-
- int cashToSpend = currentPlayer.getCash();
-
- for (StartItem item : buyableItems) {
-
- if (item.getBasePrice() <= cashToSpend) {
- /* Player does have the cash */
- possibleActions.add(new BuyStartItem(item,
- item.getBasePrice(), false));
- }
- }
-
- if (possibleActions.isEmpty()) {
- String message =
- LocalText.getText("CannotBuyAnything",
- currentPlayer.getName());
- ReportBuffer.add(message);
- DisplayBuffer.add(message);
- numPasses.add(1);
- if (numPasses.intValue() >= numPlayers) {
- /*
- * No-one has enough cash left to buy anything, so close the
- * Start Round.
- */
- numPasses.set(0);
- finishRound();
- gameManager.getCurrentRound().setPossibleActions();
-
- // This code may be called recursively.
- // Jump out as soon as we have something to do
- if (!possibleActions.isEmpty()) break;
-
- return false;
- }
- setNextPlayer();
- }
- }
-
- /* Pass is always allowed */
- possibleActions.add(new NullAction(NullAction.PASS));
-
- return true;
- }
-
- /*----- moveStack methods -----*/
-
- @Override
- public boolean bid(String playerName, BidStartItem item) {
-
- DisplayBuffer.add(LocalText.getText("InvalidAction"));
- return false;
- }
-
- /**
- * Set the next player turn.
- *
- */
- @Override
- protected void setNextPlayer() {
-
- /* Select the player that has the turn. */
-
- if (startRoundNumber.intValue() == 1) {
- /*
- * Some variants have a reversed player order in the first or second
- * cycle of the first round (a cycle spans one turn of all players).
- * In such a case we need to keep track of the number of player
- * turns.
- */
- turn.add(1);
- int turnNumber = turn.intValue();
- int cycleNumber = turnNumber / numPlayers;
- int turnIndex = turnNumber % numPlayers;
- int newIndex;
-
- if (variant.equalsIgnoreCase(CLEMENS_VARIANT)) {
- /* Reverse order in the first cycle only */
- newIndex =
- cycleNumber == 0 ? numPlayers - 1 - turnIndex
- : turnIndex;
- } else if (variant.equalsIgnoreCase(SNAKE_VARIANT)) {
- /* Reverse order in the second cycle only */
- newIndex =
- cycleNumber == 1 ? numPlayers - 1 - turnIndex
- : turnIndex;
- } else {
- newIndex = turnIndex;
- }
- Player oldPlayer = getCurrentPlayer();
- setCurrentPlayerIndex(newIndex);
- Player newPlayer = getCurrentPlayer();
- log.debug("Game turn has moved from " + oldPlayer.getName()
- + " to " + newPlayer.getName() + " [startRound="
- + startRoundNumber + " cycle=" + cycleNumber + " turn="
- + turnNumber + " newIndex=" + newIndex + "]");
-
- } else {
-
- /* In any subsequent Round, the normal order applies. */
- Player oldPlayer = getCurrentPlayer();
- super.setNextPlayer();
- Player newPlayer = getCurrentPlayer();
- log.debug("Game turn has moved from " + oldPlayer.getName()
- + " to " + newPlayer.getName());
- }
-
- return;
- }
-
- /**
- * Process a player's pass.
- *
- * @param playerName The name of the current player (for checking purposes).
- */
- @Override
- public boolean pass(String playerName) {
-
- String errMsg = null;
- Player player = getCurrentPlayer();
-
- while (true) {
-
- // Check player
- if (!playerName.equals(player.getName())) {
- errMsg = LocalText.getText("WrongPlayer", playerName, player.getName());
- break;
- }
- break;
- }
-
- if (errMsg != null) {
- DisplayBuffer.add(LocalText.getText("InvalidPass",
- playerName,
- errMsg ));
- return false;
- }
-
- ReportBuffer.add(LocalText.getText("PASSES", playerName));
-
- moveStack.start(false);
-
- numPasses.add(1);
-
- if (numPasses.intValue() >= numPlayers) {
- // All players have passed.
- ReportBuffer.add(LocalText.getText("ALL_PASSED"));
- numPasses.set(0);
- //gameManager.nextRound(this);
- finishRound();
- } else {
- setNextPlayer();
- }
-
- return true;
- }
-
- @Override
- public String getHelp() {
- return "1835 Start Round help text";
- }
-
-}
diff --git a/rails/game/specific/_1835/StartRound_1835.java b/rails/game/specific/_1835/StartRound_1835.java
new file mode 100644
index 0000000..cfca1c1
--- /dev/null
+++ b/rails/game/specific/_1835/StartRound_1835.java
@@ -0,0 +1,275 @@
+/* $Header: /Users/blentz/rails_rcs/cvs/18xx/rails/game/StartRound_1835.java,v 1.26 2010/03/30 21:59:03 evos Exp $ */
+package rails.game.specific._1835;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import rails.common.DisplayBuffer;
+import rails.common.LocalText;
+import rails.game.*;
+import rails.game.action.*;
+import rails.game.state.IntegerState;
+
+/**
+ * Implements an 1835-style startpacket sale.
+ */
+public class StartRound_1835 extends StartRound {
+
+ /* To control the player sequence in the Clemens and Snake variants */
+ private static IntegerState turn = new IntegerState("TurnNumber", 0);
+
+ private static IntegerState startRoundNumber =
+ new IntegerState("StartRoundNumber", 0);
+
+ /* Additional variants */
+ public static final String CLEMENS_VARIANT = "Clemens";
+ public static final String SNAKE_VARIANT = "Snake";
+
+ /**
+ * Constructor, only to be used in dynamic instantiation.
+ */
+ public StartRound_1835(GameManagerI gameManager) {
+ super(gameManager);
+ hasBidding = false;
+ }
+
+ /**
+ * Start the 1835-style start round.
+ *
+ * @param startPacket The startpacket to be sold in this start round.
+ */
+ @Override
+ public void start() {
+ super.start();
+ startRoundNumber.add(1);
+
+ if (variant.equalsIgnoreCase(CLEMENS_VARIANT)) {
+ setCurrentPlayerIndex (numPlayers-1);
+ }
+
+
+ if (!setPossibleActions()) {
+ /*
+ * If nobody can do anything, keep executing Operating and Start
+ * rounds until someone has got enough money to buy one of the
+ * remaining items. The game mechanism ensures that this will
+ * ultimately be possible.
+ */
+ //gameManager.nextRound(this);
+ finishRound();
+ }
+
+ }
+
+ @Override
+ public boolean setPossibleActions() {
+
+ List<StartItem> startItems = startPacket.getItems();
+ List<StartItem> buyableItems = new ArrayList<StartItem>();
+ int row;
+ boolean buyable;
+ int items = 0;
+ int minRow = 0;
+
+ /*
+ * First, mark which items are buyable. Once buyable, they always remain
+ * so until bought, so there is no need to check is an item is still
+ * buyable.
+ */
+ for (StartItem item : startItems) {
+ buyable = false;
+
+ if (item.isSold()) {
+ // Already sold: skip
+ } else if (variant.equalsIgnoreCase(CLEMENS_VARIANT)) {
+ buyable = true;
+ } else {
+ row = item.getRow();
+ if (minRow == 0) minRow = row;
+ if (row == minRow) {
+ // Allow all items in the top row.
+ buyable = true;
+ } else if (row == minRow + 1 && items == 1) {
+ // Allow the first item in the next row if the
+ // top row has only one item.
+ buyable = true;
+ }
+ }
+ if (buyable) {
+ items++;
+ item.setStatus(StartItem.BUYABLE);
+ buyableItems.add(item);
+ }
+ }
+ possibleActions.clear();
+
+ /*
+ * Repeat until we have found a player with enough money to buy some
+ * item
+ */
+ while (possibleActions.isEmpty()) {
+
+ Player currentPlayer = getCurrentPlayer();
+ if (currentPlayer == startPlayer) ReportBuffer.add("");
+
+ int cashToSpend = currentPlayer.getCash();
+
+ for (StartItem item : buyableItems) {
+
+ if (item.getBasePrice() <= cashToSpend) {
+ /* Player does have the cash */
+ possibleActions.add(new BuyStartItem(item,
+ item.getBasePrice(), false));
+ }
+ }
+
+ if (possibleActions.isEmpty()) {
+ String message =
+ LocalText.getText("CannotBuyAnything",
+ currentPlayer.getName());
+ ReportBuffer.add(message);
+ DisplayBuffer.add(message);
+ numPasses.add(1);
+ if (numPasses.intValue() >= numPlayers) {
+ /*
+ * No-one has enough cash left to buy anything, so close the
+ * Start Round.
+ */
+ numPasses.set(0);
+ finishRound();
+ gameManager.getCurrentRound().setPossibleActions();
+
+ // This code may be called recursively.
+ // Jump out as soon as we have something to do
+ if (!possibleActions.isEmpty()) break;
+
+ return false;
+ }
+ setNextPlayer();
+ }
+ }
+
+ /* Pass is always allowed */
+ possibleActions.add(new NullAction(NullAction.PASS));
+
+ return true;
+ }
+
+ /*----- moveStack methods -----*/
+
+ @Override
+ public boolean bid(String playerName, BidStartItem item) {
+
+ DisplayBuffer.add(LocalText.getText("InvalidAction"));
+ return false;
+ }
+
+ /**
+ * Set the next player turn.
+ *
+ */
+ @Override
+ protected void setNextPlayer() {
+
+ /* Select the player that has the turn. */
+
+ if (startRoundNumber.intValue() == 1) {
+ /*
+ * Some variants have a reversed player order in the first or second
+ * cycle of the first round (a cycle spans one turn of all players).
+ * In such a case we need to keep track of the number of player
+ * turns.
+ */
+ turn.add(1);
+ int turnNumber = turn.intValue();
+ int cycleNumber = turnNumber / numPlayers;
+ int turnIndex = turnNumber % numPlayers;
+ int newIndex;
+
+ if (variant.equalsIgnoreCase(CLEMENS_VARIANT)) {
+ /* Reverse order in the first cycle only */
+ newIndex =
+ cycleNumber == 0 ? numPlayers - 1 - turnIndex
+ : turnIndex;
+ } else if (variant.equalsIgnoreCase(SNAKE_VARIANT)) {
+ /* Reverse order in the second cycle only */
+ newIndex =
+ cycleNumber == 1 ? numPlayers - 1 - turnIndex
+ : turnIndex;
+ } else {
+ newIndex = turnIndex;
+ }
+ Player oldPlayer = getCurrentPlayer();
+ setCurrentPlayerIndex(newIndex);
+ Player newPlayer = getCurrentPlayer();
+ log.debug("Game turn has moved from " + oldPlayer.getName()
+ + " to " + newPlayer.getName() + " [startRound="
+ + startRoundNumber + " cycle=" + cycleNumber + " turn="
+ + turnNumber + " newIndex=" + newIndex + "]");
+
+ } else {
+
+ /* In any subsequent Round, the normal order applies. */
+ Player oldPlayer = getCurrentPlayer();
+ super.setNextPlayer();
+ Player newPlayer = getCurrentPlayer();
+ log.debug("Game turn has moved from " + oldPlayer.getName()
+ + " to " + newPlayer.getName());
+ }
+
+ return;
+ }
+
+ /**
+ * Process a player's pass.
+ *
+ * @param playerName The name of the current player (for checking purposes).
+ */
+ @Override
+ public boolean pass(String playerName) {
+
+ String errMsg = null;
+ Player player = getCurrentPlayer();
+
+ while (true) {
+
+ // Check player
+ if (!playerName.equals(player.getName())) {
+ errMsg = LocalText.getText("WrongPlayer", playerName, player.getName());
+ break;
+ }
+ break;
+ }
+
+ if (errMsg != null) {
+ DisplayBuffer.add(LocalText.getText("InvalidPass",
+ playerName,
+ errMsg ));
+ return false;
+ }
+
+ ReportBuffer.add(LocalText.getText("PASSES", playerName));
+
+ moveStack.start(false);
+
+ numPasses.add(1);
+
+ if (numPasses.intValue() >= numPlayers) {
+ // All players have passed.
+ ReportBuffer.add(LocalText.getText("ALL_PASSED"));
+ numPasses.set(0);
+ //gameManager.nextRound(this);
+ finishRound();
+ } else {
+ setNextPlayer();
+ }
+
+ return true;
+ }
+
+ @Override
+ public String getHelp() {
+ return "1835 Start Round help text";
+ }
+
+}
|
