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

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

Revision: 1560
          http://rails.svn.sourceforge.net/rails/?rev=1560&view=rev
Author:   evos
Date:     2011-05-13 15:44:06 +0000 (Fri, 13 May 2011)

Log Message:
-----------
1830 Simple variant

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

Modified: trunk/18xx/data/1830/CompanyManager.xml
===================================================================
--- trunk/18xx/data/1830/CompanyManager.xml	2011-05-12 20:26:14 UTC (rev 1559)
+++ trunk/18xx/data/1830/CompanyManager.xml	2011-05-13 15:44:06 UTC (rev 1560)
@@ -82,7 +82,7 @@
 	</Company>
 	<Company name="C&amp;O" type="Public" tokens="3" fgColour="000000" bgColour="A0E0FF"
 			longname="Chesapeake &amp; Ohio">
-		<IfOption name="Variant" value="Basegame,Pere Marquette,Wabash">
+		<IfOption name="Variant" value="Basegame,Pere Marquette,Simple,Wabash">
 			<Home hex="F6"/>
 		</IfOption>
 		<IfOption name="Variant" value="Coalfields,Coalfields&amp;Reading">
@@ -99,6 +99,18 @@
 			in each city one slot has to be available -->
 		<Home hex="E11" city="0" allCitiesBlocked="yes"/>
 	</Company>
+    <IfOption name="Variant" value="Simple">
+        <Company name="L&amp;N" type="Public" tokens="3" fgColour="FFE600" bgColour="FF0000"
+                longname="Louisville &amp; Nashville">
+            <Home hex="H4" city="0" allCitiesBlocked="yes" />
+        </Company>
+    </IfOption>
+    <IfOption name="Variant" value="Simple">
+        <Company name="MILW" type="Public" tokens="3" fgColour="FFFFFF" bgColour="FF8000"
+                longname="Milwaukee Road">
+            <Home hex="D2" city="0" allCitiesBlocked="yes" />
+        </Company>
+    </IfOption>
     <IfOption name="Variant" value="Coalfields,Coalfields&amp;Reading">
         <Company name="N&amp;W" type="Public" tokens="3" fgColour="FFFF00" bgColour="000080"
                 longname="Norfolk &amp; Western">
@@ -132,7 +144,7 @@
         </Company>
     </IfOption>
     <IfOption name="Variant" value="Wabash">
-        <Company name="WR" type="Public" tokens="2" fgColour="000000" bgColour="FFFFFF"
+        <Company name="WAB" type="Public" tokens="2" fgColour="000000" bgColour="FFFFFF"
                 longname="Wabash Railroad">
             <Home hex="H2"/>
             <Certificate type="President" shares="2"/>

Modified: trunk/18xx/data/1830/Game.xml
===================================================================
--- trunk/18xx/data/1830/Game.xml	2011-05-12 20:26:14 UTC (rev 1559)
+++ trunk/18xx/data/1830/Game.xml	2011-05-13 15:44:06 UTC (rev 1560)
@@ -15,7 +15,7 @@
 		<!-- The options in Game.xml are not currently used.
 			 See GamesList.xml for the real ones.
 		--> 
-		<GameOption name="Variant" values="Basegame,Pere Marquette,Coalfields,Reading,Coalfields&amp;Reading,Wabash" default="Basegame" />
+		<GameOption name="Variant" values="Basegame,Pere Marquette,Coalfields,Reading,Coalfields&amp;Reading,Simple,Wabash" default="Basegame" />
 		<GameOption name="NoMapMode" type="toggle" default="no" />
 		<GameOption name="RouteAwareness" values="Highlight,Deactivate" default="Deactivate" />
 		<GameOption name="RevenueCalculation" values="Suggest,Deactivate" default="Deactivate" />
@@ -50,7 +50,7 @@
 		</EndOfGame>
 	</Component>
 	<Component name="PlayerManager" class="rails.game.PlayerManager">
-		<IfOption name="Variant" value="Basegame">
+		<IfOption name="Variant" value="Basegame,Simple">
 			<Players number="2" cash="1200" certLimit="28"/>
 			<Players number="3" cash="800" certLimit="20"/>
 			<Players number="4" cash="600" certLimit="16"/>
@@ -96,7 +96,7 @@
         </IfOption>     
 	</Component>
 	<Component name="Bank" class="rails.game.Bank">
-        <IfOption name="Variant" value="Basegame,Pere Marquette,Coalfields,Reading">
+        <IfOption name="Variant" value="Basegame,Pere Marquette,Coalfields,Reading,Simple">
 			<Bank amount="12000"/>
 		</IfOption>
         <IfOption name="Variant" value="Coalfields&amp;Reading">
