[Rails-commits] 18xx/rails/game/specific/_1835 StockRound_1835.java, 1.6, 1.7

[Erik V. <ev...@us...>]

Update of /cvsroot/rails/18xx/rails/game/specific/_1835
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29557/rails/game/specific/_1835

Modified Files:
	StockRound_1835.java 
Log Message:
Name strings are now constants

Index: StockRound_1835.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1835/StockRound_1835.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** StockRound_1835.java	6 Feb 2010 23:48:26 -0000	1.6
--- StockRound_1835.java	16 Feb 2010 20:18:25 -0000	1.7
***************
*** 9,12 ****
--- 9,21 ----
  
  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";
  
      /**
***************
*** 19,22 ****
--- 28,40 ----
          super (aGameManager);
      }
+     
+     /** Share price goes down 1 space for any number of shares sold.
+      */
+     protected void adjustSharePrice (PublicCompanyI company, int numberSold, boolean soldBefore) {
+         // No more changes if it has already dropped
+         if (!soldBefore) {
+             company.adjustSharePrice (SOLD, 1, gameManager.getStockMarket());
+         }
+     }
  
      /**
***************
*** 41,60 ****
          // Check for group releases
          if (sharesInIPO == 0) {
!             if (name.equals("Sax") &&
!                 ipo.getShare(companyManager.getCompanyByName("Bay")) == 0
!             || name.equals("Bay") &&
!                 ipo.getShare(companyManager.getCompanyByName("Sax")) == 0) {
                  // Group 1 sold out: release Badische
!                 releaseCompanyShares (companyManager.getCompanyByName("Bad"));
                  ReportBuffer.add (LocalText.getText("SharesReleased",
!                         "All", "Bad"));
!             } else if (name.equals("Bad") || name.equals("Wrt") || name.equals("Hes")) {
!                 if (ipo.getShare(companyManager.getCompanyByName("Bad")) == 0
!                         && ipo.getShare(companyManager.getCompanyByName("Wrt")) == 0
!                         && ipo.getShare(companyManager.getCompanyByName("Hes")) == 0) {
                      // Group 2 sold out: release MS
!                     releaseCompanyShares (companyManager.getCompanyByName("MS"));
                      ReportBuffer.add (LocalText.getText("SharesReleased",
!                             "All", "MS"));
                  }
              }
--- 59,78 ----
          // 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));
                  }
              }
***************
*** 65,92 ****
           * will always be available at the start of SR1.
           */
!         if (name.equals("Bad")) {
              if (sharesInIPO == 50) {  // 50% sold: release Wurttemberg
!                 releaseCompanyShares (companyManager.getCompanyByName("Wrt"));
                  ReportBuffer.add (LocalText.getText("SharesReleased",
!                         "All", "Wrt"));
              } else if (sharesInIPO == 80) {
                  // President sold: release four 10% Prussian shares
                  for (int i=0; i<4; i++) {
!                     unavailable.getCertOfType("Pr_10%").moveTo(ipo);
                  }
                  ReportBuffer.add (LocalText.getText("SharesReleased",
!                         "4 10%", "Pr"));
              }
!         } else if (name.equals("Wrt")) { //Wurttembergische
              if (sharesInIPO == 50) {  // 50% sold: release Hessische
!                 releaseCompanyShares (companyManager.getCompanyByName("Hes"));
                  ReportBuffer.add (LocalText.getText("SharesReleased",
!                         "All", "Hes"));
              }
!         } else if (name.equals("MS")) { // Mecklenburg/Schwerin
              if (sharesInIPO == 40) {  // 60% sold: release Oldenburg
!                 releaseCompanyShares (companyManager.getCompanyByName("Old"));
                  ReportBuffer.add (LocalText.getText("SharesReleased",
!                         "All", "Old"));
              }
          }
--- 83,111 ----
           * 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));
              }
          }