rails-commits — CVS Commits

[Rails-commits] 18xx/rails/ui/swing/elements CheckBoxDialog.java, NONE, 1.1

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

Update of /cvsroot/rails/18xx/rails/ui/swing/elements
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18714/rails/ui/swing/elements

Added Files:
	CheckBoxDialog.java 
Log Message:
New dialog (added for destination reaching)

--- NEW FILE: CheckBoxDialog.java ---
/* $Header: /cvsroot/rails/18xx/rails/ui/swing/elements/CheckBoxDialog.java,v 1.1 2008/11/20 21:46:00 evos Exp $*/
package rails.ui.swing.elements;

import java.awt.*;
import java.awt.event.*;
import javax.swing.*;

import org.apache.log4j.Logger;

import rails.util.LocalText;

/**
 * A generic dialog for presenting choices by radio buttons.
 */
public class CheckBoxDialog extends JDialog implements ActionListener {

    private static final long serialVersionUID = 1L;
    GridBagConstraints gc;
    JPanel optionsPane, buttonPane;
    JButton okButton, cancelButton;
    JCheckBox[] checkBoxes;
    Dimension size, optSize;
    ButtonGroup group;

    String message;
    int numOptions;
    String[] options;
    boolean selectedOptions[];
    int chosenOption = -1;

    protected static Logger log =
            Logger.getLogger(CheckBoxDialog.class.getPackage().getName());

    public CheckBoxDialog(JComponent owner, String title, String message,
            String[] options) {
        this (owner, title, message, options, null);
    }
        
    public CheckBoxDialog(JComponent owner, String title, String message,
            String[] options, boolean[] selectedOptions) {
        super((Frame) null, title, true); // Modal !?
        this.message = message;
        this.options = options;
        this.numOptions = options.length;
        if (selectedOptions != null) {
            this.selectedOptions = selectedOptions;
        } else {
            this.selectedOptions = new boolean[numOptions];
        }

        initialize();
        pack();

        // Center on owner
        int x =
                (int) owner.getLocationOnScreen().getX()
                        + (owner.getWidth() - getWidth()) / 2;
        int y =
                (int) owner.getLocationOnScreen().getY()
                        + (owner.getHeight() - getHeight()) / 2;
        setLocation(x, y);

        this.setVisible(true);
    }

    private void initialize() {
        gc = new GridBagConstraints();

        optionsPane = new JPanel();
        buttonPane = new JPanel();

        okButton = new JButton(LocalText.getText("OK"));
        okButton.setMnemonic(KeyEvent.VK_O);
        okButton.addActionListener(this);
        buttonPane.add(okButton);

        cancelButton = new JButton(LocalText.getText("Cancel"));
        cancelButton.setMnemonic(KeyEvent.VK_C);
        cancelButton.addActionListener(this);
        buttonPane.add(cancelButton);

        checkBoxes = new JCheckBox[numOptions];

        this.getContentPane().setLayout(new GridBagLayout());
        this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);

        optionsPane.setLayout(new GridBagLayout());
        optionsPane.add(new JLabel(message), constraints(0, 0, 10, 10, 10, 10));

        checkBoxes = new JCheckBox[numOptions];

        for (int i = 0; i < numOptions; i++) {
            checkBoxes[i] =
                    new JCheckBox(options[i], selectedOptions[i]);
            optionsPane.add(checkBoxes[i], constraints(0, 1 + i, 0, 0, 0, 0));
            checkBoxes[i].setPreferredSize(size);
        }

        getContentPane().add(optionsPane, constraints(0, 0, 0, 0, 0, 0));
        getContentPane().add(buttonPane, constraints(0, 1, 0, 0, 0, 0));
    }

    private GridBagConstraints constraints(int gridx, int gridy, int leftinset,
            int topinset, int rightinset, int bottominset) {
        if (gridx >= 0) gc.gridx = gridx;
        if (gridy >= 0) gc.gridy = gridy;
        gc.fill = GridBagConstraints.BOTH;
        gc.weightx = 0.5;
        gc.weighty = 0.5;
        if (leftinset >= 0) gc.insets.left = leftinset;
        if (topinset >= 0) gc.insets.top = topinset;
        if (rightinset >= 0) gc.insets.right = rightinset;
        if (bottominset >= 0) gc.insets.bottom = bottominset;

        return gc;
    }

    public void actionPerformed(ActionEvent arg0) {
        if (arg0.getSource().equals(okButton)) {
            for (int i = 0; i < numOptions; i++) {
                selectedOptions[i] = checkBoxes[i].isSelected();
            }
        } else if (arg0.getSource().equals(cancelButton)) {
        }
        this.setVisible(false);
        this.dispose();

    }

    public boolean[] getSelectedOptions() {
        return selectedOptions;
    }
}

[Rails-commits] 18xx/data/1856 TileSet.xml,1.4,1.5

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

Update of /cvsroot/rails/18xx/data/1856
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18621/data/1856

Modified Files:
	TileSet.xml 
Log Message:
Fixed upgrade (and downgrade) rules.

Index: TileSet.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1856/TileSet.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TileSet.xml	24 Dec 2005 13:56:37 -0000	1.4
--- TileSet.xml	20 Nov 2008 21:44:46 -0000	1.5
***************
*** 29,42 ****
  	<!-- Yellow tiles -->
  	<Tile id="1" quantity="1">
! 		<Upgrade id="14" phase="5"/>
  	</Tile>
  	<Tile id="2" quantity="1">
! 		<Upgrade id="15" phase="5"/>
  	</Tile>
  	<Tile id="3" quantity="3">
! 		<Upgrade id="5,7" phase="5"/>
  	</Tile>
  	<Tile id="4" quantity="3">
! 		<Upgrade id="57,9" phase="5"/>
  	</Tile>
  	<Tile id="5" quantity="2">
--- 29,42 ----
  	<!-- Yellow tiles -->
  	<Tile id="1" quantity="1">
! 		<Upgrade id="14" phase="5,6"/>
  	</Tile>
  	<Tile id="2" quantity="1">
! 		<Upgrade id="15" phase="5,6"/>
  	</Tile>
  	<Tile id="3" quantity="3">
! 		<Upgrade id="5,7" phase="5,6"/>
  	</Tile>
  	<Tile id="4" quantity="3">
! 		<Upgrade id="57,9" phase="5,6"/>
  	</Tile>
  	<Tile id="5" quantity="2">
***************
*** 56,63 ****
  	</Tile>
  	<Tile id="55" quantity="1">
! 		<Upgrade id="14" phase="5"/>
  	</Tile>
  	<Tile id="56" quantity="1">
! 		<Upgrade id="15" phase="5"/>
  	</Tile>
  	<Tile id="57" quantity="4">
--- 56,63 ----
  	</Tile>
  	<Tile id="55" quantity="1">
! 		<Upgrade id="14" phase="5,6"/>
  	</Tile>
  	<Tile id="56" quantity="1">
! 		<Upgrade id="15" phase="5,6"/>
  	</Tile>
  	<Tile id="57" quantity="4">
***************
*** 65,69 ****
  	</Tile>
  	<Tile id="58" quantity="3">
! 		<Upgrade id="6,8" phase="5"/>
  	</Tile>
  	<Tile id="69" quantity="1" />
--- 65,69 ----
  	</Tile>
  	<Tile id="58" quantity="3">
! 		<Upgrade id="6,8" phase="5,6"/>
  	</Tile>
  	<Tile id="69" quantity="1" />
***************
*** 71,80 ****
  	<!-- Green tiles -->
  	<Tile id="14" quantity="4">
! 		<Upgrade id="63" />
! 		<Upgrade id="125" hexLabel="L"/>
  	</Tile>
  	<Tile id="15" quantity="4">
! 		<Upgrade id="63" />
! 		<Upgrade id="125" hexLabel="L"/>
  	</Tile>
  	<Tile id="16" quantity="1">
--- 71,80 ----
  	<!-- Green tiles -->
  	<Tile id="14" quantity="4">
! 		<Upgrade id="63" hex="D17,G12,H15,I8,J11,J13,J15,K8"/>
! 		<Upgrade id="125" hex="B19,C14,F17,L13,N3,O18,P9"/>
  	</Tile>
  	<Tile id="15" quantity="4">
! 		<Upgrade id="63" hex="D17,G12,H15,I8,J11,J13,J15,K8"/>
! 		<Upgrade id="125" hex="B19,C14,F17,L13,N3,O18,P9"/>
  	</Tile>
  	<Tile id="16" quantity="1">
***************
*** 115,119 ****
  	</Tile>
  	<Tile id="59" quantity="2">
! 		<Upgrade id="63,64,65,66,67,68" />
  	</Tile>
  	<Tile id="120" quantity="1">
--- 115,119 ----
  	</Tile>
  	<Tile id="59" quantity="2">
! 		<Upgrade id="64,65,66,67,68" />
  	</Tile>
  	<Tile id="120" quantity="1">
***************
*** 121,125 ****
  	</Tile>
  	<Tile id="121" quantity="2">
! 		<Upgrade id="126,127" />
  	</Tile>
  
--- 121,126 ----
  	</Tile>
  	<Tile id="121" quantity="2">
! 		<Upgrade id="126" hex="F15"/>
! 		<Upgrade id="127" hex="M4"/>
  	</Tile>
  
