[Rails-commits] Branch 'rails1.7.x' - 2 commits - rails/game readme.txt version.number

[Stefan F. <ste...@us...>]

 rails/game/StockRound.java |   10 +++++++++-
 readme.txt                 |   20 ++++++--------------
 version.number             |    2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 0adc2f4fe55c2501c4dfb8f6ce2937097f29cb61
Author: Stefan Frey <ste...@we...>
Date:   Mon Jun 4 19:07:15 2012 +0200

    prepared for 1.7.6 release

diff --git a/readme.txt b/readme.txt
index c74b11d..a1180ee 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,20 +1,12 @@
-Rails release 1.7.5:
+Rails release 1.7.6:
 
 A new maintenance release for Rails 1.x series
 
-This release fixes several recent bugs.
+This release fixes one sole bug.
 
-Contributors: Erik Vos, Stefan Frey
+Contributors: Erik Vos
 
-Bugs reported by John David Galt, Mike Bourke, Phil Davies
+Bug reported by Antonio Baracca
 
-New:
-1856: Alternate Trains variant added
-1856: Alternate Destinations variant added (not fully implemented yet)
-
-List of bugs fixed:
-Phase extra info is reported in report window (e.g. Civil War in 18TN)
-Tokens on map are updated after undo/redo
-Fixed non-modal dialog bug during loading game
-1835: preventing selling double non-president shares in parts.
-1835: fixed 1835 hex distance calculation bug
+1856: Allowing selling a share just bought by the president. 
+(According to Steve Thomas rule clarification).
\ No newline at end of file
diff --git a/version.number b/version.number
index 905b3b7..cde0424 100644
--- a/version.number
+++ b/version.number
@@ -1,5 +1,5 @@
 #Property file that contains version number and the develop indicator
-version=1.7.5
+version=1.7.6
 # the following string "@DEVELOP@ is replaced by an empty string in the release version
 # this is done automatically by ant
 develop=@DEVELOP@
\ No newline at end of file


commit 4cb7933c2b1ca1ebc7d8d200fb14e25780bf8fc0
Author: Erik Vos <eri...@xs...>
Date:   Mon Jun 4 15:15:11 2012 +0200

    1856: allow selling a just bought share by the president.
    
    In theory a half-presidency share is then sold, which is allowed
    according to a clarification by Steve Thomas (backed by Bill Dixon).
    Apparently it does not matter if the presidency can actually be dumped.(cherry picked from commit f654b2d5744b8048d6a78a04be9b760c8acc1631)

diff --git a/rails/game/StockRound.java b/rails/game/StockRound.java
index 67ab6ce..1a8ebb4 100644
--- a/rails/game/StockRound.java
+++ b/rails/game/StockRound.java
@@ -479,7 +479,15 @@ public class StockRound extends Round {
                 /* In some games (1856), a just bought share may not be sold */
                 // This code ignores the possibility of different share units
                 if ((Boolean)gameManager.getGameParameter(GameDef.Parm.NO_SALE_OF_JUST_BOUGHT_CERT)
-                        && company.equals(companyBoughtThisTurnWrapper.get())) {
+                        && company.equals(companyBoughtThisTurnWrapper.get())
+                        /* An 1856 clarification by Steve Thomas (backed by Bill Dixon) states that
+                         * in this situation a half-presidency may be sold
+                         * (apparently even if a dump would otherwise not be allowed),
+                         * as long as the number of shares does not become zero.
+                         * So the rule "can't sell a just bought share" only means,
+                         * that the number of shares may not be sold down to zero.
+                         * Added 4jun2012 by EV */
+                        && number == ownedShare/shareUnit) {
                     number--;
                 }
                 if (number <= 0) continue;