Menu
▾
▴
rails-commits
|
From: <ev...@us...> - 2011-05-11 20:58:51
|
Revision: 1558
http://rails.svn.sourceforge.net/rails/?rev=1558&view=rev
Author: evos
Date: 2011-05-11 20:58:45 +0000 (Wed, 11 May 2011)
Log Message:
-----------
18Scan: fixes to the map and the tile upgrade rules.
Modified Paths:
--------------
trunk/18xx/data/18Scan/Map.xml
trunk/18xx/data/18Scan/TileSet.xml
trunk/18xx/data/18Scan/Tiles.xml
Modified: trunk/18xx/data/18Scan/Map.xml
===================================================================
--- trunk/18xx/data/18Scan/Map.xml 2011-05-11 20:29:31 UTC (rev 1557)
+++ trunk/18xx/data/18Scan/Map.xml 2011-05-11 20:58:45 UTC (rev 1558)
@@ -25,7 +25,7 @@
<Hex name="C16" tile="0" cost="60"/>
<Hex name="C18" tile="-1" city="Lulea"/>
<Hex name="D5" tile="-1" city="Kristiansand" impassable="E4,E6"/>
- <Hex name="D7" tile="-10" city="Oslo"/>
+ <Hex name="D7" tile="-3007" city="Oslo"/>
<Hex name="D9" tile="0"/>
<Hex name="D11" tile="0"/>
<Hex name="D13" tile="0" impassable="E14"/>
@@ -55,7 +55,7 @@
<Hex name="G6" tile="0"/>
<Hex name="G8" tile="0"/>
<Hex name="G12" tile="-4007" orientation="2"/>
- <Hex name="G14" tile="-10" city="Helsinki"/>
+ <Hex name="G14" tile="-3007" city="Helsinki"/>
<Hex name="G16" tile="-1" city="Lahti"/>
<Hex name="H13" tile="-911" city="Tallinn" value="0,30,60" orientation="4"/>
<Hex name="H17" tile="-911" city="Vyborg" value="30,50,80" orientation="3"/>
Modified: trunk/18xx/data/18Scan/TileSet.xml
===================================================================
--- trunk/18xx/data/18Scan/TileSet.xml 2011-05-11 20:29:31 UTC (rev 1557)
+++ trunk/18xx/data/18Scan/TileSet.xml 2011-05-11 20:58:45 UTC (rev 1558)
@@ -7,73 +7,81 @@
<Upgrade id="58"/>
</Tile>
<Tile id="-10">
- <Upgrade id="5"/>
+ <Upgrade id="5" hex="-F3"/>
+ <Upgrade id="403" hex="F3"/>
</Tile>
<Tile id="-911"/>
<Tile id="-912"/>
+ <Tile id="-3007">
+ <Upgrade id="5"/>
+ </Tile>
<Tile id="-4002"/>
<Tile id="-4007"/>
- <Tile id="-10004"/>
+ <Tile id="-10004">
+ <Upgrade id="622"/>
+ </Tile>
<!-- Yellow Tiles -->
- <Tile id="5">
- <Upgrade id="15"/>
+ <Tile id="5" quantity="12">
+ <Upgrade id="15" hex="-D7,G14"/>
+ <Upgrade id="622" hex="D7,G14"/>
</Tile>
- <Tile id="8">
+ <Tile id="8" quantity="8">
<Upgrade id="80,81,82,83"/>
</Tile>
- <Tile id="9">
+ <Tile id="9" quantity="8">
<Upgrade id="82,83"/>
</Tile>
- <Tile id="58">
+ <Tile id="58" quantity="7">
<Upgrade id="141,142,143,144"/>
</Tile>
- <Tile id="403">
+ <Tile id="403" quantity="1">
<Upgrade id="1121"/>
</Tile>
<!-- Green Tiles -->
- <Tile id="15"/>
- <Tile id="80">
+ <Tile id="15" quantity="6"/>
+ <Tile id="80" pic="3080" quantity="3">
<Upgrade id="545,546"/>
</Tile>
- <Tile id="81">
+ <Tile id="81" pic="3081" quantity="3">
<Upgrade id="546"/>
</Tile>
- <Tile id="82">
+ <Tile id="82" pic="3082" quantity="3">
<Upgrade id="544,545,546"/>
</Tile>
- <Tile id="83">
+ <Tile id="83" pic="3083" quantity="3">
<Upgrade id="544,545,546"/>
</Tile>
- <Tile id="1121" extId="121">
+ <Tile id="1121" extId="121" quantity="1">
<Upgrade id="1584"/>
</Tile>
- <Tile id="141">
+ <Tile id="141" quantity="3">
<Upgrade id="145,146,147"/>
</Tile>
- <Tile id="142">
+ <Tile id="142" quantity="3">
<Upgrade id="145,146,147"/>
</Tile>
- <Tile id="143">
+ <Tile id="143" quantity="3">
<Upgrade id="146,147"/>
</Tile>
- <Tile id="144">
+ <Tile id="144" quantity="3">
<Upgrade id="147"/>
</Tile>
- <Tile id="622">
- <Upgrade id="623"/>
+ <Tile id="622" quantity="3">
+ <Upgrade id="623" hex="D7"/>
+ <Upgrade id="582" hex="F11,H14"/>
</Tile>
<!-- Brown Tiles -->
- <Tile id="145"/>
- <Tile id="146"/>
- <Tile id="147"/>
- <Tile id="544"/>
- <Tile id="545"/>
- <Tile id="546"/>
- <Tile id="582"/>
- <Tile id="1584" extId="584"/>
- <Tile id="623"/>
+ <Tile id="145" quantity="3"/>
+ <Tile id="146" quantity="3"/>
+ <Tile id="147" quantity="4"/>
+ <Tile id="544" pic="3544" quantity="3"/>
+ <Tile id="545" pic="3545" quantity="3"/>
+ <Tile id="546" pic="3546" quantity="4"/>
+ <Tile id="582" quantity="2"/>
+ <Tile id="1584" extId="584" quantity="1"/>
+ <Tile id="623" quantity="1"/>
</TileManager>
Modified: trunk/18xx/data/18Scan/Tiles.xml
===================================================================
--- trunk/18xx/data/18Scan/Tiles.xml 2011-05-11 20:29:31 UTC (rev 1557)
+++ trunk/18xx/data/18Scan/Tiles.xml 2011-05-11 20:58:45 UTC (rev 1558)
@@ -16,6 +16,9 @@
<Track from="city1" gauge="normal" to="side1"/>
<Track from="city1" gauge="normal" to="side2"/>
</Tile>
+ <Tile colour="white" id="-3007" name="Y city (cent)">
+ <Station id="city1" position="0" slots="1" type="City"/>
+ </Tile>
<Tile colour="red" id="-4002" name="Port-2">
<Station id="city1" position="0" type="OffMapCity"/>
<Track from="city1" gauge="normal" to="side2"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ev...@us...> - 2011-05-12 20:26:20
|
Revision: 1559
http://rails.svn.sourceforge.net/rails/?rev=1559&view=rev
Author: evos
Date: 2011-05-12 20:26:14 +0000 (Thu, 12 May 2011)
Log Message:
-----------
18Scan: companies and Game.xml
Modified Paths:
--------------
trunk/18xx/data/18Scan/CompanyManager.xml
trunk/18xx/data/18Scan/Game.xml
Modified: trunk/18xx/data/18Scan/CompanyManager.xml
===================================================================
--- trunk/18xx/data/18Scan/CompanyManager.xml 2011-05-11 20:58:45 UTC (rev 1558)
+++ trunk/18xx/data/18Scan/CompanyManager.xml 2011-05-12 20:26:14 UTC (rev 1559)
@@ -4,12 +4,23 @@
<ClosingConditions>
<Phase>5</Phase>
</ClosingConditions>
- <Tradeable toCompany="yes" lowerPriceFactor="0.5" upperPriceFactor="1.5"/>
- <Tradeable toPlayer="yes"/>
</CompanyType>
+
+ <CompanyType name="Minor" class="rails.game.PublicCompany" fgColour="FFCC11" bgColour="9370DB">
+ <ShareUnit percentage="100"/>
+ <Certificate type="President" shares="1"/>
+ <StockPrice market="no"/>
+ <Payout split="always"/>
+ <BaseTokens>
+ <HomeBase lay="whenStarted"/>
+ </BaseTokens>
+ <Trains number="2,2,1,0" mandatory="no"/>
+ </CompanyType>
+
<CompanyType name="Public" class="rails.game.PublicCompany">
- <PoolPaysOut/>
- <Float percentage="60"/>
+ <Capitalisation type="incremental"/>
+ <Float percentage="20"/>
+ <StockPrice par="no"/>
<ShareUnit percentage="10"/>
<Certificate type="President" shares="2"/>
<Certificate shares="1" number="8"/>
@@ -18,17 +29,59 @@
<LayCost method="sequence" cost="0,40,100"/>
</BaseTokens>
<Trains number="4,4,3,2"/>
- <CanBuyPrivates/>
<CanUseSpecialProperties/>
</CompanyType>
- <Company name="P1" type="Private" basePrice="20" revenue="5"
- longname="Private 1"></Company>
-
+ <Company name="Ferry" type="Private" basePrice="120" revenue="20"
+ longname="Stockholm-Åbo Ferry Company (Ferry)"></Company>
+ <Company name="Mine" type="Private" basePrice="150" revenue="25"
+ longname="Lapland Ore Line (Mine)"></Company>
+ <Company name="ZRC" type="Private" basePrice="180" revenue="30"
+ longname="Sjællandske Jernbaneselskab (Zeeland Railway Company)"></Company>
+ <Company name="1" type="Minor" tokens="2" longname="Västra Stambanan (Western Mainline)">
+ <Home hex="G4" />
+ </Company>
+ <Company name="2" type="Minor" tokens="2" longname="Nordvästra Stambanan (Northwestern Mainline)">
+ <Home hex="F11" />
+ </Company>
+ <Company name="3" type="Minor" tokens="2" longname="Södra Stambanan (Southern Mainline)">
+ <Home hex="F11" />
+ </Company>
+
+ <Company name="DSB" type="Public" tokens="3" fgColour="FFFFFF"
+ bgColour="EE2C2C" longname="Danske Statsbaner">
+ <Home hex="F3" />
+ </Company>
+ <Company name="NSB" type="Public" tokens="4" fgColour="FFFFFF"
+ bgColour="23238E" longname="Norges Statsbaner">
+ <Home hex="D7" />
+ </Company>
+ <Company name="S&NJ" type="Public" tokens="3" fgColour="FFFFFF"
+ bgColour="228B22" longname="Sveriges & Norges Järnvägar">
+ <Home hex="B19" />
+ </Company>
+ <Company name="VR" type="Public" tokens="4" fgColour="FFFFFF"
+ bgColour="1464F4" longname="Valtionrautatiet">
+ <Home hex="G14" />
+ </Company>
+ <Company name="SJ" type="Public" tokens="6" fgColour="FFCC11"
+ bgColour="9370DB" longname="Statens Järnvägar">
+ <Trains number="3"/>
+ </Company>
+
<StartPacket roundClass="rails.game.StartRound_1830">
<Bidding initial="5" minimum="5" increment="1"/>
- <Item name="P1" type="Private" basePrice="20"/>
-
-
+ <Item name="Ferry" type="Private" basePrice="120">
+ <SubItem name="VR" type="Public" />
+ </Item>
+ <Item name="Mine" type="Private" basePrice="150">
+ <SubItem name="S&NJ" type="Public" />
+ </Item>
+ <Item name="ZRC" type="Private" basePrice="180">
+ <SubItem name="DSB" type="Public" president="yes"/>
+ </Item>
+ <Item name="1" type="Minor" basePrice="200"/>
+ <Item name="2" type="Minor" basePrice="220"/>
+ <Item name="3" type="Minor" basePrice="260"/>
</StartPacket>
</CompanyManager>
\ No newline at end of file
Modified: trunk/18xx/data/18Scan/Game.xml
===================================================================
--- trunk/18xx/data/18Scan/Game.xml 2011-05-11 20:58:45 UTC (rev 1558)
+++ trunk/18xx/data/18Scan/Game.xml 2011-05-12 20:26:14 UTC (rev 1559)
@@ -11,15 +11,14 @@
</IfOption>
</PlayerShareLimit>
<BankPoolLimit percentage="50"/>
- <StockRound>
- <NoSaleInFirstSR/>
+ <StockRound sequence="SellBuy">
+ <NoSaleIfNotOperated/>
</StockRound>
</GameParameters>
<GuiClasses>
</GuiClasses>
<EndOfGame>
- <Bankruptcy/>
- <BankBreaks limit="0" finish="currentOR"/>
+ <BankBreaks limit="0" finish="setOfORs"/>
<!-- "Runs out"; when "broken", -1 is the limit -->
<!-- Also when the share value reaches $300; this is configured in the stock market XML,
but uses the 'finish' attribute value defined above. -->
@@ -45,47 +44,36 @@
<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="2" majorStops="2" cost="100" amount="6"/>
+ <Train name="3" majorStops="3" cost="200" amount="4" startPhase="3"/>
<Train name="4" majorStops="4" cost="300" amount="3" startPhase="4"
rustedTrain="2" />
- <Train name="5" majorStops="5" cost="450" amount="2" startPhase="5"/>
- <Train name="6" majorStops="6" cost="630" amount="2" startPhase="6"
+ <Train name="5" majorStops="5" cost="500" amount="2" startPhase="5" releasedTrain="5E"/>
+ <Train name="5E" majorStops="5" cost="600" amount="2" startPhase="6" releasedTrain="4D"
rustedTrain="3"/>
- <Train name="8" majorStops="8" cost="800" startPhase="8"
+ <Train name="4D" majorStops="4" cost="800" amount="6" startPhase="4D"
rustedTrain="4">
- <IfOption name="UnlimitedTopTrains" value="yes">
- <Attributes amount="-1"/>
- </IfOption>
- <IfOption name="UnlimitedTopTrains" value="no">
- <Attributes amount="5"/>
- </IfOption>
</Train>
</Component>
<Component name="PhaseManager" class="rails.game.PhaseManager">
<Phase name="2" >
<Tiles colour="yellow"/>
- <OperatingRounds number="1"/>
+ <OperatingRounds number="2"/>
<Trains onePerTurn="yes" tradingAllowed="yes"/>
</Phase>
<Phase name="3">
<Tiles colour="yellow,green"/>
- <Privates sellingAllowed="yes"/>
- <OperatingRounds number="2"/>
+ <OffBoardRevenue step="2"/>
</Phase>
- <Phase name="4">
- <Trains onePerTurn="no"/>
- </Phase>
+ <Phase name="4"/>
<Phase name="5">
<Tiles colour="yellow,green,brown"/>
- <OperatingRounds number="3"/>
<Privates close="yes"/>
- <OffBoardRevenue step="2"/>
+ <OffBoardRevenue step="3"/>
</Phase>
- <Phase name="6" />
- <Phase name="8">
- <Tiles colour="yellow,green,brown"/>
- </Phase>
+ <Phase name="5E" />
+ <Phase name="4D"/>
+
</Component>
<Component name="RevenueManager" class="rails.algorithms.RevenueManager">
</Component>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X