***************
*** 135,143 ****
  	<Tile id="47" quantity="2" />
  	<Tile id="63" quantity="4" />
! 	<Tile id="64" quantity="1" />
! 	<Tile id="65" quantity="1" />
! 	<Tile id="66" quantity="1" />
! 	<Tile id="67" quantity="1" />
! 	<Tile id="68" quantity="1" />
  	<Tile id="70" quantity="1" />
  	<Tile id="122" quantity="1">
--- 136,154 ----
  	<Tile id="47" quantity="2" />
  	<Tile id="63" quantity="4" />
! 	<Tile id="64" quantity="1">
! 		<Upgrade id="123" hex="L15"/>
! 	</Tile>
! 	<Tile id="65" quantity="1">
! 		<Upgrade id="123" hex="L15"/>
! 	</Tile>
! 	<Tile id="66" quantity="1">
! 		<Upgrade id="123" hex="L15"/>
! 	</Tile>
! 	<Tile id="67" quantity="1">
! 		<Upgrade id="123" hex="L15"/>
! 	</Tile>
! 	<Tile id="68" quantity="1">
! 		<Upgrade id="123" hex="L15"/>
! 	</Tile>
  	<Tile id="70" quantity="1" />
  	<Tile id="122" quantity="1">

[Rails-commits] 18xx/rails/ui/swing ReportWindow.java,1.5,1.6

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

Update of /cvsroot/rails/18xx/rails/ui/swing
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29795/rails/ui/swing

Modified Files:
	ReportWindow.java 
Log Message:
Improve display (Jonathan's fix)

Index: ReportWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ReportWindow.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ReportWindow.java	30 Jun 2008 20:35:29 -0000	1.5
--- ReportWindow.java	18 Nov 2008 22:12:50 -0000	1.6
***************
*** 33,36 ****
--- 33,38 ----
          message.setOpaque(true);
          message.setVerticalAlignment(SwingConstants.TOP);
+         message.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+ 
          messagePanel = new JPanel(new GridBagLayout());
          messageScroller =
***************
*** 48,54 ****
          setSize(400, 400);
          setLocation(600, 400);
- 
-         messagePanel.setBorder(BorderFactory.createEtchedBorder());
- 
          setTitle("Rails: Game log");
          addWindowListener(this);
--- 50,53 ----
***************
*** 63,67 ****
  
              messageWindow.message.setText(buffer.toString());
!             messageWindow.vbar.setValue(messageWindow.vbar.getMaximum());
          }
      }
--- 62,70 ----
  
              messageWindow.message.setText(buffer.toString());
!             SwingUtilities.invokeLater(new Runnable() {
!                 public void run() {
!                     messageWindow.vbar.setValue(messageWindow.vbar.getMaximum());
!                 }
!             });
          }
      }

[Rails-commits] 18xx/rails/game Tile.java,1.21,1.22

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

Update of /cvsroot/rails/18xx/rails/game
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31438/rails/game

Modified Files:
	Tile.java 
Log Message:
Removed dead code

Index: Tile.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Tile.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Tile.java	15 Nov 2008 13:41:11 -0000	1.21
--- Tile.java	15 Nov 2008 21:22:50 -0000	1.22
***************
*** 185,193 ****
              }
          }
-         /*
-          * if (stations != null) { for (Station station : stations) { List<Track>
-          * tt = tracksPerStation.get(station); if (tt == null) continue; // TODO
-          * Put tracks into stations? } }
-          */
  
          /* External (printed) id */
--- 185,188 ----
***************
*** 324,336 ****
  
      /**
-      * Is the tile layable now (in the current phase)?
-      * 
-      * @return
-      */
-     // public boolean isLayableNow() {
-     //    return GameManager.getInstance().getCurrentPhase().isTileColourAllowed(colourName);
-     //}
- 
-     /**
       * Get the valid upgrades if this tile on a certain hex (restrictions per
       * hex have not yet been implemented).
--- 319,322 ----

[Rails-commits] 18xx LocalisedText.properties,1.58,1.59

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

Update of /cvsroot/rails/18xx
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7662

Modified Files:
	LocalisedText.properties 
Log Message:
Added message "MayNotYetOperate" to signal 1856 condition

Index: LocalisedText.properties
===================================================================
RCS file: /cvsroot/rails/18xx/LocalisedText.properties,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** LocalisedText.properties	30 Oct 2008 21:48:20 -0000	1.58
--- LocalisedText.properties	15 Nov 2008 13:45:00 -0000	1.59
***************
*** 180,183 ****
--- 180,184 ----
  MARKET=Stock Market
  MayNotBuyAndSell={0} may not both buy and sell shares
+ MayNotYetOperate={0} may not yet operate: {1}% sold whereas {2}% required
  MergeMinorConfirm=Do you want to merge minor {0} to start company {1}?
  MERGE_MINOR_LOG={0} merges minor {1} into {2}, with {3} cash and {4} train(s)

[Rails-commits] 18xx/rails/game/specific/_1856 OperatingRound_1856.java, NONE, 1.1

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

Update of /cvsroot/rails/18xx/rails/game/specific/_1856
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7652/rails/game/specific/_1856

Added Files:
	OperatingRound_1856.java 
Log Message:
New class for specific first operation rules

--- NEW FILE: OperatingRound_1856.java ---
package rails.game.specific._1856;

import rails.game.DisplayBuffer;
import rails.game.OperatingRound;
import rails.game.TrainI;
import rails.game.TrainManager;
import rails.game.state.IntegerState;
import rails.util.LocalText;

public class OperatingRound_1856 extends OperatingRound {

    /** 
     * Implements special rules for first time operating in 1856
     */
    protected boolean setNextOperatingCompany(boolean initial) {
        
        
        if (operatingCompanyIndexObject == null) {
            operatingCompanyIndexObject =
                    new IntegerState("OperatingCompanyIndex");
        }
        
        while (true) {
            if (initial) {
                operatingCompanyIndexObject.set(0);
                initial = false;
            } else {
                operatingCompanyIndexObject.add(1);
            }
            
            operatingCompanyIndex = operatingCompanyIndexObject.intValue();
            
            if (operatingCompanyIndex >= operatingCompanyArray.length) {
                return false;
            } else {
                operatingCompany = operatingCompanyArray[operatingCompanyIndex];
                
                // 1856 special: check if the company may operate
                if (!operatingCompany.hasOperated()) {
                    int soldPercentage 
                        = 100 - operatingCompany.getUnsoldPercentage();
                    
                    TrainI nextAvailableTrain = TrainManager.get().getAvailableNewTrains().get(0);
                    int trainNumber;
                    try { 
                        trainNumber = Integer.parseInt(nextAvailableTrain.getName());
                    } catch (NumberFormatException e) {
                        trainNumber = 6; // Diesel!
                    }
                    int floatPercentage = 10 * trainNumber;
                    
                    log.debug ("Float percentage is "+floatPercentage
                            +" sold percentage is "+soldPercentage);
                    

                    if (soldPercentage < floatPercentage) {
                        DisplayBuffer.add(LocalText.getText("MayNotYetOperate", new String[] {
                                operatingCompany.getName(),
                                String.valueOf(soldPercentage),
                                String.valueOf(floatPercentage)
                        }));
                        // Company may not yet operate
                        continue;
                    }
                    
                }
                return true;
            }
        }
    }

}

[Rails-commits] 18xx/rails/game OperatingRound.java,1.42,1.43

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

Update of /cvsroot/rails/18xx/rails/game
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7613/rails/game

Modified Files:
	OperatingRound.java 
Log Message:
New setNextOperatingCompany method & some refactoring to allow specific 1856 rules in a subclass