@@ -177,7 +177,7 @@
 			<IfOption name="Variant" value="Coalfields&amp;Reading">
 				<Attributes amount="4" releasedTrain="7,D"/>
 			</IfOption>
-            <IfOption name="Variant" value="Wabash">
+            <IfOption name="Variant" value="Simple,Wabash">
                 <Attributes amount="3"/>
             </IfOption>
 		</Train>
@@ -187,9 +187,9 @@
         <IfOption name="Variant" value="Wabash">
             <Train name="7" majorStops="7" cost="830" amount="-1"/>
         </IfOption>
-		<IfOption name="Variant" value="Basegame,Pere Marquette,Reading,Coalfields,Coalfields&amp;Reading">
+		<IfOption name="Variant" value="Basegame,Pere Marquette,Reading,Coalfields,Coalfields&amp;Reading,Simple">
 			<Train name="D" majorStops="99" startPhase="D" rustedTrain="4">
-				<IfOption name="Variant" value="Basegame,Pere Marquette">
+				<IfOption name="Variant" value="Basegame,Pere Marquette,Simple">
 					<Attributes cost="1100"/>
 					<Exchange cost="800"/>
 				</IfOption>

Modified: trunk/18xx/data/1830/Map.xml
===================================================================
--- trunk/18xx/data/1830/Map.xml	2011-05-12 20:26:14 UTC (rev 1559)
+++ trunk/18xx/data/1830/Map.xml	2011-05-13 15:44:06 UTC (rev 1560)
@@ -30,14 +30,14 @@
 	<Hex name="D14" tile="-102" value="20"/>
 	<Hex name="D16" tile="0"/>
 	<Hex name="D18" tile="0"/>
-    <IfOption name="Variant" value="Basegame,Pere Marquette,Coalfields,Reading,Coalfields&amp;Reading">
+    <IfOption name="Variant" value="Basegame,Pere Marquette,Coalfields,Reading,Coalfields&amp;Reading,Simple">
 		<Hex name="D20" tile="0"/>
     </IfOption>
     <IfOption name="Variant" value="Wabash">
 		<Hex name="D20" tile="-25007" orientation="3"/>
     </IfOption>
 	<Hex name="D22" tile="0" cost="120"/>
-    <IfOption name="Variant" value="Basegame,Pere Marquette,Wabash">
+    <IfOption name="Variant" value="Basegame,Pere Marquette,Wabash,Simple">
 	    <Hex name="D24" tile="-7" orientation="2"/>
     </IfOption>
     <IfOption name="Variant" value="Coalfields,Reading,Coalfields&amp;Reading">
@@ -54,7 +54,7 @@
 	<Hex name="E19" tile="-10"/>
 	<Hex name="E21" tile="0" cost="120"/>
 	<Hex name="E23" tile="-11" orientation="5" label="B" city="Boston"/>
-	<IfOption name="Variant" value="Basegame,Pere Marquette,Reading">
+	<IfOption name="Variant" value="Basegame,Pere Marquette,Reading,Simple">
 		<Hex name="F2" tile="-903" orientation="5" value="40,70" city="Chicago"/>
 	</IfOption>
 	<IfOption name="Variant" value="Coalfields,Coalfields&amp;Reading">
@@ -71,7 +71,7 @@
 	<Hex name="F14" tile="0"/>
 	<Hex name="F16" tile="-10" cost="120"/>
 	<Hex name="F18" tile="0"/>
-    <IfOption name="Variant" value="Basegame,Pere Marquette,Reading,Wabash">
+    <IfOption name="Variant" value="Basegame,Pere Marquette,Reading,Simple,Wabash">
 		<Hex name="F20" tile="-2"/>
     </IfOption>
     <IfOption name="Variant" value="Coalfields,Coalfields&amp;Reading">
@@ -97,20 +97,20 @@
         <Hex name="H0" tile="0"/>
         <Hex name="H2" tile="-10"/>
     </IfOption>
-    <IfOption name="Variant" value="Basegame,Pere Marquette,Reading,Coalfields,Coalfields&amp;Reading">
+    <IfOption name="Variant" value="Basegame,Pere Marquette,Reading,Coalfields,Coalfields&amp;Reading,Simple">
 		<Hex name="H2" tile="0"/>
     </IfOption>
 	<Hex name="H4" tile="-10"/>
 	<Hex name="H6" tile="0"/>
 	<Hex name="H8" tile="0"/>
 	<Hex name="H10" tile="-10"/>
