[Rails-commits] SF.net SVN: rails:[1528] trunk/18xx/data/18GA

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1528
          http://rails.svn.sourceforge.net/rails/?rev=1528&view=rev
Author:   evos
Date:     2011-04-26 10:12:34 +0000 (Tue, 26 Apr 2011)

Log Message:
-----------
18GA XML updates

Modified Paths:
--------------
    trunk/18xx/data/18GA/CompanyManager.xml
    trunk/18xx/data/18GA/Game.xml
    trunk/18xx/data/18GA/Map.xml
    trunk/18xx/data/18GA/TileSet.xml
    trunk/18xx/data/18GA/Tiles.xml

Modified: trunk/18xx/data/18GA/CompanyManager.xml
===================================================================

--- trunk/18xx/data/18GA/CompanyManager.xml	2011-04-26 10:11:59 UTC (rev 1527)
+++ trunk/18xx/data/18GA/CompanyManager.xml	2011-04-26 10:12:34 UTC (rev 1528)
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <CompanyManager>
 	<CompanyType name="Private" class="rails.game.PrivateCompany">
+		<ClosingConditions>
+            <Phase>5</Phase>
+		</ClosingConditions>
+		<Tradeable toCompany="yes" lowerPriceFactor="0.5" upperPriceFactor="1.5"/>
+		<Tradeable toPlayer="yes"/>	
 	</CompanyType>
 	<CompanyType name="Public" class="rails.game.PublicCompany">
 		<PoolPaysOut/>
@@ -9,41 +14,66 @@
 		<Certificate type="President" shares="2"/>
 		<Certificate shares="1" number="8"/>
 		<BaseTokens>
+			<HomeBase lay="firstOR"/>
 			<LayCost method="sequence" cost="0,40,100"/>
 		</BaseTokens>
 		<Trains number="4,4,3,2"/>
+		<CanBuyPrivates/>
 		<CanUseSpecialProperties/>
 	</CompanyType>
-	<Company name="LTRR" type="Private" basePrice="20" revenue="5" longname="Lexington Terminal RR"/>
-	<Company name="MRC" type="Private" basePrice="40" revenue="10" longname="Midland Railroad Co."/>
-	<Company name="WSRR" type="Private" basePrice="70" revenue="15" longname="Waycross &amp; Southern RR"/>
-	<Company name="OSRR" type="Private" basePrice="100" revenue="20" longname="Ocilla Southern RR"/>
-	<Company name="MBRR" type="Private" basePrice="150" revenue="25" longname="Macon &amp; Birmingham RR"/>
+	<Company name="LT" type="Private" basePrice="20" revenue="5" longname="Lexington Terminal Railroad"></Company>
+	<Company name="MR" type="Private" basePrice="40" revenue="10" longname="Midland Railroad">
+			<Blocking hex="F12"/>
+			<SpecialProperties>
+			<SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay">
+				<SpecialTileLay location="F12" extra="yes" free="yes"/>
+			</SpecialProperty>
+		</SpecialProperties>
+		</Company>
+	<Company name="W&amp;S" type="Private" basePrice="70" revenue="15" longname="Waycross and Southern Railroad">
+		<SpecialProperties>
+			<SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay">
+				<SpecialTileLay location="I9" extra="no" free="no" tile="57" />
+			</SpecialProperty>
+			<SpecialProperty condition="ifOwnedByCompany" when="tokenLayingStep" class="rails.game.special.SpecialTokenLay">
+				<SpecialTokenLay location="I9" extra="no" free="yes"/>
+			</SpecialProperty>
+		</SpecialProperties>
+		</Company>
+	<Company name="OSO" type="Private" basePrice="100" revenue="20" longname="Ocilla Southern Railroad">
+				<Blocking hex="G7"/>
+				</Company>
+	<Company name="M&amp;B" type="Private" basePrice="150" revenue="25" longname="Macon and Birmingham Railway">
+			<Blocking hex="F4"/>
+			</Company>
 
-	<Company name="ACL" type="Public" tokens="4" fgColour="FFFFFF" bgColour="1F1A17" longname="Atlantic Coast Line">
+	<Company name="ACL" type="Public" tokens="4" fgColour="FFFFFF" bgColour="1F1A17" longname="Atlantic Coast Line Railroad">
 		<Home hex="J12" />
 	</Company>