Index: OperatingRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** OperatingRound.java	26 Oct 2008 20:47:37 -0000	1.42
--- OperatingRound.java	15 Nov 2008 13:43:38 -0000	1.43
***************
*** 130,137 ****
      public void start(boolean operate, String orNumber) {
  
!         if (operatingCompanyIndexObject == null) {
!             operatingCompanyIndexObject =
!                     new IntegerState("OperatingCompanyIndex", 0);
!         }
  
          if (players == null) {
--- 130,137 ----
      public void start(boolean operate, String orNumber) {
  
!         //if (operatingCompanyIndexObject == null) {
!         //    operatingCompanyIndexObject =
!         //            new IntegerState("OperatingCompanyIndex", 0);
!         //}
  
          if (players == null) {
***************
*** 153,163 ****
              if (operatingCompanyArray.length > 0) {
                  gameManager.setRound(this);
-                 operatingCompanyIndex = operatingCompanyIndexObject.intValue();
-                 operatingCompany = operatingCompanyArray[operatingCompanyIndex];
  
!                 setStep(STEP_INITIAL);
              }
  
-             return;
          }
  
--- 153,163 ----
              if (operatingCompanyArray.length > 0) {
                  gameManager.setRound(this);
  
!                 if (setNextOperatingCompany(true)) {
!                     setStep(STEP_INITIAL);
!                     return;
!                 }
              }
  
          }
  
***************
*** 321,325 ****
              if (tile == null) break;
  
!             if (!tile.isLayableNow()) {
                  errMsg =
                          LocalText.getText("TileNotYetAvailable",
--- 321,326 ----
              if (tile == null) break;
  
!             //if (!tile.isLayableNow()) {
!             if (!currentPhase.isTileColourAllowed(tile.getColourName())) {
                  errMsg =
                          LocalText.getText("TileNotYetAvailable",
***************
*** 1122,1136 ****
          }
          
!         if (operatingCompanyIndex >= operatingCompanyArray.length - 1) {
  
              finishOR();
! 
          } else {
- 
              operatingCompanyIndexObject.add(1);
!             operatingCompanyIndex = operatingCompanyIndexObject.intValue();
              operatingCompany = operatingCompanyArray[operatingCompanyIndex];
! 
!             setStep(STEP_INITIAL);
          }
      }
--- 1123,1154 ----
          }
          
!         if (setNextOperatingCompany(false)) {
  
+             setStep(STEP_INITIAL);
+         } else {
              finishOR();
!         }
!     }
!     
!     protected boolean setNextOperatingCompany(boolean initial) {
!         
!         
!         if (operatingCompanyIndexObject == null) {
!             operatingCompanyIndexObject =
!                     new IntegerState("OperatingCompanyIndex");
!         }
!         if (initial) {
!             operatingCompanyIndexObject.set(0);
          } else {
              operatingCompanyIndexObject.add(1);
!         }
!         
!         operatingCompanyIndex = operatingCompanyIndexObject.intValue();
!         
!         if (operatingCompanyIndex >= operatingCompanyArray.length) {
!             return false;
!         } else {
              operatingCompany = operatingCompanyArray[operatingCompanyIndex];
!             return true;
          }
      }

[Rails-commits] 18xx/rails/game PublicCompanyI.java, 1.23, 1.24 PublicCompany.java, 1.41, 1.42

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

Update of /cvsroot/rails/18xx/rails/game
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7577/rails/game

Modified Files:
	PublicCompanyI.java PublicCompany.java 
Log Message:
Added destination reached condition

Index: PublicCompany.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCompany.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** PublicCompany.java	2 Nov 2008 20:04:26 -0000	1.41
--- PublicCompany.java	15 Nov 2008 13:42:27 -0000	1.42
***************
*** 56,59 ****
--- 56,60 ----
      /** Destination hex * */
      protected MapHex destinationHex = null;
+     protected BooleanState hasReachedDestination = null;
  
      /** Sequence number in the array of public companies - may not be useful */
***************
*** 278,281 ****
--- 279,283 ----
              if (hex != null) {
                  destinationHex = hex;
+                 hasReachedDestination = new BooleanState (name+"_reachedDestination", false); 
              } else {
                  throw new ConfigurationException("Invalid destination hex "
***************
*** 698,701 ****
--- 700,716 ----
          return destinationHex;
      }
+     
+     public boolean hasDestination () {
+         return destinationHex != null;
+     }
+     
+     public boolean hasReachedDestination() {
+         return hasReachedDestination != null &&
+             hasReachedDestination.booleanValue();
+     }
+     
+     public void setReachedDestination (boolean value) {
+         hasReachedDestination.set(value);
+     }
  
      /**

Index: PublicCompanyI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCompanyI.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** PublicCompanyI.java	2 Nov 2008 20:04:26 -0000	1.23
--- PublicCompanyI.java	15 Nov 2008 13:42:27 -0000	1.24
***************
*** 329,333 ****
  
      public MapHex getDestinationHex();
! 
      public int getNumberOfTileLays(String tileColour);
  
--- 329,336 ----
  
      public MapHex getDestinationHex();
!     public boolean hasDestination ();
!     public boolean hasReachedDestination();
!     public void setReachedDestination (boolean value);
!     
      public int getNumberOfTileLays(String tileColour);
  

[Rails-commits] 18xx/data/1856 Game.xml,1.19,1.20

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

Update of /cvsroot/rails/18xx/data/1856
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7547/data/1856

Modified Files:
	Game.xml 
Log Message:
Added custom OperatingRound

Index: Game.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1856/Game.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Game.xml	5 Nov 2008 22:44:27 -0000	1.19
--- Game.xml	15 Nov 2008 13:41:48 -0000	1.20
***************
*** 5,8 ****
--- 5,9 ----
  		<StockRound class="rails.game.specific._1856.StockRound_1856" 
  			sequence="SellBuyOrBuySell"/>
+ 		<OperatingRound class="rails.game.specific._1856.OperatingRound_1856"/>
  		<PlayerShareLimit percentage="60"/>
  		<BankPoolLimit percentage="50"/>

[Rails-commits] 18xx/rails/game TileI.java, 1.11, 1.12 Tile.java, 1.20, 1.21

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

Update of /cvsroot/rails/18xx/rails/game
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7515/rails/game

Modified Files:
	TileI.java Tile.java 
Log Message:
Removed isLayableNow()

Index: TileI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/TileI.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TileI.java	4 Jun 2008 19:00:32 -0000	1.11
--- TileI.java	15 Nov 2008 13:41:11 -0000	1.12
***************
*** 39,43 ****
      public boolean isUpgradeable();
  
!     public boolean isLayableNow();
  
      public List<TileI> getUpgrades(MapHex hex);
--- 39,43 ----
      public boolean isUpgradeable();
  
!     //public boolean isLayableNow();
  
      public List<TileI> getUpgrades(MapHex hex);

Index: Tile.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Tile.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Tile.java	30 Jun 2008 20:35:29 -0000	1.20
--- Tile.java	15 Nov 2008 13:41:11 -0000	1.21
***************
*** 328,334 ****
       * @return
       */
!     public boolean isLayableNow() {
!         return GameManager.getInstance().getCurrentPhase().isTileColourAllowed(colourName);
!     }
  
      /**
--- 328,334 ----
       * @return
       */
!     // public boolean isLayableNow() {
!     //    return GameManager.getInstance().getCurrentPhase().isTileColourAllowed(colourName);
!     //}
  
      /**

[Rails-commits] 18xx/data/1856 Map.xml,1.9,1.10

[Mark J S. <kr...@us...>]

Update of /cvsroot/rails/18xx/data/1856
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18856/18xx/data/1856

Modified Files:
	Map.xml 
Log Message:
Corrected starting orientation of Tile on B13 - Sarnia

Index: Map.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1856/Map.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Map.xml	3 Nov 2008 15:55:00 -0000	1.9
--- Map.xml	7 Nov 2008 01:20:12 -0000	1.10
***************
*** 1,5 ****
  <Map mapClass="rails.ui.swing.hexmap.NSHexMap" tileOrientation="NS" letterOrientation="horizontal" even="A">
  	<Hex name="A20" tile="-902" value="30,50,60" city="Detroit/Windsor"/>
! 	<Hex name="B13" tile="-902" value="30,50,50" city="Sarnia"/>
  	<Hex name="B15" tile="0"/>
  	<Hex name="B17" tile="0"/>
--- 1,5 ----
  <Map mapClass="rails.ui.swing.hexmap.NSHexMap" tileOrientation="NS" letterOrientation="horizontal" even="A">
  	<Hex name="A20" tile="-902" value="30,50,60" city="Detroit/Windsor"/>
! 	<Hex name="B13" tile="-902" orientation="1" value="30,50,50" city="Sarnia"/>
  	<Hex name="B15" tile="0"/>
  	<Hex name="B17" tile="0"/>

[Rails-commits] 18xx/rails/ui/swing/hexmap GUIHex.java,1.18,1.19

[Mark J S. <kr...@us...>]

Update of /cvsroot/rails/18xx/rails/ui/swing/hexmap
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17162/18xx/rails/ui/swing/hexmap

Modified Files:
	GUIHex.java 
Log Message:
When drawing Blocked Hexes for Privates, tested to be sure there are blocked entries in the list. Not all Privates Block Hexes. This Fixes the 1856 Map Drawing Issue

Index: GUIHex.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/GUIHex.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** GUIHex.java	4 Jun 2008 19:00:38 -0000	1.18
--- GUIHex.java	7 Nov 2008 00:52:11 -0000	1.19
***************
*** 320,336 ****
              for (PrivateCompanyI p : privates) {
                  List<MapHex> blocked = p.getBlockedHexes();
!                 for (MapHex hex : blocked) {
!                     if (getHexModel().equals(hex)) {
!                         g2.drawString(
!                                 "(" + p.getName() + ")",
!                                 rectBound.x
!                                         + (rectBound.width - fontMetrics.stringWidth("("
!                                                                                      + p.getName()
!                                                                                      + ")"))
!                                         * 1 / 2,
!                                 rectBound.y
!                                         + ((fontMetrics.getHeight() + rectBound.height) * 7 / 15));
!                     }
!                 }
              }
          }
--- 320,338 ----
              for (PrivateCompanyI p : privates) {
                  List<MapHex> blocked = p.getBlockedHexes();
! 				if (blocked != null) {
! 					for (MapHex hex : blocked) {
! 						if (getHexModel().equals(hex)) {
! 							g2.drawString(
! 										  "(" + p.getName() + ")",
! 										  rectBound.x
! 										  + (rectBound.width - fontMetrics.stringWidth("("
! 																					   + p.getName()
! 																					   + ")"))
! 										  * 1 / 2,
! 										  rectBound.y
! 										  + ((fontMetrics.getHeight() + rectBound.height) * 7 / 15));
! 						}
! 					}
! 				}
              }
          }

[Rails-commits] 18xx/data/1856 Game.xml,1.18,1.19

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

Update of /cvsroot/rails/18xx/data/1856
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26416/data/1856

Modified Files:
	Game.xml 
Log Message:
Fixed 1856 float percentage (was incorrectly linked to phase rather than next available train)

Index: Game.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1856/Game.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Game.xml	3 Nov 2008 15:55:00 -0000	1.18
--- Game.xml	5 Nov 2008 22:44:27 -0000	1.19
***************
*** 49,53 ****
  			<OperatingRounds number="1"/>
  			<Trains tradingAllowed="yes"/>
- 			<Parameters floatPercentage="20"/>
  		</Phase>
  		<Phase name="2">
--- 49,52 ----
***************
*** 55,63 ****
  			<OperatingRounds number="2"/>
  			<Privates sellingAllowed="yes"/>
- 			<Parameters floatPercentage="30"/>
  		</Phase>
  		<Phase name="3">
  			<Tiles colour="yellow,green"/>
- 			<Parameters floatPercentage="40"/>
  		</Phase>
  		<Phase name="4">
--- 54,60 ----
***************
*** 66,74 ****
  			<Privates close="yes"/>
  			<OffBoardRevenue step="2"/>
- 			<Parameters floatPercentage="50"/>
  		</Phase>
  		<Phase name="5">
  			<Tiles colour="yellow,green,brown,grey"/>
- 			<Parameters floatPercentage="60"/>
  		</Phase>
  		<Phase name="6">
--- 63,69 ----

[Rails-commits] 18xx/rails/game/specific/_1856 StockRound_1856.java, 1.1, 1.2

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

Update of /cvsroot/rails/18xx/rails/game/specific/_1856
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26416/rails/game/specific/_1856

Modified Files:
	StockRound_1856.java 
Log Message:
Fixed 1856 float percentage (was incorrectly linked to phase rather than next available train)

Index: StockRound_1856.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/StockRound_1856.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StockRound_1856.java	3 Nov 2008 15:55:00 -0000	1.1
--- StockRound_1856.java	5 Nov 2008 22:44:26 -0000	1.2
***************
*** 3,6 ****
--- 3,8 ----
  import rails.game.PublicCompanyI;
  import rails.game.StockRound;
+ import rails.game.TrainI;
+ import rails.game.TrainManager;
  
  public class StockRound_1856 extends StockRound {
***************
*** 16,26 ****
  
          int unsoldPercentage = company.getUnsoldPercentage();
-         int floatPercentage = getCurrentPhase().getParameterAsInteger("floatPercentage");
          
!         if (floatPercentage == 0) {
!             log.error ("FloatPercentage is null!");
!         } else {
!             log.debug ("Floatpercentage is "+floatPercentage);
          }
          
          //int floatPercentage = Math.min(60, (Integer)getCurrentPhase().getParameter("floatPercentage"));
--- 18,32 ----
  
          int unsoldPercentage = company.getUnsoldPercentage();
          
!         TrainI nextAvailableTrain = TrainManager.get().getAvailableNewTrains().get(0);
!         int trainNumber;
!         try { 
!             trainNumber = Integer.parseInt(nextAvailableTrain.getName());
!         } catch (NumberFormatException e) {
!             trainNumber = 6; // Diesel!
          }
+         int floatPercentage = 10 * trainNumber;
+         
+         log.debug ("Floatpercentage is "+floatPercentage);
          
          //int floatPercentage = Math.min(60, (Integer)getCurrentPhase().getParameter("floatPercentage"));

[Rails-commits] 18xx/rails/game Phase.java, 1.8, 1.9 PhaseI.java, 1.5, 1.6

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

Update of /cvsroot/rails/18xx/rails/game
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17514/rails/game

Modified Files:
	Phase.java PhaseI.java 
Log Message:
Implemented varying flotation percentage for 1856.
New generic Parameter property map in Phase.

Index: Phase.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Phase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Phase.java	4 Jun 2008 19:00:31 -0000	1.8
--- Phase.java	3 Nov 2008 15:55:00 -0000	1.9
***************
*** 42,45 ****
--- 42,50 ----
      /** Items to close if a phase gets activated */
      protected List<Closeable> closedObjects = null;
+     
+     /** A HashMap to contain phase-dependent parameters
+      * by name and value.
+      */
+     protected Map<String, String> parameters = null;
  
      // protected static boolean previousPrivateSellingAllowed = false;
***************
*** 66,69 ****
--- 71,80 ----
              oneTrainPerTurn = defaults.oneTrainPerTurn;
              oneTrainPerTypePerTurn = defaults.oneTrainPerTypePerTurn;
+             if (defaults.parameters != null) {
+                 this.parameters = new HashMap<String, String>();
+                 for (String key : defaults.parameters.keySet()) {
+                     parameters.put(key, defaults.parameters.get(key));
+                 }
+             }
          }
  
***************
*** 119,122 ****
--- 130,142 ----
                              oneTrainPerTypePerTurn);
          }