-    <IfOption name="Variant" value="Basegame,Pere Marquette,Wabash">
+    <IfOption name="Variant" value="Basegame,Pere Marquette,Simple,Wabash">
 	    <Hex name="H12" tile="-101" city="Altoona" runThrough="tokenOnly"/>
     </IfOption>
     <IfOption name="Variant" value="Coalfields,Reading,Coalfields&amp;Reading">
         <Hex name="H12" tile="-30003" pic="-30002" city="Altoona" runThrough="tokenOnly"/>
     </IfOption>
-    <IfOption name="Variant" value="Basegame,Pere Marquette,Coalfields,Wabash">
+    <IfOption name="Variant" value="Basegame,Pere Marquette,Coalfields,Simple,Wabash">
 		<Hex name="H14" tile="0"/>
     </IfOption>
     <IfOption name="Variant" value="Reading,Coalfields&amp;Reading">
@@ -123,7 +123,7 @@
         <Hex name="I-1" tile="0"/>
         <Hex name="I1" tile="0"/>
     </IfOption>
-	<IfOption name="Variant" value="Basegame,Pere Marquette,Reading">
+	<IfOption name="Variant" value="Basegame,Pere Marquette,Reading,Simple">
 		<Hex name="I1" tile="-901" orientation="5" value="30,60" city="Gulf"/>
 	</IfOption>
 	<IfOption name="Variant" value="Coalfields,Coalfields&amp;Reading">
@@ -143,7 +143,7 @@
         <Hex name="J0" tile="0"/>
         <Hex name="J2" tile="-10" city="Cincinnati"/>
     </IfOption>
-	<IfOption name="Variant" value="Basegame,Pere Marquette,Reading">
+	<IfOption name="Variant" value="Basegame,Pere Marquette,Reading,Simple">
 		<Hex name="J2" tile="-902" orientation="5" value="30,60" city="Gulf"/>
 	</IfOption>
 	<IfOption name="Variant" value="Coalfields,Coalfields&amp;Reading">
@@ -155,7 +155,7 @@
 	<Hex name="J10" tile="0" cost="120"/>
 	<Hex name="J12" tile="0" cost="120"/>
 	<Hex name="J14" tile="-10" cost="80" city="Washington"/>
-	<IfOption name="Variant" value="Basegame,Pere Marquette,Wabash">
+	<IfOption name="Variant" value="Basegame,Pere Marquette,Simple,Wabash">
 		<Hex name="K13" tile="-902" orientation="4" value="30,40" city="Deep South"/>
 		<Hex name="K15" tile="-104" orientation="3"/>
 	</IfOption>

Modified: trunk/18xx/data/1830/TileSet.xml
===================================================================
--- trunk/18xx/data/1830/TileSet.xml	2011-05-12 20:26:14 UTC (rev 1559)
+++ trunk/18xx/data/1830/TileSet.xml	2011-05-13 15:44:06 UTC (rev 1560)
@@ -16,7 +16,7 @@
 		<Upgrade id="57"/>
 	</Tile>
 	<Tile id="-11"><!-- B yellow -->
-        <IfOption name="Variant" value="Basegame,Pere Marquette,Wabash">
+        <IfOption name="Variant" value="Basegame,Pere Marquette,Simple,Wabash">
 			<Upgrade id="53"/>
         </IfOption>
         <IfOption name="Variant" value="Coalfields,Reading,Coalfields&amp;Reading">
@@ -80,7 +80,7 @@
         </IfOption>
     </Tile>
 	<Tile id="57">
-		<IfOption name="Variant" value="Basegame,Pere Marquette,Reading">
+		<IfOption name="Variant" value="Basegame,Pere Marquette,Reading,Simple">
 			<Attributes quantity="4"/>
 		</IfOption>
         <IfOption name="Variant" value="Wabash">
@@ -100,7 +100,7 @@
 	
 	<!-- Green tiles -->
 	<Tile id="14">
-        <IfOption name="Variant" value="Basegame,Pere Marquette,Reading,Wabash">
+        <IfOption name="Variant" value="Basegame,Pere Marquette,Reading,Simple,Wabash">
             <Attributes quantity="3"/>
         </IfOption>
         <IfOption name="Variant" value="Coalfields,Coalfields&amp;Reading">
@@ -115,7 +115,7 @@
         <IfOption name="Variant" value="Wabash">
             <Upgrade id="63,448"/>
         </IfOption>
-        <IfOption name="Variant" value="Basegame,Pere Marquette,Coalfields,Coalfields&amp;Reading">
+        <IfOption name="Variant" value="Basegame,Pere Marquette,Coalfields,Coalfields&amp;Reading,Simple">
 			<Upgrade id="63" />
         </IfOption>
 	</Tile>
