Menu
▾
▴
[Rails-commits] 18xx/rails/game/specific/_1835 GameManager_1835.java, 1.5, 1.6 PrussianFormationRound.java, 1.8, 1.9 StockRound_1835.java, 1.9, 1.10
|
From: Erik V. <ev...@us...> - 2010-04-08 21:23:54
|
Update of /cvsroot/rails/18xx/rails/game/specific/_1835 In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv4630/rails/game/specific/_1835 Modified Files: GameManager_1835.java PrussianFormationRound.java StockRound_1835.java Log Message: Moved hardcoded company IDs to GameManager_1835 Index: StockRound_1835.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/specific/_1835/StockRound_1835.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** StockRound_1835.java 2 Apr 2010 20:03:55 -0000 1.9 --- StockRound_1835.java 8 Apr 2010 21:23:47 -0000 1.10 *************** *** 14,26 **** public class StockRound_1835 extends StockRound { - public static String BY_ID="Bay"; - public static String SX_ID="Sax"; - public static String BA_ID="Bad"; - public static String HE_ID="Hes"; - public static String WT_ID="Wrt"; - public static String MS_ID="MS"; - public static String OL_ID="Old"; - public static String PR_ID="Pr"; - /** * Constructor with the GameManager, will call super class (StockRound's) Constructor to initialize --- 14,17 ---- *************** *** 113,132 **** // Check for group releases if (sharesInIPO == 0) { ! if (name.equals(SX_ID) && ! ipo.getShare(companyManager.getCompanyByName(BY_ID)) == 0 ! || name.equals(BY_ID) && ! ipo.getShare(companyManager.getCompanyByName(SX_ID)) == 0) { // Group 1 sold out: release Badische ! releaseCompanyShares (companyManager.getCompanyByName(BA_ID)); ReportBuffer.add (LocalText.getText("SharesReleased", ! "All", BA_ID)); ! } else if (name.equals(BA_ID) || name.equals(WT_ID) || name.equals(HE_ID)) { ! if (ipo.getShare(companyManager.getCompanyByName(BA_ID)) == 0 ! && ipo.getShare(companyManager.getCompanyByName(WT_ID)) == 0 ! && ipo.getShare(companyManager.getCompanyByName(HE_ID)) == 0) { // Group 2 sold out: release MS ! releaseCompanyShares (companyManager.getCompanyByName(MS_ID)); ReportBuffer.add (LocalText.getText("SharesReleased", ! "All", MS_ID)); } } --- 104,123 ---- // Check for group releases if (sharesInIPO == 0) { ! if (name.equals(GameManager_1835.SX_ID) && ! ipo.getShare(companyManager.getCompanyByName(GameManager_1835.BY_ID)) == 0 ! || name.equals(GameManager_1835.BY_ID) && ! ipo.getShare(companyManager.getCompanyByName(GameManager_1835.SX_ID)) == 0) { // Group 1 sold out: release Badische ! releaseCompanyShares (companyManager.getCompanyByName(GameManager_1835.BA_ID)); ReportBuffer.add (LocalText.getText("SharesReleased", ! "All", GameManager_1835.BA_ID)); ! } else if (name.equals(GameManager_1835.BA_ID) || name.equals(GameManager_1835.WT_ID) || name.equals(GameManager_1835.HE_ID)) { ! if (ipo.getShare(companyManager.getCompanyByName(GameManager_1835.BA_ID)) == 0 ! && ipo.getShare(companyManager.getCompanyByName(GameManager_1835.WT_ID)) == 0 ! && ipo.getShare(companyManager.getCompanyByName(GameManager_1835.HE_ID)) == 0) { // Group 2 sold out: release MS ! releaseCompanyShares (companyManager.getCompanyByName(GameManager_1835.MS_ID)); ReportBuffer.add (LocalText.getText("SharesReleased", ! "All", GameManager_1835.MS_ID)); } } *************** *** 137,165 **** * will always be available at the start of SR1. */ ! if (name.equals(BA_ID)) { if (sharesInIPO == 50) { // 50% sold: release Wurttemberg ! releaseCompanyShares (companyManager.getCompanyByName(WT_ID)); ReportBuffer.add (LocalText.getText("SharesReleased", ! "All", WT_ID)); } else if (sharesInIPO == 80) { // President sold: release four 10% Prussian shares ! gameManager.getCompanyManager().getPublicCompany(PR_ID).setBuyable(true); for (int i=0; i<4; i++) { ! unavailable.getCertOfType(PR_ID+"_10%").moveTo(ipo); } ReportBuffer.add (LocalText.getText("SharesReleased", ! "4 10%", PR_ID)); } ! } else if (name.equals(WT_ID)) { //Wurttembergische if (sharesInIPO == 50) { // 50% sold: release Hessische ! releaseCompanyShares (companyManager.getCompanyByName(HE_ID)); ReportBuffer.add (LocalText.getText("SharesReleased", ! "All", HE_ID)); } ! } else if (name.equals(MS_ID)) { // Mecklenburg/Schwerin if (sharesInIPO == 40) { // 60% sold: release Oldenburg ! releaseCompanyShares (companyManager.getCompanyByName(OL_ID)); ReportBuffer.add (LocalText.getText("SharesReleased", ! "All", OL_ID)); } } --- 128,156 ---- * will always be available at the start of SR1. */ ! if (name.equals(GameManager_1835.BA_ID)) { if (sharesInIPO == 50) { // 50% sold: release Wurttemberg ! releaseCompanyShares (companyManager.getCompanyByName(GameManager_1835.WT_ID)); ReportBuffer.add (LocalText.getText("SharesReleased", ! "All", GameManager_1835.WT_ID)); } else if (sharesInIPO == 80) { // President sold: release four 10% Prussian shares ! gameManager.getCompanyManager().getPublicCompany(GameManager_1835.PR_ID).setBuyable(true); for (int i=0; i<4; i++) { ! unavailable.getCertOfType(GameManager_1835.PR_ID+"_10%").moveTo(ipo); } ReportBuffer.add (LocalText.getText("SharesReleased", ! "4 10%", GameManager_1835.PR_ID)); } ! } else if (name.equals(GameManager_1835.WT_ID)) { //Wurttembergische if (sharesInIPO == 50) { // 50% sold: release Hessische ! releaseCompanyShares (companyManager.getCompanyByName(GameManager_1835.HE_ID)); ReportBuffer.add (LocalText.getText("SharesReleased", ! "All", GameManager_1835.HE_ID)); } ! } else if (name.equals(GameManager_1835.MS_ID)) { // Mecklenburg/Schwerin if (sharesInIPO == 40) { // 60% sold: release Oldenburg ! releaseCompanyShares (companyManager.getCompanyByName(GameManager_1835.OL_ID)); ReportBuffer.add (LocalText.getText("SharesReleased", ! "All", GameManager_1835.OL_ID)); } } Index: PrussianFormationRound.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/specific/_1835/PrussianFormationRound.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** PrussianFormationRound.java 28 Mar 2010 20:14:20 -0000 1.8 --- PrussianFormationRound.java 8 Apr 2010 21:23:47 -0000 1.9 *************** *** 31,37 **** Step step; ! public static String PR_ID = StockRound_1835.PR_ID; ! public static String M2_ID = "M2"; ! public PrussianFormationRound (GameManagerI gameManager) { super (gameManager); --- 31,37 ---- Step step; ! public static String PR_ID = GameManager_1835.PR_ID; ! public static String M2_ID = GameManager_1835.M2_ID; ! public PrussianFormationRound (GameManagerI gameManager) { super (gameManager); *************** *** 188,192 **** errMsg = LocalText.getText("WrongCompany", action.getFoldedCompanyNames(), ! M2_ID); break; } --- 188,192 ---- errMsg = LocalText.getText("WrongCompany", action.getFoldedCompanyNames(), ! GameManager_1835.M2_ID); break; } Index: GameManager_1835.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/specific/_1835/GameManager_1835.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GameManager_1835.java 28 Mar 2010 20:14:20 -0000 1.5 --- GameManager_1835.java 8 Apr 2010 21:23:47 -0000 1.6 *************** *** 9,12 **** --- 9,22 ---- private RoundI previousRound = null; private Player prFormStartingPlayer = null; + + public static String M2_ID = "M2"; + public static String PR_ID = "Pr"; + public static String OL_ID = "Old"; + public static String MS_ID = "MS"; + public static String WT_ID = "Wrt"; + public static String HE_ID = "Hes"; + public static String BA_ID = "Bad"; + public static String SX_ID = "Sax"; + public static String BY_ID = "Bay"; public GameManager_1835() { |