-	<Company name="CoG" type="Public" tokens="4" fgColour="FFFFFF" bgColour="CC3366" longname="Central of Georgia">
+	<Company name="CoG" type="Public" tokens="4" fgColour="FFFFFF" bgColour="CC3366" longname="Central of Georgia Railway">
 		<Home hex="F6" />
 	</Company>
 	<Company name="GR" type="Public" tokens="4" fgColour="FFFFFF" bgColour="219C29" longname="Georgia Railroad">
 		<Home hex="D10" />
 	</Company>
-	<Company name="G&amp;F" type="Public" tokens="2" fgColour="000000" bgColour="75C4F0" longname="Georgia &amp; Florida RR">
+	<Company name="G&amp;F" type="Public" tokens="2" fgColour="000000" bgColour="75C4F0" longname="Georgia and Florida Railroad">
 		<Home hex="H4" />
 	</Company>
-	<Company name="SAL" type="Public" tokens="3" fgColour="000000" bgColour="F7C400" longname="Seaboard Air Line">
+	<Company name="SAL" type="Public" tokens="3" fgColour="000000" bgColour="F7C400" longname="Seaboard Air Line Railroad">
 		<Home hex="G13" />
 	</Company>
-	<Company name="W&amp;AR" type="Public" tokens="2" fgColour="FFFFFF" bgColour="994778" longname="Western &amp; Atlantic Railroad">
-		<Home hex="D4" />
+	<Company name="W&amp;AR" type="Public" tokens="2" fgColour="FFFFFF" bgColour="994778" longname="Western and Atlantic Railroad">
+		<Home hex="D4" city="0"/>
 	</Company>
 	<StartPacket roundClass="rails.game.StartRound_1830">
 		<Bidding initial="5" minimum="5" increment="1" />
-		<Item name="LTRR" type="Private" basePrice="20" />
-		<Item name="MRC" type="Private" basePrice="40" />
-		<Item name="WSRR" type="Private" basePrice="70" />
-		<Item name="OSRR" type="Private" basePrice="100" />
-		<Item name="MBRR" type="Private" basePrice="150" />
+		<Item name="LT" type="Private" basePrice="20" />
+		<Item name="MR" type="Private" basePrice="40" />
+		<Item name="W&amp;S" type="Private" basePrice="70" />
+		<Item name="OSO" type="Private" basePrice="100" />
+		<Item name="M&amp;B" type="Private" basePrice="150" >
+			<SubItem name="CoG" type="Public" />		
+		</Item>
+		
 	</StartPacket>
 </CompanyManager>
\ No newline at end of file

Modified: trunk/18xx/data/18GA/Game.xml
===================================================================
--- trunk/18xx/data/18GA/Game.xml	2011-04-26 10:11:59 UTC (rev 1527)
+++ trunk/18xx/data/18GA/Game.xml	2011-04-26 10:12:34 UTC (rev 1528)
@@ -15,7 +15,7 @@
 			<Bankruptcy/>
 			<BankBreaks limit="0" finish="currentOR"/>
 			<!-- "Runs out"; when "broken", -1 is the limit -->
-			<!-- Also when the share value reaches $300; this is configured in teh stock market XML -->
+			<!-- Also when the share value reaches $300; this is configured in the stock market XML -->
 		</EndOfGame>
 	</Component>
 	<Component name="PlayerManager" class="rails.game.PlayerManager">
@@ -34,17 +34,14 @@
 	<Component name="StockMarket" class="rails.game.StockMarket" 
 		file="StockMarket.xml"/>
 	<Component name="TrainManager" class="rails.game.TrainManager">
+		<Defaults>
+			<Reach base="stops" countTowns="no"/>
+			<Score towns="yes"/>
+		</Defaults>
 		<Train name="2" majorStops="2" cost="100" amount="5"/>
 		<Train name="3" majorStops="3" cost="180" amount="4" startPhase="3"/>
 		<Train name="4" majorStops="4" cost="300" amount="3" startPhase="4" 
-			rustedTrain="2" >
-			<IfOption name="Obsolete4Trains" value="yes">
-				<Attributes obsoleting="yes"/>
-			</IfOption>
-			<IfOption name="Obsolete4Trains" value="no">
-				<Attributes obsoleting="no"/>
-			</IfOption>
-		</Train>/>
+			rustedTrain="2" />
 		<Train name="5" majorStops="5" cost="450" amount="2" startPhase="5"/>
 		<Train name="6" majorStops="6" cost="630" amount="2" startPhase="6" 
 			rustedTrain="3"/>
