Menu
▾
▴
[Rails-commits] 18xx/rails/game/specific/_1835 GameManager_1835.java, 1.7, 1.8 OperatingRound_1835.java, 1.3, 1.4 PrussianFormationRound.java, 1.9, 1.10 StockRound_1835.java, 1.10, 1.11
|
From: Erik V. <ev...@us...> - 2010-04-15 19:49:58
|
Update of /cvsroot/rails/18xx/rails/game/specific/_1835 In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv19350/rails/game/specific/_1835 Modified Files: GameManager_1835.java OperatingRound_1835.java PrussianFormationRound.java StockRound_1835.java Log Message: Removed a redundant (because duplicate) method Index: StockRound_1835.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/specific/_1835/StockRound_1835.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** StockRound_1835.java 8 Apr 2010 21:23:47 -0000 1.10 --- StockRound_1835.java 15 Apr 2010 19:49:50 -0000 1.11 *************** *** 105,121 **** 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)); --- 105,121 ---- if (sharesInIPO == 0) { if (name.equals(GameManager_1835.SX_ID) && ! ipo.getShare(companyManager.getPublicCompany(GameManager_1835.BY_ID)) == 0 || name.equals(GameManager_1835.BY_ID) && ! ipo.getShare(companyManager.getPublicCompany(GameManager_1835.SX_ID)) == 0) { // Group 1 sold out: release Badische ! releaseCompanyShares (companyManager.getPublicCompany(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.getPublicCompany(GameManager_1835.BA_ID)) == 0 ! && ipo.getShare(companyManager.getPublicCompany(GameManager_1835.WT_ID)) == 0 ! && ipo.getShare(companyManager.getPublicCompany(GameManager_1835.HE_ID)) == 0) { // Group 2 sold out: release MS ! releaseCompanyShares (companyManager.getPublicCompany(GameManager_1835.MS_ID)); ReportBuffer.add (LocalText.getText("SharesReleased", "All", GameManager_1835.MS_ID)); *************** *** 130,134 **** 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)); --- 130,134 ---- if (name.equals(GameManager_1835.BA_ID)) { if (sharesInIPO == 50) { // 50% sold: release Wurttemberg ! releaseCompanyShares (companyManager.getPublicCompany(GameManager_1835.WT_ID)); ReportBuffer.add (LocalText.getText("SharesReleased", "All", GameManager_1835.WT_ID)); *************** *** 144,148 **** } 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)); --- 144,148 ---- } else if (name.equals(GameManager_1835.WT_ID)) { //Wurttembergische if (sharesInIPO == 50) { // 50% sold: release Hessische ! releaseCompanyShares (companyManager.getPublicCompany(GameManager_1835.HE_ID)); ReportBuffer.add (LocalText.getText("SharesReleased", "All", GameManager_1835.HE_ID)); *************** *** 150,154 **** } 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)); --- 150,154 ---- } else if (name.equals(GameManager_1835.MS_ID)) { // Mecklenburg/Schwerin if (sharesInIPO == 40) { // 60% sold: release Oldenburg ! releaseCompanyShares (companyManager.getPublicCompany(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.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** PrussianFormationRound.java 8 Apr 2010 21:23:47 -0000 1.9 --- PrussianFormationRound.java 15 Apr 2010 19:49:50 -0000 1.10 *************** *** 31,36 **** Step step; ! public static String PR_ID = GameManager_1835.PR_ID; ! public static String M2_ID = GameManager_1835.M2_ID; public PrussianFormationRound (GameManagerI gameManager) { --- 31,36 ---- Step step; ! private static String PR_ID = GameManager_1835.PR_ID; ! private static String M2_ID = GameManager_1835.M2_ID; public PrussianFormationRound (GameManagerI gameManager) { *************** *** 45,49 **** public void start() { ! prussian = companyManager.getCompanyByName(PR_ID); phase = getCurrentPhase(); startPr = !prussian.hasStarted(); --- 45,49 ---- public void start() { ! prussian = companyManager.getPublicCompany(PR_ID); phase = getCurrentPhase(); startPr = !prussian.hasStarted(); *************** *** 59,63 **** if (step == Step.START) { ! m2 = companyManager.getCompanyByName(M2_ID); setCurrentPlayer(m2.getPresident()); ((GameManager_1835)gameManager).setPrussianFormationStartingPlayer(currentPlayer); --- 59,63 ---- if (step == Step.START) { ! m2 = companyManager.getPublicCompany(M2_ID); setCurrentPlayer(m2.getPresident()); ((GameManager_1835)gameManager).setPrussianFormationStartingPlayer(currentPlayer); *************** *** 348,354 **** --- 348,362 ---- public static boolean prussianIsComplete(GameManagerI gameManager) { + + for (PublicCompanyI company : gameManager.getAllPublicCompanies()) { + if (!company.getTypeName().equalsIgnoreCase("Minor")) continue; + if (!company.isClosed()) return false; + } + return true; + /* List<PublicCertificateI> unissued = gameManager.getBank().getUnavailable().getCertificatesPerCompany(PR_ID); return unissued == null || unissued.isEmpty(); + */ } Index: GameManager_1835.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/specific/_1835/GameManager_1835.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GameManager_1835.java 9 Apr 2010 21:26:11 -0000 1.7 --- GameManager_1835.java 15 Apr 2010 19:49:50 -0000 1.8 *************** *** 6,10 **** public class GameManager_1835 extends GameManager { - public static String PR_NAME = PrussianFormationRound.PR_ID; private RoundI previousRound = null; private Player prFormStartingPlayer = null; --- 6,9 ---- Index: OperatingRound_1835.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/specific/_1835/OperatingRound_1835.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OperatingRound_1835.java 11 Apr 2010 15:49:47 -0000 1.3 --- OperatingRound_1835.java 15 Apr 2010 19:49:50 -0000 1.4 *************** *** 120,125 **** return result; } - - - } --- 120,122 ---- |
