rails-commits

[Rails-commits] Branch 'rails1.7.x' - rails/game

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

 rails/game/specific/_1835/ElsasModifier.java |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 6a7bca5cc8266db82a457a88caa03259822797d2
Author: Stefan Frey <ste...@we...>
Date:   Tue Apr 3 12:12:24 2012 +0200

    fixed recent 1835 elsas modifier: added N4 hex

diff --git a/rails/game/specific/_1835/ElsasModifier.java b/rails/game/specific/_1835/ElsasModifier.java
index cce0b74..2c9898c 100644
--- a/rails/game/specific/_1835/ElsasModifier.java
+++ b/rails/game/specific/_1835/ElsasModifier.java
@@ -1,5 +1,7 @@
 package rails.game.specific._1835;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
 
 import org.apache.log4j.Logger;
@@ -29,12 +31,15 @@ public class ElsasModifier implements NetworkGraphModifier {
         GameManagerI gm = GameManager.getInstance();
         SimpleGraph<NetworkVertex, NetworkEdge> graph = graphBuilder.getMapGraph();
 
-        // Check if elsasHex has zero value ...
-        MapHex elsasHex = gm.getMapManager().getHex("M5");
-        if (elsasHex.getCurrentValueForPhase(gm.getCurrentPhase()) == 0) {
-            // .. then remove 
-            Set<NetworkVertex> elsasVertices = NetworkVertex.getVerticesByHex(graph.vertexSet(), elsasHex);
-            graph.removeAllVertices(elsasVertices);
+        // Check if (one of the  elsasHex has zero value ...
+        MapHex hex = gm.getMapManager().getHex("M5");
+        if (hex.getCurrentValueForPhase(gm.getCurrentPhase()) == 0) {
+            // .. then remove both
+            Set<NetworkVertex> vertices = NetworkVertex.getVerticesByHex(graph.vertexSet(), hex);
+            graph.removeAllVertices(vertices);
+            hex = gm.getMapManager().getHex("N4");
+            vertices = NetworkVertex.getVerticesByHex(graph.vertexSet(), hex);
+            graph.removeAllVertices(vertices);
             log.debug("Elsas is inactive");
         }
     }

[Rails-commits] Branch 'rails1.7.x' - rails/game

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

 rails/game/specific/_18EU/OffBoardRevenueModifier.java |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 24a8b77ef0783efba3db5ac008d6ffa6674cf495
Author: Stefan Frey <ste...@we...>
Date:   Wed May 2 07:13:39 2012 +0200

    fixed 18EU hamburg revenue calculation bug, reported by James Romano

diff --git a/rails/game/specific/_18EU/OffBoardRevenueModifier.java b/rails/game/specific/_18EU/OffBoardRevenueModifier.java
index ce0d0ae..c1848d3 100644
--- a/rails/game/specific/_18EU/OffBoardRevenueModifier.java
+++ b/rails/game/specific/_18EU/OffBoardRevenueModifier.java
@@ -52,6 +52,8 @@ public class OffBoardRevenueModifier implements RevenueStaticModifier {
             NetworkVertex hamburgTerminal = NetworkVertex.duplicateVertex(revenueAdapter.getGraph(), hamburgCity, "B7", true);
             hamburgTerminal.setSink(true);
             offBoard.add(hamburgTerminal);
+            // following statement was missing, it removes bug reported by James Romano (2012/01/05)
+            offBoard.remove(hamburgCity);
             
             // vertexVisitSet for the two Hamburgs
             VertexVisit hamburgSet = revenueAdapter.new VertexVisit();

[Rails-commits] Branch 'rails1.7.x' - rails/game

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

 rails/game/Stop.java |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 15d6a1153f2dbdca98010f64e1a6c31c3ed898d3
Author: Stefan Frey <ste...@we...>
Date:   Tue May 29 11:51:01 2012 +0200

    fixed update of token display after undo/redo

diff --git a/rails/game/Stop.java b/rails/game/Stop.java
index 401f18f..b58dc02 100644
--- a/rails/game/Stop.java
+++ b/rails/game/Stop.java
@@ -227,6 +227,7 @@ public class Stop implements TokenHolder {
 
     public boolean addObject(Moveable object, int[] position) {
         if (object instanceof TokenI) {
+            mapHex.update();
             return addToken((TokenI) object, position == null ? -1 : position[0]);
         } else {
             return false;
@@ -235,6 +236,7 @@ public class Stop implements TokenHolder {
 
     public boolean removeObject(Moveable object) {
         if (object instanceof TokenI) {
+            mapHex.update();
             return removeToken((TokenI) object);
         } else {
             return false;

[Rails-commits] Branch 'rails1.7.x' - rails/game

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

 rails/game/ReportBuffer.java |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 1686fd33004bbef7c25eeabab96e649f8d1849f8
Author: Stefan Frey <ste...@we...>
Date:   Thu Jun 14 17:56:46 2012 +0200

    fixed error if a comment is added at the start of the game. Reported by Are-Harald Brenne

diff --git a/rails/game/ReportBuffer.java b/rails/game/ReportBuffer.java
index fa3074e..e95eebf 100644
--- a/rails/game/ReportBuffer.java
+++ b/rails/game/ReportBuffer.java
@@ -326,7 +326,12 @@ public final class ReportBuffer {
             // comments first
             if (comment != null) {
                 s.append("<span style='color:green;font-size:80%;font-style:italic;'>");
-                s.append(item.player.getName() + " says: ' ");
+                // at gamestart no player is defined, this is a bug-fix
+                if (item.player == null) {
+                    s.append("'");
+                } else {
+                    s.append(item.player.getName() + " says: '");
+                }
                 s.append(comment + "'"  + NEWLINE_STRING);
                 s.append("</span>");
             }

[Rails-commits] Branch 'rails1.7.x' - rails/game

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

 rails/game/correct/ClosePrivate.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b564e00983be9033464fd3e0658d61143ab5bf5f
Author: Stefan Frey <ste...@we...>
Date:   Sun Jul 22 23:32:17 2012 +0200

    fixed bug: cannot save game file with ClosePrivate action, reported by John David Galt

diff --git a/rails/game/correct/ClosePrivate.java b/rails/game/correct/ClosePrivate.java
index e780ff1..45786f1 100644
--- a/rails/game/correct/ClosePrivate.java
+++ b/rails/game/correct/ClosePrivate.java
@@ -18,7 +18,7 @@ public class ClosePrivate extends PossibleAction {
     /* Preconditions */
     
     /** private company to close */
-    private PrivateCompanyI privateCompany;
+    transient private PrivateCompanyI privateCompany;
     
     /** converted to name */
     private String privateCompanyName;