@@ -63,7 +60,6 @@
 			<OperatingRounds number="2"/>
 		</Phase>
 		<Phase name="4">
-			<Tiles colour="yellow,green"/>
 			<Trains onePerTurn="no"/>
 		</Phase>
 		<Phase name="5">
@@ -72,9 +68,7 @@
 			<Privates close="yes"/>
 			<OffBoardRevenue step="2"/>
 		</Phase>
-		<Phase name="6">
-			<Tiles colour="yellow,green,brown"/>
-		</Phase>
+		<Phase name="6" />
 		<Phase name="8">
 			<Tiles colour="yellow,green,brown,grey"/>
 		</Phase>

Modified: trunk/18xx/data/18GA/Map.xml
===================================================================
--- trunk/18xx/data/18GA/Map.xml	2011-04-26 10:11:59 UTC (rev 1527)
+++ trunk/18xx/data/18GA/Map.xml	2011-04-26 10:12:34 UTC (rev 1528)
@@ -32,7 +32,7 @@
 	<Hex name="C9" tile="0" />
 
 	<Hex name="D2" tile="0" />
-	<Hex name="D4" tile="-3008" city="Atlanta" />
+	<Hex name="D4" tile="-30" city="Atlanta" />
 	<Hex name="D6" tile="0" />
 	<Hex name="D8" tile="0" />
 	<Hex name="D10" tile="-3008" city="Augusta" />

Modified: trunk/18xx/data/18GA/TileSet.xml
===================================================================
--- trunk/18xx/data/18GA/TileSet.xml	2011-04-26 10:11:59 UTC (rev 1527)
+++ trunk/18xx/data/18GA/TileSet.xml	2011-04-26 10:12:34 UTC (rev 1528)
@@ -47,14 +47,14 @@
 
 	<!-- Sharp-curve city (20) -->
 	<Tile id="5" quantity="2">
-		<Upgrade id="14,15" hex="-D10,-G13" />
+		<Upgrade id="14,15" hex="-D10,G13" />
 		<Upgrade id="1453" hex="D10" />
 		<Upgrade id="1454" hex="G13" />
 	</Tile>
 
 	<!-- Gentle-curve city (20) -->
 	<Tile id="6" quantity="2">
-		<Upgrade id="14,15" hex="-D10,-G13" />
+		<Upgrade id="14,15" hex="-D10,G13" />
 		<Upgrade id="1453" hex="D10" />
 		<Upgrade id="1454" hex="G13" />
 	</Tile>
@@ -95,14 +95,14 @@
 
 	<!-- X-shape city (30) -->
 	<Tile id="14" quantity="4">
-		<Upgrade id="63" hex="-F6,-I11" />
+		<Upgrade id="63" hex="-F6,I11" />
 		<Upgrade id="1457" hex="I11" />
 		<Upgrade id="1458" hex="F6" />
 	</Tile>
 
 	<!-- K-shape city (30) -->
 	<Tile id="15" quantity="4">
-		<Upgrade id="63" hex="-F6,-I11" />
+		<Upgrade id="63" hex="-F6,I11" />
 		<Upgrade id="1457" hex="I11" />
 		<Upgrade id="1458" hex="F6" />
 	</Tile>
@@ -216,7 +216,7 @@
 	<Tile id="47" quantity="2" />
 
 	<!-- 6-way city (40) -->
-	<Tile id="63" quantity="4" />
+	<Tile id="63" quantity="4"/>
 
 	<!-- Interchange, tracks N-SE, S-NE, N-NE, S-SE -->
 	<Tile id="70" quantity="1" />

Modified: trunk/18xx/data/18GA/Tiles.xml
===================================================================
--- trunk/18xx/data/18GA/Tiles.xml	2011-04-26 10:11:59 UTC (rev 1527)
+++ trunk/18xx/data/18GA/Tiles.xml	2011-04-26 10:12:34 UTC (rev 1528)
@@ -13,7 +13,7 @@
 		<Track from="city1" gauge="normal" to="side1"/>
 	</Tile>
 	<Tile colour="fixed" id="-1143" name="Bham1851">
-		<Station id="city1" position="0" type="Town"/>
+		<Station id="city1" position="0" type="City"/>
 		<Track from="side5" gauge="normal" to="city1"/>
 		<Track from="city1" gauge="normal" to="side0"/>
 		<Track from="city1" gauge="normal" to="side1"/>


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