+         
+         Tag parameterTag = tag.getChild("Parameters");
+         if (parameterTag != null) {
+             if (parameters == null) parameters = new HashMap<String, String>();
+             Map<String,String> attributes = parameterTag.getAttributes();
+             for (String key : attributes.keySet()) {
+                 parameters.put (key, attributes.get(key));
+             }
+         }
      }
  
***************
*** 191,194 ****
--- 211,236 ----
          closedObjects.add(object);
      }
+     
+     public String getParameterAsString (String key) {
+         if (parameters != null) {
+             return parameters.get(key);
+         } else {
+             return null;
+         }
+     }
+     
+     public int getParameterAsInteger (String key) {
+         String stringValue = getParameterAsString(key);
+         if (stringValue == null) {
+             return 0;
+         }
+         try {
+             return Integer.parseInt(stringValue);
+         } catch (Exception e) {
+             log.error ("Error while parsing parameter "+key+" in phase "+name, e);
+             return 0;
+         }
+ 
+     }
  
      public String toString() {

Index: PhaseI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PhaseI.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PhaseI.java	4 Jun 2008 19:00:30 -0000	1.5
--- PhaseI.java	3 Nov 2008 15:55:00 -0000	1.6
***************
*** 29,31 ****
--- 29,34 ----
  
      public int getOffBoardRevenueStep();
+ 
+     public String getParameterAsString (String key);
+     public int getParameterAsInteger (String key);
  }

[Rails-commits] 18xx/data/1856 CompanyManager.xml, 1.21, 1.22 Map.xml, 1.8, 1.9 Game.xml, 1.17, 1.18

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

Update of /cvsroot/rails/18xx/data/1856
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17514/data/1856

Modified Files:
	CompanyManager.xml Map.xml Game.xml 
Log Message:
Implemented varying flotation percentage for 1856.
New generic Parameter property map in Phase.

Index: CompanyManager.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1856/CompanyManager.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** CompanyManager.xml	28 Oct 2008 21:01:34 -0000	1.21
--- CompanyManager.xml	3 Nov 2008 15:55:00 -0000	1.22
***************
*** 6,13 ****
      <CanBuyPrivates lowerPriceFactor="0.5" upperPriceFactor="2.0"/>
      <PoolPaysOut/>
-     <Float percentage="30"/><!-- Should be variable-->
      <ShareUnit percentage="10"/>
      <Certificate type="President" shares="2"/>
      <Certificate shares="1" number="8"/>
  	<BaseTokens>
  		<LayCost method="sequence" cost="0,40,100"/>
--- 6,13 ----
      <CanBuyPrivates lowerPriceFactor="0.5" upperPriceFactor="2.0"/>
      <PoolPaysOut/>
      <ShareUnit percentage="10"/>
      <Certificate type="President" shares="2"/>
      <Certificate shares="1" number="8"/>
+ 	<Capitalisation type="incremental"/>
  	<BaseTokens>
  		<LayCost method="sequence" cost="0,40,100"/>

Index: Map.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1856/Map.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Map.xml	6 Mar 2008 21:52:10 -0000	1.8
--- Map.xml	3 Nov 2008 15:55:00 -0000	1.9
***************
*** 1,4 ****
  <Map mapClass="rails.ui.swing.hexmap.NSHexMap" tileOrientation="NS" letterOrientation="horizontal" even="A">
- 	<!-- To be added: tiles, orientation, impassable hex sides, etc.-->
  	<Hex name="A20" tile="-902" value="30,50,60" city="Detroit/Windsor"/>
  	<Hex name="B13" tile="-902" value="30,50,50" city="Sarnia"/>
--- 1,3 ----

Index: Game.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1856/Game.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Game.xml	11 Dec 2007 20:58:35 -0000	1.17
--- Game.xml	3 Nov 2008 15:55:00 -0000	1.18
***************
*** 3,6 ****
--- 3,8 ----
  	<Component name="GameManager" class="rails.game.GameManager">
  		<Game name="1856"/>
+ 		<StockRound class="rails.game.specific._1856.StockRound_1856" 
+ 			sequence="SellBuyOrBuySell"/>
  		<PlayerShareLimit percentage="60"/>
  		<BankPoolLimit percentage="50"/>
***************
*** 47,50 ****
--- 49,53 ----
  			<OperatingRounds number="1"/>
  			<Trains tradingAllowed="yes"/>
+ 			<Parameters floatPercentage="20"/>
  		</Phase>
  		<Phase name="2">
***************
*** 52,58 ****
--- 55,63 ----
  			<OperatingRounds number="2"/>
  			<Privates sellingAllowed="yes"/>