@@ -152,7 +152,7 @@
 	<Tile id="29" quantity="1">
 		<Upgrade id="39,43,45,70" />
 	</Tile>
-	<IfOption name="Variant" value="Basegame,Pere Marquette">
+	<IfOption name="Variant" value="Basegame,Pere Marquette,Simple,Wabash">
 		<Tile id="53" quantity="2">
 			<Upgrade id="61" />
 		</Tile>
@@ -169,7 +169,7 @@
         </Tile>
     </IfOption>
 	<Tile id="54" quantity="1">
-		<IfOption name="Variant" value="Basegame,Pere Marquette,Reading">
+		<IfOption name="Variant" value="Basegame,Pere Marquette,Reading,Simple">
 			<Upgrade id="62" />
 		</IfOption>
 		<IfOption name="Variant" value="Coalfields,Coalfields&amp;Reading">
@@ -190,9 +190,14 @@
 	<Tile id="45" quantity="2" />
 	<Tile id="46" quantity="2" />
 	<Tile id="47" quantity="1" />
-    <IfOption name="Variant" value="Basegame,Pere Marquette">
+    <IfOption name="Variant" value="Basegame,Pere Marquette,Wabash">
 	    <Tile id="61" quantity="2" />
     </IfOption>
+    <IfOption name="Variant" value="Simple">
+	    <Tile id="61" quantity="2" >
+			<Upgrade id="368" />
+		</Tile>
+    </IfOption>
     <IfOption name="Variant" value="Reading">
 	    <Tile id="1061" quantity="2" />
     </IfOption>
@@ -203,11 +208,16 @@
     <IfOption name="Variant" value="Basegame,Pere Marquette,Reading">
 		<Tile id="62" quantity="1" />
     </IfOption>
+    <IfOption name="Variant" value="Simple">
+		<Tile id="62" quantity="1" >
+			<Upgrade id="124" />
+		</Tile>
+    </IfOption>
     <IfOption name="Variant" value="Coalfields,Coalfields&amp;Reading">
         <Tile id="1062" extId="62" quantity="1" />
     </IfOption>
 	<Tile id="63">
-        <IfOption name="Variant" value="Basegame,Pere Marquette,Reading">
+        <IfOption name="Variant" value="Basegame,Pere Marquette,Reading,Simple">
             <Attributes quantity="3"/>
         </IfOption>
         <IfOption name="Variant" value="Coalfields,Coalfields&amp;Reading">
@@ -223,6 +233,12 @@
     <IfOption name="Variant" value="Coalfields,Coalfields&amp;Reading">
         <Tile id="1717" extId="G17" quantity="1" />
     </IfOption>
+    <IfOption name="Variant" value="Simple">
+        <Tile id="124" quantity="1" />
+    </IfOption>
+    <IfOption name="Variant" value="Simple">
+        <Tile id="368" quantity="1" />
+    </IfOption>
     <IfOption name="Variant" value="Wabash">
         <Tile id="448" quantity="2" />
     </IfOption>

Modified: trunk/18xx/data/1830/Tiles.xml
===================================================================
--- trunk/18xx/data/1830/Tiles.xml	2011-05-12 20:26:14 UTC (rev 1559)
+++ trunk/18xx/data/1830/Tiles.xml	2011-05-13 15:44:06 UTC (rev 1560)
@@ -432,6 +432,20 @@
 		<Track from="side5" gauge="normal" to="side0"/>
 		<Track from="side4" gauge="normal" to="side0"/>
 	</Tile>
+    <Tile colour="gray" id="124" name="124">
+        <Station id="city1" position="0" slots="4" type="City" value="100"/>
+        <Track from="city1" gauge="normal" to="side0"/>
+        <Track from="city1" gauge="normal" to="side1"/>
+        <Track from="city1" gauge="normal" to="side2"/>
+        <Track from="city1" gauge="normal" to="side3"/>
+    </Tile>
+	<Tile colour="brown" id="368" name="1889 dc K brown">
+		<Station id="city1" position="0" slots="2" type="City" value="40"/>
+		<Track from="city1" gauge="normal" to="side0"/>
+		<Track from="city1" gauge="normal" to="side1"/>
+		<Track from="city1" gauge="normal" to="side2"/>
+		<Track from="city1" gauge="normal" to="side3"/>
+	</Tile>
 	<Tile colour="brown" id="1717" name="G17">
 		<Station id="city1" position="0" type="Town" value="20"/>
 		<Track from="city1" gauge="normal" to="side0"/>


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