[Rails-commits] SF.net SVN: rails:[1385] trunk/18xx

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

Revision: 1385
          http://rails.svn.sourceforge.net/rails/?rev=1385&view=rev
Author:   stefanfrey
Date:     2010-08-13 16:03:47 +0000 (Fri, 13 Aug 2010)

Log Message:
-----------
Remaining changes of THB fix

Modified Paths:
--------------
    trunk/18xx/LocalisedText.properties
    trunk/18xx/data/1856/Game.xml
    trunk/18xx/data/GamesList.xml
    trunk/18xx/rails/game/MapHex.java

Modified: trunk/18xx/LocalisedText.properties
===================================================================
--- trunk/18xx/LocalisedText.properties	2010-08-13 15:59:03 UTC (rev 1384)
+++ trunk/18xx/LocalisedText.properties	2010-08-13 16:03:47 UTC (rev 1385)
@@ -1,6 +1,6 @@
 # Texts with lowercase keys are intended to be inserted into other messages
 1856MergerDialog=Repay loan decision of {0} for CGR merger
-1856THBHomeBlocked=THB home hex is blocked for token lays (unless gray tile)
+1856THBHomeBlocked=THB home hex is blocked (until gray tile)
 1889PrivateBactive=Player {0} (owner of Private B) may lay port tile
 1889PrivateCactive=Player {0} (previous owner of Private C) may lay tile on C4 immediately
 18ALOptimizeNamedTrains=Optimize named train assignment

Modified: trunk/18xx/data/1856/Game.xml
===================================================================
--- trunk/18xx/data/1856/Game.xml	2010-08-13 15:59:03 UTC (rev 1384)
+++ trunk/18xx/data/1856/Game.xml	2010-08-13 16:03:47 UTC (rev 1385)
@@ -9,7 +9,7 @@
 		<GameOption name="UnlimitedTiles" type="toggle" default="no"/>
 		<GameOption name="LeaveAuctionOnPass" type="toggle" default="no"/>
         <GameOption name="SeparateSalesAtSamePrice" type="toggle" default="yes"/>
-        <GameOption name="1856THBHomeBlocked" type="toggle" default="yes" />
+        <GameOption name="1856THBHomeBlocked" type="toggle" default="no" />
 		<GameParameters>
 			<StockRound class="rails.game.specific._1856.StockRound_1856" 
 				sequence="SellBuyOrBuySell">

Modified: trunk/18xx/data/GamesList.xml
===================================================================
--- trunk/18xx/data/GamesList.xml	2010-08-13 15:59:03 UTC (rev 1384)
+++ trunk/18xx/data/GamesList.xml	2010-08-13 16:03:47 UTC (rev 1385)
@@ -67,6 +67,7 @@
 		<Option name="UnlimitedTiles" type="toggle" default="no"/>
 		<Option name="LeaveAuctionOnPass" type="toggle" default="no"/>
         <Option name="SeparateSalesAtSamePrice" type="toggle" default="yes"/>
+        <Option name="1856THBHomeBlocked" type="toggle" default="no" />
 		<Players minimum="3" maximum="6"/>
 	</Game>
 

Modified: trunk/18xx/rails/game/MapHex.java
===================================================================
--- trunk/18xx/rails/game/MapHex.java	2010-08-13 15:59:03 UTC (rev 1384)
+++ trunk/18xx/rails/game/MapHex.java	2010-08-13 16:03:47 UTC (rev 1385)
@@ -1030,10 +1030,10 @@
      * C) Or the company does not block its home city at all (example:Pr in 1835)
      *    then isBlockedForTokenLays attribute is used
      * 
-     * NOTE: It assumes that not two company share the same home city.  
-     * Undecided companies cannot share the same hex with any other company.
+     * NOTE: It now deals with more than one company with a home base on the
+     * same hex.  
      * 
-     * Previously used was the variable isBlockedForTokenLays
+     * Previously there was only the variable isBlockedForTokenLays
      * which is set to yes to block the whole hex for the token lays
      * until the (home) company laid their token
      * 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.