Update of /cvsroot/rails/18xx/rails/game/action
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1357/rails/game/action
Modified Files:
LayToken.java LayBaseToken.java
Log Message:
Home base on green OO tile can now be chosen in first turn
Index: LayBaseToken.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/LayBaseToken.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LayBaseToken.java 31 Jan 2010 22:22:28 -0000 1.6
--- LayBaseToken.java 3 Feb 2010 20:16:40 -0000 1.7
***************
*** 26,29 ****
--- 26,30 ----
public final static int LOCATION_SPECIFIC = 1; // Valid hex
public final static int SPECIAL_PROPERTY = 2; // Directed by a special
+ public final static int HOME_CITY = 3; // If city on home hex is undefined in 1st turn
// property
***************
*** 52,55 ****
--- 53,62 ----
}
+ public LayBaseToken (MapHex hex) {
+ super (hex);
+ setChosenHex (hex);
+ type = HOME_CITY;
+ }
+
public int getChosenStation() {
return chosenStation;
Index: LayToken.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/LayToken.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** LayToken.java 4 Jun 2008 19:00:29 -0000 1.9
--- LayToken.java 3 Feb 2010 20:16:38 -0000 1.10
***************
*** 1,4 ****
/* $Header$
! *
* Created on 14-Sep-2006
* Change Log:
--- 1,4 ----
/* $Header$
! *
* Created on 14-Sep-2006
* Change Log:
***************
*** 6,9 ****
--- 6,10 ----
package rails.game.action;
+ import java.util.ArrayList;
import java.util.List;
***************
*** 56,59 ****
--- 57,66 ----
}
+ public LayToken (MapHex hex) {
+ this.locations = new ArrayList<MapHex>(1);
+ locations.add(hex);
+ buildLocationNameString();
+ }
+
/**
* @return Returns the chosenHex.
***************
*** 90,94 ****
* @return Returns the location.
*/
! public MapHex getLocation() {
if (locations != null) {
return locations.get(0);
--- 97,102 ----
* @return Returns the location.
*/
! @Deprecated
! public MapHex getLocation() {
if (locations != null) {
return locations.get(0);
|