+ 			<Parameters floatPercentage="30"/>
  		</Phase>
  		<Phase name="3">
  			<Tiles colour="yellow,green"/>
+ 			<Parameters floatPercentage="40"/>
  		</Phase>
  		<Phase name="4">
***************
*** 61,67 ****
--- 66,74 ----
  			<Privates close="yes"/>
  			<OffBoardRevenue step="2"/>
+ 			<Parameters floatPercentage="50"/>
  		</Phase>
  		<Phase name="5">
  			<Tiles colour="yellow,green,brown,grey"/>
+ 			<Parameters floatPercentage="60"/>
  		</Phase>
  		<Phase name="6">

[Rails-commits] 18xx/rails/game/specific/_1856 StockRound_1856.java, NONE, 1.1

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

Update of /cvsroot/rails/18xx/rails/game/specific/_1856
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17514/rails/game/specific/_1856

Added Files:
	StockRound_1856.java 
Log Message:
Implemented varying flotation percentage for 1856.
New generic Parameter property map in Phase.

--- NEW FILE: StockRound_1856.java ---
package rails.game.specific._1856;

import rails.game.PublicCompanyI;
import rails.game.StockRound;

public class StockRound_1856 extends StockRound {

    /**
     * Special 1856 code to check for company flotation.
     * 
     * @param company
     */
    protected void checkFlotation(PublicCompanyI company) {

        if (!company.hasStarted() || company.hasFloated()) return;

        int unsoldPercentage = company.getUnsoldPercentage();
        int floatPercentage = getCurrentPhase().getParameterAsInteger("floatPercentage");
        
        if (floatPercentage == 0) {
            log.error ("FloatPercentage is null!");
        } else {
            log.debug ("Floatpercentage is "+floatPercentage);
        }
        
        //int floatPercentage = Math.min(60, (Integer)getCurrentPhase().getParameter("floatPercentage"));

        if (unsoldPercentage <= 100 - floatPercentage) {
            // Company floats
            floatCompany(company);
        }
    }

}

[Rails-commits] 18xx/rails/game/specific/_1856 - New directory

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

Update of /cvsroot/rails/18xx/rails/game/specific/_1856
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17475/rails/game/specific/_1856

Log Message:
Directory /cvsroot/rails/18xx/rails/game/specific/_1856 added to the repository

[Rails-commits] 18xx/rails/game PublicCompanyI.java, 1.22, 1.23 PublicCompany.java, 1.40, 1.41 StockMarket.java, 1.12, 1.13

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

Update of /cvsroot/rails/18xx/rails/game
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8506/rails/game

Modified Files:
	PublicCompanyI.java PublicCompany.java StockMarket.java 
Log Message:
Renamed setParPrice and setCurrentPrice

Index: StockMarket.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockMarket.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** StockMarket.java	2 Nov 2008 19:52:48 -0000	1.12
--- StockMarket.java	2 Nov 2008 20:04:26 -0000	1.13
***************
*** 307,311 ****
  
          }
!         company.setCurrentPrice(to);
          new PriceTokenMove(company, from, to);
      }
--- 307,311 ----
  
          }
!         company.setCurrentSpace(to);
          new PriceTokenMove(company, from, to);
      }

Index: PublicCompany.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCompany.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** PublicCompany.java	2 Nov 2008 19:52:48 -0000	1.40
--- PublicCompany.java	2 Nov 2008 20:04:26 -0000	1.41
***************
*** 716,720 ****
      public void start(StockSpaceI startSpace) {
          hasStarted.set(true);
!         setParPrice(startSpace);
          // The current price is set via the Stock Market
          StockMarket.getInstance().start(this, startSpace);
--- 716,720 ----
      public void start(StockSpaceI startSpace) {
          hasStarted.set(true);
!         setParSpace(startSpace);
          // The current price is set via the Stock Market
          StockMarket.getInstance().start(this, startSpace);
***************
*** 867,871 ****
       * @param spaceI
       */
!     public void setParPrice(StockSpaceI space) {
          if (hasStockPrice) {
              if (space != null) {
--- 867,871 ----
       * @param spaceI
       */
!     public void setParSpace(StockSpaceI space) {
          if (hasStockPrice) {
              if (space != null) {
***************
*** 915,919 ****
       * stock market.
       */
!     public void setCurrentPrice(StockSpaceI price) {
          if (price != null) {
              currentPrice.setPrice(price);
--- 915,919 ----
       * stock market.
       */
!     public void setCurrentSpace(StockSpaceI price) {
          if (price != null) {
              currentPrice.setPrice(price);

Index: PublicCompanyI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCompanyI.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** PublicCompanyI.java	2 Nov 2008 19:52:48 -0000	1.22
--- PublicCompanyI.java	2 Nov 2008 20:04:26 -0000	1.23
***************
*** 108,112 ****
       */
  
!     public void setParPrice(StockSpaceI parPrice);
  
      /**
--- 108,112 ----
       */
  
!     public void setParSpace(StockSpaceI parPrice);
  
      /**
***************
*** 124,128 ****
       * stock market.
       */
!     public void setCurrentPrice(StockSpaceI price);
  
      /**
--- 124,128 ----
       * stock market.
       */
!     public void setCurrentSpace(StockSpaceI price);
  
      /**

[Rails-commits] 18xx/rails/game Portfolio.java, 1.27, 1.28 PublicCompanyI.java, 1.21, 1.22 StartRound.java, 1.19, 1.20 StockRound.java, 1.30, 1.31 ShareSellingRound.java, 1.13, 1.14 StockMarket.java, 1.11, 1.12 PublicCertificate.java, 1.10, 1.11 PublicCertificateI.java, 1.8, 1.9 StartItem.java, 1.11, 1.12 Round.java, 1.10, 1.11 PublicCompany.java, 1.39, 1.40 TreasuryShareRound.java, 1.6, 1.7 Player.java, 1.13, 1.14

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

Update of /cvsroot/rails/18xx/rails/game
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7890/rails/game

Modified Files:
	Portfolio.java PublicCompanyI.java StartRound.java 
	StockRound.java ShareSellingRound.java StockMarket.java 
	PublicCertificate.java PublicCertificateI.java StartItem.java 
	Round.java PublicCompany.java TreasuryShareRound.java 
	Player.java 
Log Message:
Reorganized "getPrice" methods of PublicCompany.

Index: Portfolio.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Portfolio.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Portfolio.java	28 Oct 2008 21:01:34 -0000	1.27
--- Portfolio.java	2 Nov 2008 19:52:48 -0000	1.28
***************
*** 338,342 ****
              comp = cert.getCompany();
              if (!comp.hasFloated() || !comp.hasStockPrice()
!                 || !cert.getCompany().getCurrentPrice().isNoCertLimit())
                  number++;
          }
--- 338,342 ----
              comp = cert.getCompany();
              if (!comp.hasFloated() || !comp.hasStockPrice()
!                 || !cert.getCompany().getCurrentSpace().isNoCertLimit())
                  number++;
          }

Index: TreasuryShareRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/TreasuryShareRound.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TreasuryShareRound.java	8 Jul 2008 19:54:08 -0000	1.6
--- TreasuryShareRound.java	2 Nov 2008 19:52:48 -0000	1.7
***************
*** 136,141 ****
              if (number == 0) continue;
  
!             stockSpace = comp.getCurrentPrice();
!             price = stockSpace.getPrice();
  
              // Does the company have enough cash?
--- 136,141 ----
              if (number == 0) continue;
  
!             //stockSpace = comp.getCurrentSpace();
!             price = comp.getMarketPrice();
  
              // Does the company have enough cash?
***************
*** 228,232 ****
                  price = (sellPrices.get(compName)).getPrice();
              } else {
!                 price = company.getCurrentPrice().getPrice();
              }
  
--- 228,232 ----
                  price = (sellPrices.get(compName)).getPrice();
              } else {
!                 price = company.getMarketPrice();
              }
  
***************
*** 333,339 ****
              StockSpaceI currentSpace;
              // TODO NEVER A PAR PRICE ?
!             currentSpace = company.getCurrentPrice();
  
!             price = currentSpace.getPrice();
  
              // Check if the Player has the money.
--- 333,339 ----
              StockSpaceI currentSpace;
              // TODO NEVER A PAR PRICE ?
!             //currentSpace = company.getCurrentSpace();
  
!             price = company.getMarketPrice();
  
              // Check if the Player has the money.
***************
*** 479,483 ****
              price = (sellPrices.get(companyName)).getPrice();
          } else {
!             sellPrice = company.getCurrentPrice();
              price = sellPrice.getPrice();
              sellPrices.put(companyName, sellPrice);
--- 479,483 ----
              price = (sellPrices.get(companyName)).getPrice();
          } else {
!             sellPrice = company.getCurrentSpace();
              price = sellPrice.getPrice();
              sellPrices.put(companyName, sellPrice);

Index: StartItem.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StartItem.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** StartItem.java	4 Jun 2008 19:00:30 -0000	1.11
--- StartItem.java	2 Nov 2008 19:52:48 -0000	1.12
***************
*** 459,463 ****
          if (!company.hasStockPrice()) return null;
  
!         if (company.getParPrice() != null) return null;
  
          return company;
--- 459,463 ----
          if (!company.hasStockPrice()) return null;
  
!         if (company.getIPOPrice() != 0) return null;
  
          return company;

Index: PublicCompany.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCompany.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** PublicCompany.java	30 Oct 2008 21:48:20 -0000	1.39
--- PublicCompany.java	2 Nov 2008 19:52:48 -0000	1.40
***************
*** 881,885 ****
       * the stock chart.
       */
!     public StockSpaceI getParPrice() {
          if (hasParPrice) {
              return parPrice != null ? parPrice.getPrice() : null;
--- 881,885 ----
       * the stock chart.
       */
!     public StockSpaceI getStartSpace() {
          if (hasParPrice) {
              return parPrice != null ? parPrice.getPrice() : null;
***************
*** 888,891 ****
--- 888,911 ----
          }
      }
+     
+     public int getIPOPrice () {
+         if (hasParPrice) {
+             if (getStartSpace() != null) {
+                 return getStartSpace().getPrice();
+             } else {
+                 return 0;
+             }
+         } else {
+             return getMarketPrice();
+         }
+     }
+     
+     public int getMarketPrice () {
+         if (getCurrentSpace() != null) {
+             return getCurrentSpace().getPrice();
+         } else {
+             return 0;
+         }
+     }
  
      /**
***************
*** 918,922 ****
       * stock market.
       */
!     public StockSpaceI getCurrentPrice() {
          return currentPrice != null ? currentPrice.getPrice() : null;
      }
--- 938,942 ----
       * stock market.
       */
!     public StockSpaceI getCurrentSpace() {
          return currentPrice != null ? currentPrice.getPrice() : null;
      }

Index: StartRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StartRound.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** StartRound.java	10 Oct 2008 19:56:30 -0000	1.19
--- StartRound.java	2 Nov 2008 19:52:48 -0000	1.20
***************
*** 275,280 ****
                          // User has told us the start price
                          comp.start(sharePrice);
!                     } else if (comp.getParPrice() != null) {
!                         // Company has a fixed start price
                          comp.start();
                      } else {
--- 275,280 ----
                          // User has told us the start price
                          comp.start(sharePrice);
!                     } else if (comp.getIPOPrice() != 0) {
!                         // Company has a known start price
                          comp.start();
                      } else {

Index: Player.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Player.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Player.java	12 Oct 2008 14:36:44 -0000	1.13
--- Player.java	2 Nov 2008 19:52:48 -0000	1.14
***************
*** 135,145 ****
      }
  
      public void buyShare(PublicCertificate share) throws NullPointerException {
          try {
!             buyShare(share, share.getCompany().getCurrentPrice().getPrice());
          } catch (NullPointerException e) {
              throw e;
          }
      }
  
      public boolean isOverLimits() {
--- 135,147 ----
      }
  
+     /*
      public void buyShare(PublicCertificate share) throws NullPointerException {
          try {
!             buyShare(share, share.getCompany().getCurrentSpace().getPrice());
          } catch (NullPointerException e) {
              throw e;
          }
      }
+     */
  
      public boolean isOverLimits() {
***************
*** 166,170 ****
       */
      public boolean mayBuyCertificate(PublicCompanyI comp, int number) {
!         if (comp.hasFloated() && comp.getCurrentPrice().isNoCertLimit())
              return true;
          if (portfolio.getNumberOfCountedCertificates() + number > playerCertificateLimit)
--- 168,172 ----
       */
      public boolean mayBuyCertificate(PublicCompanyI comp, int number) {
!         if (comp.hasFloated() && comp.getCurrentSpace().isNoCertLimit())
              return true;
          if (portfolio.getNumberOfCountedCertificates() + number > playerCertificateLimit)
***************
*** 185,189 ****
          // Check for per-company share limit
          if (portfolio.getShare(company) + number * company.getShareUnit() > playerShareLimit
!             && !company.getCurrentPrice().isNoHoldLimit()) return false;
          return true;
      }
--- 187,191 ----
          // Check for per-company share limit
          if (portfolio.getShare(company) + number * company.getShareUnit() > playerShareLimit
!             && !company.getCurrentSpace().isNoHoldLimit()) return false;
          return true;
      }
***************
*** 209,213 ****
          } else {
              limit =
!                     company.getCurrentPrice().isNoHoldLimit() ? 100
                              : playerShareLimit;
          }
--- 211,215 ----
          } else {
              limit =
!                     company.getCurrentSpace().isNoHoldLimit() ? 100
                              : playerShareLimit;
          }
***************
*** 234,243 ****
      }
  
      public int sellShare(PublicCertificate share) {
          Portfolio.sellCertificate(share, portfolio,
!                 share.getCompany().getCurrentPrice().getPrice());
          Game.getStockMarket().sell(share.getCompany(), 1);
          return 1;
      }
  
      /**
--- 236,247 ----
      }
  
+     /*
      public int sellShare(PublicCertificate share) {
          Portfolio.sellCertificate(share, portfolio,
!                 share.getCompany().getCurrentSpace().getPrice());
          Game.getStockMarket().sell(share.getCompany(), 1);
          return 1;
      }
+     */
  
      /**
***************
*** 284,288 ****
  
          for (PublicCertificateI cert : portfolio.getCertificates()) {
!             worth += cert.getCertificatePrice();
          }
          for (PrivateCompanyI priv : portfolio.getPrivateCompanies()) {
--- 288,292 ----
  
          for (PublicCertificateI cert : portfolio.getCertificates()) {
!             worth += cert.getCompany().getMarketPrice();
          }
          for (PrivateCompanyI priv : portfolio.getPrivateCompanies()) {

Index: PublicCertificate.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCertificate.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** PublicCertificate.java	30 Oct 2008 21:48:20 -0000	1.10
--- PublicCertificate.java	2 Nov 2008 19:52:48 -0000	1.11
***************
*** 114,117 ****
--- 114,118 ----
       * @return The current certificate price.
       */
+     /*
      public int getCertificatePrice() {
          if (company.getCurrentPrice() != null) {
***************
*** 121,124 ****
--- 122,126 ----
          }
      }
+     */
  
      /**

Index: Round.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Round.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Round.java	8 Jul 2008 19:54:08 -0000	1.10
--- Round.java	2 Nov 2008 19:52:48 -0000	1.11
***************
*** 117,121 ****
              // is ascending.
              if (company.hasStockPrice()) {
!                 space = company.getCurrentPrice();
                  key =
                          1000000 * (999 - space.getPrice()) + 10000
--- 117,121 ----
              // is ascending.
              if (company.hasStockPrice()) {
!                 space = company.getCurrentSpace();
                  key =
                          1000000 * (999 - space.getPrice()) + 10000
***************
*** 172,178 ****
                  capFactor = (100 - unsoldPercentage) / shareUnit;
              }
!             int price =
!                     (company.hasParPrice() ? company.getParPrice()
!                             : company.getCurrentPrice()).getPrice();
              cash = capFactor * price;
          } else {
--- 172,176 ----
                  capFactor = (100 - unsoldPercentage) / shareUnit;
              }
!             int price = company.getIPOPrice();
              cash = capFactor * price;
          } else {

Index: PublicCompanyI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCompanyI.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** PublicCompanyI.java	30 Oct 2008 21:48:20 -0000	1.21
--- PublicCompanyI.java	2 Nov 2008 19:52:48 -0000	1.22
***************
*** 116,120 ****
       * the stock chart.
       */
!     public StockSpaceI getParPrice();
  
      /**
--- 116,120 ----
       * the stock chart.
       */
!     public StockSpaceI getStartSpace();
  
      /**
***************
*** 132,136 ****
       * stock market.
       */
!     public StockSpaceI getCurrentPrice();
  
      public PriceModel getCurrentPriceModel();
--- 132,136 ----
       * stock market.
       */
!     public StockSpaceI getCurrentSpace();
  
      public PriceModel getCurrentPriceModel();
***************
*** 140,146 ****
      public int getFixedPrice();
  
!     /**
!      * @return
!      */
      public int getPublicNumber();
  
--- 140,147 ----
      public int getFixedPrice();
  
!     public int getIPOPrice ();
!     
!     public int getMarketPrice ();
! 
      public int getPublicNumber();
  

Index: ShareSellingRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/ShareSellingRound.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ShareSellingRound.java	8 Jul 2008 19:54:08 -0000	1.13
--- ShareSellingRound.java	2 Nov 2008 19:52:48 -0000	1.14
***************
*** 160,164 ****
                  price = (sellPrices.get(compName)).getPrice();
              } else {
!                 price = company.getCurrentPrice().getPrice();
              }
  
--- 160,164 ----
                  price = (sellPrices.get(compName)).getPrice();
              } else {
!                 price = company.getMarketPrice();
              }
  
***************
*** 304,308 ****
              price = (sellPrices.get(companyName)).getPrice();
          } else {
!             sellPrice = company.getCurrentPrice();
              price = sellPrice.getPrice();
              sellPrices.put(companyName, sellPrice);
--- 304,308 ----
              price = (sellPrices.get(companyName)).getPrice();
          } else {
!             sellPrice = company.getCurrentSpace();
              price = sellPrice.getPrice();
              sellPrices.put(companyName, sellPrice);

Index: StockMarket.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockMarket.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** StockMarket.java	4 Jun 2008 19:00:30 -0000	1.11
--- StockMarket.java	2 Nov 2008 19:52:48 -0000	1.12
***************
*** 157,162 ****
  
          for (PublicCompanyI comp : Game.getCompanyManager().getAllPublicCompanies()) {
!             if (!comp.hasStarted() && comp.getParPrice() != null) {
!                 comp.getParPrice().addFixedStartPrice(comp);
              }
          }
--- 157,162 ----
  
          for (PublicCompanyI comp : Game.getCompanyManager().getAllPublicCompanies()) {
!             if (!comp.hasStarted() && comp.getStartSpace() != null) {
!                 comp.getStartSpace().addFixedStartPrice(comp);
              }
          }
***************
*** 206,210 ****
  
      public void moveUp(PublicCompanyI company) {
!         StockSpaceI oldsquare = company.getCurrentPrice();
          StockSpaceI newsquare = oldsquare;
          int row = oldsquare.getRow();
--- 206,210 ----
  
      public void moveUp(PublicCompanyI company) {
!         StockSpaceI oldsquare = company.getCurrentSpace();
          StockSpaceI newsquare = oldsquare;
          int row = oldsquare.getRow();
***************
*** 219,223 ****
  
      protected void moveDown(PublicCompanyI company, int numberOfSpaces) {
!         StockSpaceI oldsquare = company.getCurrentPrice();
          StockSpaceI newsquare = oldsquare;
          int row = oldsquare.getRow();
--- 219,223 ----
  
      protected void moveDown(PublicCompanyI company, int numberOfSpaces) {
!         StockSpaceI oldsquare = company.getCurrentSpace();
          StockSpaceI newsquare = oldsquare;
          int row = oldsquare.getRow();
***************
*** 253,257 ****
      protected void moveRightOrUp(PublicCompanyI company) {
          /* Ignore the amount for now */
!         StockSpaceI oldsquare = company.getCurrentPrice();
          StockSpaceI newsquare = oldsquare;
          int row = oldsquare.getRow();
--- 253,257 ----
      protected void moveRightOrUp(PublicCompanyI company) {
          /* Ignore the amount for now */
!         StockSpaceI oldsquare = company.getCurrentSpace();
          StockSpaceI newsquare = oldsquare;
          int row = oldsquare.getRow();
***************
*** 267,271 ****
  
      protected void moveLeftOrDown(PublicCompanyI company) {
!         StockSpaceI oldsquare = company.getCurrentPrice();
          StockSpaceI newsquare = oldsquare;
          int row = oldsquare.getRow();
--- 267,271 ----
  
      protected void moveLeftOrDown(PublicCompanyI company) {
!         StockSpaceI oldsquare = company.getCurrentSpace();
          StockSpaceI newsquare = oldsquare;
          int row = oldsquare.getRow();

Index: PublicCertificateI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCertificateI.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PublicCertificateI.java	28 Oct 2008 21:01:34 -0000	1.8
--- PublicCertificateI.java	2 Nov 2008 19:52:48 -0000	1.9
***************
*** 37,41 ****
       * @return The current certificate price.
       */
!     public int getCertificatePrice();
  
      /**
--- 37,41 ----
       * @return The current certificate price.
       */
!     //public int getCertificatePrice();
  
      /**

Index: StockRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockRound.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** StockRound.java	31 Oct 2008 20:38:56 -0000	1.30
--- StockRound.java	2 Nov 2008 19:52:48 -0000	1.31
***************
*** 172,183 ****
  
                  if (!cert.isPresidentShare()) {
!                     if (cert.getCertificatePrice() <= playerCash) {
!                         possibleActions.add(new BuyCertificate(cert, from));
                      }
                  } else if (!comp.hasStarted()) {
!                     if (comp.getParPrice() != null) {
!                         price = comp.getParPrice().getPrice() * cert.getShares();
!                         possibleActions.add(new StartCompany(cert, 
!                                 price));
                      } else {
                          List<Integer> startPrices = new ArrayList<Integer>();
--- 172,186 ----
  
                  if (!cert.isPresidentShare()) {
!                     price = comp.getIPOPrice();
!                     if (price <= playerCash) {
!                         possibleActions.add(new BuyCertificate(cert, from, price));
                      }
                  } else if (!comp.hasStarted()) {
!                     if (comp.getIPOPrice() != 0) {
!                         price = comp.getIPOPrice() * cert.getShares();
!                         if (price <= playerCash) {
!                             possibleActions.add(new StartCompany(cert, 
!                                     price));
!                         }
                      } else {
                          List<Integer> startPrices = new ArrayList<Integer>();
***************
*** 196,205 ****
                          }
                      }
-                 } else if (comp.hasParPrice()) {
-                     price = comp.getParPrice().getPrice() * cert.getShares();
-                     if (price <= playerCash) {
-                         possibleActions.add(new BuyCertificate(cert, from,
-                                 price));
-                     }
                  } 
  
--- 199,202 ----
***************
*** 221,225 ****
              if (currentPlayer.maxAllowedNumberOfSharesToBuy(comp,
                      cert.getShare()) < 1) continue;
!             stockSpace = comp.getCurrentPrice();
              price = stockSpace.getPrice();
  
--- 218,222 ----
              if (currentPlayer.maxAllowedNumberOfSharesToBuy(comp,
                      cert.getShare()) < 1) continue;
!             stockSpace = comp.getCurrentSpace();
              price = stockSpace.getPrice();
  
***************
*** 265,274 ****
                  if (currentPlayer.maxAllowedNumberOfSharesToBuy(company,
                          certs.get(0).getShare()) < 1) continue;
!                 stockSpace = company.getCurrentPrice();
                  if (!stockSpace.isNoCertLimit()
                      && !currentPlayer.mayBuyCertificate(company, 1)) continue;
!                 if (cert.getCertificatePrice() <= playerCash) {
                      possibleActions.add(new BuyCertificate(cert,
!                             company.getPortfolio()));
                  }
              }
--- 262,272 ----
                  if (currentPlayer.maxAllowedNumberOfSharesToBuy(company,
                          certs.get(0).getShare()) < 1) continue;
!                 stockSpace = company.getCurrentSpace();
                  if (!stockSpace.isNoCertLimit()
                      && !currentPlayer.mayBuyCertificate(company, 1)) continue;
!                 if (company.getMarketPrice() <= playerCash) {
                      possibleActions.add(new BuyCertificate(cert,
!                             company.getPortfolio(),
!                             company.getMarketPrice()));
                  }
              }
***************
*** 362,366 ****
                  price = (sellPrices.get(compName)).getPrice();
              } else {
!                 price = company.getCurrentPrice().getPrice();
              }
  
--- 360,364 ----
                  price = (sellPrices.get(compName)).getPrice();
              } else {
!                 price = company.getMarketPrice();
              }
  
***************
*** 514,518 ****
  
              // Check if the company has a fixed par price (1835).
!             startSpace = company.getParPrice();
              if (startSpace != null) {
                  // If so, it overrides whatever is given.
--- 512,516 ----
  
              // Check if the company has a fixed par price (1835).
!             startSpace = company.getStartSpace();
              if (startSpace != null) {
                  // If so, it overrides whatever is given.
***************
*** 551,555 ****
          // Transfer the President's certificate
          currentPlayer.getPortfolio().buyCertificate(cert, ipo,
!                 cert.getCertificatePrice());
  
          // If more than one certificate is bought at the same time, transfer
--- 549,553 ----
          // Transfer the President's certificate
          currentPlayer.getPortfolio().buyCertificate(cert, ipo,
!                 company.getIPOPrice());
  
          // If more than one certificate is bought at the same time, transfer
***************
*** 558,562 ****
              cert = ipo.findCertificate(company, false);
              currentPlayer.getPortfolio().buyCertificate(cert, ipo,
!                     cert.getCertificatePrice());
          }
  
--- 556,560 ----
              cert = ipo.findCertificate(company, false);
              currentPlayer.getPortfolio().buyCertificate(cert, ipo,
!                     company.getIPOPrice());
          }
  
***************
*** 643,647 ****
                      (PublicCompanyI) companyBoughtThisTurnWrapper.getObject();
              if (companyBoughtThisTurn != null
!                 && (companyBoughtThisTurn != company || !company.getCurrentPrice().isNoBuyLimit())) {
                  errMsg = LocalText.getText("AlreadyBought", playerName);
                  break;
--- 641,645 ----
                      (PublicCompanyI) companyBoughtThisTurnWrapper.getObject();
              if (companyBoughtThisTurn != null
!                 && (companyBoughtThisTurn != company || !company.getCurrentSpace().isNoBuyLimit())) {
                  errMsg = LocalText.getText("AlreadyBought", playerName);
                  break;
***************
*** 658,664 ****
              StockSpaceI currentSpace;
              if (from == ipo && company.hasParPrice()) {
!                 currentSpace = company.getParPrice();
              } else {
!                 currentSpace = company.getCurrentPrice();
              }
  
--- 656,662 ----
              StockSpaceI currentSpace;
              if (from == ipo && company.hasParPrice()) {
!                 currentSpace = company.getStartSpace();
              } else {
!                 currentSpace = company.getCurrentSpace();
              }
  
***************
*** 903,907 ****
              price = (sellPrices.get(companyName)).getPrice();
          } else {
!             sellPrice = company.getCurrentPrice();
              price = sellPrice.getPrice();
              sellPrices.put(companyName, sellPrice);
--- 901,905 ----
              price = (sellPrices.get(companyName)).getPrice();
          } else {
!             sellPrice = company.getCurrentSpace();
              price = sellPrice.getPrice();
              sellPrices.put(companyName, sellPrice);
***************
*** 1021,1027 ****
              for (PublicCompanyI company : companyManager.getAllPublicCompanies()) {
                  if (company.hasStockPrice() && company.isSoldOut()) {
!                     StockSpaceI oldSpace = company.getCurrentPrice();
                      stockMarket.soldOut(company);
!                     StockSpaceI newSpace = company.getCurrentPrice();
                      if (newSpace != oldSpace) {
                          ReportBuffer.add(LocalText.getText("SoldOut",
--- 1019,1025 ----
              for (PublicCompanyI company : companyManager.getAllPublicCompanies()) {
                  if (company.hasStockPrice() && company.isSoldOut()) {
!                     StockSpaceI oldSpace = company.getCurrentSpace();
                      stockMarket.soldOut(company);
!                     StockSpaceI newSpace = company.getCurrentSpace();
                      if (newSpace != oldSpace) {
                          ReportBuffer.add(LocalText.getText("SoldOut",

[Rails-commits] 18xx/rails/game/specific/_18EU StockRound_18EU.java, 1.13, 1.14

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

Update of /cvsroot/rails/18xx/rails/game/specific/_18EU
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7890/rails/game/specific/_18EU

Modified Files:
	StockRound_18EU.java 
Log Message:
Reorganized "getPrice" methods of PublicCompany.

Index: StockRound_18EU.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/StockRound_18EU.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** StockRound_18EU.java	8 Jul 2008 19:54:09 -0000	1.13
--- StockRound_18EU.java	2 Nov 2008 19:52:48 -0000	1.14
***************
*** 138,143 ****
                          possibleActions.add(action);
                      }
!                 } else if (cert.getCertificatePrice() <= playerCash) {
!                     possibleActions.add(new BuyCertificate(cert, from));
                  }
  
--- 138,144 ----
                          possibleActions.add(action);
                      }
!                 } else if (comp.getMarketPrice() <= playerCash) {
!                     possibleActions.add(new BuyCertificate(cert, from,
!                             comp.getMarketPrice()));
                  }
  
***************
*** 159,164 ****
              if (currentPlayer.maxAllowedNumberOfSharesToBuy(comp,
                      cert.getShare()) < 1) continue;
!             stockSpace = comp.getCurrentPrice();
!             price = stockSpace.getPrice();
  
              if (companyBoughtThisTurn != null) {
--- 160,165 ----
              if (currentPlayer.maxAllowedNumberOfSharesToBuy(comp,
                      cert.getShare()) < 1) continue;
!             //stockSpace = comp.getCurrentSpace();
!             price = comp.getMarketPrice();
  
              if (companyBoughtThisTurn != null) {
***************
*** 189,198 ****
                  if (currentPlayer.maxAllowedNumberOfSharesToBuy(company,
                          certs.get(0).getShare()) < 1) continue;
!                 stockSpace = company.getCurrentPrice();
                  if (!stockSpace.isNoCertLimit()
                      && !currentPlayer.mayBuyCertificate(company, 1)) continue;
!                 if (cert.getCertificatePrice() <= playerCash) {
                      possibleActions.add(new BuyCertificate(cert,
!                             company.getPortfolio()));
                  }
              }
--- 190,200 ----
                  if (currentPlayer.maxAllowedNumberOfSharesToBuy(company,
                          certs.get(0).getShare()) < 1) continue;
!                 stockSpace = company.getCurrentSpace();
                  if (!stockSpace.isNoCertLimit()
                      && !currentPlayer.mayBuyCertificate(company, 1)) continue;
!                 if (company.getMarketPrice() <= playerCash) {
                      possibleActions.add(new BuyCertificate(cert,
!                             company.getPortfolio(),
!                             company.getMarketPrice()));
                  }
              }
***************
*** 556,560 ****
              Util.moveObjects(company.getPortfolio().getCertificatesPerCompany(
                      company.getName()), pool);
!             int cash = 5 * company.getCurrentPrice().getPrice();
              new CashMove(null, company, cash);
              ReportBuffer.add(LocalText.getText("MonetiseTreasuryShares",
--- 558,562 ----
              Util.moveObjects(company.getPortfolio().getCertificatesPerCompany(
                      company.getName()), pool);
!             int cash = 5 * company.getMarketPrice();
              new CashMove(null, company, cash);
              ReportBuffer.add(LocalText.getText("MonetiseTreasuryShares",

[Rails-commits] 18xx/rails/game/action BuyCertificate.java, 1.10, 1.11

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

Update of /cvsroot/rails/18xx/rails/game/action
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7890/rails/game/action

Modified Files:
	BuyCertificate.java 
Log Message:
Reorganized "getPrice" methods of PublicCompany.

Index: BuyCertificate.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/BuyCertificate.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** BuyCertificate.java	4 Jun 2008 19:00:29 -0000	1.10
--- BuyCertificate.java	2 Nov 2008 19:52:48 -0000	1.11
***************
*** 48,54 ****
  
      /** Buy a certificate from some portfolio at the current price */
!     public BuyCertificate(PublicCertificateI certificate, Portfolio from) {
!         this(certificate, from, certificate.getCertificatePrice(), 1);
!     }
  
      /** Buy a certificate from some portfolio at a given price */
--- 48,54 ----
  
      /** Buy a certificate from some portfolio at the current price */
!     //public BuyCertificate(PublicCertificateI certificate, Portfolio from) {
!     //    this(certificate, from, certificate.getCertificatePrice(), 1);
!     //}
  
      /** Buy a certificate from some portfolio at a given price */

[Rails-commits] 18xx/data/18AL TileSet.xml,1.9,1.10

[Mark J S. <kr...@us...>]

Update of /cvsroot/rails/18xx/data/18AL
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10168/18xx/data/18AL

Modified Files:
	TileSet.xml 
Log Message:
Added Upgrades for Tiles 3, 4 and 58 that were missing.

Index: TileSet.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/18AL/TileSet.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TileSet.xml	17 Jan 2008 21:13:48 -0000	1.9
--- TileSet.xml	2 Nov 2008 00:07:13 -0000	1.10
***************
*** 22,27 ****
  	
  	<!-- Yellow tiles -->
! 	<Tile id="3" quantity="3" />
! 	<Tile id="4" quantity="3" />
  	<Tile id="5" quantity="3">
  		<Upgrade id="14,15" hex="-L5"/>
--- 22,31 ----
  	
  	<!-- Yellow tiles -->
! 	<Tile id="3" quantity="3" >
! 		<Upgrade id="142,143" />
! 	</Tile>
! 	<Tile id="4" quantity="3">
! 		<Upgrade id="142"/>
! 	</Tile>
  	<Tile id="5" quantity="3">
  		<Upgrade id="14,15" hex="-L5"/>
***************
*** 45,49 ****
  		<Upgrade id="1443" hex="L5"/>
  	</Tile>
! 	<Tile id="58" quantity="3" />
  	<Tile id="1441" extId="441" quantity="1"><!--Missing!-->
  		<Upgrade id="1442" />
--- 49,55 ----
  		<Upgrade id="1443" hex="L5"/>
  	</Tile>
! 	<Tile id="58" quantity="3">
! 		<Upgrade id="142,143,144" />
! 	</Tile>
  	<Tile id="1441" extId="441" quantity="1"><!--Missing!-->
  		<Upgrade id="1442" />

[Rails-commits] 18xx/rails/game StockRound.java,1.29,1.30

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

Update of /cvsroot/rails/18xx/rails/game
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16369/rails/game

Modified Files:
	StockRound.java 
Log Message:
Fixed bug that prevented company start

Index: StockRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockRound.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** StockRound.java	30 Oct 2008 21:48:20 -0000	1.29
--- StockRound.java	31 Oct 2008 20:38:56 -0000	1.30
***************
*** 176,180 ****
                      }
                  } else if (!comp.hasStarted()) {
!                     if (comp.hasParPrice()) {
                          price = comp.getParPrice().getPrice() * cert.getShares();
                          possibleActions.add(new StartCompany(cert, 
--- 176,180 ----
                      }
                  } else if (!comp.hasStarted()) {
!                     if (comp.getParPrice() != null) {
                          price = comp.getParPrice().getPrice() * cert.getShares();
                          possibleActions.add(new StartCompany(cert, 

[Rails-commits] 18xx/data/1835 Game.xml,1.17,1.18

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

Update of /cvsroot/rails/18xx/data/1835
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16327/data/1835

Modified Files:
	Game.xml 
Log Message:
Removed test values

Index: Game.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1835/Game.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Game.xml	30 Oct 2008 21:48:20 -0000	1.17
--- Game.xml	31 Oct 2008 20:38:34 -0000	1.18
***************
*** 14,19 ****
  	</Component>
  	<Component name="Bank" class="rails.game.Bank">
! 		<Bank amount="120000"/>
! 		<Players number="3" cash="6000" certLimit="19"/>
  		<Players number="4" cash="475" certLimit="15"/>
  		<Players number="5" cash="390" certLimit="12"/>
--- 14,19 ----
  	</Component>
  	<Component name="Bank" class="rails.game.Bank">
! 		<Bank amount="12000"/>
! 		<Players number="3" cash="600" certLimit="19"/>
  		<Players number="4" cash="475" certLimit="15"/>
  		<Players number="5" cash="390" certLimit="12"/>