You can subscribe to this list here.
2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
(46) |
Dec
(57) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2009 |
Jan
(51) |
Feb
(10) |
Mar
|
Apr
|
May
(14) |
Jun
|
Jul
(13) |
Aug
(30) |
Sep
(83) |
Oct
(56) |
Nov
(148) |
Dec
(107) |
2010 |
Jan
(260) |
Feb
(164) |
Mar
(183) |
Apr
(99) |
May
(160) |
Jun
(40) |
Jul
(33) |
Aug
(48) |
Sep
(22) |
Oct
(24) |
Nov
(1) |
Dec
(12) |
2011 |
Jan
(6) |
Feb
(15) |
Mar
(13) |
Apr
(37) |
May
(27) |
Jun
(29) |
Jul
(33) |
Aug
(20) |
Sep
(17) |
Oct
(20) |
Nov
(33) |
Dec
(17) |
2012 |
Jan
(39) |
Feb
(38) |
Mar
(20) |
Apr
(21) |
May
(17) |
Jun
(22) |
Jul
(16) |
Aug
(3) |
Sep
(9) |
Oct
(10) |
Nov
|
Dec
|
From: <ev...@us...> - 2011-04-26 22:28:07
|
Revision: 1532 http://rails.svn.sourceforge.net/rails/?rev=1532&view=rev Author: evos Date: 2011-04-26 22:28:01 +0000 (Tue, 26 Apr 2011) Log Message: ----------- 18GA Cotton Port Modified Paths: -------------- trunk/18xx/data/18GA/Map.xml Modified: trunk/18xx/data/18GA/Map.xml =================================================================== --- trunk/18xx/data/18GA/Map.xml 2011-04-26 22:20:14 UTC (rev 1531) +++ trunk/18xx/data/18GA/Map.xml 2011-04-26 22:28:01 UTC (rev 1532) @@ -90,7 +90,7 @@ </IfOption> <IfOption name="Variant" value="Cotton Port"> - <Hex name="G13" tile="-5015" orientation="5" city="Savannah"/> + <Hex name="G13" tile="-5015" orientation="5" value="30,60" city="Savannah"/> </IfOption> <IfOption name="Variant" value="Basegame"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ev...@us...> - 2011-04-26 22:20:21
|
Revision: 1531 http://rails.svn.sourceforge.net/rails/?rev=1531&view=rev Author: evos Date: 2011-04-26 22:20:14 +0000 (Tue, 26 Apr 2011) Log Message: ----------- 18GA Cotton Port Modified Paths: -------------- trunk/18xx/data/18GA/CompanyManager.xml trunk/18xx/data/18GA/Game.xml trunk/18xx/data/18GA/Map.xml trunk/18xx/data/GamesList.xml Modified: trunk/18xx/data/18GA/CompanyManager.xml =================================================================== --- trunk/18xx/data/18GA/CompanyManager.xml 2011-04-26 19:41:31 UTC (rev 1530) +++ trunk/18xx/data/18GA/CompanyManager.xml 2011-04-26 22:20:14 UTC (rev 1531) @@ -1,79 +1,98 @@ -<?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/> - <Float percentage="60"/> - <ShareUnit percentage="10"/> - <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="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&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&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 Railroad"> - <Home hex="J12" /> - </Company> - <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&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 Railroad"> - <Home hex="G13" /> - </Company> - <Company name="W&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="LT" type="Private" basePrice="20" /> - <Item name="MR" type="Private" basePrice="40" /> - <Item name="W&S" type="Private" basePrice="70" /> - <Item name="OSO" type="Private" basePrice="100" /> - <Item name="M&B" type="Private" basePrice="150" > - <SubItem name="CoG" type="Public" /> - </Item> - - </StartPacket> +<?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/> + <Float percentage="60"/> + <ShareUnit percentage="10"/> + <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="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&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&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 Railroad"> + <Home hex="J12"/> + </Company> + <Company name="CoG" type="Public" tokens="4" fgColour="FFFFFF" bgColour="CC3366" + longname="Central of Georgia Railway"> + <Home hex="F6"/> + </Company> + <Company name="GA" type="Public" tokens="4" fgColour="FFFFFF" bgColour="219C29" + longname="Georgia Railroad"> + <IfOption name="Variant" value="Basegame"> + <Home hex="D10"/> + </IfOption> + <IfOption name="Variant" value="Cotton Port"> + <Home hex="D10,E15"/> + </IfOption> + </Company> + <Company name="G&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 Railroad"> + <Home hex="G13"/> + </Company> + <Company name="W&A" 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="LT" type="Private" basePrice="20"/> + <Item name="MR" type="Private" basePrice="40"/> + <Item name="W&S" type="Private" basePrice="70"/> + <Item name="OSO" type="Private" basePrice="100"/> + <Item name="M&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 19:41:31 UTC (rev 1530) +++ trunk/18xx/data/18GA/Game.xml 2011-04-26 22:20:14 UTC (rev 1531) @@ -2,8 +2,22 @@ <ComponentManager> <Component name="GameManager" class="rails.game.GameManager"> <Game name="18GA"/> + <GameOption name="Variant" values="Basegame,Cotton Port" default="Basegame" /> + <GameOption name="NoMapMode" type="toggle" default="no" /> + <GameOption name="RouteAwareness" values="Highlight,Deactivate" default="Highlight" /> + <GameOption name="RevenueCalculation" values="Suggest,Deactivate" default="Suggest" /> + <GameOption name="UnlimitedTopTrains" parm="8" type="toggle" default="no"/> + <GameOption name="UnlimitedTiles" type="toggle" default="no"/> + <GameOption name="LeaveAuctionOnPass" type="toggle" default="no"/> + <GameOption name="TwoPlayersCertLimit70Percent" type="toggle" default="yes"/> <GameParameters> - <PlayerShareLimit percentage="60"/> + <PlayerShareLimit percentage="60"> + <IfOption name="NumberOfPlayers" value="2"> + <IfOption name="TwoPlayersCertLimit70Percent" value="yes"> + <Attributes percentage="70"/> + </IfOption> + </IfOption> + </PlayerShareLimit> <BankPoolLimit percentage="50"/> <StockRound> <NoSaleInFirstSR/> @@ -20,6 +34,7 @@ </EndOfGame> </Component> <Component name="PlayerManager" class="rails.game.PlayerManager"> + <Players number="2" cash="810" certLimit="20"/> <Players number="3" cash="600" certLimit="15"/> <Players number="4" cash="450" certLimit="12"/> <Players number="5" cash="360" certLimit="10"/> @@ -46,8 +61,15 @@ <Train name="5" majorStops="5" cost="450" amount="2" startPhase="5"/> <Train name="6" majorStops="6" cost="630" amount="2" startPhase="6" rustedTrain="3"/> - <Train name="8" majorStops="8" cost="800" amount="5" startPhase="8" - rustedTrain="4"/> + <Train name="8" majorStops="8" cost="800" startPhase="8" + 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" > Modified: trunk/18xx/data/18GA/Map.xml =================================================================== --- trunk/18xx/data/18GA/Map.xml 2011-04-26 19:41:31 UTC (rev 1530) +++ trunk/18xx/data/18GA/Map.xml 2011-04-26 22:20:14 UTC (rev 1531) @@ -1,117 +1,133 @@ -<Map mapClass="rails.ui.swing.hexmap.EWHexMap" tileOrientation="EW" letterOrientation="vertical" even="B"> - <Hex name="A3" tile="-902" orientation="1" value="30,60" city="Chattanooga" /> - - <Hex name="B2" tile="0" cost="60"> - <Symbols> - <Symbol name="mountain" where="tp2SideA" anchorX="center" anchorY="center" fromPhase="0" toPhase="0" /> - </Symbols> - </Hex> - <Hex name="B4" tile="0" /> - <Hex name="B6" tile="0" cost="60"> - <Symbols> - <Symbol name="mountain" where="tp2SideA" anchorX="center" anchorY="center" fromPhase="0" toPhase="0" /> - </Symbols> - </Hex> - <Hex name="B8" tile="0" cost="60"> - <Symbols> - <Symbol name="mountain" where="tp2SideA" anchorX="center" anchorY="center" fromPhase="0" toPhase="0" /> - </Symbols> - </Hex> - <Hex name="B10" tile="-902" orientation="2" value="30,40" city="Greeneville" /> - - <Hex name="C1" tile="0" cost="60"> - <Symbols> - <Symbol name="mountain" where="tp2SideA" anchorX="center" anchorY="center" fromPhase="0" toPhase="0" /> - </Symbols> - </Hex> - <Hex name="C3" tile="-3008" city="Rome" /> - <Hex name="C5" tile="0" cost="20"> - <River from="center" to="D4" /> - </Hex> - <Hex name="C7" tile="0" /> - <Hex name="C9" tile="0" /> - - <Hex name="D2" tile="0" /> - <Hex name="D4" tile="-30" city="Atlanta" /> - <Hex name="D6" tile="0" /> - <Hex name="D8" tile="0" /> - <Hex name="D10" tile="-3008" city="Augusta" /> - - <Hex name="E1" tile="-1143" orientation="1" value="30,40" city="Montgomery" /> - <Hex name="E3" tile="0" cost="40"> - <River from="D4" to="F2" /> - </Hex> - <Hex name="E5" tile="0" /> - <Hex name="E7" tile="-1" cost="20" city="Milledgeville"> - <River from="center" to="F8" /> - </Hex> - <Hex name="E9" tile="0" /> - <Hex name="E11" tile="0" /> - - <Hex name="F2" tile="0" cost="40"> - <River from="E3" to="G3" /> - </Hex> - <Hex name="F4" tile="0"> - <Private name="MBRR" /> - </Hex> - <Hex name="F6" tile="-3008" city="Macon" /> - <Hex name="F8" tile="0" cost="20"> - <River from="E7" to="G9" /> - </Hex> - <Hex name="F10" tile="0" /> - <Hex name="F12" tile="0" cost="40"> - <Symbols> - <Symbol name="swamp" where="tpCenter" anchorX="center" anchorY="bottom" fromPhase="0" toPhase="0" /> - </Symbols> - <Private name="MRC" /> - </Hex> - - <Hex name="G1" tile="0"> - <River from="G3" to="H2" /> - </Hex> - <Hex name="G3" tile="-3008" cost="40" city="Columbus"> - <River from="F2" to="G1" /> - </Hex> - <Hex name="G5" tile="0" /> - <Hex name="G7" tile="0"> - <Private name="OSR" /> - </Hex> - <Hex name="G9" tile="0" cost="20"> - <River from="F8" to="H10" /> - </Hex> - <Hex name="G11" tile="-1" city="Statesboro" /> - <Hex name="G13" tile="-3008" city="Savannah" /> - - <Hex name="H2" tile="0" cost="40"> - <River from="G1" to="I3" /> - </Hex> - <Hex name="H4" tile="-3008" city="Albany" /> - <Hex name="H6" tile="0" /> - <Hex name="H8" tile="0" /> - <Hex name="H10" tile="0" cost="20"> - <River from="G9" to="H12" /> - </Hex> - <Hex name="H12" tile="0" cost="20"> - <River from="H10" to="H14" /> - </Hex> - - <Hex name="I3" tile="0" cost="40"> - <River from="H2" to="J4" /> - </Hex> - <Hex name="I5" tile="0" /> - <Hex name="I7" tile="-1" city="Valdosta" /> - <Hex name="I9" tile="-3008" city="Waycross"> - <Private name="WSRR" /> - </Hex> - <Hex name="I11" tile="-3008" city="Brunswick" /> - - <Hex name="J4" tile="-1143" value="20,50" city="Tallahassee" /> - <Hex name="J6" tile="0" /> - <Hex name="J8" tile="0" /> - <Hex name="J10" tile="0"> - <Symbols> - <Symbol name="swamp" where="tpCenter" anchorX="center" anchorY="bottom" fromPhase="0" toPhase="0" /> - </Symbols> - </Hex> - <Hex name="J12" tile="-912" orientation="3" value="30,60" city="Jacksonville" /> +<Map mapClass="rails.ui.swing.hexmap.EWHexMap" tileOrientation="EW" + letterOrientation="vertical" even="B"> + <Hex name="A3" tile="-902" orientation="1" value="30,60" city="Chattanooga"/> + + <Hex name="B2" tile="0" cost="60"> + </Hex> + <Hex name="B4" tile="0"/> + <Hex name="B6" tile="0" cost="60"> + </Hex> + <Hex name="B8" tile="0" cost="60"> + </Hex> + <Hex name="B10" tile="-902" orientation="2" value="30,40" city="Greeneville"/> + + <Hex name="C1" tile="0" cost="60"> + </Hex> + <Hex name="C3" tile="-3008" city="Rome"/> + <Hex name="C5" tile="0" cost="20"> + <River from="center" to="D4"/> + </Hex> + <Hex name="C7" tile="0"/> + <Hex name="C9" tile="0"/> + + <Hex name="D2" tile="0"/> + <Hex name="D4" tile="-30" city="Atlanta"/> + <Hex name="D6" tile="0"/> + <Hex name="D8" tile="0"/> + <Hex name="D10" tile="-3008" city="Augusta"/> + + <Hex name="E1" tile="-1143" orientation="1" value="30,40" city="Montgomery"/> + <IfOption name="Variant" value="Basegame"> + <Hex name="E3" tile="0" cost="40"/> + </IfOption> + + <IfOption name="Variant" value="Cotton Port"> + <Hex name="E3" tile="0" cost="20"/> + </IfOption> + <Hex name="E5" tile="0"/> + <Hex name="E7" tile="-1" cost="20" city="Milledgeville"> + <River from="center" to="F8"/> + </Hex> + <Hex name="E9" tile="0"/> + <Hex name="E11" tile="0"/> + <IfOption name="Variant" value="Cotton Port"> + <Hex name="E13" tile="0"/> + </IfOption> + <IfOption name="Variant" value="Cotton Port"> + <Hex name="E15" tile="-912" orientation="2" value="30,60" city="Charleston"/> + </IfOption> + <IfOption name="Variant" value="Basegame"> + <Hex name="F2" tile="0" cost="40"/> + </IfOption> + + <IfOption name="Variant" value="Cotton Port"> + <Hex name="F2" tile="0" cost="20"/> + </IfOption> + <Hex name="F4" tile="0"> + <Private name="MBRR"/> + </Hex> + <Hex name="F6" tile="-3008" city="Macon"/> + <Hex name="F8" tile="0" cost="20"> + <River from="E7" to="G9"/> + </Hex> + <Hex name="F10" tile="0"/> + <Hex name="F12" tile="0" cost="40"> + <Private name="MRC"/> + </Hex> + <IfOption name="Variant" value="Cotton Port"> + <Hex name="F14" tile="0" cost="20"/> + </IfOption> + <Hex name="G1" tile="0"> + <River from="G3" to="H2"/> + </Hex> + <IfOption name="Variant" value="Basegame"> + <Hex name="G3" tile="-3008" cost="40" city="Columbus"/> + </IfOption> + + <IfOption name="Variant" value="Cotton Port"> + <Hex name="G3" tile="-3008" cost="20" city="Columbus"/> + </IfOption> + <Hex name="G5" tile="0"/> + <Hex name="G7" tile="0"> + <Private name="OSR"/> + </Hex> + <Hex name="G9" tile="0" cost="20"> + <River from="F8" to="H10"/> + </Hex> + <Hex name="G11" tile="-1" city="Statesboro"/> + <IfOption name="Variant" value="Basegame"> + <Hex name="G13" tile="-3008" city="Savannah"/> + </IfOption> + + <IfOption name="Variant" value="Cotton Port"> + <Hex name="G13" tile="-5015" orientation="5" city="Savannah"/> + </IfOption> + + <IfOption name="Variant" value="Basegame"> + <Hex name="H2" tile="0" cost="40"/> + </IfOption> + + <IfOption name="Variant" value="Cotton Port"> + <Hex name="H2" tile="0" cost="20"/> + </IfOption> + <Hex name="H4" tile="-3008" city="Albany"/> + <Hex name="H6" tile="0"/> + <Hex name="H8" tile="0"/> + <Hex name="H10" tile="0" cost="20"> + <River from="G9" to="H12"/> + </Hex> + <Hex name="H12" tile="0" cost="20"> + <River from="H10" to="H14"/> + </Hex> + + <IfOption name="Variant" value="Basegame"> + <Hex name="I3" tile="0" cost="40"/> + </IfOption> + + <IfOption name="Variant" value="Cotton Port"> + <Hex name="I3" tile="0" cost="20"/> + </IfOption> + <Hex name="I5" tile="0"/> + <Hex name="I7" tile="-1" city="Valdosta"/> + <Hex name="I9" tile="-3008" city="Waycross"> + <Private name="WSRR"/> + </Hex> + <Hex name="I11" tile="-3008" city="Brunswick"/> + + <Hex name="J4" tile="-1143" value="20,50" city="Tallahassee"/> + <Hex name="J6" tile="0"/> + <Hex name="J8" tile="0"/> + <Hex name="J10" tile="0"> + </Hex> + <Hex name="J12" tile="-912" orientation="3" value="30,60" city="Jacksonville"/> </Map> \ No newline at end of file Modified: trunk/18xx/data/GamesList.xml =================================================================== --- trunk/18xx/data/GamesList.xml 2011-04-26 19:41:31 UTC (rev 1530) +++ trunk/18xx/data/GamesList.xml 2011-04-26 22:20:14 UTC (rev 1531) @@ -272,7 +272,15 @@ <Game name="18GA"> <Note>Prototype</Note> <Description>18GA</Description> - <Players minimum="3" maximum="5"/> + <Option name="Variant" values="Basegame,Cotton Port" default="Basegame" /> + <Option name="RouteAwareness" values="Highlight,Deactivate" default="Highlight" /> + <Option name="RevenueCalculation" values="Suggest,Deactivate" default="Suggest" /> + <Option name="NoMapMode" type="toggle" default="no" /> + <Option name="UnlimitedTopTrains" parm="D" type="toggle" default="no"/> + <Option name="UnlimitedTiles" type="toggle" default="no"/> + <Option name="LeaveAuctionOnPass" type="toggle" default="no"/> + <Option name="TwoPlayersCertLimit70Percent" type="toggle" default="no"/> + <Players minimum="2" maximum="5"/> </Game> <Game name="18TN"> <Note>Prototype</Note> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ev...@us...> - 2011-04-26 19:41:37
|
Revision: 1530 http://rails.svn.sourceforge.net/rails/?rev=1530&view=rev Author: evos Date: 2011-04-26 19:41:31 +0000 (Tue, 26 Apr 2011) Log Message: ----------- Implemented game end after share price has maxed out (for 18GA) Modified Paths: -------------- trunk/18xx/LocalisedText.properties trunk/18xx/data/18GA/Game.xml trunk/18xx/rails/game/Bank.java trunk/18xx/rails/game/GameManager.java trunk/18xx/rails/game/GameManagerI.java trunk/18xx/rails/game/StockMarket.java trunk/18xx/rails/game/StockMarketI.java Modified: trunk/18xx/LocalisedText.properties =================================================================== --- trunk/18xx/LocalisedText.properties 2011-04-26 15:15:37 UTC (rev 1529) +++ trunk/18xx/LocalisedText.properties 2011-04-26 19:41:31 UTC (rev 1530) @@ -42,8 +42,8 @@ BuyPrivatePrompt={0} from {1} for {2}...{3} BankIsBrokenDisplayText=Bank is broken. Play continues until {0} BankIsBrokenReportText=Bank is broken -bankIsBrokenPlaySetOfORs=the current set of operating rounds is finished. -bankIsBrokenPlayOnlyOR=the current operating round is finished. +gameOverPlaySetOfORs=the current set of operating rounds is finished. +gameOverPlayOnlyOR=the current operating round is finished. BankHas=The Bank has {0}. BankSizeIs=Bank size is {0} BaseTokenSlotIsReserved=Base token slot is reserved @@ -363,6 +363,8 @@ MapWindowTitle=Rails: Map MapWindowORTitle=Rails: Map, Operating Round {0} ({1} of {2}) MARKET=Stock Market +MaxedSharePriceDisplayText={0} share price has maxed at {1}. Play continues until {2} +MaxedSharePriceReportText={0} share price has maxed at {1} MayDiscardTrain={0} may voluntarily discard a train MayNotBuyAndSell={0} may not both buy and sell shares MayNotYetOperate={0} may not yet operate: {1}% sold whereas {2}% required Modified: trunk/18xx/data/18GA/Game.xml =================================================================== --- trunk/18xx/data/18GA/Game.xml 2011-04-26 15:15:37 UTC (rev 1529) +++ trunk/18xx/data/18GA/Game.xml 2011-04-26 19:41:31 UTC (rev 1530) @@ -15,7 +15,8 @@ <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 the stock market XML --> + <!-- Also when the share value reaches $300; this is configured in the stock market XML, + but uses the 'finish' attribute value defined above. --> </EndOfGame> </Component> <Component name="PlayerManager" class="rails.game.PlayerManager"> Modified: trunk/18xx/rails/game/Bank.java =================================================================== --- trunk/18xx/rails/game/Bank.java 2011-04-26 15:15:37 UTC (rev 1529) +++ trunk/18xx/rails/game/Bank.java 2011-04-26 19:41:31 UTC (rev 1530) @@ -31,8 +31,6 @@ /** Is the bank broken (remains true once set) */ private BooleanState broken = new BooleanState("Bank.broken", false); - // /** Is the bank just broken (returns true exactly once) */ - // private BooleanState brokenReported = new BooleanState("Bank.brokenReported", false); /** * The money format template. '@' is replaced by the numeric amount, the @@ -151,16 +149,6 @@ } } - public boolean isBroken() { - return broken.booleanValue(); - } - - // public boolean isJustBroken() { - // boolean result = broken.booleanValue() && !brokenReported.booleanValue(); - // brokenReported.set(true); - // return result; - // } - /** * @return Portfolio of stock in Bank Pool */ Modified: trunk/18xx/rails/game/GameManager.java =================================================================== --- trunk/18xx/rails/game/GameManager.java 2011-04-26 15:15:37 UTC (rev 1529) +++ trunk/18xx/rails/game/GameManager.java 2011-04-26 19:41:31 UTC (rev 1530) @@ -118,6 +118,9 @@ new IntegerState("RelativeORNumber"); protected IntegerState numOfORs = new IntegerState("numOfORs"); + /** GameOver pending, a last OR or set of ORs must still be completed */ + protected BooleanState gameOverPending = new BooleanState ("GameOverPending", false); + /** GameOver is executed, no more moves */ protected BooleanState gameOver = new BooleanState("GameOver" ,false); protected Boolean gameOverReportedUI = false; protected BooleanState endedByBankruptcy = new BooleanState("EndedByBankruptcy", false); @@ -415,9 +418,9 @@ bankBreaksTag.getAttributeAsInteger("limit", gameEndsWhenBankHasLessOrEqual); String attr = bankBreaksTag.getAttributeAsString("finish"); - if (attr.equalsIgnoreCase("SetOfORs")) { + if (attr.equalsIgnoreCase("setOfORs")) { gameEndsAfterSetOfORs = true; - } else if (attr.equalsIgnoreCase("CurrentOR")) { + } else if (attr.equalsIgnoreCase("currentOR")) { gameEndsAfterSetOfORs = false; } } @@ -645,7 +648,7 @@ startOperatingRound(true); } else if (round instanceof OperatingRound) { - if (bank.isBroken() && !gameEndsAfterSetOfORs) { + if (gameOverPending.booleanValue() && !gameEndsAfterSetOfORs) { finishGame(); @@ -655,7 +658,7 @@ } else if (startPacket != null && !startPacket.areAllSold()) { startStartRound(); } else { - if (bank.isBroken() && gameEndsAfterSetOfORs) { + if (gameOverPending.booleanValue() && gameEndsAfterSetOfORs) { finishGame(); } else { ((OperatingRound)round).checkForeignSales(); @@ -1331,17 +1334,36 @@ public void registerBrokenBank(){ + gameOverPending.set(true); ReportBuffer.add(LocalText.getText("BankIsBrokenReportText")); String msgContinue; if (gameEndsAfterSetOfORs) - msgContinue = LocalText.getText("bankIsBrokenPlaySetOfORs"); + msgContinue = LocalText.getText("gameOverPlaySetOfORs"); else - msgContinue = LocalText.getText("bankIsBrokenPlayOnlyOR"); + msgContinue = LocalText.getText("gameOverPlayOnlyOR"); String msg = LocalText.getText("BankIsBrokenDisplayText", msgContinue); DisplayBuffer.add(msg); addToNextPlayerMessages(msg, true); } + public void registerMaxedSharePrice(PublicCompanyI company, StockSpaceI space){ + gameOverPending.set(true); + ReportBuffer.add(LocalText.getText("MaxedSharePriceReportText", + company.getName(), + Bank.format(space.getPrice()))); + String msgContinue; + if (gameEndsAfterSetOfORs) + msgContinue = LocalText.getText("gameOverPlaySetOfORs"); + else + msgContinue = LocalText.getText("gameOverPlayOnlyOR"); + String msg = LocalText.getText("MaxedSharePriceDisplayText", + company.getName(), + Bank.format(space.getPrice()), + msgContinue); + DisplayBuffer.add(msg); + addToNextPlayerMessages(msg, true); + } + private void finishGame() { gameOver.set(true); Modified: trunk/18xx/rails/game/GameManagerI.java =================================================================== --- trunk/18xx/rails/game/GameManagerI.java 2011-04-26 15:15:37 UTC (rev 1529) +++ trunk/18xx/rails/game/GameManagerI.java 2011-04-26 19:41:31 UTC (rev 1530) @@ -67,7 +67,8 @@ public abstract void registerBankruptcy(); public abstract void registerBrokenBank(); - + public void registerMaxedSharePrice(PublicCompanyI company, StockSpaceI space); + public boolean isDynamicOperatingOrder(); /** Modified: trunk/18xx/rails/game/StockMarket.java =================================================================== --- trunk/18xx/rails/game/StockMarket.java 2011-04-26 15:15:37 UTC (rev 1529) +++ trunk/18xx/rails/game/StockMarket.java 2011-04-26 19:41:31 UTC (rev 1530) @@ -4,6 +4,7 @@ import java.util.*; import rails.game.move.PriceTokenMove; +import rails.game.state.BooleanState; import rails.util.LocalText; import rails.util.Tag; @@ -20,6 +21,8 @@ protected ArrayList<StockSpaceI> startSpaces = new ArrayList<StockSpaceI>(); protected int[] startPrices; protected StockSpaceTypeI defaultType; + + GameManagerI gameManager; /* Game-specific flags */ protected boolean upOrDownRight = false; /* @@ -28,10 +31,8 @@ */ /* States */ - protected boolean gameOver = false; /* - * Some games have "rails.game over" - * stockmarket squares - */ + /** GameOver becomes true if a stock market square is reached that is marked as such */ + protected BooleanState gameOver = new BooleanState ("GameOver", false); ArrayList<PublicCertificate> ipoPile; @@ -155,7 +156,9 @@ */ public void finishConfiguration (GameManagerI gameManager) { - for (PublicCompanyI comp : GameManager.getInstance().getCompanyManager().getAllPublicCompanies()) { + this.gameManager = gameManager; + + for (PublicCompanyI comp : gameManager.getCompanyManager().getAllPublicCompanies()) { if (!comp.hasStarted() && comp.getStartSpace() != null) { comp.getStartSpace().addFixedStartPrice(comp); } @@ -302,7 +305,7 @@ /* Check for rails.game closure */ if (to.endsGame()) { ReportBuffer.add(LocalText.getText("GAME_OVER")); - gameOver = true; + gameManager.registerMaxedSharePrice(company, to); } } @@ -347,13 +350,6 @@ return null; } - /** - * @return - */ - public boolean isGameOver() { - return gameOver; - } - public PublicCertificate removeShareFromPile(PublicCertificate stock) { if (ipoPile.contains(stock)) { int index = ipoPile.lastIndexOf(stock); Modified: trunk/18xx/rails/game/StockMarketI.java =================================================================== --- trunk/18xx/rails/game/StockMarketI.java 2011-04-26 15:15:37 UTC (rev 1529) +++ trunk/18xx/rails/game/StockMarketI.java 2011-04-26 19:41:31 UTC (rev 1530) @@ -41,8 +41,6 @@ public StockSpaceI getStartSpace(int price); - public boolean isGameOver(); - public void processMove(PublicCompanyI company, StockSpaceI from, StockSpaceI to); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ev...@us...> - 2011-04-26 15:15:44
|
Revision: 1529 http://rails.svn.sourceforge.net/rails/?rev=1529&view=rev Author: evos Date: 2011-04-26 15:15:37 +0000 (Tue, 26 Apr 2011) Log Message: ----------- Allow a company to have multiple Home hexes. Limitations: - must be fixed (i.e. assigned in the XML) - may not have different station (city) numbers. Modified Paths: -------------- trunk/18xx/rails/game/MapManager.java trunk/18xx/rails/game/OperatingRound.java trunk/18xx/rails/game/PublicCompany.java trunk/18xx/rails/game/PublicCompanyI.java trunk/18xx/rails/game/action/MergeCompanies.java trunk/18xx/rails/game/specific/_1856/CGRFormationRound.java trunk/18xx/rails/game/specific/_18EU/StockRound_18EU.java Modified: trunk/18xx/rails/game/MapManager.java =================================================================== --- trunk/18xx/rails/game/MapManager.java 2011-04-26 10:12:34 UTC (rev 1528) +++ trunk/18xx/rails/game/MapManager.java 2011-04-26 15:15:37 UTC (rev 1529) @@ -28,7 +28,7 @@ // upgrade costs on the map for noMapMode protected SortedSet<Integer> possibleTileCosts; - // information to define neighbors + // information to define neighbours protected static final int[] xDeltaNS = new int[] { 0, -1, -1, 0, +1, +1 }; protected static final int[] yXEvenDeltaNS = new int[] { +1, 0, -1, -1, -1, 0 }; @@ -148,9 +148,12 @@ } } + List<MapHex> homeHexes; for (PublicCompanyI company : gameManager.getCompanyManager().getAllPublicCompanies()) { - if ((hex = company.getHomeHex()) != null) { - hex.addHome(company, company.getHomeCityNumber()); + if ((homeHexes = company.getHomeHexes()) != null) { + for (MapHex homeHex : homeHexes) { + homeHex.addHome(company, company.getHomeCityNumber()); + } } if ((hex = company.getDestinationHex()) != null) { hex.addDestination(company); Modified: trunk/18xx/rails/game/OperatingRound.java =================================================================== --- trunk/18xx/rails/game/OperatingRound.java 2011-04-26 10:12:34 UTC (rev 1528) +++ trunk/18xx/rails/game/OperatingRound.java 2011-04-26 15:15:37 UTC (rev 1529) @@ -2362,7 +2362,7 @@ if (!operatingCompany.get().hasLaidHomeBaseTokens()) { // This can occur if the home hex has two cities and track, // such as the green OO tile #59 - possibleActions.add(new LayBaseToken (operatingCompany.get().getHomeHex())); + possibleActions.add(new LayBaseToken (operatingCompany.get().getHomeHexes())); forced = true; } else { possibleActions.addAll(getNormalTileLays(true)); Modified: trunk/18xx/rails/game/PublicCompany.java =================================================================== --- trunk/18xx/rails/game/PublicCompany.java 2011-04-26 10:12:34 UTC (rev 1528) +++ trunk/18xx/rails/game/PublicCompany.java 2011-04-26 15:15:37 UTC (rev 1529) @@ -14,7 +14,7 @@ /** * This class provides an implementation of a (perhaps only basic) public - * company. Public companies emcompass all 18xx company-like entities that lay + * company. Public companies encompass all 18xx company-like entities that lay * tracks and run trains. <p> Ownership of companies will always be performed by * holding certificates. Some minor company types may have only one certificate, * but this will still be the form in which ownership is expressed. <p> Company @@ -55,9 +55,13 @@ /** Hexadecimal representation (RRGGBB) of the background colour. */ protected String bgHexColour = "000000"; - /** Home hex & city * */ - protected String homeHexName = null; - protected MapHex homeHex = null; + /** Home hex & city * + * Two home hexes is supported, but only if:<br> + * 1. The locations are fixed (i.e. configured by XML), and<br> + * 2. Any station (city) numbers are equal for the two home stations. + * There is no provision yet for two home hexes having different tile station numbers. */ + protected String homeHexNames = null; + protected List<MapHex> homeHexes = null; protected int homeCityNumber = 1; protected boolean homeAllCitiesBlocked = false; @@ -319,7 +323,7 @@ Tag homeBaseTag = tag.getChild("Home"); if (homeBaseTag != null) { - homeHexName = homeBaseTag.getAttributeAsString("hex"); + homeHexNames = homeBaseTag.getAttributeAsString("hex"); homeCityNumber = homeBaseTag.getAttributeAsInteger("city", 1); homeAllCitiesBlocked = homeBaseTag.getAttributeAsBoolean("allCitiesBlocked", false); } @@ -707,14 +711,19 @@ freeBaseTokens.add(token); } - if (homeHexName != null) { - homeHex = mapManager.getHex(homeHexName); - if (homeHex == null) { - throw new ConfigurationException("Invalid home hex " - + homeHexName - + " for company " + name); + if (homeHexNames != null) { + homeHexes = new ArrayList<MapHex>(2); + MapHex homeHex; + for (String homeHexName : homeHexNames.split(",")) { + homeHex = mapManager.getHex(homeHexName); + if (homeHex == null) { + throw new ConfigurationException("Invalid home hex " + + homeHexName + + " for company " + name); + } + homeHexes.add (homeHex); + infoText += "<br>Home: " + homeHex.getInfo(); } - infoText += "<br>Home: " + homeHex.getInfo(); } if (destinationHexName != null) { @@ -789,17 +798,22 @@ } /** + * Return the company's Home hexes (usually one). * @return Returns the homeHex. */ - public MapHex getHomeHex() { - return homeHex; + public List<MapHex> getHomeHexes() { + return homeHexes; } /** + * Set a non-fixed company home hex. + * Only covers setting <i>one</i> home hex. + * Having <i>two</i> home hexes is currently only supported if the locations are preconfigured. * @param homeHex The homeHex to set. */ public void setHomeHex(MapHex homeHex) { - this.homeHex = homeHex; + if (homeHexes == null) homeHexes = new ArrayList<MapHex>(1); + homeHexes.set(0, homeHex); } /** @@ -1662,7 +1676,7 @@ /** * Calculate the cost of laying a token, given the hex where - * the token is laid. This only makes a diofference for de "distance" method. + * the token is laid. This only makes a difference for de "distance" method. * @param hex The hex where the token is to be laid. * @return The cost of laying that token. */ @@ -1683,7 +1697,8 @@ if (hex == null) { return baseTokenLayCost[0]; } else { - return mapManager.getHexDistance(homeHex, hex) * baseTokenLayCost[0]; + // WARNING: no provision yet for multiple home hexes. + return mapManager.getHexDistance(homeHexes.get(0), hex) * baseTokenLayCost[0]; } } else { return 0; @@ -1699,7 +1714,8 @@ if (baseTokenLayCostMethod.equals(BASE_COST_SEQUENCE)) { return new int[] {getBaseTokenLayCost(null)}; } else if (baseTokenLayCostMethod.equals(BASE_COST_DISTANCE)) { - int[] distances = mapManager.getCityDistances(homeHex); + // WARNING: no provision yet for multiple home hexes. + int[] distances = mapManager.getCityDistances(homeHexes.get(0)); int[] costs = new int[distances.length]; int i = 0; for (int distance : distances) { @@ -1763,28 +1779,27 @@ // Return value is not used public boolean layHomeBaseTokens() { - // TODO Assume for now that companies have only one home base. - // This is not true in 1841! - // TODO This does not yet cover cases where the user - // has a choice, such in 1830 Erie. if (hasLaidHomeBaseTokens()) return true; - if (homeCityNumber == 0) { - // This applies to cases like 1830 Erie and 1856 THB. - // On a trackless tile it does not matter, but if - // the tile has track (such as the green OO tile), - // the player must select a city. - Map<Integer, List<Track>> tracks - = homeHex.getCurrentTile().getTracksPerStationMap(); - if (tracks == null || tracks.isEmpty()) { - homeCityNumber = 1; - } else { - return false; + for (MapHex homeHex : homeHexes) { + if (homeCityNumber == 0) { + // This applies to cases like 1830 Erie and 1856 THB. + // On a trackless tile it does not matter, but if + // the tile has track (such as the green OO tile), + // the player must select a city. + Map<Integer, List<Track>> tracks + = homeHex.getCurrentTile().getTracksPerStationMap(); + if (tracks == null || tracks.isEmpty()) { + homeCityNumber = 1; + } else { + return false; + } } + log.debug(name + " lays home base on " + homeHex.getName() + " city " + + homeCityNumber); + homeHex.layBaseToken(this, homeCityNumber); } - log.debug(name + " lays home base on " + homeHex.getName() + " city " - + homeCityNumber); - return homeHex.layBaseToken(this, homeCityNumber); + return true; } public BaseToken getFreeToken() { Modified: trunk/18xx/rails/game/PublicCompanyI.java =================================================================== --- trunk/18xx/rails/game/PublicCompanyI.java 2011-04-26 10:12:34 UTC (rev 1528) +++ trunk/18xx/rails/game/PublicCompanyI.java 2011-04-26 15:15:37 UTC (rev 1529) @@ -313,7 +313,7 @@ public boolean removeBonus (String name); public List<Bonus> getBonuses(); - public MapHex getHomeHex(); + public List<MapHex> getHomeHexes(); public void setHomeHex(MapHex homeHex); Modified: trunk/18xx/rails/game/action/MergeCompanies.java =================================================================== --- trunk/18xx/rails/game/action/MergeCompanies.java 2011-04-26 10:12:34 UTC (rev 1528) +++ trunk/18xx/rails/game/action/MergeCompanies.java 2011-04-26 15:15:37 UTC (rev 1529) @@ -50,7 +50,7 @@ canReplaceToken.add(false); } else { b.append(target.getName()); - MapHex hex = mergingCompany.getHomeHex(); + MapHex hex = mergingCompany.getHomeHexes().get(0); canReplaceToken.add(target.getNumberOfFreeBaseTokens() > 0 && (!hex.hasTokenOfCompany(target) || hex.getCurrentTile().allowsMultipleBasesOfOneCompany() Modified: trunk/18xx/rails/game/specific/_1856/CGRFormationRound.java =================================================================== --- trunk/18xx/rails/game/specific/_1856/CGRFormationRound.java 2011-04-26 10:12:34 UTC (rev 1528) +++ trunk/18xx/rails/game/specific/_1856/CGRFormationRound.java 2011-04-26 15:15:37 UTC (rev 1529) @@ -532,7 +532,7 @@ if (!bt.isPlaced()) continue; city = (City) bt.getHolder(); hex = city.getHolder(); - if (hex == comp.getHomeHex()) { + if (hex == comp.getHomeHexes()) { homeTokens.add(bt); } else { nonHomeTokens.add(bt); Modified: trunk/18xx/rails/game/specific/_18EU/StockRound_18EU.java =================================================================== --- trunk/18xx/rails/game/specific/_18EU/StockRound_18EU.java 2011-04-26 10:12:34 UTC (rev 1528) +++ trunk/18xx/rails/game/specific/_18EU/StockRound_18EU.java 2011-04-26 15:15:37 UTC (rev 1529) @@ -387,7 +387,7 @@ MapHex homeHex = null; int homeCityNumber = 1; if (minor != null) { - homeHex = minor.getHomeHex(); + homeHex = minor.getHomeHexes().get(0); homeCityNumber = homeHex.getCityOfBaseToken(minor); } else if (selectedHomeCity != null) { homeHex = selectedHomeCity.getHolder(); @@ -536,7 +536,7 @@ } } - MapHex homeHex = minor.getHomeHex(); + MapHex homeHex = minor.getHomeHexes().get(0); int homeCityNumber = homeHex.getCityOfBaseToken(minor); minor.setClosed(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ev...@us...> - 2011-04-26 10:12:41
|
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 & 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 & 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&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&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&F" type="Public" tokens="2" fgColour="000000" bgColour="75C4F0" longname="Georgia & Florida RR"> + <Company name="G&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&AR" type="Public" tokens="2" fgColour="FFFFFF" bgColour="994778" longname="Western & Atlantic Railroad"> - <Home hex="D4" /> + <Company name="W&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&S" type="Private" basePrice="70" /> + <Item name="OSO" type="Private" basePrice="100" /> + <Item name="M&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. |
From: <ev...@us...> - 2011-04-26 10:12:05
|
Revision: 1527 http://rails.svn.sourceforge.net/rails/?rev=1527&view=rev Author: evos Date: 2011-04-26 10:11:59 +0000 (Tue, 26 Apr 2011) Log Message: ----------- Allow missing "RouteAwareness" and "RevenueCalculation" game options (as in 18GA) Modified Paths: -------------- trunk/18xx/rails/game/GameManager.java Modified: trunk/18xx/rails/game/GameManager.java =================================================================== --- trunk/18xx/rails/game/GameManager.java 2011-04-26 10:10:14 UTC (rev 1526) +++ trunk/18xx/rails/game/GameManager.java 2011-04-26 10:11:59 UTC (rev 1527) @@ -572,10 +572,10 @@ guiParameters.put(GuiDef.Parm.ROUTE_HIGHLIGHT, false); guiParameters.put(GuiDef.Parm.REVENUE_SUGGEST, false); } else { - if (getGameOption("RouteAwareness").equalsIgnoreCase("Highlight")) { + if ("Highlight".equalsIgnoreCase(getGameOption("RouteAwareness"))) { guiParameters.put(GuiDef.Parm.ROUTE_HIGHLIGHT, true); } - if (getGameOption("RevenueCalculation").equalsIgnoreCase("Suggest")) { + if ("Suggest".equalsIgnoreCase(getGameOption("RevenueCalculation"))) { guiParameters.put(GuiDef.Parm.REVENUE_SUGGEST, true); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ev...@us...> - 2011-04-26 10:10:20
|
Revision: 1526 http://rails.svn.sourceforge.net/rails/?rev=1526&view=rev Author: evos Date: 2011-04-26 10:10:14 +0000 (Tue, 26 Apr 2011) Log Message: ----------- Add "caused by" trace to exceptions in loading a property file Modified Paths: -------------- trunk/18xx/rails/util/Config.java Modified: trunk/18xx/rails/util/Config.java =================================================================== --- trunk/18xx/rails/util/Config.java 2011-04-20 16:01:53 UTC (rev 1525) +++ trunk/18xx/rails/util/Config.java 2011-04-26 10:10:14 UTC (rev 1526) @@ -526,7 +526,7 @@ * This method loads a property file. * * @param properties - the property to store - * @param filepath - filname as a String. + * @param filepath - filename as a String. * @param resource - if TRUE, loaded from jar (via classloader), otherwise from filesystem * @return TRUE if load was successful */ @@ -544,7 +544,7 @@ properties.load(inFile); } catch (Exception e) { log.error(e + " whilst loading properties file " - + filepath); + + filepath, e); result = false; } return result; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wak...@us...> - 2011-04-20 16:02:01
|
Revision: 1525 http://rails.svn.sourceforge.net/rails/?rev=1525&view=rev Author: wakko666 Date: 2011-04-20 16:01:53 +0000 (Wed, 20 Apr 2011) Log Message: ----------- Add the rest of Batik 1.7. Woops. Added Paths: ----------- trunk/18xx/lib/batik-1.7/lib/LICENSE.dom-documentation.txt trunk/18xx/lib/batik-1.7/lib/LICENSE.dom-software.txt trunk/18xx/lib/batik-1.7/lib/LICENSE.js.txt trunk/18xx/lib/batik-1.7/lib/LICENSE.pdf-transcoder.txt trunk/18xx/lib/batik-1.7/lib/LICENSE.sax.txt trunk/18xx/lib/batik-1.7/lib/LICENSE.xalan-2.6.0.txt trunk/18xx/lib/batik-1.7/lib/LICENSE.xerces_2_5_0.txt trunk/18xx/lib/batik-1.7/lib/README.js.txt trunk/18xx/lib/batik-1.7/lib/README.pdf-transcoder.txt trunk/18xx/lib/batik-1.7/lib/README.xalan-2.6.0.txt trunk/18xx/lib/batik-1.7/lib/README.xerces_2_5_0.txt trunk/18xx/lib/batik-1.7/lib/README.xml-apis-ext.txt trunk/18xx/lib/batik-1.7/lib/README.xml-apis.txt trunk/18xx/lib/batik-1.7/lib/batik-anim.jar trunk/18xx/lib/batik-1.7/lib/batik-awt-util.jar trunk/18xx/lib/batik-1.7/lib/batik-bridge.jar trunk/18xx/lib/batik-1.7/lib/batik-codec.jar trunk/18xx/lib/batik-1.7/lib/batik-css.jar trunk/18xx/lib/batik-1.7/lib/batik-dom.jar trunk/18xx/lib/batik-1.7/lib/batik-ext.jar trunk/18xx/lib/batik-1.7/lib/batik-extension.jar trunk/18xx/lib/batik-1.7/lib/batik-gui-util.jar trunk/18xx/lib/batik-1.7/lib/batik-gvt.jar trunk/18xx/lib/batik-1.7/lib/batik-parser.jar trunk/18xx/lib/batik-1.7/lib/batik-script.jar trunk/18xx/lib/batik-1.7/lib/batik-svg-dom.jar trunk/18xx/lib/batik-1.7/lib/batik-svggen.jar trunk/18xx/lib/batik-1.7/lib/batik-swing.jar trunk/18xx/lib/batik-1.7/lib/batik-transcoder.jar trunk/18xx/lib/batik-1.7/lib/batik-util.jar trunk/18xx/lib/batik-1.7/lib/batik-xml.jar trunk/18xx/lib/batik-1.7/lib/js.jar trunk/18xx/lib/batik-1.7/lib/pdf-transcoder.jar trunk/18xx/lib/batik-1.7/lib/xalan-2.6.0.jar trunk/18xx/lib/batik-1.7/lib/xerces_2_5_0.jar trunk/18xx/lib/batik-1.7/lib/xml-apis-ext.jar trunk/18xx/lib/batik-1.7/lib/xml-apis.jar Added: trunk/18xx/lib/batik-1.7/lib/LICENSE.dom-documentation.txt =================================================================== --- trunk/18xx/lib/batik-1.7/lib/LICENSE.dom-documentation.txt (rev 0) +++ trunk/18xx/lib/batik-1.7/lib/LICENSE.dom-documentation.txt 2011-04-20 16:01:53 UTC (rev 1525) @@ -0,0 +1,86 @@ +xml-commons/java/external/LICENSE.dom-documentation.txt $Id: LICENSE.dom-documentation.txt 201084 2002-12-09 16:15:21Z vhardy $ + + +This license came from: http://www.w3.org/Consortium/Legal/copyright-documents-19990405 + + +W3C\xAE DOCUMENT NOTICE AND LICENSE +Copyright \xA9 1994-2001 World +Wide Web Consortium, <a href="http://www.w3.org/">World +Wide Web Consortium</a>, (<a href= +"http://www.lcs.mit.edu/">Massachusetts Institute of +Technology</a>, <a href="http://www.inria.fr/">Institut National de +Recherche en Informatique et en Automatique</a>, <a href= +"http://www.keio.ac.jp/">Keio University</a>). All Rights Reserved. +http://www.w3.org/Consortium/Legal/ + +Public documents on the W3C site are provided by the copyright +holders under the following license. The software or Document Type +Definitions (DTDs) associated with W3C specifications are governed +by the Software Notice. By using and/or copying this document, or the +W3C document from which this statement is linked, you (the +licensee) agree that you have read, understood, and will comply +with the following terms and conditions: + +Permission to use, copy, and distribute the contents of this +document, or the W3C document from which this statement is linked, +in any medium for any purpose and without fee or royalty is hereby +granted, provided that you include the following on ALL +copies of the document, or portions thereof, that you use: + +A link or URL to the original W3C document. + +The pre-existing copyright notice of the original author, or if +it doesn't exist, a notice of the form: "Copyright \xA9 [$date-of-document] World Wide Web +Consortium, (Massachusetts +Institute of Technology, Institut National de Recherche en Informatique et en +Automatique, Keio +University). All Rights Reserved. +http://www.w3.org/Consortium/Legal/" (Hypertext is preferred, but a +textual representation is permitted.) + +If it exists, the STATUS of the W3C document. + +When space permits, inclusion of the full text of this NOTICE +should be provided. We request that authorship +attribution be provided in any software, documents, or other items +or products that you create pursuant to the implementation of the +contents of this document, or any portion thereof. + +No right to create modifications or derivatives of W3C documents +is granted pursuant to this license. However, if additional +requirements (documented in the Copyright +FAQ) are satisfied, the right to create modifications or +derivatives is\xA0sometimes granted by the W3C to individuals +complying with those requirements. + +THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO +REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT +NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS +OF THE DOCUMENT ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE +IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY +PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. +COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, +SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE +DOCUMENT OR THE PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS +THEREOF. + +The name and trademarks of copyright holders may NOT be used in +advertising or publicity pertaining to this document or its +contents without specific, written prior permission. Title to +copyright in this document will at all times remain with copyright +holders. + +---------------------------------------------------------------------------- +This formulation of W3C's notice and license became active on +April 05 1999 so as to account for the treatment of DTDs, schema's and +bindings. See the older formulation for the policy prior to this date. +Please see +our Copyright FAQ for common questions +about using materials from our site, including specific terms and +conditions for packages like libwww, Amaya, and Jigsaw. +Other questions about this notice can be directed to sit...@w3.... + +webmaster +(last updated by reagle on 1999/04/99.) \ No newline at end of file Property changes on: trunk/18xx/lib/batik-1.7/lib/LICENSE.dom-documentation.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/18xx/lib/batik-1.7/lib/LICENSE.dom-software.txt =================================================================== --- trunk/18xx/lib/batik-1.7/lib/LICENSE.dom-software.txt (rev 0) +++ trunk/18xx/lib/batik-1.7/lib/LICENSE.dom-software.txt 2011-04-20 16:01:53 UTC (rev 1525) @@ -0,0 +1,74 @@ +xml-commons/java/external/LICENSE.dom-software.txt $Id: LICENSE.dom-software.txt 201084 2002-12-09 16:15:21Z vhardy $ + + +This license came from: http://www.w3.org/Consortium/Legal/copyright-software-19980720 + + +W3C\xAE SOFTWARE NOTICE AND LICENSE +Copyright \xA9 1994-2001 World +Wide Web Consortium, <a href="http://www.w3.org/">World +Wide Web Consortium</a>, (<a href= +"http://www.lcs.mit.edu/">Massachusetts Institute of +Technology</a>, <a href="http://www.inria.fr/">Institut National de +Recherche en Informatique et en Automatique</a>, <a href= +"http://www.keio.ac.jp/">Keio University</a>). All Rights Reserved. +http://www.w3.org/Consortium/Legal/ + +This W3C work (including software, documents, or other related +items) is being provided by the copyright holders under the +following license. By obtaining, using and/or copying this work, +you (the licensee) agree that you have read, understood, and will +comply with the following terms and conditions: +Permission to use, copy, modify, and distribute this software +and its documentation, with or without modification,\xA0 for any +purpose and without fee or royalty is hereby granted, provided that +you include the following on ALL copies of the software and +documentation or portions thereof, including modifications, that +you make: + +The full text of this NOTICE in a location viewable to users of +the redistributed or derivative work. + +Any pre-existing intellectual property disclaimers, notices, or +terms and conditions. If none exist, a short notice of the +following form (hypertext is preferred, text is permitted) should +be used within the body of any redistributed or derivative code: +"Copyright \xA9 [$date-of-software] World Wide Web Consortium, (Massachusetts Institute of +Technology, Institut National de +Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. +http://www.w3.org/Consortium/Legal/" + +Notice of any changes or modifications to the W3C files, +including the date changes were made. (We recommend you provide +URIs to the location from which the code is derived.) + +THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND +COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF +MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE +USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD +PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. +COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, +SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE +SOFTWARE OR DOCUMENTATION. + +The name and trademarks of copyright holders may NOT be used in +advertising or publicity pertaining to the software without +specific, written prior permission. Title to copyright in this +software and any associated documentation will at all times remain +with copyright holders. +____________________________________ +This formulation of W3C's notice and license became active on +August 14 1998 so as to improve compatibility with GPL. This +version ensures that W3C software licensing terms are no more +restrictive than GPL and consequently W3C software may be +distributed in GPL packages. See the older formulation for the +policy prior to this date. Please see our Copyright FAQ for common +questions about using materials from +our site, including specific terms and conditions for packages like +libwww, Amaya, and Jigsaw. +Other questions about this notice can be +directed to sit...@w3.... + +webmaster +(last updated $Date: 2002-12-10 03:15:21 +1100 (Tue, 10 Dec 2002) $) \ No newline at end of file Property changes on: trunk/18xx/lib/batik-1.7/lib/LICENSE.dom-software.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/18xx/lib/batik-1.7/lib/LICENSE.js.txt =================================================================== --- trunk/18xx/lib/batik-1.7/lib/LICENSE.js.txt (rev 0) +++ trunk/18xx/lib/batik-1.7/lib/LICENSE.js.txt 2011-04-20 16:01:53 UTC (rev 1525) @@ -0,0 +1,890 @@ +This distribution includes a binary distribution of Mozilla Rhino 1.6 release 5 +plus one patch. + +You can get the unpatched 1.6R5 release of Rhino from the following URL: + + ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_6R5.zip + +To obtain the source code for the 1.6R5 release of Rhino, issue the following +commands: + + cvs -d :pserver:ano...@cv...:/cvsroot \ + co -D2006-11-20 mozilla/js/rhino + +The patch is available here: + + https://bugzilla.mozilla.org/attachment.cgi?id=288467 + +which is attached to this bug: + + https://bugzilla.mozilla.org/show_bug.cgi?id=367627 + +Rhino is licensed under both the MPL (Mozilla Public License) 1.1 and the +GPL (GNU General Public License) 2.0, which are duplicated below. + +The Rhino jar also includes four classes: + org.mozilla.javascript.tools.debugger.downloaded.AbstractCellEditor.java + org.mozilla.javascript.tools.debugger.downloaded.JTreeTable.java + org.mozilla.javascript.tools.debugger.downloaded.TreeTableModel.java + org.mozilla.javascript.tools.debugger.downloaded.TreeTableModelAdapter.java +Which come from: + http://java.sun.com/products/jfc/tsc/articles/treetable2 + +Under the following license: + +Code sample +License +Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + + * Redistribution of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistribution in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + +Neither the name of Sun Microsystems, Inc. or the names of +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +This software is provided "AS IS," without a warranty of any kind. ALL +EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, +INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN +MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR +ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR +DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR +ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR +DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE +DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, +ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF +SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +You acknowledge that this software is not designed, licensed or +intended for use in the design, construction, operation or maintenance +of any nuclear facility. + + + +============================================================================== + + MOZILLA PUBLIC LICENSE + Version 1.1 + + --------------- + +1. Definitions. + + 1.0.1. "Commercial Use" means distribution or otherwise making the + Covered Code available to a third party. + + 1.1. "Contributor" means each entity that creates or contributes to + the creation of Modifications. + + 1.2. "Contributor Version" means the combination of the Original + Code, prior Modifications used by a Contributor, and the Modifications + made by that particular Contributor. + + 1.3. "Covered Code" means the Original Code or Modifications or the + combination of the Original Code and Modifications, in each case + including portions thereof. + + 1.4. "Electronic Distribution Mechanism" means a mechanism generally + accepted in the software development community for the electronic + transfer of data. + + 1.5. "Executable" means Covered Code in any form other than Source + Code. + + 1.6. "Initial Developer" means the individual or entity identified + as the Initial Developer in the Source Code notice required by Exhibit + A. + + 1.7. "Larger Work" means a work which combines Covered Code or + portions thereof with code not governed by the terms of this License. + + 1.8. "License" means this document. + + 1.8.1. "Licensable" means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed herein. + + 1.9. "Modifications" means any addition to or deletion from the + substance or structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of files, a + Modification is: + A. Any addition to or deletion from the contents of a file + containing Original Code or previous Modifications. + + B. Any new file that contains any part of the Original Code or + previous Modifications. + + 1.10. "Original Code" means Source Code of computer software code + which is described in the Source Code notice required by Exhibit A as + Original Code, and which, at the time of its release under this + License is not already Covered Code governed by this License. + + 1.10.1. "Patent Claims" means any patent claim(s), now owned or + hereafter acquired, including without limitation, method, process, + and apparatus claims, in any patent Licensable by grantor. + + 1.11. "Source Code" means the preferred form of the Covered Code for + making modifications to it, including all modules it contains, plus + any associated interface definition files, scripts used to control + compilation and installation of an Executable, or source code + differential comparisons against either the Original Code or another + well known, available Covered Code of the Contributor's choice. The + Source Code can be in a compressed or archival form, provided the + appropriate decompression or de-archiving software is widely available + for no charge. + + 1.12. "You" (or "Your") means an individual or a legal entity + exercising rights under, and complying with all of the terms of, this + License or a future version of this License issued under Section 6.1. + For legal entities, "You" includes any entity which controls, is + controlled by, or is under common control with You. For purposes of + this definition, "control" means (a) the power, direct or indirect, + to cause the direction or management of such entity, whether by + contract or otherwise, or (b) ownership of more than fifty percent + (50%) of the outstanding shares or beneficial ownership of such + entity. + +2. Source Code License. + + 2.1. The Initial Developer Grant. + The Initial Developer hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + (a) under intellectual property rights (other than patent or + trademark) Licensable by Initial Developer to use, reproduce, + modify, display, perform, sublicense and distribute the Original + Code (or portions thereof) with or without Modifications, and/or + as part of a Larger Work; and + + (b) under Patents Claims infringed by the making, using or + selling of Original Code, to make, have made, use, practice, + sell, and offer for sale, and/or otherwise dispose of the + Original Code (or portions thereof). + + (c) the licenses granted in this Section 2.1(a) and (b) are + effective on the date Initial Developer first distributes + Original Code under the terms of this License. + + (d) Notwithstanding Section 2.1(b) above, no patent license is + granted: 1) for code that You delete from the Original Code; 2) + separate from the Original Code; or 3) for infringements caused + by: i) the modification of the Original Code or ii) the + combination of the Original Code with other software or devices. + + 2.2. Contributor Grant. + Subject to third party intellectual property claims, each Contributor + hereby grants You a world-wide, royalty-free, non-exclusive license + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Contributor, to use, reproduce, modify, + display, perform, sublicense and distribute the Modifications + created by such Contributor (or portions thereof) either on an + unmodified basis, with other Modifications, as Covered Code + and/or as part of a Larger Work; and + + (b) under Patent Claims infringed by the making, using, or + selling of Modifications made by that Contributor either alone + and/or in combination with its Contributor Version (or portions + of such combination), to make, use, sell, offer for sale, have + made, and/or otherwise dispose of: 1) Modifications made by that + Contributor (or portions thereof); and 2) the combination of + Modifications made by that Contributor with its Contributor + Version (or portions of such combination). + + (c) the licenses granted in Sections 2.2(a) and 2.2(b) are + effective on the date Contributor first makes Commercial Use of + the Covered Code. + + (d) Notwithstanding Section 2.2(b) above, no patent license is + granted: 1) for any code that Contributor has deleted from the + Contributor Version; 2) separate from the Contributor Version; + 3) for infringements caused by: i) third party modifications of + Contributor Version or ii) the combination of Modifications made + by that Contributor with other software (except as part of the + Contributor Version) or other devices; or 4) under Patent Claims + infringed by Covered Code in the absence of Modifications made by + that Contributor. + +3. Distribution Obligations. + + 3.1. Application of License. + The Modifications which You create or to which You contribute are + governed by the terms of this License, including without limitation + Section 2.2. The Source Code version of Covered Code may be + distributed only under the terms of this License or a future version + of this License released under Section 6.1, and You must include a + copy of this License with every copy of the Source Code You + distribute. You may not offer or impose any terms on any Source Code + version that alters or restricts the applicable version of this + License or the recipients' rights hereunder. However, You may include + an additional document offering the additional rights described in + Section 3.5. + + 3.2. Availability of Source Code. + Any Modification which You create or to which You contribute must be + made available in Source Code form under the terms of this License + either on the same media as an Executable version or via an accepted + Electronic Distribution Mechanism to anyone to whom you made an + Executable version available; and if made available via Electronic + Distribution Mechanism, must remain available for at least twelve (12) + months after the date it initially became available, or at least six + (6) months after a subsequent version of that particular Modification + has been made available to such recipients. You are responsible for + ensuring that the Source Code version remains available even if the + Electronic Distribution Mechanism is maintained by a third party. + + 3.3. Description of Modifications. + You must cause all Covered Code to which You contribute to contain a + file documenting the changes You made to create that Covered Code and + the date of any change. You must include a prominent statement that + the Modification is derived, directly or indirectly, from Original + Code provided by the Initial Developer and including the name of the + Initial Developer in (a) the Source Code, and (b) in any notice in an + Executable version or related documentation in which You describe the + origin or ownership of the Covered Code. + + 3.4. Intellectual Property Matters + (a) Third Party Claims. + If Contributor has knowledge that a license under a third party's + intellectual property rights is required to exercise the rights + granted by such Contributor under Sections 2.1 or 2.2, + Contributor must include a text file with the Source Code + distribution titled "LEGAL" which describes the claim and the + party making the claim in sufficient detail that a recipient will + know whom to contact. If Contributor obtains such knowledge after + the Modification is made available as described in Section 3.2, + Contributor shall promptly modify the LEGAL file in all copies + Contributor makes available thereafter and shall take other steps + (such as notifying appropriate mailing lists or newsgroups) + reasonably calculated to inform those who received the Covered + Code that new knowledge has been obtained. + + (b) Contributor APIs. + If Contributor's Modifications include an application programming + interface and Contributor has knowledge of patent licenses which + are reasonably necessary to implement that API, Contributor must + also include this information in the LEGAL file. + + (c) Representations. + Contributor represents that, except as disclosed pursuant to + Section 3.4(a) above, Contributor believes that Contributor's + Modifications are Contributor's original creation(s) and/or + Contributor has sufficient rights to grant the rights conveyed by + this License. + + 3.5. Required Notices. + You must duplicate the notice in Exhibit A in each file of the Source + Code. If it is not possible to put such notice in a particular Source + Code file due to its structure, then You must include such notice in a + location (such as a relevant directory) where a user would be likely + to look for such a notice. If You created one or more Modification(s) + You may add your name as a Contributor to the notice described in + Exhibit A. You must also duplicate this License in any documentation + for the Source Code where You describe recipients' rights or ownership + rights relating to Covered Code. You may choose to offer, and to + charge a fee for, warranty, support, indemnity or liability + obligations to one or more recipients of Covered Code. However, You + may do so only on Your own behalf, and not on behalf of the Initial + Developer or any Contributor. You must make it absolutely clear than + any such warranty, support, indemnity or liability obligation is + offered by You alone, and You hereby agree to indemnify the Initial + Developer and every Contributor for any liability incurred by the + Initial Developer or such Contributor as a result of warranty, + support, indemnity or liability terms You offer. + + 3.6. Distribution of Executable Versions. + You may distribute Covered Code in Executable form only if the + requirements of Section 3.1-3.5 have been met for that Covered Code, + and if You include a notice stating that the Source Code version of + the Covered Code is available under the terms of this License, + including a description of how and where You have fulfilled the + obligations of Section 3.2. The notice must be conspicuously included + in any notice in an Executable version, related documentation or + collateral in which You describe recipients' rights relating to the + Covered Code. You may distribute the Executable version of Covered + Code or ownership rights under a license of Your choice, which may + contain terms different from this License, provided that You are in + compliance with the terms of this License and that the license for the + Executable version does not attempt to limit or alter the recipient's + rights in the Source Code version from the rights set forth in this + License. If You distribute the Executable version under a different + license You must make it absolutely clear that any terms which differ + from this License are offered by You alone, not by the Initial + Developer or any Contributor. You hereby agree to indemnify the + Initial Developer and every Contributor for any liability incurred by + the Initial Developer or such Contributor as a result of any such + terms You offer. + + 3.7. Larger Works. + You may create a Larger Work by combining Covered Code with other code + not governed by the terms of this License and distribute the Larger + Work as a single product. In such a case, You must make sure the + requirements of this License are fulfilled for the Covered Code. + +4. Inability to Comply Due to Statute or Regulation. + + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Code due to + statute, judicial order, or regulation then You must: (a) comply with + the terms of this License to the maximum extent possible; and (b) + describe the limitations and the code they affect. Such description + must be included in the LEGAL file described in Section 3.4 and must + be included with all distributions of the Source Code. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. + +5. Application of this License. + + This License applies to code to which the Initial Developer has + attached the notice in Exhibit A and to related Covered Code. + +6. Versions of the License. + + 6.1. New Versions. + Netscape Communications Corporation ("Netscape") may publish revised + and/or new versions of the License from time to time. Each version + will be given a distinguishing version number. + + 6.2. Effect of New Versions. + Once Covered Code has been published under a particular version of the + License, You may always continue to use it under the terms of that + version. You may also choose to use such Covered Code under the terms + of any subsequent version of the License published by Netscape. No one + other than Netscape has the right to modify the terms applicable to + Covered Code created under this License. + + 6.3. Derivative Works. + If You create or use a modified version of this License (which you may + only do in order to apply it to code which is not already Covered Code + governed by this License), You must (a) rename Your license so that + the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", + "MPL", "NPL" or any confusingly similar phrase do not appear in your + license (except to note that your license differs from this License) + and (b) otherwise make it clear that Your version of the license + contains terms which differ from the Mozilla Public License and + Netscape Public License. (Filling in the name of the Initial + Developer, Original Code or Contributor in the notice described in + Exhibit A shall not of themselves be deemed to be modifications of + this License.) + +7. DISCLAIMER OF WARRANTY. + + COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF + DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. + THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE + IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE + COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +8. TERMINATION. + + 8.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to cure + such breach within 30 days of becoming aware of the breach. All + sublicenses to the Covered Code which are properly granted shall + survive any termination of this License. Provisions which, by their + nature, must remain in effect beyond the termination of this License + shall survive. + + 8.2. If You initiate litigation by asserting a patent infringement + claim (excluding declatory judgment actions) against Initial Developer + or a Contributor (the Initial Developer or Contributor against whom + You file such action is referred to as "Participant") alleging that: + + (a) such Participant's Contributor Version directly or indirectly + infringes any patent, then any and all rights granted by such + Participant to You under Sections 2.1 and/or 2.2 of this License + shall, upon 60 days notice from Participant terminate prospectively, + unless if within 60 days after receipt of notice You either: (i) + agree in writing to pay Participant a mutually agreeable reasonable + royalty for Your past and future use of Modifications made by such + Participant, or (ii) withdraw Your litigation claim with respect to + the Contributor Version against such Participant. If within 60 days + of notice, a reasonable royalty and payment arrangement are not + mutually agreed upon in writing by the parties or the litigation claim + is not withdrawn, the rights granted by Participant to You under + Sections 2.1 and/or 2.2 automatically terminate at the expiration of + the 60 day notice period specified above. + + (b) any software, hardware, or device, other than such Participant's + Contributor Version, directly or indirectly infringes any patent, then + any rights granted to You by such Participant under Sections 2.1(b) + and 2.2(b) are revoked effective as of the date You first made, used, + sold, distributed, or had made, Modifications made by that + Participant. + + 8.3. If You assert a patent infringement claim against Participant + alleging that such Participant's Contributor Version directly or + indirectly infringes any patent where such claim is resolved (such as + by license or settlement) prior to the initiation of patent + infringement litigation, then the reasonable value of the licenses + granted by such Participant under Sections 2.1 or 2.2 shall be taken + into account in determining the amount or value of any payment or + license. + + 8.4. In the event of termination under Sections 8.1 or 8.2 above, + all end user license agreements (excluding distributors and resellers) + which have been validly granted by You or any distributor hereunder + prior to termination shall survive termination. + +9. LIMITATION OF LIABILITY. + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL + DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, + OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR + ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY + CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, + WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER + COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN + INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF + LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY + RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW + PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO + THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +10. U.S. GOVERNMENT END USERS. + + The Covered Code is a "commercial item," as that term is defined in + 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer + software" and "commercial computer software documentation," as such + terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 + C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), + all U.S. Government End Users acquire Covered Code with only those + rights set forth herein. + +11. MISCELLANEOUS. + + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed by + California law provisions (except to the extent applicable law, if + any, provides otherwise), excluding its conflict-of-law provisions. + With respect to disputes in which at least one party is a citizen of, + or an entity chartered or registered to do business in the United + States of America, any litigation relating to this License shall be + subject to the jurisdiction of the Federal Courts of the Northern + District of California, with venue lying in Santa Clara County, + California, with the losing party responsible for costs, including + without limitation, court costs and reasonable attorneys' fees and + expenses. The application of the United Nations Convention on + Contracts for the International Sale of Goods is expressly excluded. + Any law or regulation which provides that the language of a contract + shall be construed against the drafter shall not apply to this + License. + +12. RESPONSIBILITY FOR CLAIMS. + + As between Initial Developer and the Contributors, each party is + responsible for claims and damages arising, directly or indirectly, + out of its utilization of rights under this License and You agree to + work with Initial Developer and Contributors to distribute such + responsibility on an equitable basis. Nothing herein is intended or + shall be deemed to constitute any admission of liability. + +13. MULTIPLE-LICENSED CODE. + + Initial Developer may designate portions of the Covered Code as + "Multiple-Licensed". "Multiple-Licensed" means that the Initial + Developer permits you to utilize portions of the Covered Code under + Your choice of the NPL or the alternative licenses, if any, specified + by the Initial Developer in the file described in Exhibit A. + +EXHIBIT A -Mozilla Public License. + + ``The contents of this file are subject to the Mozilla Public License + Version 1.1 (the "License"); you may not use this file except in + compliance with the License. You may obtain a copy of the License at + http://www.mozilla.org/MPL/ + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + License for the specific language governing rights and limitations + under the License. + + The Original Code is ______________________________________. + + The Initial Developer of the Original Code is ________________________. + Portions created by ______________________ are Copyright (C) ______ + _______________________. All Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the terms + of the _____ license (the "[___] License"), in which case the + provisions of [______] License are applicable instead of those + above. If you wish to allow use of your version of this file only + under the terms of the [____] License and not to allow others to use + your version of this file under the MPL, indicate your decision by + deleting the provisions above and replace them with the notice and + other provisions required by the [___] License. If you do not delete + the provisions above, a recipient may use your version of this file + under either the MPL or the [___] License." + + [NOTE: The text of this Exhibit A may differ slightly from the text of + the notices in the Source Code files of the Original Code. You should + use the text of this Exhibit A rather than the text found in the + Original Code Source Code for Your Modifications.] + +============================================================================== + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. + +============================================================================== Property changes on: trunk/18xx/lib/batik-1.7/lib/LICENSE.js.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/18xx/lib/batik-1.7/lib/LICENSE.pdf-transcoder.txt =================================================================== --- trunk/18xx/lib/batik-1.7/lib/LICENSE.pdf-transcoder.txt (rev 0) +++ trunk/18xx/lib/batik-1.7/lib/LICENSE.pdf-transcoder.txt 2011-04-20 16:01:53 UTC (rev 1525) @@ -0,0 +1,2 @@ +The pdf-transcoder.jar file is licensed under the Apache License 2.0, which +can be found in the distribution root directory in the LICENSE file. Property changes on: trunk/18xx/lib/batik-1.7/lib/LICENSE.pdf-transcoder.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/18xx/lib/batik-1.7/lib/LICENSE.sax.txt =================================================================== --- trunk/18xx/lib/batik-1.7/lib/LICENSE.sax.txt (rev 0) +++ trunk/18xx/lib/batik-1.7/lib/LICENSE.sax.txt 2011-04-20 16:01:53 UTC (rev 1525) @@ -0,0 +1,23 @@ +xml-commons/java/external/LICENSE.sax.txt $Id: LICENSE.sax.txt 201084 2002-12-09 16:15:21Z vhardy $ + + +This license came from: http://www.megginson.com/SAX/copying.html + However please note future versions of SAX may be covered + under http://saxproject.org/?selected=pd + + +This page is now out of date -- see the new SAX site at +http://www.saxproject.org/ for more up-to-date +releases and other information. Please change your bookmarks. + + +SAX2 is Free! + +I hereby abandon any property rights to SA... [truncated message content] |
From: <wak...@us...> - 2011-04-19 20:59:57
|
Revision: 1524 http://rails.svn.sourceforge.net/rails/?rev=1524&view=rev Author: wakko666 Date: 2011-04-19 20:59:51 +0000 (Tue, 19 Apr 2011) Log Message: ----------- remove batik 1.6 Removed Paths: ------------- trunk/18xx/lib/batik-1.6/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wak...@us...> - 2011-04-19 20:57:30
|
Revision: 1523 http://rails.svn.sourceforge.net/rails/?rev=1523&view=rev Author: wakko666 Date: 2011-04-19 20:57:21 +0000 (Tue, 19 Apr 2011) Log Message: ----------- Add in batik-1.7, update classpath. Modified Paths: -------------- trunk/18xx/.classpath trunk/18xx/test/SVGOffscreenLoader.java Added Paths: ----------- trunk/18xx/lib/batik-1.7/ trunk/18xx/lib/batik-1.7/CHANGES trunk/18xx/lib/batik-1.7/LICENSE trunk/18xx/lib/batik-1.7/NOTICE trunk/18xx/lib/batik-1.7/README trunk/18xx/lib/batik-1.7/batik-rasterizer.jar trunk/18xx/lib/batik-1.7/batik-slideshow.jar trunk/18xx/lib/batik-1.7/batik-squiggle.jar trunk/18xx/lib/batik-1.7/batik-svgpp.jar trunk/18xx/lib/batik-1.7/batik-ttf2svg.jar trunk/18xx/lib/batik-1.7/batik.jar trunk/18xx/lib/batik-1.7/lib/ Modified: trunk/18xx/.classpath =================================================================== --- trunk/18xx/.classpath 2011-04-18 16:18:35 UTC (rev 1522) +++ trunk/18xx/.classpath 2011-04-19 20:57:21 UTC (rev 1523) @@ -1,15 +1,16 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path=""/> - <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/batik.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/js.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/pdf-transcoder.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/xerces_2_5_0.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/xml-apis.jar"/> - <classpathentry exported="true" kind="lib" path="lib/log4j-1.2/log4j-1.2.14.jar"/> - <classpathentry kind="lib" path="lib/jgraph5/jgraph.jar"/> - <classpathentry kind="lib" path="lib/jgrapht-0.7.3/jgrapht-jdk1.5.jar"/> - <classpathentry kind="lib" path="lib/junit_3.8.2/junit.jar"/> - <classpathentry kind="output" path="classes"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry excluding="lib/batik-1.7/|lib/jgraph5/|lib/jgrapht-0.7.3/|lib/junit_3.8.2/|lib/log4j-1.2/|lib/batik-1.7/lib/|lib/jgraph5/|lib/jgrapht-0.7.3/|lib/junit_3.8.2/|lib/log4j-1.2/|lib/batik-1.7/|lib/batik-1.7/lib/" kind="src" path=""/> + <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="lib" path="lib/log4j-1.2/log4j-1.2.14.jar"/> + <classpathentry kind="lib" path="lib/jgrapht-0.7.3/jgrapht-jdk1.5.jar"/> + <classpathentry kind="lib" path="lib/junit_3.8.2/junit.jar"/> + <classpathentry kind="lib" path="lib/jgraph5/jgraph.jar"/> + <classpathentry kind="lib" path="lib/batik-1.7/batik.jar"/> + <classpathentry kind="lib" path="lib/batik-1.7/lib/batik-bridge.jar"/> + <classpathentry kind="lib" path="lib/batik-1.7/lib/batik-dom.jar"/> + <classpathentry kind="lib" path="lib/batik-1.7/lib/batik-ext.jar"/> + <classpathentry kind="lib" path="lib/batik-1.7/lib/batik-gvt.jar"/> + <classpathentry kind="lib" path="lib/batik-1.7/lib/batik-util.jar"/> + <classpathentry kind="output" path="classes"/> +</classpath> Added: trunk/18xx/lib/batik-1.7/CHANGES =================================================================== --- trunk/18xx/lib/batik-1.7/CHANGES (rev 0) +++ trunk/18xx/lib/batik-1.7/CHANGES 2011-04-19 20:57:21 UTC (rev 1523) @@ -0,0 +1,1528 @@ +Change Log +========== + +The following log records some of the most important changes. +Bug fixing is an on-going task, so it is implied in all sub-releases. + +1.7beta1 -> 1.7 +--------------- + +1. Bugzilla problem reports fixed: + + 26815, 28344, 35165, 36570, 37496, 38498, 40163, 40727, 41205, + 41820, 41947, 41955, 41988, 42014, 42021, 42032, 42075, 42118, + 42137, 42168, 42169, 42196, 42209, 42210, 42212, 42221, 42228, + 42255, 42258, 42311, 42312, 42333, 42381, 42386, 42479, 42504, + 42505, 42543, 42645, 42651, 42697, 42698, 42807, 42961, 42963, + 442968, 3022, 43043, 43045, 43165, 43194, 43195, 43370, 43418, + 443446, 3638, 43657, 43744, 43760, 43764, 43787, 43854, 43871, + 443904, 3953, 44029, 44054, 44092, 44146 + +2. New features + + * xml:id support (http://www.w3.org/TR/xml-id/). + * ElementTraversal support (http://www.w3.org/TR/ElementTraversal/). + * Enhanced DOM Viewer window, contributed from Ivan Andjelkovic, + a Google Summer of Code student. + +3. Improvements + + * Support for cursor="move" on OS X, and cursor="help" on all + platforms. + * Improved conversion to/from WMF. + * data: URIs now supported as external stylesheets, scripts, filters. + * SVG 1.1 feature strings now reported. + * The viewBox="" attribute on <svg> is now animatable. + * Implemented SVGSVGelement.getViewBox(). + * A document's document element can now be replaced. + * Performing animation hyperlinking backwards is now supported, as + well as using <a> elements to hyperlink to animations. + * Updated pdf-transcoder.jar to one built from FOP 0.94. + * Squiggle's View Source window is now syntax highlighted. + +4. Bug fixes + + * XPath interface objects now exposed to ECMAScript. + * The three other MIME types for ECMAScript are now really supported + (text/javascript, application/javascript, application/ecmascript). + * Pseudo-elements now parsed properly in CSS selectors. + * Avoid null pointer exception when event-base timing specifiers + in animations reference an element by ID within a <use> shadow tree. + * Invalid min="" and max="" values on animation elements now ignored. + * Corrected CSS cascade order for rules of equal specificity. + * Fixed CSS :lang() processing so that it matches case insenstiviely, + using xml:lang="" as well as lang="", and using proper hyphen- + separated tokens. + * Gradients with gradientUnits="objectBoundingBox" disabled when the + bounding box has zero width or height. + * Avoid an array index exception for certain degenerate motion path + animations. + * Fixed mouse event button reporting. + * Avoid null pointer exception when cloning <symbol> and <image> + elements. + * Make empty <filter> elements result in no rendering for the + filtered element. + * SVGStylable.getPresentationAttribute() now returns null if the given + presentation attribute is not specified on the element. + * Specifying textLength="" on text elements that have non-text nodes + as their first children now works. + * Avoid numerical accuracy issues when sampling frozen animations. + * Event listeners are now removed when <text> elements are removed + from the document. + * Invalid SVG 1.0 feature string removed. + * Ensure animation elements are properly deinitialised when they are + removed from the document. + * Allowed animations in <use> element shadow trees to have syncbase + timing specifiers that refer to elements outside the shadow tree. + * Fixed bug in DOM event removal/dispatch. + * Ensure the animation engine is resumed if it is sleeping when a + beginElement() call is made. + * Avoid a null pointer exception in JSVGScrollPane if the document + doesn't return a bounds. + * Avoid a null pointer exception when painting a GraphicsNode on to an + SVGGraphics2D. + * Rasterizer -cssUser command line argument now resolved against + current working directory. + * Fixed bug in key event dispatching code. + * Decrease memory required for storing animation elements' previous + intervals (used for hyperlinking). + * Avoid infinite loop for animations with multiple, identical begin + (or end) instance times. + * Ensure TIFF and JPEG codecs really aren't compiled unless the relevant + Sun classes are present. + * Avoid null pointer exception when accessing animated marker orient + values. + * Patched Rhino so that the ECMAScript debugger runs on OS X. + * Ensure the animation engine is initialised before the SVGLoad event + is dispatched. + * Restored exception throwing from bridge classes when required + length attributes are missing. + * Duplicated codec classes removed from awt-util jar. + * Avoid null pointer exceptions in DOMMouseEvent objects. + * Motion animation transforms are now applied after the transform="" + attribute. + * Fixed bug in DOM event default action invocation in SVG 1.2 documents. + * Fixed bug in CSS class name matching, which occured only when an + element was declared to be a member of multiple classes, where one + is a prefix of another. + * Fixed bug on OS X where the zoom interactor overlay was not shown. + +5. Misc + + * Official maven artifacts are now supplied. + +1.6 -> 1.7beta1 +--------------- + +1. Bugzilla problem reports fixed: + + 22260, 25428, 28337, 29417, 29552, 32415, 34217, 34234, 34364, + 34847, 34938, 35349, 35480, 35549, 35655, 35661, 35683, 35722, + 35727, 35773, 35878, 35976, 35977, 36165, 36253, 36278, 36309, + 36455, 36483, 36485, 36493, 36511, 36613, 36614, 36615, 36743, + 36745, 36746, 36747, 36769, 36889, 36924, 36933, 37276, 37497, + 37890, 37891, 37892, 37986, 37989, 38045, 38158, 38176, 38178, + 38183, 38379, 38475, 38497, 38549, 38558, 38568, 38750, 38775, + 38782, 38785, 38831, 38872, 38930, 38932, 38933, 38990, 39032, + 39058, 39202, 39297, 39303, 39318, 39361, 39751, 39755, 39784, + 39831, 39838, 40098, 40167, 40336, 40368, 40392, 40393, 40397, + 40403, 40405, 40594, 40605, 40631, 40681, 40686, 40857, 40898, + 40927, 40994, 41079, 41165, 41216, 41234, 41288, 41329, 41331, + 41336, 41473, 43954 + +2. New features + + * DOM Level 3 Core/Events/XPath support. + * Improved WMF transcoder support. + * Override style declaration support. + * Near complete SMIL Animation support. + * SVG 1.2 features: + * resource documents + * shapechange and RenderedBBoxChange events + * SVGGlobal startMouseCapture/stopMouseCapture methods + * handler elements + +3. Improvements + + * The SVG namespace declaration is now not assumed for the document element + when an SVG declaration is not present. Certain non-conformant content + will now be identified as being in error. + * New MacRenderer implementation that avoids 10x slowdown on + Tiger. + * Mutations to flowText contents now cause the rendering to update, and + flowRegion objects are now rendered. + * Support for normalized path segments on SVGAnimatedPathData, thanks to + Andres Toussaint. + * Updated pdf-transcoder.jar to one built from FOP 0.9alpha1: + * This fixes text being drawn as text in PDF. + * JPEG streams being embedded as JPEG. + * Default bitmap dpi is 300. + * Most gradients and patterns are now correct (pattern overflow isn't + handled properly although most of the code is present), and + gradients with complex repeats are rasterized due to difficulties + expressing them in PDF. + * Transcoders with the KEY_EXECUTE_ONLOAD hint set force the document + to be dynamic. + * Added JIIO codecs to Batik (not enabled by default) + * Support for finding XML Parser through JAXP. + * Enhancements to ArabicTextHandler. + * Update Manager's MIN_REPAINT time is now adjustable. + * GraphicsUtil warning about Graphics from BufferedImage + w/o BUFFERED_IMAGE hint is now controllable with property. + * JSVGScrollPane now has 'scrollbarAlwaysVisible' mode. + * Improved Path parser so it is more conformant. + * Updated Rhino to 1.6R5. + * Documents in Squiggle's Go menu now have the full URI as a tooltip. + * Better version number reporting from org.apache.batik.Version. + * Implemented SVGPathElement.getPathSegAtLength. + * Implemented 'getFunctionName' for built in CSS functions. + * Exposed SAXDocumentFactory's parser to subclasses. + * Added a -snapshotTime option to the rasteriser. + * Now using Apache XML Commons External, for SAC, DOM 3 Core, SMIL Animation + and SVG 1.1 DOM bindings. + * Encoding as specified in a Content-Type header's charset parameter is now + honoured when scripts are loaded. + * Changed InterpreterFactory so that multiple MIME types can be associated + with a given Interpreter. + * text/javascript, text/ecmascript, application/javascript and + application/ecmascript are now all supported as script types for Rhino. + Processing of application/ecmascript is as specified in RFC 4329. + * Improved integration when running under Mac OS X: Squiggle's menu bar + is now at the top of the screen, the application window has a proper + name and functional About/Preferences/Quit menu items, and a Squiggle.app + application bundle can now be created. + * JAR files now have Implementation-* attributes. + * Added an interface for all ImageRenderers to get/set RenderingHints. + +3. Bug fixes + + * SVGMatrix.rotate now takes deg rather than radians. + * Fixed mouseout/mouseover tracking, which regressed some time between + 1.5beta5 and 1.6. + * Fixed misplaced glyph for mixed LTR and RTL text. + * Fixed handling of tooltips from title elements. + * Fixed rendering error (bug 36511). + * Fix for broken event propagation across 'use' element shadow tree boundary. + * Fixed a bug in the handling of 'x', 'y', 'width', 'height', + on feImage elements. + * Fixed bug in EventTarget.{add,remove}EventListenerNS wrapper + for Rhino. + * Fixed memory leak with dynamically added title tooltips. + * Fixed bug with update regions and filters. + * Fixed a problem with feSpotLight and feSpecular lighting (bug 36745). + * Fixed bug with event removal for multiple events and the same target + (thanks Andreas). + * Fixed problem with lowercase 'European' vowels (accented vowels). + * Fixed duplicated fragment identifier bug. + * Fix to allow transcoders that execute onload to work with SVG 1.2 + documents. + * Fix incorrect reporting of modifier key states in DOM UI event objects. + * The broken link image works again now. + * Convert "" to null for namespace URIs given to public DOM interfaces. + * Gradient scaleback is now 0.999 rather than 0.97. + * ttf2svg now emits a document with an SVG namespace declaration. + * Include the o.a.b.ext.awt.image.spi.{ImageWriter,RegistryEntry} service + resource files in the codec jar. (Fixes problems with data: URIs for + images when Squiggle is run from the jars.) + * Fixed problem with ZoomAndPan handling overriding user disabling of + interactors. + * More sensible handling of source 'URLs' in svgrasterizer. + * Greyscale sources are now treated as if they have sRGB Gamma. + * Fixed SVGTextContentElement.getExtentOfChar to use glyph metrics rather + than the glyph shape bounding box. + * Changed Errors to UnsupportedOperationExceptions for unimplemented methods. + * JSVGViewerFrame uses reflection for the Rhino debugger to enable + compilation without Rhino. + * Fixed phantom 'double click' bug. + * Handle 'style' elements added and removed from the document when they are + not at the root of the addition/removal. + * Make CSS engine not throw an NPE for extension elements that don't expose + an OverrideStyleProvider. + * Fixes for text-on-a-path with glyphs who's geometry doesn't "start" at 0. + * Various deadlock fixes. + * Fixed bug where writing TIFF with JPEG compression fails. + * Fixed significant performance bug in creating geometry (it was + parsing the entire path for each entry in the path, O(N^2)). + * Fixed SVGTextContent interfaces on FlowRoot elements. + * Fixed NPE when reloading an SVG 1.2 document quickly. + * Fixed bug where mousing over 'a' elements would result in exceptions. + * Avoid NPEs when loading scripts from file: URIs. + * Fixed flowText regression by rebasing off SVGOMTextPositioningElement. + * radialGradient has a default value of "50%" for 'r' (thanks Tonny). + * Fixed bug in key event dispatching when compiled under JDK 1.3. + * Avoid precision errors in stringification of transform list values + (thanks Nick). + * Unmaximize Squiggle window if the "Automatically resize window when + loading documents" option is turned on. + * Fixed improper rendering of the batik70.svg sample under OS X. + * Fixed synchronization bug in the SVG generator. + +4. Misc + + * Code now compiles under Java 1.5 and 1.6. + * Lots of code/javadoc cleanups. + * New Forrest-based website for Batik. + * New about box/splash screen. + * Visual refresh for Squiggle's toolbar icons and Preferences window. + +1.5.1 -> 1.6 +------------ + +1. Bugzilla problem reports fixed: + + 28035, 28188, 28429, 28432, 28487, 29110, 29891, 30580, 30584, + 30739, 30923, 30925, 30948, 31603, 32108, 32435, 32872, 32951, + 33242, 33733, 33890, 33923, 33986, 34030, 34041, 34115 + + +2. SVG 1.2 Features: + + * All SVG 1.2 elements/features have been moved from + the Batik namespace into the SVG 1.2 namespace (except for + flowText which remains, due to some loss of functionality + with the current flowRoot and potential spec instability). + * Implementation of SVG 1.2 flowRoot element (text flow into + arbitrary regions with bidi support). + * There is now an SVG12CSSEngine which has support for new + properties in SVG 1.2 + + +3. Improvements: + + * Massive performance improvement (>10X) for drawing on Mac OS X. + * Document.getElementById now uses a Hashtable to speedup lookups. + * JavaScript can now be used in an Applet out of the box. + * Added support for 'font' shorthand property. + * Added support for 'deselectAll' SVG DOM call. + * getEncolsureList and getIntersectionList are implemented. + * Added support for get[Screen]PixelUnitToMillimeterX/Y + * SVG DOM getTotalLength, and getPointAtLength are now implemented. + * Support for preserveAspectRatio DOM methods. + * Squiggle browser now has a 'Save As' menu item. + * Can toggle if xml:base should be added to saved SVG. + * Can 'pretty print' saved XML for readability. + * ExtensibleSVGDOMImplementation no longer exists, + the SVGDOMImplementation is now extensible. There is a + new baseclass ExtensibleDOMImplementation that provides + extension capabilities to any DOMImplementation subclass. + As a result the name of the services meta-file has moved to: + 'org.apache.batik.dom.DomExtension' + from: + 'org.apache.batik.dom.svg.DomExtension'. + People with DOM extension will have to update the service file + accordingly. + * ExtensibleDOMImplementation now allows 'extension' elements in + the SVG Namespace (they are always lower priority than 'buit ins'). + * When a new Document is loaded a new BridgeContext is created for it. + As a result each document now get's it's own CSS engine. + * ttf2svg now supports 'auto ranging' so it looks at the font + to decide what to output. + * DOM will now detect when the child passed to insert/remove + * AbstractParentNode will now throw a DOM Hierarchy exception + if you try to append a node as a child of it's self (PR 34030) + * Anti-aliased clips (hqClip patch). This can be disabled by setting + the transcoding hint to vector or print (so content doesn't get + rasterized). PR 29110. + * Control of tiled image rendering based on rendering hint. + Using this hint may greatly increase the amount of memory used. + * The Marker interface now has a 'getCharIndex()' method to + get the index of the character the Mark is associated with. + node is not the child of the node insert/remove is called on. + * DrawImage now defaults color model to sRGB_Unpre if the destination + doesn't include alpha. + * The pattern element now shares one rendering tree across all + references. + * Some improvements for Kerning in SVG Font (faster) + * Arabic diacritics are now positioned relative to the right edge + of the base glyph. Bug 28429 + * Basic DocumentType implementation, if present DOMUtilities will + now emit a proper doctype specification + * GVT Tree walker can now be given any node in the GVT tree and it + walk just that subtree. + * Many places now use getResource as Stream instead of Resource + bundles where localization is not wanted/needed. + * Tweaked UpdateManager repaint scheduling alg. + It now tracks when the rendering goes 'out of date' + with the document and runs runnables until it is out of + them or MIN_REPAINT_TIME is exceeded. + * Arc2D now translated to path with elliptical arc commands + in SVGGraphics2D interface. + * JSVGScrollPane now uses bbox of geometry if no viewBox is provided. + * Refactored the text and flow bridges so make things cleaner. + * Implemented textLength to return the value of + getComputedTextLength when the textLength attribute is not + set. + * Potentially large optimization in BBox generation + * The DOM tree viewer now has an option to hide text nodes that + only contain whitespace. + * The DOM tree viewer now includes the id of an element in the + tree view if it has one. + * Improvements to empty bounds handling, should decrease update areas. + * GVT Render requests are now compressed. This helps when doing + live resize of large documents. + * Some refactoring/restructuring of svggen.XmlWriter to potentially + make it a pretty printing DOM serializer. + * Latest pdf-transcoder from FOP which supports '-dpi' switch. + * ScrollPane now should do a better job of fitting document w/o + scrollbars + * title and desc changes are now dynamically tracked. + * ScriptFactorys now loaded via Services interface. + * Made the JDK image loading Mediatracker static + (so others could use it easier). + * ParsedURL now uses the current Batik version as it's default + UserAgent + * Rationalized Text Selection code. Copy to clipboard is now done + by JGVTComponent only if 'unix style' text selection is requested + (default). + +4. Bug Fixes: + + * Fixed all known memory leaks with loading images. + * Changing documents in JSVGScrollPane now works properly. + * Fixed a small memory leak when changing xlink:href on a + use referencing a local element. + * No longer uses Thread.interrupt. On some JVM's this can confuse the + class loader. + * Adding elements in the 'null' namespace nolonger causes a NPE exception. + * Fixed colorspace error in ColorMatrixRed. + * Line element no longer has a fill associated with it. + * Fixed bug #29416 - problem with empty quotes in CSS. + * Fixed bug #34210 - element selectors are now case sensitive + * Index out of bounds error fixed in linear gradient. + * AOI problem in PrintTranscoder now fixed. + * Null Pointer exception when PrintingTranscoding documents + using SVG fonts is fixed (the BridgeContext was being + disposed of too early). + * PrintTranscoder now uses UserAgent to report exceptions + rather than silently swallowing them. + * Fixed some minor bugs in the GlyphLayout code for flow regions. + * Very minor tweaks in JSVGScrollPane. + * Applied patch 28188, fixed tooltip text & title text, thanks Glen + * Applied patch 28487, fixed enabled/disabled state for + toolbar buttons, thanks Glen + * Fixed bug in text selection (programatically selected text wouldn't + clear properly. + * Fixed bug 23035 - Xlink attributes initialized with wrong values. + * Fixed Bug 28785 - 'a' element not clickable with namespace prefix. + * Bug 30584 - Concurrent Modification believed fixed (couldn't get + test case to fail after fix). + * Bug 29891 - Rasterizer problem if w/h == viewBox w/h + * No more 'flicker' when panning a dynamic document. + * CmapFormat4 now clips charCode 0->65534. + * All Object.wait calls are now in while loops to prevent spurious wakeups. + * DOM keypress events will now be generated for so called + Java 'action' keyEvents (previously only keydown/up were + generated). + * Fixed a bug in the PNG Encoder for some 1,2 or 4 bit/pixel images. + * Fixed bug in PackBits TIFF files with multiple IFD's + * The 'debug' messages are now synced with GUI messages. Also they + are localizable. + * Tweaked the way we generate paths to avoid a bug + in the Mac OS X Java implemention where a close + followed by a moveto didn't join the path properly. + * Fixed width/height change onload bug in transcoders submitted + by Simon Mieth. Thanks! + * Fixed a bug with CSS shorthand properties not being set by presentation + attributes. + * DOMImplementations now return empty documents if + qualifiedName in createDocument is null (PR 32108) + * Fixed 'flashing' with JSVGScrollPane. + * Fixed PR: 30923. Text children now respect display and + visibility properties (including dynamic changes). + * Fixed visibility update bug reported by George Armhold. + * Fixed visibility bug on image elements. + * getBBox should now work per the specification. + a) fill="none" will still give bbox + b) It is now the tight bounds of the geometry + c) It does not include the stroke anymore. + d) When called on 'undisplayed' elements returns null (not sure + what the spec really says about this). + * Modification of use element's width/height now works. + * Fixed potential interrupted bug in the RunnableQueue class. + * The document loader cache now uses soft references to avoid + being a memory leak. + * Improved the xml:space support. + * textPath no longer supports 'position attributes' on it's self + * textPath now supports progression position attributes provided + by parent/child tspan/text nodes. + * systemLanguage, requiredFeatures, requiredExtensions now all fail + to match when given an empty string (as specified by the SVG + specification). Bug #33242 (thanks Rick Graham). + * Fixed potential synchronization issues in JavaScript intervals. + * Small optimization in Event dispatch. + * Removed debug print from SVGOMAnimatedPreserveAspectRatio.java + * Synchronization fix in SoftReferenceCache. + * SAXParser now includes 'ignorableWhitespace' when building the + DOM tree. I also tweaked the way text and CDATA sections are + created. + * UpdateManager is now always the 'source' of UpdateManagerEvents + previously in some cases it was an inner class. + * Fix for masks when using Alpha Premultiplied (Mac OS X). + * Improved consistency of events from the RunnableQueue. + Calling suspend/resumeExecution should now always generate + a runHandler event (although the events may be "compressed" + so suspend/resume may only generate one resume event). + * Fixed bug in handling kerning elements with multiple glyph entries + in g/u 1or2. + * Removed use of 'getTagName' to use 'getLocalName' to avoid issues with + prefixed svg elements. + * Fixed a mistake in the generation of SVG fonts that include + arabic forms (PR 33733) + * Fixed handling of complex paint types (base types with + fallbacks). + * Fixed CSS SVG DOM interfaces for complex paint types + (see bug 33923). Added new test for same. + * Text Selection events are now generated even when the + done event is not over a graphics node. + * The double '#' bug is gone in the SVG Pretty Printer. PR 33890 + * The worst of the 'extra spaces' problem with the pretty printer + is solved. + * Fixed updates to SVG Font based text (PR 34041) + * Bug fix in NumberParser (thanks dvholten) + * Fixed bug 34115 - CSSStyleDecl doesn't collapse properties. + * JSVGCanvas no longer holds cached viewBox so it responds + properly when viewBox is updated in SVG content. + +5. Misc: + + Documentation updates + JavaDoc will now reference W3 and JDK docs + Updated MAINTAIN file + Splash/startup screen now embed font (a little simpler SVG as well). + Some Rhino improvements. + New Tests for bugs. + + Thanks to everyone on batik-dev/users for reporting problems and + working on finding solutions. + +1.5 -> 1.5.1 +------------ +1. Security: + + A script security issue was reported in the Batik Squiggle + browser. Squiggle uses the Rhino scripting engine and some features + of that engine can be leveraged by malicious scripts to gain access + to otherwise protected resources (like the file system). + + The Batik team has worked with the Rhino team to fix the isssue + that was reported and the Batik 1.5.1 patch release addresses the + issue. + +2. Features: + + Rhino JavaScript Debugger now integrated with Squiggle. + Better line numbers in error messages. + Zachary DelProposto's Scroll pane class is added. Allows for + scrollbars on SVG documents. + Cool solitaire examples in SVG. + +3. Performance fixes: + + Parents who have children added/removed no longer invalidate + their entire area. + When a element is removed or CSS properties changed all next + siblings are not repainted unless CSS rules change them. + First event dispatch is much quicker than the past. + Switched to Xerces 2.5.0 to improve performance of data protocol. + Changes to paint properties on text is now _much_ faster. + When using many objects from an external file the file will only + be loaded/parsed once. + Modifying x/y and some viewBox changes on SVG elements is now much + faster. + Better JPEG embedding in PDF. + +4. Conformance: + Batik now passes all non SMIL-Animation tests from the SVG Working + Group beSuite. + + @font-face CSS property and font-face elements are now compliant + with SVG specification. + + Changes to the 'class' attribute now update rendering tree + correctly. + + selectSubString now implemented. + + Dynamic modification of display, and marker properties supported. + SVG 'a' element respects 'preventDefault' on event object. + Pattern element no longer applies object bounding box transform + if viewBox is specified. + +5. Bugs: + + Fullscreen mode (F11) works again. + getExtentOfChar() returns bbox in text elements coordinate system. + SVGPoint now supports matrixTransform in more cases + clientX/Y now correct when target is a text element. + Bugfix in parsing some TrueType fonts fixed. + Now applies the 'all' media type to all content. + Image transcoders default to 400x400 rather than issuing an error + (consistent with viewer). + The properties opacity/filter/masking/pointer-events now work + on SVG elements. + Clearing text selection now works + Zero width/height image elements now work properly. + BBox info is correct for zero width/height items. + Fills/strokes text when text-rendering is set to geometricPrecision + rather than using drawGlyphVector. + getCssText() returns the relative version of URI's + SVG Graphics2D outputs correct rendering hints for text. + TextNodes returns the correct bounds. + Proper text child set as 'target' of events. + Events handled correctly for documents that reference the same + image multiple times. + Image are displayed as 'broken links' instead of being an error. + FeColorMatrix now respects color-interpolation-filters property. + elem.style.setProperty now works for shorthand properties. + Fixed race condition in JSVGComponent.set[SVG]Document. + Fixed several memory leaks dealing with use element. + Glyph element's 'd' attribute uses inherited winding-rule. + SVG 'style' element no longer generates multiple 'xml:space' attrs. + SAXDocumentFactory now generates only one CData node for each + CData section in source document. + Memory leak with addEventListener and objects that ref event target fixed. + Click events now allow a small amount of 'slop'. + Fixed bug in rendering with Double Buffering. + Clicking on the Canvas no longer clears the system clipboard. + No longer recascades elements in use tree from foreign documents + Now supports CSS properties with the max negative 32bit int value + Now supports more JPEG image types. + No longer throws a Class Cast exception when using named colors + as the fallback for icc-colors + clearTimeout, clearInterval no longer throw exceptions for null + objects. + clipPath now respects clip-rule when using 'use' element. + + Bug PRs: 12536, 23030, 23038, 23079, 23177, 24919, 25251, 25463 + + +1.5beta5 -> 1.5 +--------------- + +1. Features: + + - With JDK 1.4 text-rendering="optimizeSpeed" will render + non-anti-aliased hinted text (for axially aligned text). + + - The pointer-events property is now handled correctly for elements + without fill or stroke paint. + + - Improved stroke accuracy when shape-rendering="geometricPrecision" + + - JSVGComponent.setSVGDocument with 'null' now releases all + heavy resources and makes the Canvas display only Background. + + - Many memory leaks fixed. + + - Transcoders and JSVGComponent will now accept any Document + and convert to a Batik SVG Document if needed. + + - Script interpreters are loaded lazily. This means that unless you + use them (by having event attributes or script elements) you + don't need any script engines. + + Performance Improvements: + + - Image drawing is now 5-10x faster, for most raster images. + + - Significant performance improvement for patterns that are + filtered or have filters applied to them (take Batik70 for + example). + + - AbstractParentNode insertNode, removeNode, replaceNode are + now much faster for Parents with many children. + + + Library changes: + + - Updated to the Rhino 1.5R41 library + + Others: + + - Added control of floating point precision used in SVGGraphics2D + (see the org.apache.batik.svggen.SVGGeneratorContext class) + + - Batik now almost never opens image URL's twice. + + - JSVGComponent/BridgeContext now has three levels of interactivity. + STATIC, INTERACTIVE, DYNAMIC. With increasing memory overhead + and build time requirements. + + - Improved test environment with automated memory leak, performance, + threading and interactivity tests. There are now over 1000 tests + in the regard regression test suite. + + - Window.parseXML now returns a Document when no 'host' + Document provided. + +2. Bugs: + + See: http://nagoya.apache.org/bugzilla for details on each bug. + + - 6526 pointer-events does not work for fill="none" stroke="none" + - 6683 JSVGCanvas - Problem adding to JScrollPane + - 6951 see samples/tests/spec/paints/linearGradientLine.svg + - 8854 Fix feImage implementation according to latest SVG 1.0/1.1 c + - 9981 Improve Documentation on Scripting with Java + - 9994 text-decoration:underline is incorrect with tspan elements. + - 12013 Squiggle renders jagged curves/paths 12079 transcoder.wmf + - 13870 Language Code errors + - 14011 problem using rasterizer with the headless option + - 14673 not-so-pretty text rendering + - 14788 TranscoderInput(XMLReader reader) does not seem to be implem + - 14789 TranscoderInput(Document document) is incorrect + - 15348 SVGGraphics2D should not export scientific notation on CSS p + - 17168 SVGGraphics2D has package level protected on DOMGroupManager + - 17863 API to get Version info + - 17965 SVGGraphics2D adds 'font-size' attribute to 'line' and 'circ + - 18143 Removing attribute using Element.removeAttributeNode doesn't + - 18566 JSVGComponent packs its parent window + - 18640 Problem with setSVGDocument + - 18840 A few issues with the Batik source + - 18841 Problems with imports in Batik source + - 19017 error when attempting SVG to PDF conversion + - 19363 zero width on rect element causes error + - 19392 Bug in "org.apache.batik.dom.util.DOMUtilities.java" + - 19865 Exception rendering linked PNG file. + - 20147 JSVGCanvas doesn't function with JInternalFrame + - 20201 incorrect gAMA chunk for sRGB + - 20331 bug on batik SVG DOM implementation on the SVGPathSegArcAbs + - 20332 bug on batik SVG DOM implementation on the SVGPathSegCurveto + - 20811 A rect disabled because of zero width or height doesn't get + - 21125 XML comment cause css parser to abort parsing + - 21259 Drawing on an SVGGraphics2D and then using JPEGTranscoder pr + - 21352 XML comments inside script elements treated as script code + - 21358 Dynamic Update of content referenced by a <use> does not wor + - 21361 Bug on SVGPaint implementation + - 21362 Bug on CSSStyleDeclaration on URI reference + - 21374 Implement conformant Java Handler code + - Viewer now properly displays w/h x/y locations in + 'viewbox' coordinates. + - Fixed dirty regions for nodes that change size then + position in the rendering tree (where the new position + has a different rendering transform). + - Fixed handling Fragment URL's with colon's in them. + - Batik no longer considers all @font-face rules a syntax error. + Batik now just ignores them. + - Fixed use elements in Documents with no base url. + - Runs of RTL Text now work with JDK 1.4. + Nested embed and bidi-override properties should now work. + - Fixed bug setting viewBox on outermost SVG element as + described in: + http://koala.ilog.fr/batik/mlists/batik-users/archives/msg03513.html + - JSVGComponent/Canvas now repaints when it changes size + (even when no viewBox). + - Modifying zero W/H rect, circle, ellipse now works properly. + - Fixed the handling of kerning attribute. + - JSVGComponent.setSVGDocument with a Document that has been + previously viewed in the Canvas now works + - 'style' and 'script' elements no longer include the contents + of XML Comments (unless inside a CDATA block). + - Fixed a with absolute x/y attributes in non-text + progression direction. + - Fixed JSVGComponent when it's working threads are + interrupted. + - RhinoInterpreter once again binds the Global Object + as 'window' + + +3. Extensions: + + - Updated multiImage element to match WD. + + +4. Documentation: + + - Updated the FAQ with frequent questions on UpdateManager, DOM + updates and visual updates. + + - Updated the implementation status page and the home page. + + +1.5beta4b -> 1.5beta5 +--------------------- + +1. Features: + + Library changes: + + - Xerces 2.3 is now the default parser. The parser can still be controlled + through the org.apache.batik.util.XMLResourceDescriptor class. + + ** NOTE ** + + While the general performance of the Xerces 2.3 parser seems equivalent + to those of the Crimson parser used previously, there is a notable exception + in the handling of long attributes. This makes a very visible difference + for SVG content that uses embeded images through the 'data:' protocol which + can be extremely slow with Xerces 2.3. The bookOfKells.svgz example, which + used the data: protocol for rather long images has been removed from the + distribution as it does not load in a reasonable amount of time when using + Xerces. + + - Rhino version has been updated from 1.5R3 to 1.5R4 allowing to fix + BR #11968 (DOM access functions should return ECMAScript strings). + + - Removed SAX and DOM sources from the Batik project. Now use xml-apis.jar + from xml-commons. + + Others: + + - currentScale/Translate now implemented (get and set). + + - Implemented getScreenCTM, fixed getCTM (SVGLocatable) + + - onzoom, onscroll, onresize events are now implemented. + + - Integrated pdf-transcoder from FOP. + + - Ctrl-K/L work in fullscreen mode. + + - initial support for SVGList ( provided for SVGPointList in + <polygon> and <polyline>, SVGPathSegList in <path>, SVGLengthList + in textual elements, SVGTransformList in graphical elements ) + + - RFE #12735 : added support for dynamic modifications of 'xlink:href' in image element + + - Now skips reading the SVG DTD unless validation + is turned on (improves load times for small docs). + + - glyph-orientation-horizontal now works. + + - linearGradient's can now be anti-aliased (radial gradient + anti-aliasing also improved). + + - PNG Transcoder can now produce 1,2,4 & 8 bit indexed PNG's. + + - rasterizer can now be used in headless mode (JDK 1.4) + + - JPEG files now have X/YDensity set according to -dpi option. + + - Batik Docs now include a dependency graph for the jar files. + + - In ECMAScript, add the ability to pass an Object instead of a + Function to the Window.getURL() method in which case the + operationComplete method is called once the URL is retrieved. + + - SVGUserAgent now controls the default font-family + + - Added max-width and max-height support in the rasterizer infrastructure + (contribution by Henri Ruini, Hen...@no...) + + - Improvements to the WMFTranscoder by Luan O'Caroll + + - Added better error reporting for external scripts: errors now include the uri + of the external scripts in addition to the line number which is convenient + when an SVG file references multiple external scripts. + + - Modified the way SVG public identifiers are mapped to system identifiers. + The resource file now contains the mapping to the correct SVG DTD instead + of only containing the allowed SVG 1.0 system identifiers for a hard + coded DTD. + + - Added support for cursors. + +Bug Fixes: + + - clientX/Y values in MouseEvents are now returned in screen + pixels (it had been the viewBox coordinate system which was + convenient but wrong and problematic for some cases). + + - Changed default extension for TIFF files to '.tif' from '.tiff'. + + - Fixed bugs in screen updating when the size/location of the + root graphics node changed, and when transform on group + changes after bounds on a child. + + - ToolTips no longer 'hang around' under JDK 1.4.1 + + - The JSVGCanvas no longer steals focus and pops forward whenever + the cursor passes over the canvas. + + - The JSVGCanvas will no longer thrown an exception if an SVG + document is set prior to the component's size being set. + + - Text anchor for vertical text. + + - For corrupt/incomplete JPEG images now shows what it can. + + - Fixed bug with Indexed PNG's that have a bKGD chunk. + + - getRelatedTarget fixed for mouseout event. + + - glyph-orientation-horizontal/vertical no longer require a unit + as per the SVG specification. + + - Fixes for 'jar' protocol. + + - Fixed compressed Tiff writing. + + - Missing Glyph's are now rendered correctly. + + - Text selection now works better with altGlyphs. + + - PrintTranscoder no longer scales 'real world' units wrong. + + - Fixed a bug involving the 'use' element with a width/height in + an SVGFont referenced from external documents. + + - Collaboration with Philipe Converset (Qarbon) on an extension to define + margins in filter regions. This is now supported in the Batik namespace. + +2. Bugs: + + 12389 Focus issue in Squiggle's URL text field + 12121 Cursor in URL field disappears + 12168 MarkerShapePainter delivers wrong PaintedArea + 12239 [PATCH] Moved some method local variables into class + 12954 add support for stroke-width:0 + 15162 PNGTranscoder gives error message about TIFF transcoder + 17167 stroke-dashoffset does not support negative length + 13713 <use> element fails when using percentage values x/y coords + 17183 baseline-shift doesn't refer to parent "line-height" + 15063 Version-dependent code in package org.apache.batik.gvt.font + 12736 Allow non-element nodes to be added to g and svg elements. + + - Added Units resolutions to CSS rects + + - 'd' and 'points' can now be empty on <path>, <polygon> and + <polylines> + + - Now support the transform attribute on the <switch> element + + - Fixed class loader delegation bug in RhinoClassLoader + + - Patch from Keiron Liddle fixing PNGTranscoder KEY_INDEXED hint type + issue (was Boolean instead of Integer) + +3. Extensions: + + - Binary distributions now include jar files that can display + extensions. + + - The multImage element can now reference SVG images as well + as raster images. + + - flowText now supports vertical-align. + + - flowText now uses 'flowRegion' and 'rect' to describe flow + areas. + +4. Documentation: + + - Status of Batik implementation of SVG DOM. + + - Diagram showing the various Batik jar files and their relationships. + + +1.5beta4 -> 1.5beta4b +--------------------- + +This is a patch release fixing a bug on linking. + +1.5beta3 -> 1.5beta4 +-------------------- + +1. Features + + - Squiggle Browser: + + - the F11 key lets users enter the full screen mode or exit the + full screen mode if they are already in that mode. + + - the Browser can now handle XML files which contain a stylesheet + declaration referencing an XSL transformation. If that transformation + generates an SVG document, Squiggle will display it. + + By default, this feature is disabled because it requires that + the user either uses the JDK 1.4 (or greater) version (which at + this time is not a requirement for Batik) or that an XSL transformation + engine (such as Xalan) be in the classpath. + + To enable the feature, uncomment the following line (i.e., remove the '#'): + + #org.apache.batik.apps.svgbrowser.XMLInputHandler + + in the: + + resources/META-INF/services/org.apache.batik.apps.svgbrowser.SquiggleInputHandler + + file. + + - Scripting: + + - Added the ability to use an ECMAScript object providing an handleEvent + method for the listener argument of the addEventListener method on DOM objects + (previously only ECMAScript functions were accepted as parameter). [RFE9149] + +2. Bug Fixes + + - Images - bounds/hints now updated correctly when changed via script + - Local refs now work with null Document URL. + - Double buffered rendering now updates correctly on Mac OS X. + - ParseXML no longer assumes doc is SVG. + - Squiggle can now do Http authentication. + - SVG Font bounds fix + - Text layout fix (anchor and textLength) + - Adding/Removing children no longer invalidates entire parent region. + - handling of position attributes (x,y,dx,dy,rotate) on emtpy tspans has been fixed. + - Fixed improper handling on <altGlyphItem> + - Removed unnecessary font matching with <altGlyph> which can be found + - 'stroke-dasharray' now works with units, + - fixed bugs (CSS !important rules, DOM replaceChild on the root element, + SVG paint parsing, CSS percentages). + + +1.5beta2 -> 1.5beta3 +-------------------- + +1. Features: + + - Squiggle Browser: + + - now keeps a history of recently visited URIs + + - offers more control over the security features + + - Enhanced Security Support: + + - downloading of all external resources can now be + controlled through the UserAgent. This includes + scripting (as before) but also <image>, <use>, and + all elements which may reference external resources + (over 15). + + - users security policy now takes precedence over the + application policy. Users can set the java.security.policy + system property when starting a Batik application and it + will take precedence. + + - Interactivity and Scripting Support Improvements: + + - filter, mask, gradients, clip, pattern and marker are now + updated when the geometry of the referencing graphical + element is dynamically changed. + + - implementation of keyboard events (KeyEvents from DOM Level 2 + Working Draft). In the near future, the batik team will + implement the TextEvents from the DOM Level 3 Events module. + + - Newly supported elements (can now be modified by scripts): + <svg>, <image> and <text> element children (such as <tspan>); + + - Support for addition/removal/modification of stylesheets + + - Misc: + + - external scripts can now be gzipped. + + - added getPixelUnitToMillimeter to UserAgent classes + NOTE: the getPixelToMM and getPixelToMillimeter methods will be + removed after 1.5b3 is released! + + - Improvements in the support for the <flowText> extension + + - Added support for attribute/id/adjacent selector and :first-child + dynamic updates, + +2. Bug Fixing: + + - #1075, #4834, #5233, #5347, #5806, #6642, #6683, #7053,#8330, #9740, + #9058, #9067, #9304, #9429, #9520, #9779, #9804, #9272, #9276, + - bug in feColorMatrix + - DOM: getElementByTagName, invalidateElementsByTagName, cloneNode(false) + - mouseout bug on <tspan> fixed + - File->Open dialog bug on JDK 1.4 fixed. + - Memory leak fixes + - ttf2svg now emits kern elements with the proper sign + - MultiImage now respects xml:base + - Fixed mouse location bug + +3. Documentation Update: + + - Many additional links have been added to the Batik documentation + as well as improvements in its structure and content, thanks to + the work of Robert Di Blasi. + +1.5beta1 -> 1.5beta2 +-------------------- + +** Note on the new security support ** + +- Scripts are now run in a sand-box by default for the Batik sample + applications (the Squiggle SVG Browser and the Rasterizer). Users of + the SVG toolkit who what to run scripts securely need to add + security support in their application and may use the work done for + Squiggle as an example + (e.g., see the org.apache.batik.util.ApplicationSecurityEnforcer class). + +- There is a known limitiation: scripts loaded from a 'file:' url + cannot access (i.e., load files) under the same root. This is not + true for scripts loaded from a server (e.g., 'http:' urls). + +1. Features: + + - Scripting support for styling properties: + + - Most of the CSS properties and style attributes can now + be changed dynad:/work/dev/svg/apache/builds/batik-1.5beta3/mically. See: + http://xml.apache.org/batik/supportedProperties.html + + - Added support for style and class attributes dynamic updates + + + - DOM support: + + - Implementation of SVGLocatable including SVGMatrix + + - All class members of type: SVGLength now works on most of the + graphical elements (rect.x.baseVal.value) + + - Implementation of CSS DOM (getStyle, getComputedStyle...) + + + - Events/Interactivity: + - DOMFocusIn, DOMFocusOut and DOMActivate event types are not supported + + + - Security: + + - Secure scripting is now in place. Scripts in ECMAScript or + Java code are run in a sand-box by default. The Batik browser + (called Squiggle), has the following security options: + . secure execution of scripts can be on or off. + . scripts for a given language can be disabled/enabled. + . scripts can be constrained to come from the same origin + as the document referencing them. + In the Squiggle SVG browser, the security options can be set + through the Preferences dialog, in the browser options panel. + + + - Misc: + + - xml:base is now supported for the image element. + + - <flowText> extension element that flows text into multiple boxes. + Trying to track the SVG 1.1 Working Group on this element. + + - getURL, parseXML supported in the Window object. + + + - Testing: + + - Improved test infrastructure. There are new tests for handling + automatic regression testing of scripting features and there are + more tests (801 now) in the regard regression test suite. + + +2. Bug Fixing: + + - Fixed bugs with textPath w/ text-anchor, and textPath w/ multiple + trailing tspan elements. + + - Work around for RenderingHints when Batik Jars loaded multiple times + in the same JVM (through different class loaders). + + - Fixed a bug with X/Y Resolution for Tiff. + + - UIEvents are not dispatched properly on <text> children (<tspan>...) + + - <a> is now supported on <text> element children + +1.1.1 -> 1.5beta1 +----------------- + +** Note on enhanced scripting support ** + +- Support for DOM Core and DOM Events (Mutation events and UI events) + +- Limitations: + - No support for dynamic modification of CSS properties. + In particular, setAttributeNS of presentation attributes + such as 'fill' or 'stroke' or modification of the 'style' + attribute are not supported. + +1. Features: + - Enhanced scripting support: it is now possible to modify + SVG documents through scripting + - Tiff Transcoder now takes FORCE_TRANSPARENT_WHITE hint. + - Tiff Transcoder now writes resolution tags. + - Implementation of SVG 1.1 solidColor element (in Batik extensions) + - Implementation of multiImage element (a Batik extension). + - Event compression mecanism (e.g., concatenates mouseMove events) + +2. Bug Fixing + + - textLength now works in all cases except nested textLengths. + - 'image' element now respects xml:base. + - Renderer now reuses image buffers more often. + - Speed improvements in cases with lots of tspans. + - Filtered Raster Images now _much_ faster. + - Things mostly work with current Mac OS X JVM (still some trouble with + images/filters). + - Applying a ICC Profile no longer messes up alpha channel in some cases. + - PNG Transcoder now always writes sRGB chunk. + - feImage image positioning fix + - <use> bridge fix, + - SVG generator <use> export fix + - +1.1 -> 1.1.1 Release +-------------------- + +1. Bug fixing: + + - dx/x and dy/y now work when combined. + - clip-path now takes transforms into account + - AbstractRable constructors problem fixed. + - Put in workaround for worst of Mac OS X text problems (layout + still isn't 100% correct in most cases). + - Removed code that is no longer needed in GlyphLayout + - Fixed the last text layout issues on Mac OS X (GlyphVector was + returning the metrics for the first char for all chars in the vector. + We now use the difference in defaultGlyphPositions to get the + character advances). + - Fixed JViewerFrame issue with large (width/height) documents. + +2. Improvements + - Text bounds computation is now much faster + +1.1rc4 -> 1.1 Release +---------------------- + +1. Bug Fixing and Improvements + + - Code factorization in parsers. + - Parsers bug fixing. + - Added examples (maps, bookOfKells example, sunRise, mathMetal). + Maps are a contribution of Andreas Neumann, + MathMetal is a contribution of Christophe Held. + - Added default xmlns and xmlns:xlink on root <svg> in generator + - Integrated Ant task contribution from Henri Ruini + - Improved error dialog (now includes details with the error stack trace). + - Printing fix. + - text-anchor fix. + +1.1rc3 -> 1.1rc4 Release +------------------------ + +1. Features: + + - rewrite of rasterizer thanks to Henri Ruini's contribution + - improved image handling strategies in the SVG generator thanks + to Paul Evenblij's contribution. + - 'requiredFeatures', 'requiredExtensions' and 'systemLanguage' on + graphical elements + - anchor on raster images and SVG images now works properly + - anchor inside a SVG image now works properly + - <a> inside <text> or <tspan> is now displayed + - many tests added (transcoder...) + - SVG viewer: added dialog box at start up time while loading classes + - SVG viewer: limited number of files in history + +2. Bug fixing: + + - memory leak fix + - DOM core serialization + - Parsing of CSS comments + - SVG generator fixes (bug 4945 and 4389) + - rasterizer fixes + - text now works with JDK 1.4b3. Remaining issue with + BufferedImages. + +3. Improvements: + + - general performance improvements in the build and rendering + phases of the viewing component (for example float parsing + has been improved). + +1.1rc2 -> 1.1rc3 Release +------------------------ + +1. Features: + - Support for xml:base + - TextSearch dialog is available (with a zoom option) + - Full support for Alternate Stylesheets + - Full support for CSS Media (including a way to define custom media) + - Changed Text Selection UI. (selectable in the preference dialog) + Added Text Selection API to GVT & swing packages + - KeyStroke on the JSVGCanvas (for pan and zoom using keyboard) + - SVG Font: The font lookup now takes into account namespaces + - Provide a way to set the quality of an exported JPEG image + - Printing now uses the CSS print medium + - More complete handling of partial URLs + - Two new extensions solidColor (a single color 'paint server' acts + similar to the gradients and pattern fills/stroke), & paintSwitch + similar to a switch element but children are paint servers instead + of graphical elements. + +2. Bug fixes: + - Fix in gradient element boundary conditions + - Fix and performance improvements in lighting filters + - Fix in PNG encoding for BufferedImage' subimages. + - feDisplacementMap fix (array out of bound exception) + - font lookup now uses namespace properly + - 'enable-background' now work on <svg> element + - zero length on <rect>, <circle> and <ellipse> disable the rendering + - linear gradient with x1=y1=x2=y2 + - printing now supports SVG URI fragment + - Javadoc improvements and clean-up + - Source clean-up + - DOM: getElementsByTagNameNS now works properly + - SVGDOM: huge cleanup of the implementation + (preparation for dynamic features) + - CSS parser bug fix + - Bridge: 'overflow' on SVG <image> should now work properly + - GVT: cleanup the API - GraphicsNodeRenderContext is now obsolete + + +3. Testing + + - Reorganized tests (see samples/tests subdirectory) + - Improved test reporting (i.e., better HTML report) + - Simplified test infrastructure configuration files. + - Lots of new tests (see samples/tests/structure/styling and + samples/tests/spec/structure for examples) and + samples/batikCandy.svg. + + +1.1rc1 -> 1.1rc2 Release +------------------------ + +1. Bug fixes: + + - 'preserveAspectRatio' now works properly on both raster and SVG images + - bug fix with the 'clip' property on <symbol>, <image>, <marker> + - thumbnail bug fix (sometimes the area of interest became hidden) + - filename filter added to the file selection dialog in the svgbrowser when + exporting as PNG and JPG + - Infinite loop removed. Elliptical arc may cause an infinite loop if the end + point of the arc was the same than current point in the <path> datas. + - SVGGraphics2D can now generates SVG Font on demand + +2. Improvements: + + - Added new custom filter extension (look at the samples/extensions/histogramNormalization.svg) + - Added tooltips on <title> and <desc>. + +1.0 -> 1.1rc1 Release +--------------------- + +1. Enhancements: + a. HTTP headers fields (useragent/accepted...) now implemented. + b. Anti-aliased gradients (when color-rendering set to quality). + c. Small patterns are now much faster + d. Ability to flush cached image data. + e. full horizontal and vertical kerning now implemented for SVG fonts + f. added support for orientation and lang <glyph> attributes + g. improved support for Arabic text, includes handling of Arabic shaping + and ligatures for both SVG and system fonts + h. improved text selection + i. improved text rendering speed + +2. Bug fixes: + a. PNG files now use the proper gamma when reading/writing + b. Off by one bug... [truncated message content] |
From: <ev...@us...> - 2011-04-18 16:18:42
|
Revision: 1522 http://rails.svn.sourceforge.net/rails/?rev=1522&view=rev Author: evos Date: 2011-04-18 16:18:35 +0000 (Mon, 18 Apr 2011) Log Message: ----------- New tiles for 18Origins Modified Paths: -------------- trunk/18xx/tiles/TileDictionary.18t trunk/18xx/tiles/TileDictionary.xml trunk/18xx/tiles/Tiles.xml Added Paths: ----------- trunk/18xx/tiles/svg/tile-10002.svg trunk/18xx/tiles/svg/tile-10003.svg trunk/18xx/tiles/svg/tile1481.svg trunk/18xx/tiles/svg/tile1482.svg trunk/18xx/tiles/svg/tile1483.svg trunk/18xx/tiles/svg/tile1484.svg Modified: trunk/18xx/tiles/TileDictionary.18t =================================================================== (Binary files differ) Modified: trunk/18xx/tiles/TileDictionary.xml =================================================================== --- trunk/18xx/tiles/TileDictionary.xml 2011-04-16 12:44:06 UTC (rev 1521) +++ trunk/18xx/tiles/TileDictionary.xml 2011-04-18 16:18:35 UTC (rev 1522) @@ -23274,4 +23274,257 @@ </connection> </connections> </tile> + <tile> + <ID>1481</ID> + <shape>tsHexagon</shape> + <level>tlBrown</level> + <name>1481</name> + <junctions> + <junction> + <junType>jtDoubleCity</junType> + <position>tpCenter</position> + <revenue> + <value>40</value> + <position>tp3CornerA</position> + </revenue> + </junction> + </junctions> + <connections> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideC</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideD</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideB</position2> + </connection> + </connections> + </tile> + <tile> + <ID>1482</ID> + <shape>tsHexagon</shape> + <level>tlBrown</level> + <name>1482</name> + <category> + <value>S</value> + <position>tp3CornerE</position> + </category> + <junctions> + <junction> + <junType>jtTripleCity</junType> + <position>tpCenter</position> + <revenue> + <value>50</value> + <position>tp3CornerA</position> + </revenue> + </junction> + </junctions> + <connections> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideF</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideA</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideB</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideC</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideD</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideE</position2> + </connection> + </connections> + </tile> + <tile> + <ID>1483</ID> + <shape>tsHexagon</shape> + <level>tlGreen</level> + <name>1483</name> + <category> + <value>B</value> + <position>tp3CornerE</position> + </category> + <junctions> + <junction> + <junType>jtDoubleCity</junType> + <position>tpCenter</position> + <revenue> + <value>50</value> + <position>tp3CornerB</position> + </revenue> + </junction> + </junctions> + <connections> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideA</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideD</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideE</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideF</position2> + </connection> + </connections> + </tile> + <tile> + <ID>1484</ID> + <shape>tsHexagon</shape> + <level>tlBrown</level> + <name>1484</name> + <category> + <value>B</value> + <position>tp3CornerE</position> + </category> + <junctions> + <junction> + <junType>jtTripleCity</junType> + <position>tpCenter</position> + <revenue> + <value>70</value> + <position>tp3CornerA</position> + </revenue> + </junction> + </junctions> + <connections> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideF</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideA</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideB</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideC</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideD</position2> + </connection> + </connections> + </tile> + <tile> + <ID>-10002</ID> + <shape>tsHexagon</shape> + <level>tlMapUpgradableToGreen</level> + <name>-10001</name> + <category> + <value>B</value> + <position>tp3CornerE</position> + </category> + <junctions> + <junction> + <junType>jtCity</junType> + <position>tpCenter</position> + <revenue> + <value>30</value> + <position>tp3CornerB</position> + </revenue> + </junction> + </junctions> + <connections> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideF</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideE</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideD</position2> + </connection> + </connections> + </tile> + <tile> + <ID>-10003</ID> + <shape>tsHexagon</shape> + <level>tlMapUpgradableToBrown</level> + <name>-10002</name> + <category> + <value>S</value> + <position>tp3CornerE</position> + </category> + <junctions> + <junction> + <junType>jtDoubleCity</junType> + <position>tpCenter</position> + <revenue> + <value>30</value> + <position>tp3CornerB</position> + </revenue> + </junction> + </junctions> + <connections> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideA</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideB</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideD</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideE</position2> + </connection> + </connections> + </tile> </tiles> \ No newline at end of file Modified: trunk/18xx/tiles/Tiles.xml =================================================================== --- trunk/18xx/tiles/Tiles.xml 2011-04-16 12:44:06 UTC (rev 1521) +++ trunk/18xx/tiles/Tiles.xml 2011-04-18 16:18:35 UTC (rev 1522) @@ -4085,4 +4085,47 @@ <Track from="side0" gauge="normal" to="city1"/> <Track from="city1" gauge="normal" to="side4"/> </Tile> + <Tile colour="brown" id="1481" name="1481"> + <Station id="city1" position="0" slots="2" type="City" value="40"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side1"/> + </Tile> + <Tile colour="brown" id="1482" name="1482"> + <Station id="city1" position="0" slots="3" type="City" value="50"/> + <Track from="city1" gauge="normal" to="side5"/> + <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"/> + <Track from="city1" gauge="normal" to="side4"/> + </Tile> + <Tile colour="green" id="1483" name="1483"> + <Station id="city1" position="0" slots="2" type="City" value="50"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile> + <Tile colour="brown" id="1484" name="1484"> + <Station id="city1" position="0" slots="3" type="City" value="70"/> + <Track from="city1" gauge="normal" to="side5"/> + <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="yellow" id="-10002" name="-10001"> + <Station id="city1" position="0" slots="1" type="City" value="30"/> + <Track from="city1" gauge="normal" to="side5"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side3"/> + </Tile> + <Tile colour="green" id="-10003" name="-10002"> + <Station id="city1" position="0" slots="2" type="City" value="30"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side4"/> + </Tile> </Tiles> \ No newline at end of file Added: trunk/18xx/tiles/svg/tile-10002.svg =================================================================== --- trunk/18xx/tiles/svg/tile-10002.svg (rev 0) +++ trunk/18xx/tiles/svg/tile-10002.svg 2011-04-18 16:18:35 UTC (rev 1522) @@ -0,0 +1,2 @@ +<?xml version="1.0"?> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg"><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="#FFFF00" stroke="#FFFF00" stroke-width="1" stroke-linejoin="round"/><circle cx="196" cy="170" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><path d="M 196,170 L 49,85" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,255" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,340" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,85" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,255" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,340" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><circle cx="196" cy="170" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><ellipse rx="38" ry="34" cx="269" cy="43" fill="#FFFFFF" stroke="#000000" stroke-width="2" stroke-linejoin="round"/><text x="269" y="43" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Bookman Old Style" font-size="51">30</text><text x="123" y="297" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="TimpaniHeavy" font-size="51">B</text><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="none" stroke="black" stroke-width="1" stroke-linejoin="round"/></svg> Added: trunk/18xx/tiles/svg/tile-10003.svg =================================================================== --- trunk/18xx/tiles/svg/tile-10003.svg (rev 0) +++ trunk/18xx/tiles/svg/tile-10003.svg 2011-04-18 16:18:35 UTC (rev 1522) @@ -0,0 +1,2 @@ +<?xml version="1.0"?> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg"><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="#38AC00" stroke="#38AC00" stroke-width="1" stroke-linejoin="round"/><polygon points="145,119 247,119 247,221 145,221" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><circle cx="145" cy="170" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><circle cx="247" cy="170" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><path d="M 196,170 L 196,0" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,85" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,340" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,255" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,0" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,85" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,340" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,255" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><polygon points="145,119 247,119 247,221 145,221" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><circle cx="145" cy="170" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><circle cx="247" cy="170" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><ellipse rx="38" ry="34" cx="269" cy="43" fill="#FFFFFF" stroke="#000000" stroke-width="2" stroke-linejoin="round"/><text x="269" y="43" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Bookman Old Style" font-size="51">30</text><text x="123" y="297" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="TimpaniHeavy" font-size="51">S</text><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="none" stroke="black" stroke-width="1" stroke-linejoin="round"/></svg> Added: trunk/18xx/tiles/svg/tile1481.svg =================================================================== --- trunk/18xx/tiles/svg/tile1481.svg (rev 0) +++ trunk/18xx/tiles/svg/tile1481.svg 2011-04-18 16:18:35 UTC (rev 1522) @@ -0,0 +1,2 @@ +<?xml version="1.0"?> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg"><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="#B46301" stroke="#B46301" stroke-width="1" stroke-linejoin="round"/><text x="245" y="318" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Arial" font-size="34">1481</text><polygon points="145,119 247,119 247,221 145,221" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><circle cx="145" cy="170" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><circle cx="247" cy="170" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><path d="M 196,170 L 343,255" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,340" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,85" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,255" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,340" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,85" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><polygon points="145,119 247,119 247,221 145,221" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><circle cx="145" cy="170" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><circle cx="247" cy="170" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><ellipse rx="38" ry="34" cx="123" cy="43" fill="#FFFFFF" stroke="#000000" stroke-width="2" stroke-linejoin="round"/><text x="123" y="43" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Bookman Old Style" font-size="51">40</text><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="none" stroke="black" stroke-width="1" stroke-linejoin="round"/></svg> Added: trunk/18xx/tiles/svg/tile1482.svg =================================================================== --- trunk/18xx/tiles/svg/tile1482.svg (rev 0) +++ trunk/18xx/tiles/svg/tile1482.svg 2011-04-18 16:18:35 UTC (rev 1522) @@ -0,0 +1,2 @@ +<?xml version="1.0"?> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg"><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="#B46301" stroke="#B46301" stroke-width="1" stroke-linejoin="round"/><text x="245" y="318" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Arial" font-size="34">1482</text><polygon points="145,90 247,90 291,167 240,255 152,255 101,167" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><circle cx="145" cy="141" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><circle cx="247" cy="141" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><circle cx="196" cy="229" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><path d="M 196,170 L 49,85" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,0" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,85" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,255" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,340" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,255" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,85" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,0" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,85" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,255" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,340" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,255" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><polygon points="145,90 247,90 291,167 240,255 152,255 101,167" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><circle cx="145" cy="141" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><circle cx="247" cy="141" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><circle cx="196" cy="229" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><ellipse rx="38" ry="34" cx="123" cy="43" fill="#FFFFFF" stroke="#000000" stroke-width="2" stroke-linejoin="round"/><text x="123" y="43" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Bookman Old Style" font-size="51">50</text><text x="123" y="297" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="TimpaniHeavy" font-size="51">S</text><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="none" stroke="black" stroke-width="1" stroke-linejoin="round"/></svg> Added: trunk/18xx/tiles/svg/tile1483.svg =================================================================== --- trunk/18xx/tiles/svg/tile1483.svg (rev 0) +++ trunk/18xx/tiles/svg/tile1483.svg 2011-04-18 16:18:35 UTC (rev 1522) @@ -0,0 +1,2 @@ +<?xml version="1.0"?> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg"><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="#38AC00" stroke="#38AC00" stroke-width="1" stroke-linejoin="round"/><text x="245" y="318" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Arial" font-size="34">1483</text><polygon points="145,119 247,119 247,221 145,221" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><circle cx="145" cy="170" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><circle cx="247" cy="170" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><path d="M 196,170 L 196,0" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,340" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,255" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,85" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,0" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,340" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,255" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,85" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><polygon points="145,119 247,119 247,221 145,221" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><circle cx="145" cy="170" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><circle cx="247" cy="170" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><ellipse rx="38" ry="34" cx="269" cy="43" fill="#FFFFFF" stroke="#000000" stroke-width="2" stroke-linejoin="round"/><text x="269" y="43" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Bookman Old Style" font-size="51">50</text><text x="123" y="297" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="TimpaniHeavy" font-size="51">B</text><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="none" stroke="black" stroke-width="1" stroke-linejoin="round"/></svg> Added: trunk/18xx/tiles/svg/tile1484.svg =================================================================== --- trunk/18xx/tiles/svg/tile1484.svg (rev 0) +++ trunk/18xx/tiles/svg/tile1484.svg 2011-04-18 16:18:35 UTC (rev 1522) @@ -0,0 +1,2 @@ +<?xml version="1.0"?> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg"><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="#B46301" stroke="#B46301" stroke-width="1" stroke-linejoin="round"/><text x="245" y="318" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Arial" font-size="34">1484</text><polygon points="145,90 247,90 291,167 240,255 152,255 101,167" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><circle cx="145" cy="141" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><circle cx="247" cy="141" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><circle cx="196" cy="229" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><path d="M 196,170 L 49,85" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,0" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,85" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,255" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,340" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,85" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,0" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,85" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,255" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,340" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><polygon points="145,90 247,90 291,167 240,255 152,255 101,167" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><circle cx="145" cy="141" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><circle cx="247" cy="141" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><circle cx="196" cy="229" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><ellipse rx="38" ry="34" cx="123" cy="43" fill="#FFFFFF" stroke="#000000" stroke-width="2" stroke-linejoin="round"/><text x="123" y="43" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Bookman Old Style" font-size="51">70</text><text x="123" y="297" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="TimpaniHeavy" font-size="51">B</text><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="none" stroke="black" stroke-width="1" stroke-linejoin="round"/></svg> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ev...@us...> - 2011-04-16 12:44:13
|
Revision: 1521 http://rails.svn.sourceforge.net/rails/?rev=1521&view=rev Author: evos Date: 2011-04-16 12:44:06 +0000 (Sat, 16 Apr 2011) Log Message: ----------- Fixed tile 1458 (18GA). Added tiles -503, -557, -558. Modified Paths: -------------- trunk/18xx/tiles/TileDictionary.18t trunk/18xx/tiles/TileDictionary.xml trunk/18xx/tiles/Tiles.xml trunk/18xx/tiles/svg/tile1458.svg Added Paths: ----------- trunk/18xx/tiles/svg/tile-503.svg trunk/18xx/tiles/svg/tile-557.svg trunk/18xx/tiles/svg/tile-558.svg Modified: trunk/18xx/tiles/TileDictionary.18t =================================================================== (Binary files differ) Modified: trunk/18xx/tiles/TileDictionary.xml =================================================================== --- trunk/18xx/tiles/TileDictionary.xml 2011-04-15 18:48:29 UTC (rev 1520) +++ trunk/18xx/tiles/TileDictionary.xml 2011-04-16 12:44:06 UTC (rev 1521) @@ -21104,7 +21104,7 @@ </category> <junctions> <junction> - <junType>jtCity</junType> + <junType>jtDoubleCity</junType> <position>tpCenter</position> <revenue> <value>50</value> @@ -23198,4 +23198,80 @@ </connection> </connections> </tile> + <tile> + <ID>-503</ID> + <shape>tsHexagon</shape> + <level>tlMapFixed</level> + <name>-503</name> + <junctions> + <junction> + <junType>jtWhistlestop</junType> + <position>tp2CornerE</position> + </junction> + </junctions> + <connections> + <connection> + <conType>ctNormal</conType> + <position1>tp4SideD</position1> + <position2>tp2CornerE</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tp2CornerE</position1> + <position2>tp4SideE</position2> + </connection> + </connections> + </tile> + <tile> + <ID>-557</ID> + <shape>tsHexagon</shape> + <level>tlMapFixed</level> + <name>-557</name> + <junctions> + <junction> + <junType>jtCity</junType> + <position>tpCenter</position> + </junction> + </junctions> + <connections> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideC</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tpCenter</position1> + <position2>tp4SideF</position2> + </connection> + </connections> + </tile> + <tile> + <ID>-558</ID> + <shape>tsHexagon</shape> + <level>tlMapFixed</level> + <name>-558</name> + <junctions> + <junction> + <junType>jtWhistlestop</junType> + <position>tp1SideF</position> + <revenue> + <value>20</value> + <position>tp3CornerB</position> + </revenue> + </junction> + </junctions> + <connections> + <connection> + <conType>ctNormal</conType> + <position1>tp4SideA</position1> + <position2>tp1SideF</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tp1SideF</position1> + <position2>tp4SideE</position2> + </connection> + </connections> + </tile> </tiles> \ No newline at end of file Modified: trunk/18xx/tiles/Tiles.xml =================================================================== --- trunk/18xx/tiles/Tiles.xml 2011-04-15 18:48:29 UTC (rev 1520) +++ trunk/18xx/tiles/Tiles.xml 2011-04-16 12:44:06 UTC (rev 1521) @@ -3341,7 +3341,7 @@ <Track from="city1" gauge="normal" to="side4"/> <Track from="city1" gauge="normal" to="side2"/> </Tile> - <Tile colour="green" id="-89015" name="1889 Kouchi F9"> + <Tile colour="green" id="-89015" name="1889 Kouchi F9"> <Station id="city1" position="0" slots="2" type="City" value="30"/> <Track from="city1" gauge="normal" to="side0"/> <Track from="city1" gauge="normal" to="side5"/> @@ -3707,7 +3707,7 @@ <Track from="city1" gauge="normal" to="side3"/> </Tile> <Tile colour="brown" id="1458" name="GA458"> - <Station id="city1" position="0" slots="1" type="City" value="50"/> + <Station id="city1" position="0" slots="2" type="City" value="50"/> <Track from="city1" gauge="normal" to="side1"/> <Track from="city1" gauge="normal" to="side2"/> <Track from="city1" gauge="normal" to="side3"/> @@ -4070,4 +4070,19 @@ <Track from="city1" gauge="normal" to="side0"/> <Track from="city1" gauge="normal" to="side5"/> </Tile> + <Tile colour="fixed" id="-503" name="-503"> + <Station id="city1" position="452" type="Town"/> + <Track from="side3" gauge="normal" to="city1"/> + <Track from="city1" gauge="normal" to="side4"/> + </Tile> + <Tile colour="fixed" id="-557" name="-557"> + <Station id="city1" position="0" slots="1" type="City"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile> + <Tile colour="fixed" id="-558" name="-558"> + <Station id="city1" position="501" type="Town" value="20"/> + <Track from="side0" gauge="normal" to="city1"/> + <Track from="city1" gauge="normal" to="side4"/> + </Tile> </Tiles> \ No newline at end of file Added: trunk/18xx/tiles/svg/tile-503.svg =================================================================== --- trunk/18xx/tiles/svg/tile-503.svg (rev 0) +++ trunk/18xx/tiles/svg/tile-503.svg 2011-04-16 12:44:06 UTC (rev 1521) @@ -0,0 +1,2 @@ +<?xml version="1.0"?> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg"><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="#C0C0C0" stroke="#C0C0C0" stroke-width="1" stroke-linejoin="round"/><line x1="132" y1="281" x2="162" y2="229" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt"/><path d="M 196,340 A 98,98 0 0,0 147,255" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 147,255 A 98,98 0 0,0 49,255" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,340 A 98,98 0 0,0 147,255" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 147,255 A 98,98 0 0,0 49,255" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><line x1="134" y1="278" x2="160" y2="232" stroke="#000000" stroke-width="26" stroke-linecap="butt"/><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="none" stroke="black" stroke-width="1" stroke-linejoin="round"/></svg> Added: trunk/18xx/tiles/svg/tile-557.svg =================================================================== --- trunk/18xx/tiles/svg/tile-557.svg (rev 0) +++ trunk/18xx/tiles/svg/tile-557.svg 2011-04-16 12:44:06 UTC (rev 1521) @@ -0,0 +1,2 @@ +<?xml version="1.0"?> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg"><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="#C0C0C0" stroke="#C0C0C0" stroke-width="1" stroke-linejoin="round"/><circle cx="196" cy="170" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><path d="M 196,170 L 343,255" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,85" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,255" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,85" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><circle cx="196" cy="170" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="none" stroke="black" stroke-width="1" stroke-linejoin="round"/></svg> Added: trunk/18xx/tiles/svg/tile-558.svg =================================================================== --- trunk/18xx/tiles/svg/tile-558.svg (rev 0) +++ trunk/18xx/tiles/svg/tile-558.svg 2011-04-16 12:44:06 UTC (rev 1521) @@ -0,0 +1,2 @@ +<?xml version="1.0"?> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg"><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="#C0C0C0" stroke="#C0C0C0" stroke-width="1" stroke-linejoin="round"/><line x1="131" y1="132" x2="183" y2="162" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt"/><path d="M 157,147 A 294,294 0 0,0 196,0" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 49,255 A 294,294 0 0,0 157,147" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 157,147 A 294,294 0 0,0 196,0" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 49,255 A 294,294 0 0,0 157,147" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><line x1="134" y1="134" x2="180" y2="160" stroke="#000000" stroke-width="26" stroke-linecap="butt"/><ellipse rx="38" ry="34" cx="269" cy="43" fill="#FFFFFF" stroke="#000000" stroke-width="2" stroke-linejoin="round"/><text x="269" y="43" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Bookman Old Style" font-size="51">20</text><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="none" stroke="black" stroke-width="1" stroke-linejoin="round"/></svg> Modified: trunk/18xx/tiles/svg/tile1458.svg =================================================================== --- trunk/18xx/tiles/svg/tile1458.svg 2011-04-15 18:48:29 UTC (rev 1520) +++ trunk/18xx/tiles/svg/tile1458.svg 2011-04-16 12:44:06 UTC (rev 1521) @@ -1,2 +1,2 @@ <?xml version="1.0"?> -<svg version="1.1" xmlns="http://www.w3.org/2000/svg"><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="#B46301" stroke="#B46301" stroke-width="1" stroke-linejoin="round"/><text x="245" y="318" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Arial" font-size="34">1458</text><circle cx="196" cy="170" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><path d="M 196,170 L 343,85" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,255" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,340" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,255" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,85" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,85" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,255" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,340" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,255" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,85" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><circle cx="196" cy="170" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><ellipse rx="38" ry="34" cx="123" cy="297" fill="#FFFFFF" stroke="#000000" stroke-width="2" stroke-linejoin="round"/><text x="123" y="297" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Bookman Old Style" font-size="51">50</text><text x="196" y="43" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="TimpaniHeavy" font-size="51">Macon</text><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="none" stroke="black" stroke-width="1" stroke-linejoin="round"/></svg> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg"><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="#B46301" stroke="#B46301" stroke-width="1" stroke-linejoin="round"/><polygon points="145,119 247,119 247,221 145,221" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><circle cx="145" cy="170" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><circle cx="247" cy="170" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><path d="M 196,170 L 343,85" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,255" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,340" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,255" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,85" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,85" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,255" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,340" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,255" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,85" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><polygon points="145,119 247,119 247,221 145,221" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><circle cx="145" cy="170" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><circle cx="247" cy="170" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><ellipse rx="38" ry="34" cx="123" cy="297" fill="#FFFFFF" stroke="#000000" stroke-width="2" stroke-linejoin="round"/><text x="123" y="297" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Bookman Old Style" font-size="51">50</text><text x="196" y="43" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="TimpaniHeavy" font-size="51">Macon</text><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="none" stroke="black" stroke-width="1" stroke-linejoin="round"/></svg> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ev...@us...> - 2011-04-15 18:48:36
|
Revision: 1520 http://rails.svn.sourceforge.net/rails/?rev=1520&view=rev Author: evos Date: 2011-04-15 18:48:29 +0000 (Fri, 15 Apr 2011) Log Message: ----------- 18GA final tile info Modified Paths: -------------- trunk/18xx/data/18GA/TileSet.xml trunk/18xx/data/18GA/Tiles.xml Modified: trunk/18xx/data/18GA/TileSet.xml =================================================================== --- trunk/18xx/data/18GA/TileSet.xml 2011-04-14 20:33:44 UTC (rev 1519) +++ trunk/18xx/data/18GA/TileSet.xml 2011-04-15 18:48:29 UTC (rev 1520) @@ -26,9 +26,12 @@ <Tile id="-912" /> <!-- Atlanta (D4) --> - <Tile id="-4010"> - <Upgrade id="4451" /> + <Tile id="-30" > + <Upgrade id="1451" /> </Tile> + + <!-- Savannah (Cotton Port) --> + <Tile id="-5015" /> <!-- Yellow Tiles --> @@ -45,15 +48,15 @@ <!-- Sharp-curve city (20) --> <Tile id="5" quantity="2"> <Upgrade id="14,15" hex="-D10,-G13" /> - <Upgrade id="4453" hex="D10" /> - <Upgrade id="4454" hex="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="4453" hex="D10" /> - <Upgrade id="4454" hex="G13" /> + <Upgrade id="1453" hex="D10" /> + <Upgrade id="1454" hex="G13" /> </Tile> <!-- Sharp curve --> @@ -74,8 +77,8 @@ <!-- Straight city (20) --> <Tile id="57" quantity="4"> <Upgrade id="14,15" hex="-D10,-G13" /> - <Upgrade id="4453" hex="D10" /> - <Upgrade id="4454" hex="G13" /> + <Upgrade id="1453" hex="D10" /> + <Upgrade id="1454" hex="G13" /> </Tile> <!-- Gentle-curve dit (10) --> @@ -84,8 +87,8 @@ </Tile> <!-- Three dead-end cities (30), exits NW,NE,S, "Atlanta" --> - <Tile id="4451" quantity="1"> - <Upgrade id="4452" /> + <Tile id="1451" extId="451" quantity="1"> + <Upgrade id="1452" /> </Tile> <!-- Green Tiles --> @@ -93,15 +96,15 @@ <!-- X-shape city (30) --> <Tile id="14" quantity="4"> <Upgrade id="63" hex="-F6,-I11" /> - <Upgrade id="4457" hex="I11" /> - <Upgrade id="4458" hex="F6" /> + <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="4457" hex="I11" /> - <Upgrade id="4458" hex="F6" /> + <Upgrade id="1457" hex="I11" /> + <Upgrade id="1458" hex="F6" /> </Tile> <!-- Two tracks crossing, K shape --> @@ -169,18 +172,18 @@ <Tile id="143" quantity="2" /> <!-- Three straight cities (20), crossing, "Atlanta" --> - <Tile id="4452" quantity="1"> - <Upgrade id="4455" /> + <Tile id="1452" extId="452" quantity="1"> + <Upgrade id="1455" /> </Tile> - <!-- K-shape city (30), "Augusta" --> - <Tile id="4453" quantity="1"> - <Upgrade id="4456" /> + <!-- K-shape city (40), "Augusta" --> + <Tile id="1453" extId="453" quantity="1"> + <Upgrade id="1456" /> </Tile> <!-- City (30), exits N,NW,SW, "Savannah" --> - <Tile id="4454" quantity="1"> - <Upgrade id="4459" /> + <Tile id="1454" extId="454" quantity="1"> + <Upgrade id="1459" /> </Tile> <!-- Brown Tiles --> @@ -219,18 +222,18 @@ <Tile id="70" quantity="1" /> <!-- Three straight cities (70), crossing, "Atlanta" --> - <Tile id="4455" quantity="1" /> + <Tile id="1455" extId="455" quantity="1" /> <!-- K-shape city (50), "Augusta" --> - <Tile id="4456" quantity="1" /> + <Tile id="1456" extId="456" quantity="1" /> <!-- 5-way city (40), "Brunswick" --> - <Tile id="4457" quantity="1" /> + <Tile id="1457" extId="457" quantity="1" /> <!-- 5-way city (50), "Macon" --> - <Tile id="4458" quantity="1" /> + <Tile id="1458" extId="458" quantity="1" /> <!-- City (60), exits N,NW,SW, "Savannah" --> - <Tile id="4459" quantity="1" /> + <Tile id="1459" extId="459" quantity="1" /> </TileManager> Modified: trunk/18xx/data/18GA/Tiles.xml =================================================================== --- trunk/18xx/data/18GA/Tiles.xml 2011-04-14 20:33:44 UTC (rev 1519) +++ trunk/18xx/data/18GA/Tiles.xml 2011-04-15 18:48:29 UTC (rev 1520) @@ -1,284 +1,290 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Tiles> - <Tile colour="white" id="0" name="empty" /> - <Tile colour="white" id="-1" name="1 village"> - <Station id="city1" position="002" type="Town" /> - </Tile> - <Tile colour="white" id="-10" name="1 city"> - <Station id="city1" position="302" slots="1" type="City" /> - </Tile> - <Tile colour="fixed" id="-111" name="Meridian"> - <Station id="city1" position="0" slots="2" type="City" /> - <Track from="city1" gauge="normal" to="side0" /> - <Track from="city1" gauge="normal" to="side1" /> - <Track from="city1" gauge="normal" to="side3" /> - </Tile> - <Tile colour="fixed" id="-112" name="Tupelo"> - <Station id="city1" position="0" slots="1" type="City" value="30" /> - <Track from="city1" gauge="normal" to="side1" /> - <Track from="city1" gauge="normal" to="side2" /> - <Track from="city1" gauge="normal" to="side3" /> - </Tile> - <Tile colour="fixed" id="-113" name="Oxmoor"> - <Station id="city1" position="0" slots="1" type="City" value="30" /> - <Track from="city1" gauge="normal" to="side5" /> - <Track from="city1" gauge="normal" to="side1" /> - <Track from="city1" gauge="normal" to="side3" /> - </Tile> - <Tile colour="fixed" id="-3" name="MF 3"> - <Station id="city1" position="252" type="Town" value="10" /> - <Track from="city1" gauge="normal" to="side2" /> - <Track from="city1" gauge="normal" to="side3" /> - </Tile> - <Tile colour="red" id="-901" name="OM 1 way"> - <Station id="city1" position="0" type="OffMapCity" value="-1" /> - <Track from="city1" gauge="normal" to="side2" /> - </Tile> - <Tile colour="red" id="-902" name="OM 2 way"> - <Station id="city1" position="0" type="OffMapCity" value="-1" /> - <Track from="city1" gauge="normal" to="side2" /> - <Track from="city1" gauge="normal" to="side1" /> - </Tile> - <Tile colour="red" id="-912" name="OMCity-2"> - <Station id="city1" position="0" slots="1" type="OffMapCity" /> - <Track from="city1" gauge="normal" to="side1" /> - <Track from="city1" gauge="normal" to="side2" /> - </Tile> - <Tile colour="red" id="-913" name="OMCity-3"> - <Station id="city1" position="0" slots="1" type="OffMapCity" /> - <Track from="city1" gauge="normal" to="side1" /> - <Track from="city1" gauge="normal" to="side2" /> - <Track from="city1" gauge="normal" to="side3" /> - </Tile> - <Tile colour="yellow" id="3" name="3"> - <Station id="city1" position="352" type="Town" value="10" /> - <Track from="city1" gauge="normal" to="side3" /> - <Track from="city1" gauge="normal" to="side4" /> - </Tile> - <Tile colour="yellow" id="4" name="4"> - <Station id="city1" position="0" type="Town" value="10" /> - <Track from="city1" gauge="normal" to="side3" /> - <Track from="city1" gauge="normal" to="side0" /> - </Tile> - <Tile colour="yellow" id="5" name="5"> - <Station id="city1" position="0" slots="1" type="City" value="20" /> - <Track from="city1" gauge="normal" to="side1" /> - <Track from="city1" gauge="normal" to="side2" /> - </Tile> - <Tile colour="yellow" id="6" name="6"> - <Station id="city1" position="0" slots="1" type="City" value="20" /> - <Track from="city1" gauge="normal" to="side0" /> - <Track from="city1" gauge="normal" to="side2" /> - </Tile> - <Tile colour="yellow" id="7" name="7"> - <Track from="side3" gauge="normal" to="side4" /> - </Tile> - <Tile colour="yellow" id="8" name="8"> - <Track from="side3" gauge="normal" to="side5" /> - </Tile> - <Tile colour="yellow" id="9" name="9"> - <Track from="side3" gauge="normal" to="side0" /> - </Tile> - <Tile colour="yellow" id="57" name="57"> - <Station id="city1" position="0" slots="1" type="City" value="20" /> - <Track from="city1" gauge="normal" to="side3" /> - <Track from="city1" gauge="normal" to="side0" /> - </Tile> - <Tile colour="yellow" id="58" name="58"> - <Station id="city1" position="401" type="Town" value="10" /> - <Track from="city1" gauge="normal" to="side5" /> - <Track from="city1" gauge="normal" to="side3" /> - </Tile> - <Tile colour="yellow" id="1441" name="441"> - <Station id="city1" position="0" slots="1" type="City" value="10" /> - <Track from="city1" gauge="normal" to="side3" /> - </Tile> - <Tile colour="yellow" id="445" name="445"> - <Station id="city1" position="0" type="Town" value="20" /> - <Track from="city1" gauge="normal" to="side5" /> - <Track from="city1" gauge="normal" to="side3" /> - </Tile> - <Tile colour="green" id="14" name="14"> - <Station id="city1" position="0" slots="2" type="City" value="30" /> - <Track from="city1" gauge="normal" to="side1" /> - <Track from="city1" gauge="normal" to="side3" /> - <Track from="city1" gauge="normal" to="side4" /> - <Track from="city1" gauge="normal" to="side0" /> - </Tile> - <Tile colour="green" id="15" name="15"> - <Station id="city1" position="0" slots="2" type="City" value="30" /> - <Track from="city1" gauge="normal" to="side3" /> - <Track from="city1" gauge="normal" to="side4" /> - <Track from="city1" gauge="normal" to="side5" /> - <Track from="city1" gauge="normal" to="side0" /> - </Tile> - <Tile colour="green" id="16" name="16"> - <Track from="side3" gauge="normal" to="side5" /> - <Track from="side4" gauge="normal" to="side0" /> - </Tile> - <Tile colour="green" id="17" name="17"> - <Track from="side0" gauge="normal" to="side2" /> - <Track from="side3" gauge="normal" to="side5" /> - </Tile> - <Tile colour="green" id="19" name="19"> - <Track from="side5" gauge="normal" to="side1" /> - <Track from="side0" gauge="normal" to="side3" /> - </Tile> - <Tile colour="green" id="20" name="20"> - <Track from="side1" gauge="normal" to="side4" /> - <Track from="side3" gauge="normal" to="side0" /> - </Tile> - <Tile colour="green" id="23" name="23"> - <Track from="side4" gauge="normal" to="side0" /> - <Track from="side0" gauge="normal" to="side3" /> - </Tile> - <Tile colour="green" id="24" name="24"> - <Track from="side3" gauge="normal" to="side5" /> - <Track from="side3" gauge="normal" to="side0" /> - </Tile> - <Tile colour="green" id="25" name="25"> - <Track from="side1" gauge="normal" to="side3" /> - <Track from="side3" gauge="normal" to="side5" /> - </Tile> - <Tile colour="green" id="26" name="26"> - <Track from="side5" gauge="normal" to="side0" /> - <Track from="side0" gauge="normal" to="side3" /> - </Tile> - <Tile colour="green" id="27" name="27"> - <Track from="side3" gauge="normal" to="side4" /> - <Track from="side3" gauge="normal" to="side0" /> - </Tile> - <Tile colour="green" id="28" name="28"> - <Track from="side3" gauge="normal" to="side5" /> - <Track from="side4" gauge="normal" to="side5" /> - </Tile> - <Tile colour="green" id="29" name="29"> - <Track from="side3" gauge="normal" to="side4" /> - <Track from="side3" gauge="normal" to="side5" /> - </Tile> - <Tile colour="green" id="141" name="141"> - <Station id="city1" position="0" type="Town" value="10" /> - <Track from="city1" gauge="normal" to="side0" /> - <Track from="city1" gauge="normal" to="side2" /> - <Track from="city1" gauge="normal" to="side5" /> - </Tile> - <Tile colour="green" id="142" name="142"> - <Station id="city1" position="0" type="Town" value="10" /> - <Track from="city1" gauge="normal" to="side2" /> - <Track from="city1" gauge="normal" to="side4" /> - <Track from="city1" gauge="normal" to="side5" /> - </Tile> - <Tile colour="green" id="143" name="143"> - <Station id="city1" position="0" type="Town" value="10" /> - <Track from="city1" gauge="normal" to="side0" /> - <Track from="city1" gauge="normal" to="side1" /> - <Track from="city1" gauge="normal" to="side2" /> - </Tile> - <Tile colour="green" id="144" name="144"> - <Station id="city1" position="0" type="Town" value="10" /> - <Track from="city1" gauge="normal" to="side0" /> - <Track from="city1" gauge="normal" to="side2" /> - <Track from="city1" gauge="normal" to="side4" /> - </Tile> - <Tile colour="green" id="1442" name="442"> - <Station id="city1" position="0" slots="2" type="City" value="30" /> - <Track from="city1" gauge="normal" to="side1" /> - <Track from="city1" gauge="normal" to="side3" /> - <Track from="city1" gauge="normal" to="side4" /> - <Track from="city1" gauge="normal" to="side5" /> - </Tile> - <Tile colour="green" id="1443" name="443"> - <Station id="city1" position="0" slots="2" type="City" value="40" /> - <Track from="city1" gauge="normal" to="side1" /> - <Track from="city1" gauge="normal" to="side2" /> - <Track from="city1" gauge="normal" to="side3" /> - <Track from="city1" gauge="normal" to="side4" /> - <Track from="city1" gauge="normal" to="side5" /> - </Tile> - <Tile colour="green" id="-3008" name="-3008"> - </Tile> - <Tile colour="green" id="-1143" name="-1143"> - </Tile> - <Tile colour="brown" id="39" name="39"> - <Track from="side3" gauge="normal" to="side4"/> - <Track from="side3" gauge="normal" to="side5"/> - <Track from="side4" gauge="normal" to="side5"/> - </Tile> - <Tile colour="brown" id="40" name="40"> - <Track from="side1" gauge="normal" to="side3" /> - <Track from="side1" gauge="normal" to="side5" /> - <Track from="side3" gauge="normal" to="side5" /> - </Tile> - <Tile colour="brown" id="41" name="41"> - <Track from="side4" gauge="normal" to="side0" /> - <Track from="side4" gauge="normal" to="side3" /> - <Track from="side0" gauge="normal" to="side3" /> - </Tile> - <Tile colour="brown" id="42" name="42"> - <Track from="side3" gauge="normal" to="side5" /> - <Track from="side3" gauge="normal" to="side0" /> - <Track from="side5" gauge="normal" to="side0" /> - </Tile> - <Tile colour="brown" id="43" name="43"> - <Track from="side3" gauge="normal" to="side5" /> - <Track from="side3" gauge="normal" to="side0" /> - <Track from="side4" gauge="normal" to="side5" /> - <Track from="side4" gauge="normal" to="side0" /> - </Tile> - <Tile colour="brown" id="44" name="44"> - <Track from="side3" gauge="normal" to="side0" /> - <Track from="side1" gauge="normal" to="side0" /> - <Track from="side3" gauge="normal" to="side4" /> - <Track from="side1" gauge="normal" to="side4" /> - </Tile> - <Tile colour="brown" id="45" name="45"> - <Track from="side1" gauge="normal" to="side5" /> - <Track from="side1" gauge="normal" to="side3" /> - <Track from="side5" gauge="normal" to="side0" /> - <Track from="side3" gauge="normal" to="side0" /> - </Tile> - <Tile colour="brown" id="46" name="46"> - <Track from="side1" gauge="normal" to="side5" /> - <Track from="side1" gauge="normal" to="side0" /> - <Track from="side3" gauge="normal" to="side5" /> - <Track from="side3" gauge="normal" to="side0" /> - </Tile> - <Tile colour="brown" id="47" name="47"> - <Track from="side3" gauge="normal" to="side0" /> - <Track from="side3" gauge="normal" to="side1" /> - <Track from="side4" gauge="normal" to="side0" /> - <Track from="side4" gauge="normal" to="side1" /> - </Tile> - <Tile colour="brown" id="63" name="63"> - <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" /> - <Track from="city1" gauge="normal" to="side4" /> - <Track from="city1" gauge="normal" to="side5" /> - </Tile> - <Tile colour="brown" id="70" name="70"> - <Track from="side3" gauge="normal" to="side5" /> - <Track from="side3" gauge="normal" to="side4" /> - <Track from="side5" gauge="normal" to="side0" /> - <Track from="side4" gauge="normal" to="side0" /> - </Tile> - <Tile colour="brown" id="1444" name="444"> - <Station id="city1" position="0" slots="2" type="City" value="50" /> - <Track from="city1" gauge="normal" to="side1" /> - <Track from="city1" gauge="normal" to="side2" /> - <Track from="city1" gauge="normal" to="side3" /> - <Track from="city1" gauge="normal" to="side4" /> - <Track from="city1" gauge="normal" to="side5" /> - </Tile> - <Tile colour="gray" id="446" name="446"> - <Station id="city1" position="0" slots="3" type="City" value="70" /> - <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" /> - <Track from="city1" gauge="normal" to="side4" /> - <Track from="city1" gauge="normal" to="side5" /> - </Tile> -</Tiles> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<Tiles> + <Tile colour="white" id="0" name="empty"/> + <Tile colour="white" id="-1" name="1 village"> + <Station id="city1" position="002" type="Town"/> + </Tile> + <Tile colour="white" id="-3008" name="city (cent.)"> + <Station id="city1" position="0" slots="1" type="City"/> + </Tile> + <Tile colour="red" id="-902" name="OM 2 way"> + <Station id="city1" position="0" type="OffMapCity" value="-1"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side1"/> + </Tile> + <Tile colour="fixed" id="-1143" name="Bham1851"> + <Station id="city1" position="0" type="Town"/> + <Track from="side5" gauge="normal" to="city1"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side1"/> + </Tile> + <Tile colour="red" id="-912" name="OMCity-2"> + <Station id="city1" position="0" slots="1" type="OffMapCity"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side2"/> + </Tile> + <Tile colour="white" id="-30" name="3 cities"> + <Station id="city1" position="052" slots="1" type="City"/> + <Station id="city2" position="252" slots="1" type="City"/> + <Station id="city3" position="452" slots="1" type="City"/> + </Tile> + <Tile colour="fixed" id="-5015" name="GACPSav"> + <Station id="city1" position="0" slots="2" type="City"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side5"/> + <Track from="city1" gauge="normal" to="side4"/> + </Tile> + <Tile colour="yellow" id="3" name="3"> + <Station id="city1" position="452" type="Town" value="10"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side4"/> + </Tile> + <Tile colour="yellow" id="4" name="4"> + <Station id="city1" position="0" type="Town" value="10"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side0"/> + </Tile> + <Tile colour="yellow" id="5" name="5"> + <Station id="city1" position="0" slots="1" type="City" value="20"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side2"/> + </Tile> + <Tile colour="yellow" id="6" name="6"> + <Station id="city1" position="0" slots="1" type="City" value="20"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side2"/> + </Tile> + <Tile colour="yellow" id="7" name="7"> + <Track from="side3" gauge="normal" to="side4"/> + </Tile> + <Tile colour="yellow" id="8" name="8"> + <Track from="side3" gauge="normal" to="side5"/> + </Tile> + <Tile colour="yellow" id="9" name="9"> + <Track from="side3" gauge="normal" to="side0"/> + </Tile> + <Tile colour="yellow" id="57" name="57"> + <Station id="city1" position="0" slots="1" type="City" value="20"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side0"/> + </Tile> + <Tile colour="yellow" id="58" name="58"> + <Station id="city1" position="401" type="Town" value="10"/> + <Track from="city1" gauge="normal" to="side5"/> + <Track from="city1" gauge="normal" to="side3"/> + </Tile> + <Tile colour="yellow" id="1451" name="GA451"> + <Station id="city1" position="102" slots="1" type="City" value="30"/> + <Station id="city2" position="302" slots="1" type="City" value="30"/> + <Station id="city3" position="502" slots="1" type="City" value="30"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city2" gauge="normal" to="side3"/> + <Track from="city3" gauge="normal" to="side5"/> + </Tile> + <Tile colour="green" id="14" name="14"> + <Station id="city1" position="0" slots="2" type="City" value="30"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side0"/> + </Tile> + <Tile colour="green" id="15" name="15"> + <Station id="city1" position="0" slots="2" type="City" value="30"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + <Track from="city1" gauge="normal" to="side0"/> + </Tile> + <Tile colour="green" id="16" name="16"> + <Track from="side3" gauge="normal" to="side5"/> + <Track from="side4" gauge="normal" to="side0"/> + </Tile> + <Tile colour="green" id="17" name="17"> + <Track from="side0" gauge="normal" to="side2"/> + <Track from="side3" gauge="normal" to="side5"/> + </Tile> + <Tile colour="green" id="19" name="19"> + <Track from="side5" gauge="normal" to="side1"/> + <Track from="side0" gauge="normal" to="side3"/> + </Tile> + <Tile colour="green" id="20" name="20"> + <Track from="side1" gauge="normal" to="side4"/> + <Track from="side3" gauge="normal" to="side0"/> + </Tile> + <Tile colour="green" id="23" name="23"> + <Track from="side4" gauge="normal" to="side0"/> + <Track from="side0" gauge="normal" to="side3"/> + </Tile> + <Tile colour="green" id="24" name="24"> + <Track from="side3" gauge="normal" to="side5"/> + <Track from="side3" gauge="normal" to="side0"/> + </Tile> + <Tile colour="green" id="25" name="25"> + <Track from="side1" gauge="normal" to="side3"/> + <Track from="side3" gauge="normal" to="side5"/> + </Tile> + <Tile colour="green" id="26" name="26"> + <Track from="side5" gauge="normal" to="side0"/> + <Track from="side0" gauge="normal" to="side3"/> + </Tile> + <Tile colour="green" id="27" name="27"> + <Track from="side3" gauge="normal" to="side4"/> + <Track from="side3" gauge="normal" to="side0"/> + </Tile> + <Tile colour="green" id="28" name="28"> + <Track from="side3" gauge="normal" to="side5"/> + <Track from="side4" gauge="normal" to="side5"/> + </Tile> + <Tile colour="green" id="29" name="29"> + <Track from="side3" gauge="normal" to="side4"/> + <Track from="side3" gauge="normal" to="side5"/> + </Tile> + <Tile colour="green" id="141" name="141"> + <Station id="city1" position="0" type="Town" value="10"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile> + <Tile colour="green" id="142" name="142"> + <Station id="city1" position="0" type="Town" value="10"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile> + <Tile colour="green" id="143" name="143"> + <Station id="city1" position="0" type="Town" value="10"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side2"/> + </Tile> + <Tile colour="green" id="1452" name="GA452"> + <Station id="city1" position="502" slots="1" type="City" value="20"/> + <Station id="city2" position="102" slots="1" type="City" value="20"/> + <Station id="city3" position="302" slots="1" type="City" value="20"/> + <Track from="city2" gauge="normal" to="side1"/> + <Track from="city2" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city3" gauge="normal" to="side0"/> + <Track from="city3" gauge="normal" to="side3"/> + </Tile> + <Tile colour="green" id="1453" name="GA453"> + <Station id="city1" position="0" slots="2" type="City" value="40"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side4"/> + </Tile> + <Tile colour="green" id="1454" name="GA454"> + <Station id="city1" position="0" slots="2" type="City" value="30"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side4"/> + </Tile> + <Tile colour="brown" id="39" name="39"> + <Track from="side3" gauge="normal" to="side4"/> + <Track from="side3" gauge="normal" to="side5"/> + <Track from="side4" gauge="normal" to="side5"/> + </Tile> + <Tile colour="brown" id="40" name="40"> + <Track from="side1" gauge="normal" to="side3"/> + <Track from="side1" gauge="normal" to="side5"/> + <Track from="side3" gauge="normal" to="side5"/> + </Tile> + <Tile colour="brown" id="41" name="41"> + <Track from="side4" gauge="normal" to="side0"/> + <Track from="side4" gauge="normal" to="side3"/> + <Track from="side0" gauge="normal" to="side3"/> + </Tile> + <Tile colour="brown" id="42" name="42"> + <Track from="side3" gauge="normal" to="side5"/> + <Track from="side3" gauge="normal" to="side0"/> + <Track from="side5" gauge="normal" to="side0"/> + </Tile> + <Tile colour="brown" id="43" name="43"> + <Track from="side3" gauge="normal" to="side5"/> + <Track from="side3" gauge="normal" to="side0"/> + <Track from="side4" gauge="normal" to="side5"/> + <Track from="side4" gauge="normal" to="side0"/> + </Tile> + <Tile colour="brown" id="44" name="44"> + <Track from="side3" gauge="normal" to="side0"/> + <Track from="side1" gauge="normal" to="side0"/> + <Track from="side3" gauge="normal" to="side4"/> + <Track from="side1" gauge="normal" to="side4"/> + </Tile> + <Tile colour="brown" id="45" name="45"> + <Track from="side1" gauge="normal" to="side5"/> + <Track from="side1" gauge="normal" to="side3"/> + <Track from="side5" gauge="normal" to="side0"/> + <Track from="side3" gauge="normal" to="side0"/> + </Tile> + <Tile colour="brown" id="46" name="46"> + <Track from="side1" gauge="normal" to="side5"/> + <Track from="side1" gauge="normal" to="side0"/> + <Track from="side3" gauge="normal" to="side5"/> + <Track from="side3" gauge="normal" to="side0"/> + </Tile> + <Tile colour="brown" id="47" name="47"> + <Track from="side3" gauge="normal" to="side0"/> + <Track from="side3" gauge="normal" to="side1"/> + <Track from="side4" gauge="normal" to="side0"/> + <Track from="side4" gauge="normal" to="side1"/> + </Tile> + <Tile colour="brown" id="63" name="63"> + <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"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile> + <Tile colour="brown" id="70" name="70"> + <Track from="side3" gauge="normal" to="side5"/> + <Track from="side3" gauge="normal" to="side4"/> + <Track from="side5" gauge="normal" to="side0"/> + <Track from="side4" gauge="normal" to="side0"/> + </Tile> + <Tile colour="brown" id="1455" name="GA455"> + <Station id="city1" position="502" slots="1" type="City" value="60"/> + <Station id="city2" position="102" slots="1" type="City" value="60"/> + <Station id="city3" position="302" slots="1" type="City" value="60"/> + <Track from="city2" gauge="normal" to="side1"/> + <Track from="city2" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city3" gauge="normal" to="side3"/> + <Track from="city3" gauge="normal" to="side0"/> + </Tile> + <Tile colour="brown" id="1456" name="GA456"> + <Station id="city1" position="0" slots="2" type="City" value="50"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side4"/> + </Tile> + <Tile colour="brown" id="1457" name="GA457"> + <Station id="city1" position="0" slots="2" type="City" value="40"/> + <Track from="city1" gauge="normal" to="side5"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side4"/> + </Tile> + <Tile colour="brown" id="1458" name="GA458"> + <Station id="city1" position="0" slots="1" type="City" value="50"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile> + <Tile colour="brown" id="1459" name="GA459"> + <Station id="city1" position="0" slots="2" type="City" value="60"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side4"/> + </Tile> +</Tiles> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ev...@us...> - 2011-04-14 20:33:51
|
Revision: 1519 http://rails.svn.sourceforge.net/rails/?rev=1519&view=rev Author: evos Date: 2011-04-14 20:33:44 +0000 (Thu, 14 Apr 2011) Log Message: ----------- SpecialLayTile improvements: - added priority and colour attributes - UI handling rationalised Modified Paths: -------------- trunk/18xx/rails/game/OperatingRound.java trunk/18xx/rails/game/action/LayTile.java trunk/18xx/rails/game/special/SpecialProperty.java trunk/18xx/rails/game/special/SpecialPropertyI.java trunk/18xx/rails/game/special/SpecialTileLay.java trunk/18xx/rails/game/specific/_1835/OperatingRound_1835.java trunk/18xx/rails/ui/swing/ORUIManager.java Modified: trunk/18xx/rails/game/OperatingRound.java =================================================================== --- trunk/18xx/rails/game/OperatingRound.java 2011-04-14 20:31:35 UTC (rev 1518) +++ trunk/18xx/rails/game/OperatingRound.java 2011-04-14 20:33:44 UTC (rev 1519) @@ -1415,7 +1415,16 @@ // normal tile lays are also (still) allowed || stl.getTile() != null && checkNormalTileLay(stl.getTile(), false)) { - currentSpecialTileLays.add(new LayTile(stl)); + LayTile lt = new LayTile(stl); + String[] stlc = stl.getTileColours(); + if (stlc != null) { + Map<String, Integer> tc = new HashMap<String, Integer>(); + for (String c : stlc) { + tc.put(c, 1); + } + lt.setTileColours(tc); + } + currentSpecialTileLays.add(lt); } } } Modified: trunk/18xx/rails/game/action/LayTile.java =================================================================== --- trunk/18xx/rails/game/action/LayTile.java 2011-04-14 20:31:35 UTC (rev 1518) +++ trunk/18xx/rails/game/action/LayTile.java 2011-04-14 20:33:44 UTC (rev 1519) @@ -75,6 +75,7 @@ /** * Allow laying a tile on a given location. */ + // NOTE: NOT YET USED public LayTile(List<MapHex> locations, List<TileI> tiles) { type = LOCATION_SPECIFIC; this.locations = locations; Modified: trunk/18xx/rails/game/special/SpecialProperty.java =================================================================== --- trunk/18xx/rails/game/special/SpecialProperty.java 2011-04-14 20:31:35 UTC (rev 1518) +++ trunk/18xx/rails/game/special/SpecialProperty.java 2011-04-14 20:33:44 UTC (rev 1519) @@ -1,8 +1,7 @@ /* $Header: /Users/blentz/rails_rcs/cvs/18xx/rails/game/special/SpecialProperty.java,v 1.27 2010/03/23 18:45:23 stefanfrey Exp $ */ package rails.game.special; -import java.util.HashMap; -import java.util.Map; +import java.util.*; import org.apache.log4j.Logger; @@ -33,7 +32,15 @@ protected boolean permanent = false; protected boolean isORProperty = false; protected boolean isSRProperty = false; - + + /** Priority indicates whether or not the UI should assign priority to + * the execution of a PossibleAction. For instance, if the same tile can + * be laid on a hex using this special property, and by not using it, + * this attribute indicates which option will be used. + * TODO A third value means: ask the user (NOT YET IMPLEMENTED). + */ + protected Priority priority = DEFAULT_PRIORITY; + /** Optional descriptive text, for display in menus and info text. * Subclasses may put real text in it. */ @@ -88,6 +95,16 @@ // sfy 1889 permanent = tag.getAttributeAsBoolean("permanent", false); + + String priorityString = tag.getAttributeAsString("priority"); + if (Util.hasValue(priorityString)) { + try { + priority = Priority.valueOf(priorityString.toUpperCase()); + } catch (IllegalArgumentException e) { + throw new ConfigurationException ("Illegal value for SpecialProperty priority: "+priorityString, e); + } + } + } public void finishConfiguration (GameManagerI gameManager) @@ -216,6 +233,14 @@ return transferText; } + public Priority getPriority() { + return priority; + } + + public void setPriority(Priority priority) { + this.priority = priority; + } + /** * Move the special property to another holder. * Only to be used for special properties that have the "transfer" attribute. Modified: trunk/18xx/rails/game/special/SpecialPropertyI.java =================================================================== --- trunk/18xx/rails/game/special/SpecialPropertyI.java 2011-04-14 20:31:35 UTC (rev 1518) +++ trunk/18xx/rails/game/special/SpecialPropertyI.java 2011-04-14 20:33:44 UTC (rev 1519) @@ -51,6 +51,18 @@ public String getTransferText(); + public enum Priority { + LAST, + ASKUSER, + FIRST; + }; + + public static final Priority DEFAULT_PRIORITY = Priority.FIRST; + + public Priority getPriority(); + + public void setPriority(Priority priority); + public int getUniqueId(); public String toMenu(); Modified: trunk/18xx/rails/game/special/SpecialTileLay.java =================================================================== --- trunk/18xx/rails/game/special/SpecialTileLay.java 2011-04-14 20:31:35 UTC (rev 1518) +++ trunk/18xx/rails/game/special/SpecialTileLay.java 2011-04-14 20:33:44 UTC (rev 1519) @@ -18,6 +18,11 @@ boolean free = false; boolean connected = false; /* sfy 1889 extension */ + /** Tile colours that can be laid with this special property. + * Default is same colours as is allowed in a a normal tile lay. + * Don't use if specific tiles are specified! */ + protected String[] tileColours = null; + @Override public void configureFromXML(Tag tag) throws ConfigurationException { super.configureFromXML(tag); @@ -33,6 +38,11 @@ tileNumber = tileLayTag.getAttributeAsInteger("tile", 0); + String coloursString = tag.getAttributeAsString("colour"); + if (Util.hasValue(coloursString)) { + tileColours = coloursString.split(","); + } + name = tileLayTag.getAttributeAsString("name"); extra = tileLayTag.getAttributeAsBoolean("extra", extra); @@ -118,6 +128,10 @@ return tile; } + public String[] getTileColours() { + return tileColours; + } + public String getName() { return name; } Modified: trunk/18xx/rails/game/specific/_1835/OperatingRound_1835.java =================================================================== --- trunk/18xx/rails/game/specific/_1835/OperatingRound_1835.java 2011-04-14 20:31:35 UTC (rev 1518) +++ trunk/18xx/rails/game/specific/_1835/OperatingRound_1835.java 2011-04-14 20:33:44 UTC (rev 1519) @@ -235,9 +235,11 @@ errMsg )); return false; } else { + moveStack.start(true); // Duplicate, but we have to hasLaidExtraOBBTile.set(true); // Done here to make getSpecialTileLays() return the correct value. // It's provisional, on the assumption that other validations are OK. + // TODO To get it really right, we should separate validation and execution. } } Modified: trunk/18xx/rails/ui/swing/ORUIManager.java =================================================================== --- trunk/18xx/rails/ui/swing/ORUIManager.java 2011-04-14 20:31:35 UTC (rev 1518) +++ trunk/18xx/rails/ui/swing/ORUIManager.java 2011-04-14 20:33:44 UTC (rev 1519) @@ -211,9 +211,13 @@ if (sp == null || !(sp instanceof SpecialTileLay) || ((SpecialTileLay)sp).requiresConnection()) break; - case (LayTile.LOCATION_SPECIFIC): - if (layTile.getLocations() != null) + // else fall through + case (LayTile.LOCATION_SPECIFIC): // NOT YET USED + if (layTile.getLocations() != null) { hexUpgrades.addAll(layTile.getLocations()); + } else { + mapHexes = true; + } } } @@ -760,31 +764,29 @@ List<TileI> sp_tiles; List<MapHex> sp_hexes; LayTile gen_lt = null; + LayTile spec_lt = null; for (LayTile lt : allowances) { if (lt.getType() == LayTile.SPECIAL_PROPERTY) { // Cases where a special property is used include: // 1. SP refers to specified tiles, (one of) which is chosen: // (examples: 18AL Lumber Terminal, 1889 Port) - if ((((sp_tiles = lt.getTiles()) != null - && sp_tiles.contains(tile)) - // 2. SP does not refer to specific tiles but it does refer to - // specified hexes, (one of) which is chosen: + if ((sp_tiles = lt.getTiles()) != null + && !sp_tiles.contains(tile)) continue; + // 2. SP refers to specified hexes, (one of) which is chosen: // (example: 1830 hex B20) - || (sp_tiles == null - && (sp_hexes = lt.getLocations()) != null) - && sp_hexes.contains(selectedHex.getModel()))) { - allowance = lt; - break; - } + if ((sp_hexes = lt.getLocations()) != null + && !sp_hexes.contains(selectedHex.getModel())) continue; + spec_lt = lt; } else { + // Default case: the generic allowance gen_lt = lt; } } - // Default case: the generic allowance - // TODO It is not clear that all possible cases have been covered yet. - // But at least this works for 1830, 1889 - if (allowance == null) allowance = gen_lt; + allowance = spec_lt == null ? gen_lt : + gen_lt == null ? spec_lt : + spec_lt.getSpecialProperty().getPriority() + == SpecialPropertyI.Priority.FIRST ? spec_lt : gen_lt; } allowance.setChosenHex(selectedHex.getHexModel()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ev...@us...> - 2011-04-14 20:31:41
|
Revision: 1518 http://rails.svn.sourceforge.net/rails/?rev=1518&view=rev Author: evos Date: 2011-04-14 20:31:35 +0000 (Thu, 14 Apr 2011) Log Message: ----------- Removing unnecessary Batik jars from classpath Modified Paths: -------------- trunk/18xx/.classpath Modified: trunk/18xx/.classpath =================================================================== --- trunk/18xx/.classpath 2011-04-14 20:30:59 UTC (rev 1517) +++ trunk/18xx/.classpath 2011-04-14 20:31:35 UTC (rev 1518) @@ -1,37 +1,15 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path=""/> - <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/batik.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-transcoder.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-dom.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-bridge.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-util.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-gvt.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-script.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-ext.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-awt-util.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/extensions/batik-squiggle-ext.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-css.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-extension.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-gui-util.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-parser.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-svg-dom.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-svggen.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-swing.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/batik-xml.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/js.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/pdf-transcoder.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/xerces_2_5_0.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/xml-apis.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/batik-rasterizer.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/batik-slideshow.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/batik-squiggle.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/batik-svgpp.jar"/> - <classpathentry exported="true" kind="lib" path="lib/batik-1.6/batik-ttf2svg.jar"/> - <classpathentry exported="true" kind="lib" path="lib/log4j-1.2/log4j-1.2.14.jar"/> - <classpathentry kind="lib" path="lib/jgraph5/jgraph.jar"/> - <classpathentry kind="lib" path="lib/jgrapht-0.7.3/jgrapht-jdk1.5.jar"/> - <classpathentry kind="lib" path="lib/junit_3.8.2/junit.jar"/> - <classpathentry kind="output" path="classes"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path=""/> + <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry exported="true" kind="lib" path="lib/batik-1.6/batik.jar"/> + <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/js.jar"/> + <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/pdf-transcoder.jar"/> + <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/xerces_2_5_0.jar"/> + <classpathentry exported="true" kind="lib" path="lib/batik-1.6/lib/xml-apis.jar"/> + <classpathentry exported="true" kind="lib" path="lib/log4j-1.2/log4j-1.2.14.jar"/> + <classpathentry kind="lib" path="lib/jgraph5/jgraph.jar"/> + <classpathentry kind="lib" path="lib/jgrapht-0.7.3/jgrapht-jdk1.5.jar"/> + <classpathentry kind="lib" path="lib/junit_3.8.2/junit.jar"/> + <classpathentry kind="output" path="classes"/> +</classpath> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ev...@us...> - 2011-04-14 20:31:04
|
Revision: 1517 http://rails.svn.sourceforge.net/rails/?rev=1517&view=rev Author: evos Date: 2011-04-14 20:30:59 +0000 (Thu, 14 Apr 2011) Log Message: ----------- 1880 initial commit (continued) Modified Paths: -------------- trunk/18xx/tiles/TileDictionary.18t Modified: trunk/18xx/tiles/TileDictionary.18t =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ev...@us...> - 2011-04-13 20:24:39
|
Revision: 1516 http://rails.svn.sourceforge.net/rails/?rev=1516&view=rev Author: evos Date: 2011-04-13 20:24:27 +0000 (Wed, 13 Apr 2011) Log Message: ----------- 1880 initial commit (contribution from Martin Brumm) Modified Paths: -------------- trunk/18xx/data/GamesList.xml trunk/18xx/tiles/TileDictionary.18t trunk/18xx/tiles/TileDictionary.xml trunk/18xx/tiles/Tiles.xml trunk/18xx/tiles/svg/tile89.svg trunk/18xx/tools/ConvertTilesXML.java Added Paths: ----------- trunk/18xx/data/1880/ trunk/18xx/data/1880/CompanyManager.xml trunk/18xx/data/1880/Game.xml trunk/18xx/data/1880/Map.xml trunk/18xx/data/1880/StockMarket.xml trunk/18xx/data/1880/TileSet.xml trunk/18xx/data/1880/Tiles.xml trunk/18xx/rails/game/specific/_1880/ trunk/18xx/rails/game/specific/_1880/OperatingRound_1880.java trunk/18xx/rails/game/specific/_1880/PublicCompany_1880.java trunk/18xx/rails/game/specific/_1880/StockRound_1880.java trunk/18xx/tiles/svg/tile-15.svg trunk/18xx/tiles/svg/tile-80001.svg trunk/18xx/tiles/svg/tile-80002.svg trunk/18xx/tiles/svg/tile-80003.svg trunk/18xx/tiles/svg/tile-80004.svg trunk/18xx/tiles/svg/tile-80020.svg trunk/18xx/tiles/svg/tile8850.svg trunk/18xx/tiles/svg/tile8851.svg trunk/18xx/tiles/svg/tile8852.svg trunk/18xx/tiles/svg/tile8854.svg trunk/18xx/tiles/svg/tile8855.svg trunk/18xx/tiles/svg/tile8856.svg trunk/18xx/tiles/svg/tile8857.svg trunk/18xx/tiles/svg/tile8858.svg trunk/18xx/tiles/svg/tile8860.svg trunk/18xx/tiles/svg/tile8861.svg trunk/18xx/tiles/svg/tile8862.svg trunk/18xx/tiles/svg/tile8863.svg trunk/18xx/tiles/svg/tile8864.svg trunk/18xx/tiles/svg/tile8865.svg trunk/18xx/tiles/svg/tile8866.svg trunk/18xx/tiles/svg/tile887.svg trunk/18xx/tiles/svg/tile8871.svg trunk/18xx/tiles/svg/tile8872.svg trunk/18xx/tiles/svg/tile8873.svg trunk/18xx/tiles/svg/tile8874.svg trunk/18xx/tiles/svg/tile8875.svg trunk/18xx/tiles/svg/tile8877.svg trunk/18xx/tiles/svg/tile8878.svg trunk/18xx/tiles/svg/tile8879.svg trunk/18xx/tiles/svg/tile888.svg trunk/18xx/tiles/svg/tile8880.svg trunk/18xx/tiles/svg/tile8886.svg trunk/18xx/tiles/svg/tile8887.svg trunk/18xx/tiles/svg/tile8888.svg trunk/18xx/tiles/svg/tile895.svg Property Changed: ---------------- trunk/18xx/tiles/ Added: trunk/18xx/data/1880/CompanyManager.xml =================================================================== --- trunk/18xx/data/1880/CompanyManager.xml (rev 0) +++ trunk/18xx/data/1880/CompanyManager.xml 2011-04-13 20:24:27 UTC (rev 1516) @@ -0,0 +1,184 @@ +<?xml version="1.0"?> +<!-- 1880 CompanyManager.xml --> +<CompanyManager> + + <CompanyType name="Investor" class="rails.game.PublicCompany"> + <ShareUnit percentage="100" /> + <Certificate type="President" shares="1" /> + <StockPrice market="no" /> + <BaseTokens> + <HomeBase lay="whenFloated" /> + </BaseTokens> + <Payout split="no" /> + </CompanyType> + + <CompanyType name="Private" class="rails.game.PrivateCompany" /> + + + <CompanyType name="Major" class="rails.game.PublicCompany" capitalisation="incremental" > + <Capitalisation Type="incremental" /> + <TileLays> + <Number colour="yellow" phase="2,3,4,5,6,7,8" number="2" /> + </TileLays> + <Float percentage="60" /> + <StockPrice par="yes" /> + <ShareUnit percentage="10" /> + <Certificate type="President" shares="2" /> + <Certificate shares="1" number="8" /> + <BaseTokens> + <LayCost method="sequence" cost="0,40,100" /> + </BaseTokens> + <Capitalisation type="incremental" /> + <Trains number="4,4,3,3,3,3,2,2" /> + <CanUseSpecialProperties /> + </CompanyType> + + <Company Name="A1" longname="Chinese Eastern Railway" type="Investor" tokens="1" > + <Home hex="A3" city="1" /> + </Company> + <Company Name="A2" longname="South Manchuria Railway" type="Investor" tokens="1" > + <Home hex="E13" city="1" /> + </Company>> + <Company Name="A3" longname="Zeng Tai Railway" type="Investor" tokens="1" > + <Home hex="H6" city="1" /> + </Company> + <Company Name="A4" longname="Schantung-Eisenbahngesellschaft" + type="Investor" tokens="1" > + <Home hex="H14" city="1" /> + </Company> + <Company Name="A5" longname="Kowloon-Canton Railway" type="Investor" tokens="1" > + <Home hex="Q15" city="1" /> + </Company> + <Company Name="A6" longname="Macau Hafen" type="Investor" tokens="1" > + <Home hex="P12" city="1" /> + </Company> + <Company Name="A7" longname="Kunming-Hekou Railway" type="Investor" tokens="1" > + <Home hex="Q7" city="1" /> + </Company> + <Company name="WR" longname="Woosong Railway" type="Private" + basePrice="5" revenue="0"> + <!--SpecialProperty condition="ifOwnedByPlayer" Phasenwechsel-Freie Lok --> + <ClosingConditions> + <Phase>4</Phase> + <SpecialProperties condition="ifExercised" /> + </ClosingConditions> + </Company> + <Company name="KR" longname="Kaiping Railway" type="Private" + basePrice="10" revenue="5"> + <ClosingConditions> + <Phase>4</Phase> + </ClosingConditions> + </Company> + <Company name="YC" longname="Yanda Ferry + Company" type="Private" + basePrice="25" revenue="10"> <!-- SpecialProperty condition="ifOwnedByPlayer" when="revenuecalcStep" revenue="10" --> + </Company> + <Company name="TL" longname="Taiwan Western Line" type="Private" + basePrice="45" revenue="15"> <!-- SpecialProperty condition="ifOwnedByPlayer" when="revenuecalcStep" revenue="20" --> + </Company> + <Company name="CC" longname="Chinese Rivers Ferry + Company" + type="Private" basePrice="70" revenue="20"> + <SpecialProperty condition="ifOwnedByPlayer" + when="tileLayingStep" class="rails.game.special.SpecialTileLay"> + <SpecialTileLay location="M15" extra="no" free="yes" /> + </SpecialProperty> + </Company> + <Company name="JO" longname="Jeme Tien Yow Engineer Office" + type="Private" basePrice="70" revenue="20"> + <SpecialProperty condition="ifOwnedByPlayer" when="tileLayingStep" + class="rails.game.specific._1880.BuildingPermit"> + </SpecialProperty> + </Company> + <Company name="IG" longname="Imperial Qing Government" type="Private" + basePrice="160"> + <Info key="ComesWithPresidency" parm="BCR,20" /> + </Company> + <Company name="RC" longname="Rocket Company" type="Private" + basePrice="70" revenue="0"> + <SpecialProperty condition="ifOwnedByPlayer" when="trainBuyingStep" class="rails.game.special.SpecialTrainBuy" /> + <!-- Kostenfreie Lok bei Phasenwechsel durch Lokkauf --> + <!-- Can exchange Certificate for actual train in one phase 2,2+3,3,3+3,4 + as soon as train has been bought --> + <!-- The train can be moved upon purchase into one company owned by the + owner of the certificate --> <!-- Company must have space for the new train, but can hand back an older + train to bank (2+2,3,3+3) --> + <ClosingConditions> + <Phase>5</Phase> + <SpecialProperties condition="ifExercised" /> + </ClosingConditions> + </Company> + <Company name="BCR" longname="Baocheng Railway" type="Major" + tokens="3" fgColour="FFFFFF" bgColour="0000FF"> + <Home hex="M3" /> + </Company> + <Company name="JHA" longname="Jingha Railway" type="Major" + tokens="3" fgColour="FFFFFF" bgColour="FF0000"> + <Home hex="F8" /> + </Company> + <Company name="JHU" longname="Jinghu + Railway" type="Major" + tokens="3" fgColour="FFFFFF" bgColour="FF0000"> + <Home hex="F8" /> + </Company> + <Company name="JGG" longname="Jingguang Railway" type="Major" + tokens="3" fgColour="FFFFFF" bgColour="FF0000"> + <Home hex="F8" /> + </Company> + <Company name="JLR" longname="Jinglan Railway" type="Major" + tokens="3" fgColour="FFFFFF" bgColour="FF0000"> + <Home hex="F8" /> + </Company> + <Company name="BZU" longname="Binzhou + Railway" type="Major" + tokens="3" fgColour="FFFFFF" bgColour="FF0000"> + <Home hex="B8" /> + </Company> + <Company name="LHR" longname="Longhai Railway" type="Major" + tokens="3" fgColour="FFFFFF" bgColour="FF0000"> + <Home hex="J2" /> + </Company> + <Company name="SCR" longname="Schichang Railway" type="Major" + tokens="3" fgColour="FFFFFF" bgColour="FF0000"> + <Home hex="N12" /> + </Company> + <Company name="CKR" longname="Chengkun Railway" type="Major" + tokens="3" fgColour="FFFFFF" bgColour="FF0000"> + <Home hex="O5" /> + </Company> + <Company name="NXR" longname="Ningxi + Railway" type="Major" + tokens="3" fgColour="FFFFFF" bgColour="FF0000"> + <Home hex="J6" /> + </Company> + <Company name="HKR" longname="Hukun Railway" type="Major" + tokens="3" fgColour="FFFFFF" bgColour="FF0000"> + <Home hex="K14" /> + </Company> + <Company name="NJR" longname="Najiang Railway" type="Major" + tokens="3" fgColour="FFFFFF" bgColour="FF0000"> + <Home hex="K12" /> + </Company> + <Company name="QSR" longname="Qinshen + Railway" type="Major" + tokens="3" fgColour="FFFFFF" bgColour="FF0000"> + <Home hex="D13" /> + </Company> + <Company name="WNR" longname="Wunan Railway" type="Major" + tokens="3" fgColour="FFFFFF" bgColour="FF0000"> + <Home hex="L10" /> + </Company> + <StartPacket roundClass="rails.game.StartRound_1880"> + <Bidding initial="5" minimum="5" increment="5" /> + <Item name="WR" type="Private" /> + <Item name="KR" type="Private" /> + <Item name="YC" type="Private" /> + <Item name="TL" type="Private" /> + <Item name="CC" type="Public" /> + <Item name="JO" type="Private" /> + <Item name="IG" type="Private"> + <SubItem name="BCR" type="Public" /> + <Item name="RC" type="Private" /> + </Item> + </StartPacket> +</CompanyManager> \ No newline at end of file Property changes on: trunk/18xx/data/1880/CompanyManager.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/18xx/data/1880/Game.xml =================================================================== --- trunk/18xx/data/1880/Game.xml (rev 0) +++ trunk/18xx/data/1880/Game.xml 2011-04-13 20:24:27 UTC (rev 1516) @@ -0,0 +1,103 @@ +<?xml version="1.0"?> +<ComponentManager> + <Component name="GameManager" class="rails.game.GameManager"> + <Game name="1880"/> + <GameOption name="RouteAwareness" values="Highlight,Deactivate" default="Deactivate" /> + <GameOption name="RevenueCalculation" values="Suggest,Deactivate" default="Deactivate" /> + <GameOption name="UnlimitedTiles" type="toggle" default="no"/> + <GameOption name="LeaveAuctionOnPass" type="toggle" default="no"/> + <GameParameters> + <PlayerShareLimit percentage="100" /> + <StockRound class="rails.game.specific._1880.StockRound_1880"> + <NoSaleInFirstSR/> + </StockRound> + <OperatingRound class="rails.game.specific._1880.OperatingRound_1880"/> + </GameParameters> + <EndOfGame/> + <!-- need to implement the 3 OR set limit after purchase of first 8 Train --> + </Component> + <Component name="PlayerManager" class="rails.game.PlayerManager"> + <Players number="3" cash="600" certLimit="20"/> + <Players number="4" cash="480" certLimit="16"/> + <Players number="5" cash="400" certLimit="14"/> + <Players number="6" cash="340" certLimit="12"/> + <Players number="7" cash="300" certLimit="11"/> + </Component> + <Component name="Bank" class="rails.game.Bank"> + <Bank amount="30000"/> + </Component> + <Component name="TileManager" class="rails.game.TileManager" + file="TileSet.xml"/> + <Component name="Map" class="rails.game.MapManager" file="Map.xml"/> + <Component name="CompanyManager" class="rails.game.CompanyManager" + file="CompanyManager.xml"/> + <Component name="StockMarket" class="rails.game.StockMarket" + file="StockMarket.xml"/> + <Component name="TrainManager" class="rails.game.TrainManager"> + <Defaults> + <Reach base="stops" countTowns="major"/> + <Score towns="yes"/> + </Defaults> + <Train name="2" majorStops="2" cost="100" amount="10"/> + <Train name="2+2" majorStops="2" minorStops="2" cost="180" amount="5"/> + <Train name="3" majorStops="3" cost="180" amount="6" startPhase="2"/> + <Train name="3+3" majorStops="3" minorStops="3" cost="300" amount="5" startPhase="3"/> + <Train name="4" majorStops="4" cost="300" amount="5" startPhase="4" rustedTrain="2"/> + <Train name="4+4" majorStops="4" minorStops="4" cost="450" amount="5" startPhase="5" rustedTrain="2+2"/> + <Train name="6" majorStops="6" cost="600" amount="5" startPhase="6" rustedTrain="3"/> + <Train name="6e" majorStops="-1" cost="700" amount="5" startPhase="7" rustedTrain="3+3"/> + <!-- majorStops="-1" indicates that this not a normally running train--> + <!-- The e-type trains are express trains that can ignore towns/cities on their way for a maximum payout--> + <Train name="8" majorStops="8" cost="800" amount="2" startPhase="8" rustedTrain="4"/> + <Train name="8e" majorStops="-1" cost="900" amount="2" rustedTrain="4+4"/> + <!-- majorStops="-1" indicates that this not a normally running train--> + <!-- The e-type trains are express trains that can ignore towns/cities on their way for a maximum payout--> + <Train name="10" majorStops="10" cost="1000" amount="-1"/> + </Component> + <Component name="PhaseManager" class="rails.game.PhaseManager"> + <Phase name="1"> + <Tiles colour="yellow"/> + <OperatingRounds number="-1"/> + <Float percentage="20"/> + <Trains tradingAllowed="yes"/> + <Stocks avail="5"/> + </Phase> + <Phase name="2"> + <Tiles colour="yellow,green"/> + <OffBoardRevenue step="2"/> + <Float percentage="30"/> + <Stocks avail="10"/> + </Phase> + <Phase name="3"> + <Tiles colour="yellow,green"/> + + </Phase> + <Phase name="4"> + <Tiles colour="yellow,green"/> + <Privates close="yes"/> + <Investors active="no"/> + <Communists active="yes"/> + <Float percentage="40"/> + </Phase> + <Phase name="5"> + <Tiles colour="yellow,green,brown"/> + <OffBoardRevenue step="3"/> + </Phase> + <Phase name="6"> + <Tiles colour="yellow,green,brown"/> + <Float percentage="60"/> + <Comunists active="no"/> + </Phase> + <Phase name="7"> + <Tiles colour="yellow,green,brown"/> + </Phase> + <Phase name="8"> + <Tiles colour="yellow,green,brown,grey"/> + <OffBoardRevenue step="4"/> + </Phase> + <Component name="RevenueManager" class="rails.algorithms.RevenueManager"> + <Modifier class="rails.game.specific._1880.OffBoardRevenueModifier" /> + <Modifier class="rails.game.specific._1880.ExpressTrainRevenueModifier" /> + </Component> + </Component> +</ComponentManager> \ No newline at end of file Property changes on: trunk/18xx/data/1880/Game.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/18xx/data/1880/Map.xml =================================================================== --- trunk/18xx/data/1880/Map.xml (rev 0) +++ trunk/18xx/data/1880/Map.xml 2011-04-13 20:24:27 UTC (rev 1516) @@ -0,0 +1,118 @@ +<Map mapClass="rails.ui.swing.hexmap.EWHexMap" tileOrientation="EW" letterOrientation="vertical" even="B"> + <Hex name="A3" tile="-902" value="20,30,40,50" city="Russia" /> + <Hex name="A5" tile="-10" city="Qiqihar"/> + <Hex name="A7" tile="-1" /> + <Hex name="A9" tile="0" /> + <Hex name="A11" tile="0" /> + <Hex name="A13" tile="0" /> + <Hex name="A15" tile="-902" orientation="2" value="10,20,30,40" /> + <Hex name="B4" tile="0" /> + <Hex name="B6" tile="0" /> + <Hex name="B8" tile="-10" city="Harbin" /> + <Hex name="B10" tile="0" /> + <Hex name="B12" tile="-2" /> + <Hex name="B14" tile="-80001" city="testa"/> + <Hex name="C3" tile="0" cost="30" /> + <Hex name="C5" tile="0" cost="30" /> + <Hex name="C7" tile="-1" /> + <Hex name="C9" tile="-10" city="Changchun" /> + <Hex name="C11" tile="-10" city="Jilin City" /> + <Hex name="C13" tile="0" /> + <Hex name="C15" tile="0" cost="30" /> + <Hex name="D4" tile="0" cost="30"/> + <Hex name="D6" tile="0" cost="30"/> + <Hex name="D8" tile="0" cost="30"/> + <Hex name="D10" tile="0" /> + <Hex name="D12" tile="-80020" city="Shenyang, Fushun" /> + <Hex name="D14" tile="-1" /> + <Hex name="E3" tile="0" cost="30" /> + <Hex name="E5" tile="0" cost="30" /> + <Hex name="E7" tile="0" cost="30" /> + <Hex name="E9" tile="-80001" city="Test" /> + <Hex name="E11" tile="0" impassable="E13" /> + <Hex name="E13" tile="-10" city="Dalian" impassable="E11" /> + <Hex name="F2" tile="0" /> + <Hex name="F4" tile="-80020" city="Hohhot,Datong" /> + <Hex name="F6" tile="-80001" city="Test8" cost="30" /> + <Hex name="F8" tile="-80004" city="Beijing" orientation="5" label="Beijing"/> + <Hex name="F10" tile="-10" city="Tianjin" /> + <Hex name="G1" tile="0" cost="20" /> + <Hex name="G3" tile="-10" city="Baotou" cost="20" /> + <Hex name="G5" tile="0" cost="50" /> + <Hex name="G7" tile="0" /> + <Hex name="G9" tile="-1" /> + <Hex name="G11" tile="-1" cost="20" /> + <Hex name="G13" tile="0" /> + <Hex name="G15" tile="-1" /> + <Hex name="H2" tile="0" cost="30"/> + <Hex name="H4" tile="0" cost="20" /> + <Hex name="H6" tile="-10" city="Taiyuan" /> + <Hex name="H8" tile="-80020" city="Test9, Test10"/> + <Hex name="H10" tile="-10" city="Jinan" cost="20" /> + <Hex name="H12" tile="-2" /> + <Hex name="H14" tile="-10" city="Qingdao" /> + <Hex name="I1" tile="-903" orientation="5" value="10,20,30,40" city="Orumqi" /> + <Hex name="I3" tile="0" cost="30" /> + <Hex name="I5" tile="0" cost="20" /> + <Hex name="I7" tile="0" cost="50" /> + <Hex name="I9" tile="-80020" city="Kaifeng, Zhengzhou" cost="20" /> + <Hex name="I11" tile="0" /> + <Hex name="I13" tile="0" /> + <Hex name="J2" tile="-10" city="Lhasa" cost="50"/> + <Hex name="J4" tile="0" cost="30"/> + <Hex name="J6" tile="-10" cost="30" city="Xian" /> + <Hex name="J8" tile="-2" cost="30" /> + <Hex name="J10" tile="0" /> + <Hex name="J12" tile="-10" city="Hefei" /> + <Hex name="J14" tile="-1" cost="20"/> + <Hex name="K1" tile="-903" orientation="5" value="0,0,0,80" city="Lhasa" /> + <Hex name="K3" tile="0" cost="30" /> + <Hex name="K5" tile="-1" cost="30" /> + <Hex name="K7" tile="-1" cost="30" /> + <Hex name="K9" tile="0" cost="30" /> + <Hex name="K11" tile="0" /> + <Hex name="K13" tile="-10" cost="20" city="Nanjing" /> + <Hex name="K15" tile="-10" city="Shanghai" label="S"/> + <Hex name="L2" tile="0" /> + <Hex name="L4" tile="0" /> + <Hex name="L6" tile="0" /> + <Hex name="L8" tile="0" cost="50"/> + <Hex name="L10" tile="-10" city="Wuhan" cost="20"/> + <Hex name="L12" tile="-2" cost="20"/> + <Hex name="L14" tile="-80001" city="Test6" /> + <Hex name="L16" tile="-1" /> + <Hex name="M1" tile="0" cost="40"/> + <Hex name="M3" tile="-10" city="Chengdu" /> + <Hex name="M5" tile="-1" cost="30" /> + <Hex name="M7" tile="-10" city="Chongqing" cost="20" /> + <Hex name="M9" tile="0" /> + <Hex name="M11" tile="0" /> + <Hex name="M13" tile="0" /> + <Hex name="M15" tile="-1" /> + <Hex name="N2" tile="0" cost="40" /> + <Hex name="N4" tile="-80002" city="Test4,Test5" cost="20"/> + <Hex name="N6" tile="0" cost="20"/> + <Hex name="N8" tile="0" cost="30"/> + <Hex name="N10" tile="-80001" city="Test3" /> + <Hex name="N12" tile="-80020" city="Changsha, Nanchang" /> + <Hex name="N14" tile="0" /> + <Hex name="N16" tile="-903" orientation="2" value="30,30,0,0" city="Taiwan" /> + <Hex name="O1" tile="0" cost="60" /> + <Hex name="O3" tile="-2" cost="20"/> + <Hex name="O5" tile="-10" city="Kunming" /> + <Hex name="O7" tile="-80001" city="Test2" cost="30" /> + <Hex name="O9" tile="0" cost="30" /> + <Hex name="O11" tile="-2" /> + <Hex name="O13" tile="0" /> + <Hex name="O15" tile="-1" cost="30"/> + <Hex name="P2" tile="0" cost="40"/> + <Hex name="P4" tile="-1" cost="40"/> + <Hex name="P6" tile="-1" /> + <Hex name="P8" tile="-10" city="Nanning" /> + <Hex name="P10" tile="-1" cost="30" /> + <Hex name="P12" tile="-10" city="Macau" /> + <Hex name="P14" tile="-10" city="Guangzhu" /> + <Hex name="Q7" tile="-902" orientation="4" value="30,40,50,60" city="French Indochina" /> + <Hex name="Q13" tile="-902" orientation="4" value="20,30,40,50" city="Haikou" /> + <Hex name="Q15" tile="-901" orientation="3" value="20,30,10,70" city="Hongkong"/> +</Map> \ No newline at end of file Property changes on: trunk/18xx/data/1880/Map.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/18xx/data/1880/StockMarket.xml =================================================================== --- trunk/18xx/data/1880/StockMarket.xml (rev 0) +++ trunk/18xx/data/1880/StockMarket.xml 2011-04-13 20:24:27 UTC (rev 1516) @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="UTF-8"?> +<StockMarket type="rectangular"> + <UpOrDownRight /> + <StockSpaceType name="revenue5" colour="255,255,100" /> + <StockSpaceType name="revenue10" colour="255,255,0" /> + <StockSpaceType name="revenue15" colour="100,255,255" /> + <StockSpaceType name="revenue20" colour="0,255,255" /> + <StockSpace name="A3" price="70" /> + <StockSpace name="A4" price="65" /> + <StockSpace name="A5" price="60" /> + <StockSpace name="A6" price="55" /> + <StockSpace name="A7" price="50" /> + <StockSpace name="A8" price="45" /> + <StockSpace name="A9" price="40" /> + <StockSpace name="B2" price="85" /> + <StockSpace name="B3" price="80" /> + <StockSpace name="B4" price="75" /> + <StockSpace name="B5" price="70" /> + <StockSpace name="B6" price="65" /> + <StockSpace name="B7" price="60" /> + <StockSpace name="B8" price="55" /> + <StockSpace name="B9" price="50" /> + <StockSpace name="C1" price="100" /> + <StockSpace name="C2" price="95" /> + <StockSpace name="C3" price="90" /> + <StockSpace name="C4" price="85" /> + <StockSpace name="C5" price="80" /> + <StockSpace name="C6" price="75" /> + <StockSpace name="C7" price="70" /> + <StockSpace name="C8" price="65" /> + <StockSpace name="C9" price="60" /> + <StockSpace name="D1" price="105" /> + <StockSpace name="D2" price="100" > + <Startspace /> + </StockSpace> + <StockSpace name="D3" price="95" /> + <StockSpace name="D4" price="90" > + <Startspace /> + </StockSpace> + <StockSpace name="D5" price="85" /> + <StockSpace name="D6" price="80" > + <Startspace /> + </StockSpace> + <StockSpace name="D7" price="75" /> + <StockSpace name="D8" price="70" > + <Startspace /> + </StockSpace> + <StockSpace name="D9" price="65" /> + <StockSpace name="E1" price="110" /> + <StockSpace name="E2" price="105" /> + <StockSpace name="E3" price="100" /> + <StockSpace name="E4" price="95" /> + <StockSpace name="E5" price="90" /> + <StockSpace name="E6" price="85" /> + <StockSpace name="E7" price="80" /> + <StockSpace name="E8" price="75" /> + <StockSpace name="E9" price="70" /> + <StockSpace name="F1" price="115" type="revenue5" /> + <StockSpace name="F2" price="110" type="revenue5" /> + <StockSpace name="F3" price="105" type="revenue5" /> + <StockSpace name="F4" price="100" type="revenue5" /> + <StockSpace name="F5" price="95" type="revenue5" /> + <StockSpace name="F6" price="90" type="revenue5" /> + <StockSpace name="F7" price="85" type="revenue5" /> + <StockSpace name="G1" price="120" type="revenue5" /> + <StockSpace name="G2" price="115" type="revenue5" /> + <StockSpace name="G3" price="110" type="revenue5" /> + <StockSpace name="G4" price="105" type="revenue5" /> + <StockSpace name="G5" price="100" type="revenue5" /> + <StockSpace name="G6" price="95" type="revenue5" /> + <StockSpace name="G7" price="90" type="revenue5" /> + <StockSpace name="H1" price="125" type="revenue5" /> + <StockSpace name="H2" price="120" type="revenue5" /> + <StockSpace name="H3" price="115" type="revenue5" /> + <StockSpace name="H4" price="110" type="revenue5" /> + <StockSpace name="H5" price="105" type="revenue5" /> + <StockSpace name="H6" price="100" type="revenue5" /> + <StockSpace name="I1" price="130" type="revenue10" /> + <StockSpace name="I2" price="125" type="revenue10" /> + <StockSpace name="I3" price="120" type="revenue10" /> + <StockSpace name="I4" price="115" type="revenue10" /> + <StockSpace name="I5" price="110" type="revenue10" /> + <StockSpace name="J1" price="140" type="revenue10" /> + <StockSpace name="J2" price="135" type="revenue10" /> + <StockSpace name="J3" price="130" type="revenue10" /> + <StockSpace name="J4" price="125" type="revenue10" /> + <StockSpace name="J5" price="120" type="revenue10" /> + <StockSpace name="K1" price="150" type="revenue15" /> + <StockSpace name="K2" price="145" type="revenue15" /> + <StockSpace name="K3" price="140" type="revenue15" /> + <StockSpace name="K4" price="135" type="revenue15" /> + <StockSpace name="L1" price="160" type="revenue15" /> + <StockSpace name="L2" price="155" type="revenue15" /> + <StockSpace name="L3" price="150" type="revenue15" /> + <StockSpace name="L4" price="145" type="revenue15" /> + <StockSpace name="M1" price="180" type="revenue20" /> + <StockSpace name="M2" price="170" type="revenue20" /> + <StockSpace name="M3" price="165" type="revenue20" /> + <StockSpace name="N1" price="200" type="revenue20" /> + <StockSpace name="N2" price="190" type="revenue20" /> + <StockSpace name="N3" price="180" type="revenue20" /> +</StockMarket> Property changes on: trunk/18xx/data/1880/StockMarket.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/18xx/data/1880/TileSet.xml =================================================================== --- trunk/18xx/data/1880/TileSet.xml (rev 0) +++ trunk/18xx/data/1880/TileSet.xml 2011-04-13 20:24:27 UTC (rev 1516) @@ -0,0 +1,142 @@ +<TileManager tiles="Tiles.xml"> + <!-- Preprinted tiles --> + <Tile id="0"><!-- Empty space --> + <Upgrade id="7,8,9" /> + </Tile> + <Tile id="-1"><!-- 1 town --> + <Upgrade id="8850,8851,8852" /> + </Tile> + <Tile id="-2"><!-- 2 towns --> + <Upgrade id="8854,8855,8856,8857,8858" /> + </Tile> + <Tile id="-10"><!-- 1 city --> + <Upgrade id="5,6,57"/> + </Tile> + <Tile id="-80020"> + <Upgrade id="235" /> + </Tile> + <Tile id="-80001"> + <Upgrade id="5,6,57,8850,8851,8852" /> + </Tile> + <Tile id="-80002"> + <Upgrade id="8854,8855,8856,8857,8858,235" /> + </Tile> + <Tile id="-80003"> + <Upgrade id="8887" /> + </Tile> + <Tile id="-80004"> + <Upgrade id="8886" /> + </Tile> + <Tile id="-901"/> + <Tile id="-902"/> + <Tile id="-903"/> + + <!-- Yellow --> + <Tile id="5" quantity="6"> + <Upgrade id="14,15,619" /> + </Tile> + <Tile id="6" quantity="6"> + <Upgrade id="14,15,619" /> + </Tile> + <Tile id="7" quantity="5"> + <Upgrade id="18,26,27,28,29,30,31" /> + </Tile> + <Tile id="8" quantity="15"> + <Upgrade id="16,17,19,23,24,25,28,29,30,31" /> + </Tile> + <Tile id="9" quantity="15"> + <Upgrade id="18,19,20,23,24,26,27" /> + </Tile> + <Tile id="57" quantity="6"> + <Upgrade id="14,15,619" /> + </Tile> + <Tile id="235" quantity="5"> + <Upgrade id="8860,8861,8862,8863,8864,8865" /> + </Tile> + <Tile id="8850" quantity="5" /> + <Tile id="8851" quantity="6" /> + <Tile id="8852" quantity="6" /> + <Tile id="8854" quantity="2" /> + <Tile id="8855" quantity="2" /> + <Tile id="8856" quantity="2" /> + <Tile id="8857" quantity="2" /> + <Tile id="8858" quantity="2" /> + <Tile id="8877" quantity="1"> <!-- Shanghai Yellow--> + <Upgrade id="8878" /> + </Tile> + <!-- Green --> + <Tile id="14" quantity="4"> + <Upgrade id="63" /> + <Upgrade id="611" /> + </Tile> + <Tile id="15" quantity="8"> + <Upgrade id="63" /> + <Upgrade id="611" /> + </Tile> + <Tile id="619" quantity="4"> + <Upgrade id="63" /> + <Upgrade id="611" /> + </Tile> + <Tile id="16" quantity="2" /> + <Tile id="17" quantity="1" /> + <Tile id="18" quantity="1" /> + <Tile id="19" quantity="2" /> + <Tile id="20" quantity="2" /> + <Tile id="23" quantity="4" /> + <Tile id="24" quantity="4" /> + <Tile id="25" quantity="3" /> + <Tile id="26" quantity="2" /> + <Tile id="27" quantity="2" /> + <Tile id="28" quantity="2" /> + <Tile id="29" quantity="2" /> + <Tile id="30" quantity="2" /> + <Tile id="31" quantity="2" /> + <Tile id="8886" quantity="1"> + <Upgrade id="8887" /> + </Tile> + <Tile id="8878" quantity="1"> + <Upgrade id="8879" /> + </Tile> + <Tile id="8860" quantity="1"> + <Upgrade id="8872,8873,8874" /> + </Tile> + <Tile id="8861" quantity="2"> + <Upgrade id="8872,8873,8874" /> + </Tile> + <Tile id="8862" quantity="1"> + <Upgrade id="8872,8873,8874" /> + </Tile> + <Tile id="8863" quantity="1"> + <Upgrade id="8872,8873,8874" /> + </Tile> + <Tile id="8864" quantity="1"> + <Upgrade id="8872,8873,8874" /> + </Tile> + <Tile id="8865" quantity="1"> + <Upgrade id="8872,8873,8874" /> + </Tile> + <Tile id="8866" quantity="3"/> + <Tile id="887" quantity="5"/> + <Tile id="888" quantity="3"/> + <!-- Brown--> + <Tile id="63" quantity="6" > + <Upgrade id="895,455" /> + </Tile> + <Tile id="611" quantity="3" > + <Upgrade id="895,455" /> + </Tile> + <Tile id="8871" quantity="3" /> + <Tile id="8872" quantity="2" /> + <Tile id="8873" quantity="2" /> + <Tile id="8874" quantity="2" /> + <Tile id="8879" quantity="1" /> + <Tile id="8887" quantity="1" > + <Upgrade id="8888" /> + </Tile> + <!-- Grey --> + <Tile id="455" quantity="3" /> + <Tile id="895" quantity="3" /> + <Tile id="8875" quantity="1" /> + <Tile id="8880" quantity="1" /> + <Tile id="8888" quantity="1" /> +</TileManager> Property changes on: trunk/18xx/data/1880/TileSet.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/18xx/data/1880/Tiles.xml =================================================================== --- trunk/18xx/data/1880/Tiles.xml (rev 0) +++ trunk/18xx/data/1880/Tiles.xml 2011-04-13 20:24:27 UTC (rev 1516) @@ -0,0 +1,391 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?><Tiles><Tile colour="white" id="0" name="empty"/><Tile colour="white" id="-1" name="1 village"> + <Station id="city1" position="002" type="Town"/> + </Tile><Tile colour="white" id="-2" name="2 villages"> + <Station id="city1" position="102" type="Town"/> + <Station id="city2" position="302" type="Town"/> + </Tile><Tile colour="white" id="-10" name="1 city"> + <Station id="city1" position="302" slots="1" type="City"/> + </Tile><Tile colour="white" id="-80020" name="2 cities Initial"> + <Station id="city1" position="002" slots="1" type="City"/> + <Station id="city2" position="302" slots="1" type="City"/> + </Tile><Tile colour="white" id="-80001" name="Medium City"> + <Station id="city1" position="052" slots="1" type="City"/> + </Tile><Tile colour="white" id="-80002" name="2 Medium Cities"> + <Station id="city1" position="002" slots="1" type="City"/> + <Station id="city2" position="302" slots="1" type="City"/> + </Tile><Tile colour="white" id="-80003" name="Shanghai"> + <Station id="city1" position="052" slots="1" type="City"/> + </Tile><Tile colour="yellow" id="-80004" name="Beijing"> + <Station id="city1" position="103" slots="1" type="City" value="20"/> + <Station id="city2" position="203" slots="1" type="City" value="20"/> + <Station id="city3" position="403" slots="1" type="City" value="20"/> + <Station id="city4" position="503" slots="1" type="City" value="20"/> + <Track from="city3" gauge="normal" to="side4"/> + <Track from="city2" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city4" gauge="normal" to="side5"/> + </Tile><Tile colour="red" id="-901" name="OM 1 way"> + <Station id="city1" position="0" type="OffMapCity" value="-1"/> + <Track from="city1" gauge="normal" to="side2"/> + </Tile><Tile colour="red" id="-902" name="OM 2 way"> + <Station id="city1" position="0" type="OffMapCity" value="-1"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side1"/> + </Tile><Tile colour="red" id="-903" name="OM 3 way"> + <Station id="city1" position="0" type="OffMapCity" value="-1"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side1"/> + </Tile><Tile colour="yellow" id="5" name="5"> + <Station id="city1" position="0" slots="1" type="City" value="20"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side2"/> + </Tile><Tile colour="yellow" id="6" name="6"> + <Station id="city1" position="0" slots="1" type="City" value="20"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side2"/> + </Tile><Tile colour="yellow" id="7" name="7"> + <Track from="side3" gauge="normal" to="side4"/> + </Tile><Tile colour="yellow" id="8" name="8"> + <Track from="side3" gauge="normal" to="side5"/> + </Tile><Tile colour="yellow" id="9" name="9"> + <Track from="side3" gauge="normal" to="side0"/> + </Tile><Tile colour="yellow" id="57" name="57"> + <Station id="city1" position="0" slots="1" type="City" value="20"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side0"/> + </Tile><Tile colour="yellow" id="235" name="235"> + <Station id="city1" position="502" slots="1" type="City" value="20"/> + <Station id="city2" position="352" slots="1" type="City" value="20"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile><Tile colour="yellow" id="8850" name="8850"> + <Station id="city1" position="352" type="Town" value="20"/> + <Track from="side3" gauge="normal" to="city1"/> + <Track from="city1" gauge="normal" to="side2"/> + </Tile><Tile colour="yellow" id="8851" name="8851"> + <Station id="city1" position="307" type="Town" value="20"/> + <Track from="side3" gauge="normal" to="city1"/> + <Track from="city1" gauge="normal" to="side1"/> + </Tile><Tile colour="yellow" id="8852" name="8852"> + <Station id="city1" position="0" type="Town" value="20"/> + <Track from="side3" gauge="normal" to="city1"/> + <Track from="city1" gauge="normal" to="side0"/> + </Tile><Tile colour="yellow" id="8854" name="8854"> + <Station id="city1" position="0" type="Town" value="20"/> + <Station id="city2" position="252" type="Town" value="20"/> + <Track from="side2" gauge="normal" to="city2"/> + <Track from="side2" gauge="normal" to="side1"/> + <Track from="side3" gauge="normal" to="city1"/> + <Track from="side3" gauge="normal" to="side0"/> + </Tile><Tile colour="yellow" id="8855" name="8855"> + <Station id="city1" position="303" type="Town" value="20"/> + <Station id="city2" position="103" type="Town" value="20"/> + <Track from="side3" gauge="normal" to="city1"/> + <Track from="side3" gauge="normal" to="side0"/> + <Track from="side1" gauge="normal" to="city2"/> + <Track from="side1" gauge="normal" to="side4"/> + </Tile><Tile colour="yellow" id="8856" name="8856"> + <Station id="city1" position="307" type="Town" value="20"/> + <Station id="city2" position="008" type="Town" value="20"/> + <Track from="side3" gauge="normal" to="city1"/> + <Track from="side0" gauge="normal" to="city2"/> + <Track from="side1" gauge="normal" to="city1"/> + <Track from="city2" gauge="normal" to="side2"/> + </Tile><Tile colour="yellow" id="8857" name="8857"> + <Station id="city1" position="303" type="Town" value="20"/> + <Station id="city2" position="107" type="Town" value="20"/> + <Track from="side3" gauge="normal" to="city1"/> + <Track from="side5" gauge="normal" to="city2"/> + <Track from="side1" gauge="normal" to="city2"/> + <Track from="side0" gauge="normal" to="city1"/> + </Tile><Tile colour="yellow" id="8858" name="8858"> + <Station id="city1" position="201" type="Town" value="20"/> + <Station id="city2" position="501" type="Town" value="20"/> + <Track from="side4" gauge="normal" to="city2"/> + <Track from="side4" gauge="normal" to="side0"/> + <Track from="side3" gauge="normal" to="city1"/> + <Track from="side3" gauge="normal" to="side1"/> + </Tile><Tile colour="yellow" id="8877" name="8877"> + <Station id="city1" position="0" slots="1" type="City" value="20"/> + <Track from="side3" gauge="normal" to="city1"/> + <Track from="city1" gauge="normal" to="side0"/> + </Tile><Tile colour="green" id="14" name="14"> + <Station id="city1" position="0" slots="2" type="City" value="30"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side0"/> + </Tile><Tile colour="green" id="15" name="15"> + <Station id="city1" position="0" slots="2" type="City" value="30"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + <Track from="city1" gauge="normal" to="side0"/> + </Tile><Tile colour="green" id="619" name="619"> + <Station id="city1" position="0" slots="2" type="City" value="30"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile><Tile colour="green" id="16" name="16"> + <Track from="side3" gauge="normal" to="side5"/> + <Track from="side4" gauge="normal" to="side0"/> + </Tile><Tile colour="green" id="17" name="17"> + <Track from="side0" gauge="normal" to="side2"/> + <Track from="side3" gauge="normal" to="side5"/> + </Tile><Tile colour="green" id="18" name="18"> + <Track from="side3" gauge="normal" to="side0"/> + <Track from="side4" gauge="normal" to="side5"/> + </Tile><Tile colour="green" id="19" name="19"> + <Track from="side5" gauge="normal" to="side1"/> + <Track from="side0" gauge="normal" to="side3"/> + </Tile><Tile colour="green" id="20" name="20"> + <Track from="side1" gauge="normal" to="side4"/> + <Track from="side3" gauge="normal" to="side0"/> + </Tile><Tile colour="green" id="23" name="23"> + <Track from="side4" gauge="normal" to="side0"/> + <Track from="side0" gauge="normal" to="side3"/> + </Tile><Tile colour="green" id="24" name="24"> + <Track from="side3" gauge="normal" to="side5"/> + <Track from="side3" gauge="normal" to="side0"/> + </Tile><Tile colour="green" id="25" name="25"> + <Track from="side1" gauge="normal" to="side3"/> + <Track from="side3" gauge="normal" to="side5"/> + </Tile><Tile colour="green" id="26" name="26"> + <Track from="side5" gauge="normal" to="side0"/> + <Track from="side0" gauge="normal" to="side3"/> + </Tile><Tile colour="green" id="27" name="27"> + <Track from="side3" gauge="normal" to="side4"/> + <Track from="side3" gauge="normal" to="side0"/> + </Tile><Tile colour="green" id="28" name="28"> + <Track from="side3" gauge="normal" to="side5"/> + <Track from="side4" gauge="normal" to="side5"/> + </Tile><Tile colour="green" id="29" name="29"> + <Track from="side3" gauge="normal" to="side4"/> + <Track from="side3" gauge="normal" to="side5"/> + </Tile><Tile colour="green" id="30" name="30"> + <Track from="side0" gauge="normal" to="side2"/> + <Track from="side2" gauge="normal" to="side3"/> + </Tile><Tile colour="green" id="31" name="31"> + <Track from="side1" gauge="normal" to="side2"/> + <Track from="side2" gauge="normal" to="side4"/> + </Tile><Tile colour="green" id="8886" name="8886"> + <Station id="city1" position="303" slots="1" type="City" value="40"/> + <Station id="city2" position="203" slots="1" type="City" value="40"/> + <Station id="city3" position="103" slots="1" type="City" value="40"/> + <Station id="city4" position="503" slots="1" type="City" value="40"/> + <Station id="city5" position="003" slots="1" type="City" value="40"/> + <Station id="city6" position="403" slots="1" type="City" value="40"/> + <Track from="city1" gauge="normal" to="city1"/> + <Track from="city6" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city2" gauge="normal" to="side2"/> + <Track from="city3" gauge="normal" to="side1"/> + <Track from="city5" gauge="normal" to="side0"/> + <Track from="city4" gauge="normal" to="side5"/> + <Track from="city4" gauge="normal" to="side5"/> + </Tile><Tile colour="green" id="8878" name="8878"> + <Station id="city1" position="0" slots="2" type="City" value="40"/> + <Track from="side3" gauge="normal" to="city1"/> + <Track from="side0" gauge="normal" to="city1"/> + <Track from="side5" gauge="normal" to="city1"/> + <Track from="side2" gauge="normal" to="city1"/> + </Tile><Tile colour="green" id="8860" name="8860"> + <Station id="city1" position="308" slots="1" type="City" value="40"/> + <Station id="city2" position="008" slots="1" type="City" value="40"/> + <Track from="side3" gauge="normal" to="city1"/> + <Track from="side5" gauge="normal" to="city1"/> + <Track from="side0" gauge="normal" to="city2"/> + <Track from="side2" gauge="normal" to="city2"/> + </Tile><Tile colour="green" id="8861" name="8861"> + <Station id="city1" position="452" slots="1" type="City" value="40"/> + <Station id="city2" position="152" slots="1" type="City" value="40"/> + <Track from="side4" gauge="normal" to="city1"/> + <Track from="side3" gauge="normal" to="city1"/> + <Track from="side0" gauge="normal" to="city2"/> + <Track from="side1" gauge="normal" to="city2"/> + </Tile><Tile colour="green" id="8862" name="8862"> + <Station id="city1" position="452" slots="1" type="City" value="40"/> + <Station id="city2" position="052" slots="1" type="City" value="40"/> + <Track from="side0" gauge="normal" to="city2"/> + <Track from="side5" gauge="normal" to="city2"/> + <Track from="side4" gauge="normal" to="city1"/> + <Track from="side3" gauge="normal" to="city1"/> + </Tile><Tile colour="green" id="8863" name="8863"> + <Station id="city1" position="0" slots="1" type="City" value="40"/> + <Station id="city2" position="552" slots="1" type="City" value="40"/> + <Track from="side0" gauge="normal" to="city1"/> + <Track from="side3" gauge="normal" to="city1"/> + <Track from="side4" gauge="normal" to="city2"/> + <Track from="city2" gauge="normal" to="side5"/> + </Tile><Tile colour="green" id="8864" name="8864"> + <Station id="city1" position="308" slots="1" type="City" value="40"/> + <Station id="city2" position="152" slots="1" type="City" value="40"/> + <Track from="side0" gauge="normal" to="city2"/> + <Track from="city2" gauge="normal" to="side1"/> + <Track from="side3" gauge="normal" to="city1"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile><Tile colour="green" id="8865" name="8865"> + <Station id="city1" position="252" slots="1" type="City" value="40"/> + <Station id="city2" position="551" slots="1" type="City" value="40"/> + <Track from="side1" gauge="normal" to="city1"/> + <Track from="side5" gauge="normal" to="city2"/> + <Track from="city2" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side2"/> + </Tile><Tile colour="green" id="8866" name="8866"> + <Station id="city1" position="0" type="Town" value="20"/> + <Track from="side3" gauge="normal" to="city1"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile><Tile colour="green" id="887" name="887"> + <Station id="city1" position="0" type="Town" value="20"/> + <Track from="side0" gauge="normal" to="city1"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side1"/> + </Tile><Tile colour="green" id="888" name="888"> + <Station id="city1" position="0" type="Town" value="20"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile><Tile colour="brown" id="63" name="63"> + <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"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile><Tile colour="brown" id="611" name="611"> + <Station id="city1" position="0" slots="2" type="City" value="40"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile><Tile colour="brown" id="8871" name="8871"> + <Station id="city1" position="0" type="Town" value="20"/> + <Track from="side4" gauge="normal" to="city1"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile><Tile colour="brown" id="8872" name="8872"> + <Station id="city1" position="0" slots="2" type="City" value="50"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side2"/> + </Tile><Tile colour="brown" id="8873" name="8873"> + <Station id="city1" position="0" slots="2" type="City" value="50"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side2"/> + </Tile><Tile colour="brown" id="8874" name="8874"> + <Station id="city1" position="0" slots="2" type="City" value="50"/> + <Track from="side0" gauge="normal" to="city1"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side4"/> + </Tile><Tile colour="brown" id="8879" name="8879"> + <Station id="city1" position="0" slots="2" type="City" value="60"/> + <Track from="city1" gauge="normal" to="city1"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="side4" gauge="normal" to="city1"/> + </Tile><Tile colour="brown" id="8887" name="8887"> + <Station id="city1" position="403" slots="1" type="City" value="60"/> + <Station id="city2" position="303" slots="1" type="City" value="60"/> + <Station id="city3" position="203" slots="1" type="City" value="60"/> + <Station id="city4" position="103" slots="1" type="City" value="60"/> + <Station id="city5" position="003" slots="1" type="City" value="60"/> + <Station id="city6" position="503" slots="1" type="City" value="60"/> + <Track from="city6" gauge="normal" to="side5"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city2" gauge="normal" to="side3"/> + <Track from="city3" gauge="normal" to="side2"/> + <Track from="city4" gauge="normal" to="side1"/> + <Track from="city5" gauge="normal" to="side0"/> + </Tile><Tile colour="gray" id="455" name="495"> + <Station id="city1" position="0" slots="3" type="City" value="50"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side2"/> + </Tile><Tile colour="gray" id="895" name="895"> + <Station id="city1" position="0" slots="2" type="City" value="50"/> + <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"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile><Tile colour="gray" id="8875" name="8875"> + <Station id="city1" position="0" slots="2" type="City" value="60"/> + <Track from="side0" gauge="normal" to="city1"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile><Tile colour="gray" id="8880" name="8880"> + <Station id="city1" position="0" slots="2" type="City" value="70"/> + <Track from="side0" gauge="normal" to="city1"/> + <Track from="side0" gauge="normal" to="city1"/> + <Track from="side0" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile><Tile colour="gray" id="8888" name="Beijing"> + <Station id="city1" position="403" slots="1" type="City" value="80"/> + <Station id="city2" position="303" slots="1" type="City" value="80"/> + <Station id="city3" position="203" slots="1" type="City" value="80"/> + <Station id="city4" position="103" slots="1" type="City" value="80"/> + <Station id="city5" position="003" slots="1" type="City" value="80"/> + <Station id="city6" position="503" slots="1" type="City" value="80"/> + <Track from="city3" gauge="normal" to="side2"/> + <Track from="city4" gauge="normal" to="side1"/> + <Track from="city5" gauge="normal" to="side0"/> + <Track from="city6" gauge="normal" to="side5"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city2" gauge="normal" to="side3"/> + <Track from="city2" gauge="normal" to="side2"/> + <Track from="city2" gauge="normal" to="side1"/> + <Track from="city2" gauge="normal" to="side0"/> + <Track from="city2" gauge="normal" to="side5"/> + <Track from="city2" gauge="normal" to="side4"/> + <Track from="city3" gauge="normal" to="side1"/> + <Track from="city3" gauge="normal" to="side0"/> + <Track from="city3" gauge="normal" to="side5"/> + <Track from="city3" gauge="normal" to="side4"/> + <Track from="city3" gauge="normal" to="side4"/> + <Track from="city3" gauge="normal" to="side3"/> + <Track from="city4" gauge="normal" to="side2"/> + <Track from="city4" gauge="normal" to="side0"/> + <Track from="city4" gauge="normal" to="side5"/> + <Track from="city4" gauge="normal" to="side4"/> + <Track from="city4" gauge="normal" to="side3"/> + <Track from="city5" gauge="normal" to="side1"/> + <Track from="city5" gauge="normal" to="side2"/> + <Track from="city5" gauge="normal" to="side3"/> + <Track from="city5" gauge="normal" to="side4"/> + <Track from="city5" gauge="normal" to="side5"/> + <Track from="city6" gauge="normal" to="side4"/> + <Track from="city6" gauge="normal" to="side3"/> + <Track from="city6" gauge="normal" to="side2"/> + <Track from="city6" gauge="normal" to="side1"/> + <Track from="city6" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile></Tiles> \ No newline at end of file Property changes on: trunk/18xx/data/1880/Tiles.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/18xx/data/GamesList.xml =================================================================== --- trunk/18xx/data/GamesList.xml 2011-04-10 18:59:13 UTC (rev 1515) +++ trunk/18xx/data/GamesList.xml 2011-04-13 20:24:27 UTC (rev 1516) @@ -279,6 +279,15 @@ <Description>18TN</Description> <Players minimum="3" maximum="5"/> </Game> + <Game name="1880"> + <Note>Prototype</Note> + <Description>1880 - China + (c) 2010 Double O Games Mayfair Games, Inc. + Designed by Leonhard Ogler and Helmut Ohley + Limitations: + All aspects not present in 1880 have not been implemented yet.</Description> + <Players minimum="3" maximum="7"/> + </Game> <Credits>Rails is a computer implementation of a number of railroad board games, Added: trunk/18xx/rails/game/specific/_1880/OperatingRound_1880.java =================================================================== --- trunk/18xx/rails/game/specific/_1880/OperatingRound_1880.java (rev 0) +++ trunk/18xx/rails/game/specific/_1880/OperatingRound_1880.java 2011-04-13 20:24:27 UTC (rev 1516) @@ -0,0 +1,23 @@ +/** + * + */ +package rails.game.specific._1880; + +import rails.game.GameManagerI; +import rails.game.OperatingRound; + +/** + * @author Martin + * + */ +public class OperatingRound_1880 extends OperatingRound { + + /** + * @param gameManager + */ + public OperatingRound_1880(GameManagerI gameManager) { + super(gameManager); + // TODO Auto-generated constructor stub + } + +} Property changes on: trunk/18xx/rails/game/specific/_1880/OperatingRound_1880.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/18xx/rails/game/specific/_1880/PublicCompany_1880.java =================================================================== --- trunk/18xx/rails/game/specific/_1880/PublicCompany_1880.java (rev 0) +++ trunk/18xx/rails/game/specific/_1880/PublicCompany_1880.java 2011-04-13 20:24:27 UTC (rev 1516) @@ -0,0 +1,23 @@ +/** + * + */ +package rails.game.specific._1880; + +import rails.game.*; +import rails.game.state.IntegerState; + +/** + * @author Martin + * + */ +public class PublicCompany_1880 extends PublicCompany { + + /** + * + */ + + + + + +} Property changes on: trunk/18xx/rails/game/specific/_1880/PublicCompany_1880.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/18xx/rails/game/specific/_1880/StockRound_1880.java =================================================================== --- trunk/18xx/rails/game/specific/_1880/StockRound_1880.java (rev 0) +++ trunk/18xx/rails/game/specific/_1880/StockRound_1880.java 2011-04-13 20:24:27 UTC (rev 1516) @@ -0,0 +1,57 @@ +/** + * This class implements the 1880 rules for making new companies + * being available in the IPO after buying shares of another company. + */ +package rails.game.specific._1880; + +import java.util.ArrayList; +import java.util.List; + +import rails.game.*; +import rails.game.action.BuyCertificate; +import rails.util.LocalText; + +public class StockRound_1880 extends StockRound { + + /** + * Constructor with the GameManager, will call super class (StockRound's) Constructor to initialize + * + * @param aGameManager The GameManager Object needed to initialize the Stock Round + * + */ + public StockRound_1880 (GameManagerI aGameManager) { + super (aGameManager); + } + + + @Override + // The sell-in-same-turn-at-decreasing-price option does not apply here + protected int getCurrentSellPrice (PublicCompanyI company) { + + String companyName = company.getName(); + int price; + + if (sellPrices.containsKey(companyName)) { + price = (sellPrices.get(companyName)).getPrice(); + } else { + price = company.getCurrentSpace().getPrice(); + } + // stored price is the previous unadjusted price + price = price / company.getShareUnitsForSharePrice(); + // Price adjusted by -5 per share for selling + price = price -5; + return price; + } + + /** Share price goes down 1 space for any number of shares sold. + */ + @Override + protected void adjustSharePrice (PublicCompanyI company, int numberSold, boolean soldBefore) { + // No more changes if it has already dropped + if (!soldBefore) { + super.adjustSharePrice (company, 1, soldBefore); + } + } +} + + \ No newline at end of file Property changes on: trunk/18xx/rails/game/specific/_1880/StockRound_1880.java ___________________________________________________________________ Added: svn:mime-type + text/plain Property changes on: trunk/18xx/tiles ___________________________________________________________________ Modified: svn:ignore - Copy of TileDictionary.18t handmade TDwithID TDwoID xml tileimages.xml Copy (2) of TileDictionary.18t Copy (3) of TileDictionary.18t Rails18xx.ini UserGridStyle.ini UserTileStyle.ini *.exe o TDindex.pl TDindex.txt TileDictionary - kopie.xml + Copy of TileDictionary.18t handmade TDwithID TDwoID xml tileimages.xml Copy (2) of TileDictionary.18t Copy (3) of TileDictionary.18t Rails18xx.ini UserGridStyle.ini UserTileStyle.ini *.exe o TDindex.pl TDindex.txt TileDictionary - kopie.xml TileDictionary - kopie.18t Modified: trunk/18xx/tiles/TileDictionary.18t =================================================================== (Binary files differ) Modified: trunk/18xx/tiles/TileDictionary.xml =================================================================== --- trunk/18xx/tiles/TileDictionary.xml 2011-04-10 18:59:13 UTC (rev 1515) +++ trunk/18xx/tiles/TileDictionary.xml 2011-04-13 20:24:27 UTC (rev 1516) @@ -10997,408 +10997,6 @@ </connections> </tile> <tile> - <ID>391</ID> - <shape>tsHexagon</shape> - <level>tlYellow</level> - <name>391</name> - <category> - <value>Atl</value> - <position>tp3SideB</position> - </category> - <junctions> - <junction> - <junType>jtCity</junType> - <position>tp2SideC</position> - <revenue> - <value>30</value> - <position>tp3SideF</position> - </revenue> - </junction> - <junction> - <junType>jtCity</junType> - <position>tp2SideA</position> - <revenue> - <value>30</value> - <position>tp3SideF</position> - </revenue> - </junction> - <junction> - <junType>jtCity</junType> - <position>tp2SideE</position> - <revenue> - <value>30</value> - <position>tp3SideF</position> - </revenue> - </junction> - </junctions> - <connections> - <connection> - <conType>ctNormal</conType> - <position1>tp2SideC</position1> - <position2>tp4SideC</position2> - </connection> - <connection> - <conType>ctNormal</conType> - <position1>tp2SideA</position1> - <position2>tp4SideA</position2> - </connection> - <connection> - <conType>ctNormal</conType> - <position1>tp2SideE</position1> - <position2>tp4SideE</position2> - </connection> - </connections> - </tile> - <tile> - <ID>392</ID> - <shape>tsHexagon</shape> - <level>tlGreen</level> - <name>392</name> - <category> - <value>Sav</value> - <position>tp3CornerF</position> - </category> - <junctions> - <junction> - <junType>jtDoubleCity</junType> - <position>tpCenter</position> - <revenue> - <value>30</value> - <position>tp3CornerA</position> - </revenue> - </junction> - </junctions> - <connections> - <connection> - <conType>ctNormal</conType> - <position1>tpCenter</position1> - <position2>tp4SideB</position2> - </connection> - <connection> - <conType>ctNormal</conType> - <position1>tpCenter</position1> - <position2>tp4SideC</position2> - </connection> - <connection> - <conType>ctNormal</conType> - <position1>tpCenter</position1> - <position2>tp4SideD</position2> - </connection> - </connections> - </tile> - <tile> - <ID>393</ID> - <shape>tsHexagon</shape> - <level>tlGreen</level> - <name>393</name> - <category> - <value>Aug</value> - <position>tp3CornerF</position> - </category> - <junctions> - <junction> - <junType>jtDoubleCity</junType> - <position>tpCenter</position> - <revenue> - <value>30</value> - <position>tp3CornerA</position> - </revenue> - </junction> - </junctions> - <connections> - <connection> - <conType>ctNormal</conType> - <position1>tpCenter</position1> - <position2>tp4SideF</position2> - </connection> - <connection> - <conType>ctNormal</conType> - <position1>tpCenter</position1> - <position2>tp4SideC</position2> - </connection> - <connection> - <conType>ctNormal</conType> - <position1>tpCenter</position1> - <position2>tp4SideD</position2> - </connection> - <connection> - <conType>ctNormal</conType> - <position1>tpCenter</position1> - <position2>tp4SideE</position2> - </connection> - </connections> - </tile> - <tile> - <ID>394</ID> - <shape>tsHexagon</shape> - <level>tlGreen</level> - <name>394</name> - <category> - <value>Atl</value> - <position>tp3CornerF</position> - </category> - <junctions> - <j... [truncated message content] |
From: <ev...@us...> - 2011-04-10 18:59:20
|
Revision: 1515 http://rails.svn.sourceforge.net/rails/?rev=1515&view=rev Author: evos Date: 2011-04-10 18:59:13 +0000 (Sun, 10 Apr 2011) Log Message: ----------- Code cleanups only Modified Paths: -------------- trunk/18xx/rails/algorithms/NetworkGraphBuilder.java trunk/18xx/rails/algorithms/NetworkVertex.java trunk/18xx/rails/algorithms/RevenueBonusTemplate.java trunk/18xx/rails/algorithms/RevenueCalculatorMulti.java trunk/18xx/rails/algorithms/RevenueTrainRun.java trunk/18xx/rails/common/GuiHints.java trunk/18xx/rails/game/MapManager.java trunk/18xx/rails/game/StartRound_1830.java trunk/18xx/rails/game/Tile.java trunk/18xx/rails/game/action/SetDividend.java trunk/18xx/rails/game/specific/_1825/ScoreTileOnlyOnceModifier.java trunk/18xx/rails/game/specific/_1825/StockRound_1825.java trunk/18xx/rails/game/specific/_1835/PrussianFormationRound.java trunk/18xx/rails/game/specific/_1856/ShareSellingRound_1856.java trunk/18xx/rails/game/specific/_18AL/NamedTrainRevenueModifier.java trunk/18xx/rails/game/state/EnumState.java trunk/18xx/rails/ui/swing/GameSetupWindow.java trunk/18xx/rails/ui/swing/MessagePanel.java trunk/18xx/rails/ui/swing/ORPanel.java trunk/18xx/rails/ui/swing/UpgradesPanel.java trunk/18xx/rails/ui/swing/gamespecific/_1856/StatusWindow_1856.java trunk/18xx/rails/ui/swing/hexmap/GUIHex.java trunk/18xx/rails/util/ConvertTilesXML.java trunk/18xx/test/TestGameBuilder.java trunk/18xx/tools/ConvertTilesXML.java Modified: trunk/18xx/rails/algorithms/NetworkGraphBuilder.java =================================================================== --- trunk/18xx/rails/algorithms/NetworkGraphBuilder.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/algorithms/NetworkGraphBuilder.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -5,7 +5,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -20,15 +19,12 @@ import org.jgrapht.Graph; import org.jgrapht.Graphs; import org.jgrapht.ext.JGraphModelAdapter; -import org.jgrapht.graph.Multigraph; import org.jgrapht.graph.SimpleGraph; -import org.jgrapht.graph.Subgraph; import com.jgraph.layout.JGraphFacade; import com.jgraph.layout.JGraphLayout; import com.jgraph.layout.organic.JGraphFastOrganicLayout; -import rails.algorithms.NetworkEdge.MergeResult; import rails.game.BaseToken; import rails.game.City; import rails.game.GameManagerI; @@ -326,7 +322,6 @@ layout.run(facade); facade.scale(new Rectangle(1600,1200)); - @SuppressWarnings("unchecked") Map nested = facade.createNestedMap(true,true); jgraph.getGraphLayoutCache().edit(nested); Modified: trunk/18xx/rails/algorithms/NetworkVertex.java =================================================================== --- trunk/18xx/rails/algorithms/NetworkVertex.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/algorithms/NetworkVertex.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -2,7 +2,6 @@ import java.awt.Rectangle; import java.awt.geom.Point2D; -import java.awt.geom.Rectangle2D; import java.util.ArrayList; import java.util.Collection; import java.util.Comparator; Modified: trunk/18xx/rails/algorithms/RevenueBonusTemplate.java =================================================================== --- trunk/18xx/rails/algorithms/RevenueBonusTemplate.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/algorithms/RevenueBonusTemplate.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -13,7 +13,6 @@ import rails.game.PhaseManager; import rails.game.TrainManager; import rails.game.TrainTypeI; -import rails.util.LocalText; import rails.util.Tag; /** Modified: trunk/18xx/rails/algorithms/RevenueCalculatorMulti.java =================================================================== --- trunk/18xx/rails/algorithms/RevenueCalculatorMulti.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/algorithms/RevenueCalculatorMulti.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -1,6 +1,5 @@ package rails.algorithms; -import rails.algorithms.RevenueCalculator.Terminated; final class RevenueCalculatorMulti extends RevenueCalculator { Modified: trunk/18xx/rails/algorithms/RevenueTrainRun.java =================================================================== --- trunk/18xx/rails/algorithms/RevenueTrainRun.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/algorithms/RevenueTrainRun.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -3,15 +3,12 @@ import java.awt.geom.GeneralPath; import java.awt.geom.Point2D; import java.util.ArrayList; -import java.util.Comparator; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; import org.apache.log4j.Logger; -import org.jgrapht.GraphPath; -import org.jgrapht.Graphs; import rails.algorithms.NetworkVertex.StationType; import rails.algorithms.NetworkVertex.VertexType; Modified: trunk/18xx/rails/common/GuiHints.java =================================================================== --- trunk/18xx/rails/common/GuiHints.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/common/GuiHints.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; -import rails.game.GameDef; import rails.game.RoundI; import rails.game.move.StateChange; import rails.game.state.EnumState; Modified: trunk/18xx/rails/game/MapManager.java =================================================================== --- trunk/18xx/rails/game/MapManager.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/game/MapManager.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -115,7 +115,7 @@ public void finishConfiguration (GameManagerI gameManager) throws ConfigurationException { MapHex hex; - int i, j, k, dx, dy; + int i, j, k; MapHex nb; for (String hexName : mHexes.keySet()) { Modified: trunk/18xx/rails/game/StartRound_1830.java =================================================================== --- trunk/18xx/rails/game/StartRound_1830.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/game/StartRound_1830.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -360,6 +360,7 @@ } } else if (auctionItem != null) { + // TODO Now dead code - should it be reactivated? setNextBiddingPlayer(auctionItem); } else { setNextPlayer(); Modified: trunk/18xx/rails/game/Tile.java =================================================================== --- trunk/18xx/rails/game/Tile.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/game/Tile.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -32,7 +32,6 @@ private final List<Upgrade> upgrades = new ArrayList<Upgrade>(); // Contains // Upgrade instances //private String upgradesString = ""; - @SuppressWarnings("unchecked") private final List[] tracksPerSide = new ArrayList[6]; // N.B. Cannot parametrise collection array private Map<Integer, List<Track>> tracksPerStation = null; Modified: trunk/18xx/rails/game/action/SetDividend.java =================================================================== --- trunk/18xx/rails/game/action/SetDividend.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/game/action/SetDividend.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -195,7 +195,6 @@ } /** Deserialize */ - @SuppressWarnings("unchecked") private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { Modified: trunk/18xx/rails/game/specific/_1825/ScoreTileOnlyOnceModifier.java =================================================================== --- trunk/18xx/rails/game/specific/_1825/ScoreTileOnlyOnceModifier.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/game/specific/_1825/ScoreTileOnlyOnceModifier.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -1,7 +1,6 @@ package rails.game.specific._1825; import java.util.ArrayList; -import java.util.Map; import java.util.HashMap; import java.util.List; Modified: trunk/18xx/rails/game/specific/_1825/StockRound_1825.java =================================================================== --- trunk/18xx/rails/game/specific/_1825/StockRound_1825.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/game/specific/_1825/StockRound_1825.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -87,8 +87,7 @@ String compName; int price; int number; - int share, maxShareToSell; - boolean dumpAllowed; + int maxShareToSell; Portfolio playerPortfolio = currentPlayer.getPortfolio(); /* @@ -100,7 +99,7 @@ // Check if shares of this company can be sold at all if (!mayPlayerSellShareOfCompany(company)) continue; - share = maxShareToSell = playerPortfolio.getShare(company); + maxShareToSell = playerPortfolio.getShare(company); if (maxShareToSell == 0) continue; /* May not sell more than the Pool can accept */ Modified: trunk/18xx/rails/game/specific/_1835/PrussianFormationRound.java =================================================================== --- trunk/18xx/rails/game/specific/_1835/PrussianFormationRound.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/game/specific/_1835/PrussianFormationRound.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -279,6 +279,7 @@ break; } + // This is now dead code, but won't be when some sensible validations exist if (errMsg != null) { DisplayBuffer.add(LocalText.getText("CannotMerge", action.getFoldedCompanyNames(), Modified: trunk/18xx/rails/game/specific/_1856/ShareSellingRound_1856.java =================================================================== --- trunk/18xx/rails/game/specific/_1856/ShareSellingRound_1856.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/game/specific/_1856/ShareSellingRound_1856.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -1,9 +1,7 @@ package rails.game.specific._1856; import rails.game.*; -import rails.game.action.BuyCertificate; import rails.game.state.IntegerState; -import rails.util.LocalText; /** Needed to copy behaviour on share selling from StockRound_1856. */ public class ShareSellingRound_1856 extends ShareSellingRound { Modified: trunk/18xx/rails/game/specific/_18AL/NamedTrainRevenueModifier.java =================================================================== --- trunk/18xx/rails/game/specific/_18AL/NamedTrainRevenueModifier.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/game/specific/_18AL/NamedTrainRevenueModifier.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -1,9 +1,7 @@ package rails.game.specific._18AL; import java.util.ArrayList; -import java.util.Collection; import java.util.List; -import java.util.Set; import rails.algorithms.NetworkTrain; import rails.algorithms.NetworkVertex; Modified: trunk/18xx/rails/game/state/EnumState.java =================================================================== --- trunk/18xx/rails/game/state/EnumState.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/game/state/EnumState.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -7,6 +7,7 @@ super (name, object); } + @SuppressWarnings("unchecked") public E value() { return (E)object; } Modified: trunk/18xx/rails/ui/swing/GameSetupWindow.java =================================================================== --- trunk/18xx/rails/ui/swing/GameSetupWindow.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/ui/swing/GameSetupWindow.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -4,7 +4,6 @@ import java.awt.*; import java.awt.event.*; import java.io.File; -import java.io.IOException; import java.util.*; import java.util.List; @@ -261,7 +260,6 @@ } } else if (arg0.getSource().equals(recentButton)) { File saveDirectory = new File(Config.get("save.directory")); - if (saveDirectory == null) return; recentFiles = new TreeSet<File>(new Comparator<File> (){ public int compare (File a, File b) { Modified: trunk/18xx/rails/ui/swing/MessagePanel.java =================================================================== --- trunk/18xx/rails/ui/swing/MessagePanel.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/ui/swing/MessagePanel.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -74,7 +74,7 @@ } // display String text = messageText.toString(); - int lines = text.split("<[Bb][Rr]>").length + 1; + //int lines = text.split("<[Bb][Rr]>").length + 1; // setLines(lines); message.setText("<html><center>" + text + "</center></html>"); Modified: trunk/18xx/rails/ui/swing/ORPanel.java =================================================================== --- trunk/18xx/rails/ui/swing/ORPanel.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/ui/swing/ORPanel.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -10,7 +10,6 @@ import org.apache.log4j.Logger; -import org.jgrapht.graph.Multigraph; import org.jgrapht.graph.SimpleGraph; import rails.algorithms.*; Modified: trunk/18xx/rails/ui/swing/UpgradesPanel.java =================================================================== --- trunk/18xx/rails/ui/swing/UpgradesPanel.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/ui/swing/UpgradesPanel.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -475,11 +475,6 @@ this.token = token; } - // NOTE: NOT USED - TokenI getToken() { - return token; - } - } /** JLabel extension to allow attaching the internal hex ID */ Modified: trunk/18xx/rails/ui/swing/gamespecific/_1856/StatusWindow_1856.java =================================================================== --- trunk/18xx/rails/ui/swing/gamespecific/_1856/StatusWindow_1856.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/ui/swing/gamespecific/_1856/StatusWindow_1856.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -1,6 +1,5 @@ package rails.ui.swing.gamespecific._1856; -import javax.swing.JDialog; import javax.swing.WindowConstants; import rails.game.*; Modified: trunk/18xx/rails/ui/swing/hexmap/GUIHex.java =================================================================== --- trunk/18xx/rails/ui/swing/hexmap/GUIHex.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/ui/swing/hexmap/GUIHex.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -71,14 +71,6 @@ protected String toolTip = ""; - /** - * Stores the neighbouring views. This parallels the neighors field in - * MapHex, just on the view side. - * - * @todo check if we can avoid this - */ - private GUIHex[] neighbors = new GUIHex[6]; - // GUI variables double[] xVertex = new double[6]; double[] yVertex = new double[6]; Modified: trunk/18xx/rails/util/ConvertTilesXML.java =================================================================== --- trunk/18xx/rails/util/ConvertTilesXML.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/rails/util/ConvertTilesXML.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -349,11 +349,6 @@ outputJunction.setAttribute("slots", station[1]); } - // String[] p = (String[]) ((String[]) stationMap.get(type)).clone(); - if (station == null) { - throw new ConfigurationException("Unknown junction type: " + type); - } - // Junction revenue Element revenue = (Element) inputJunction.getElementsByTagName("revenue").item(0); Modified: trunk/18xx/test/TestGameBuilder.java =================================================================== --- trunk/18xx/test/TestGameBuilder.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/test/TestGameBuilder.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -1,7 +1,6 @@ package test; import java.io.File; -import java.io.FilenameFilter; import java.io.IOException; import java.io.PrintWriter; import java.util.Arrays; Modified: trunk/18xx/tools/ConvertTilesXML.java =================================================================== --- trunk/18xx/tools/ConvertTilesXML.java 2011-04-06 22:13:54 UTC (rev 1514) +++ trunk/18xx/tools/ConvertTilesXML.java 2011-04-10 18:59:13 UTC (rev 1515) @@ -330,11 +330,6 @@ outputJunction.setAttribute("slots", station[1]); } - // String[] p = (String[]) ((String[]) stationMap.get(type)).clone(); - if (station == null) { - throw new ConfigurationException("Unknown junction type: " + type); - } - // Junction revenue Element revenue = (Element) inputJunction.getElementsByTagName("revenue").item(0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ev...@us...> - 2011-04-06 22:14:00
|
Revision: 1514 http://rails.svn.sourceforge.net/rails/?rev=1514&view=rev Author: evos Date: 2011-04-06 22:13:54 +0000 (Wed, 06 Apr 2011) Log Message: ----------- AutoSave/Load improvements for the OR Window Modified Paths: -------------- trunk/18xx/rails/ui/swing/GameUIManager.java trunk/18xx/rails/ui/swing/ORPanel.java trunk/18xx/rails/ui/swing/ORUIManager.java Modified: trunk/18xx/rails/ui/swing/GameUIManager.java =================================================================== --- trunk/18xx/rails/ui/swing/GameUIManager.java 2011-04-06 22:12:31 UTC (rev 1513) +++ trunk/18xx/rails/ui/swing/GameUIManager.java 2011-04-06 22:13:54 UTC (rev 1514) @@ -711,6 +711,11 @@ log.debug("Autosaving to "+lastSavedFilename); processOnServer (saveAction); + saveAutoSavedFilename (lastSavedFilename); + } + + protected void saveAutoSavedFilename (String lastSavedFilename) { + try { File f = new File (lastSavedFilenameFilepath); PrintWriter out = new PrintWriter (new FileWriter (f)); @@ -909,6 +914,7 @@ if (gameWasLoaded) { autoSaveLoadInitialized = true; lastSavedFilenameFilepath = saveDirectory + "/" + savePrefix + ".last_rails"; + saveAutoSavedFilename (lastSavedFilename); } if (autoLoadPoller != null && autoSaveLoadStatus != AutoLoadPoller.OFF Modified: trunk/18xx/rails/ui/swing/ORPanel.java =================================================================== --- trunk/18xx/rails/ui/swing/ORPanel.java 2011-04-06 22:12:31 UTC (rev 1513) +++ trunk/18xx/rails/ui/swing/ORPanel.java 2011-04-06 22:13:54 UTC (rev 1514) @@ -746,6 +746,8 @@ ((ActionMenuItem)item).clearPossibleActions(); } } + undoButton.setEnabled(false); + } public void resetORCompanyTurn(int orCompIndex) { Modified: trunk/18xx/rails/ui/swing/ORUIManager.java =================================================================== --- trunk/18xx/rails/ui/swing/ORUIManager.java 2011-04-06 22:12:31 UTC (rev 1513) +++ trunk/18xx/rails/ui/swing/ORUIManager.java 2011-04-06 22:13:54 UTC (rev 1514) @@ -1457,8 +1457,6 @@ messagePanel.setMessage(null); - if (!myTurn) return; - if (actionToComplete != null) { log.debug("ExecutedAction: " + actionToComplete); } @@ -1480,6 +1478,8 @@ orPanel.initORCompanyTurn(orComp, orCompIndex); + if (!myTurn) return; + privatesCanBeBoughtNow = possibleActions.contains(BuyPrivate.class); orPanel.initPrivateBuying(privatesCanBeBoughtNow); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ev...@us...> - 2011-04-06 22:12:37
|
Revision: 1513 http://rails.svn.sourceforge.net/rails/?rev=1513&view=rev Author: evos Date: 2011-04-06 22:12:31 +0000 (Wed, 06 Apr 2011) Log Message: ----------- Fix: all 1830 variants had got obsoleting trains instead of just Coalfields Modified Paths: -------------- trunk/18xx/data/1830/Game.xml Modified: trunk/18xx/data/1830/Game.xml =================================================================== --- trunk/18xx/data/1830/Game.xml 2011-04-03 21:23:54 UTC (rev 1512) +++ trunk/18xx/data/1830/Game.xml 2011-04-06 22:12:31 UTC (rev 1513) @@ -99,12 +99,20 @@ cities="double" if city-revenue is doubled (e.g. 1826 TGV). --> </Defaults> - <Train name="2" majorStops="2" cost="80" amount="6" obsoleting="yes"/> - <Train name="3" majorStops="3" cost="180" amount="5" obsoleting="yes" startPhase="3"/> - <Train name="4" majorStops="4" cost="300" amount="4" obsoleting="yes" startPhase="4" + <Train name="2" majorStops="2" cost="80" amount="6"> + <IfOption name="Variant" value="Coalfields"> + <Attributes obsoleting="yes"/> + </IfOption> + </Train> + <Train name="3" majorStops="3" cost="180" amount="5" startPhase="3"> + <IfOption name="Variant" value="Coalfields"> + <Attributes obsoleting="yes"/> + </IfOption> + </Train> + <Train name="4" majorStops="4" cost="300" amount="4" startPhase="4" rustedTrain="2"> <IfOption name="Variant" value="Coalfields"> - <Attributes amount="5"/> + <Attributes obsoleting="yes" amount="5"/> </IfOption> </Train> <Train name="5" majorStops="5" cost="450" amount="3" startPhase="5"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ev...@us...> - 2011-04-03 21:24:00
|
Revision: 1512 http://rails.svn.sourceforge.net/rails/?rev=1512&view=rev Author: evos Date: 2011-04-03 21:23:54 +0000 (Sun, 03 Apr 2011) Log Message: ----------- 18TN fix to Tiles.xml Modified Paths: -------------- trunk/18xx/data/18TN/Tiles.xml Modified: trunk/18xx/data/18TN/Tiles.xml =================================================================== --- trunk/18xx/data/18TN/Tiles.xml 2011-04-03 19:35:37 UTC (rev 1511) +++ trunk/18xx/data/18TN/Tiles.xml 2011-04-03 21:23:54 UTC (rev 1512) @@ -2,11 +2,16 @@ <Station id="city1" position="002" type="Town"/> </Tile><Tile colour="white" id="-10" name="1 city"> <Station id="city1" position="302" slots="1" type="City"/> - </Tile><Tile colour="fixed" id="-143" name="-143"> - <Station id="city1" position="0" type="Town" value="10"/> + </Tile><Tile colour="fixed" id="-10001" name="TNLouisville"> + <Station id="city1" position="501" slots="1" type="City" value="30"/> + <Track from="side1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side3"/> + </Tile><Tile colour="fixed" id="-1143" name="Bham1851"> + <Station id="city1" position="0" type="Town"/> + <Track from="side5" gauge="normal" to="city1"/> <Track from="city1" gauge="normal" to="side0"/> <Track from="city1" gauge="normal" to="side1"/> - <Track from="city1" gauge="normal" to="side2"/> </Tile><Tile colour="red" id="-902" name="OM 2 way"> <Station id="city1" position="0" type="OffMapCity" value="-1"/> <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-04-03 19:35:43
|
Revision: 1511 http://rails.svn.sourceforge.net/rails/?rev=1511&view=rev Author: evos Date: 2011-04-03 19:35:37 +0000 (Sun, 03 Apr 2011) Log Message: ----------- Property Changed: ---------------- trunk/18xx/ trunk/18xx/tiles/ Property changes on: trunk/18xx ___________________________________________________________________ Modified: svn:ignore - *.bat *.txt .cvsignore .classpath .externalToolBuilders 18xx.zip deploy.xml .project zip.xml NewUIstuff.zip COMP.WPS rails.jar rails.jardesc Rails-1.0.1.jar my_my.properties log rails-1.0.1.jar rails*.zip rails-*.jar tools rails-?.*.* jar/* classes/* 18xx_autosave.rails 18xx_autosave.rails.tmp user.profiles o + *.bat *.txt .cvsignore .classpath .externalToolBuilders 18xx.zip deploy.xml .project zip.xml NewUIstuff.zip COMP.WPS rails.jar rails.jardesc Rails-1.0.1.jar my_my.properties log rails-1.0.1.jar rails*.zip rails-*.jar tools rails-?.*.* jar/* classes/* 18xx_autosave.rails 18xx_autosave.rails.tmp user.profiles o C.properties A.properties B.properties Property changes on: trunk/18xx/tiles ___________________________________________________________________ Modified: svn:ignore - Copy of TileDictionary.18t handmade TDwithID TDwoID xml tileimages.xml Copy (2) of TileDictionary.18t Copy (3) of TileDictionary.18t Rails18xx.ini UserGridStyle.ini UserTileStyle.ini *.exe o TDindex.pl TDindex.txt + Copy of TileDictionary.18t handmade TDwithID TDwoID xml tileimages.xml Copy (2) of TileDictionary.18t Copy (3) of TileDictionary.18t Rails18xx.ini UserGridStyle.ini UserTileStyle.ini *.exe o TDindex.pl TDindex.txt TileDictionary - kopie.xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ev...@us...> - 2011-04-03 19:34:12
|
Revision: 1510 http://rails.svn.sourceforge.net/rails/?rev=1510&view=rev Author: evos Date: 2011-04-03 19:34:06 +0000 (Sun, 03 Apr 2011) Log Message: ----------- 18TN Initial commit. Modified Paths: -------------- trunk/18xx/data/18TN/Map.xml trunk/18xx/data/18TN/TileSet.xml trunk/18xx/tiles/CombineTiles.pl trunk/18xx/tiles/TileDictionary.18t trunk/18xx/tiles/TileDictionary.xml trunk/18xx/tiles/Tiles.xml Added Paths: ----------- trunk/18xx/tiles/svg/tile-10001.svg Modified: trunk/18xx/data/18TN/Map.xml =================================================================== --- trunk/18xx/data/18TN/Map.xml 2011-04-03 11:57:06 UTC (rev 1509) +++ trunk/18xx/data/18TN/Map.xml 2011-04-03 19:34:06 UTC (rev 1510) @@ -2,7 +2,7 @@ letterOrientation="vertical" even="A"> <Hex name="A16" tile="-902" city="Cincinnati" orientation="1" value="50,80"/> -<Hex name="B13" tile="-10" city="Louisville"/> +<Hex name="B13" tile="-10001" city="Louisville"/> <Hex name="B15" tile="0" cost="60" /> <Hex name="B17" tile="-10" city="Lexington"/> <Hex name="C4" tile="-902" city="Saint Louis" value="40,60"/> @@ -68,7 +68,7 @@ <Hex name="I14" tile="0" cost="60" /> <Hex name="I16" tile="0" cost="60" /> <Hex name="J5" tile="-902" city="Gulf Coast" orientation="4" value="30,50"/> -<Hex name="J11" tile="-143" city="Birmingham" orientation="5" value="30,40"/> +<Hex name="J11" tile="-1143" city="Birmingham" value="30,40"/> <Hex name="J13" tile="0" cost="60" /> <Hex name="J15" tile="0" /> <Hex name="J17" tile="-902" city="Atlanta" orientation="3" value="40,60"/> Modified: trunk/18xx/data/18TN/TileSet.xml =================================================================== --- trunk/18xx/data/18TN/TileSet.xml 2011-04-03 11:57:06 UTC (rev 1509) +++ trunk/18xx/data/18TN/TileSet.xml 2011-04-03 19:34:06 UTC (rev 1510) @@ -9,8 +9,9 @@ <Tile id="-10"> <Upgrade id="5,6,57" /> </Tile> + <Tile id="-10001"/> - <Tile id="-143" /> + <Tile id="-1143" /> <Tile id="-902" /> <Tile id="-903" /> Modified: trunk/18xx/tiles/CombineTiles.pl =================================================================== --- trunk/18xx/tiles/CombineTiles.pl 2011-04-03 11:57:06 UTC (rev 1509) +++ trunk/18xx/tiles/CombineTiles.pl 2011-04-03 19:34:06 UTC (rev 1510) @@ -47,4 +47,4 @@ # - From tiles/TDwoID: all tiles with an ID <= 0 (preprinted tiles). # These images do not have the ID on the tile (create these separately from TD). # - From tiles/handmade: all tiles in that dir will overwrite any of the above. -# These are the tiles modified by hand with Inkscape. +# These are the tiles modified by hand or with Inkscape. Modified: trunk/18xx/tiles/TileDictionary.18t =================================================================== (Binary files differ) Modified: trunk/18xx/tiles/TileDictionary.xml =================================================================== --- trunk/18xx/tiles/TileDictionary.xml 2011-04-03 11:57:06 UTC (rev 1509) +++ trunk/18xx/tiles/TileDictionary.xml 2011-04-03 19:34:06 UTC (rev 1510) @@ -21733,4 +21733,37 @@ </junctions> <connections/> </tile> -</tiles> \ No newline at end of file + <tile> + <ID>-10001</ID> + <shape>tsHexagon</shape> + <level>tlMapFixed</level> + <name>TNLouisville</name> + <junctions> + <junction> + <junType>jtCity</junType> + <position>tp1SideF</position> + <revenue> + <value>30</value> + <position>tp3CornerA</position> + </revenue> + </junction> + </junctions> + <connections> + <connection> + <conType>ctNormal</conType> + <position1>tp4SideB</position1> + <position2>tp4SideD</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tp1SideF</position1> + <position2>tp4SideB</position2> + </connection> + <connection> + <conType>ctNormal</conType> + <position1>tp1SideF</position1> + <position2>tp4SideD</position2> + </connection> + </connections> + </tile> +</tiles> Modified: trunk/18xx/tiles/Tiles.xml =================================================================== --- trunk/18xx/tiles/Tiles.xml 2011-04-03 11:57:06 UTC (rev 1509) +++ trunk/18xx/tiles/Tiles.xml 2011-04-03 19:34:06 UTC (rev 1510) @@ -3813,4 +3813,10 @@ <Station id="city2" position="252" slots="1" type="City"/> <Station id="city3" position="452" slots="1" type="City"/> </Tile> + <Tile colour="fixed" id="-10001" name="TNLouisville"> + <Station id="city1" position="501" slots="1" type="City" value="30"/> + <Track from="side1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side3"/> + </Tile> </Tiles> \ No newline at end of file Added: trunk/18xx/tiles/svg/tile-10001.svg =================================================================== --- trunk/18xx/tiles/svg/tile-10001.svg (rev 0) +++ trunk/18xx/tiles/svg/tile-10001.svg 2011-04-03 19:34:06 UTC (rev 1510) @@ -0,0 +1,2 @@ +<?xml version="1.0"?> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg"><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="#C0C0C0" stroke="#C0C0C0" stroke-width="1" stroke-linejoin="round"/><circle cx="140" cy="137" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><path d="M 343,85 A 294,294 0 0,0 196,340" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 343,85 A 294,294 0 0,1 196,124 A 45,45 0 0,0 157,147" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,340 A 294,294 0 0,0 157,193 A 45,45 0 0,1 157,147" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 343,85 A 294,294 0 0,0 196,340" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 343,85 A 294,294 0 0,1 196,124 A 45,45 0 0,0 157,147" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,340 A 294,294 0 0,0 157,193 A 45,45 0 0,1 157,147" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><circle cx="140" cy="137" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><ellipse rx="38" ry="34" cx="123" cy="43" fill="#FFFFFF" stroke="#000000" stroke-width="2" stroke-linejoin="round"/><text x="123" y="43" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Bookman Old Style" font-size="51">30</text><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="none" stroke="black" stroke-width="1" stroke-linejoin="round"/></svg> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ev...@us...> - 2011-04-03 11:57:12
|
Revision: 1509 http://rails.svn.sourceforge.net/rails/?rev=1509&view=rev Author: evos Date: 2011-04-03 11:57:06 +0000 (Sun, 03 Apr 2011) Log Message: ----------- Bug fix in 1851 initialisation code Modified Paths: -------------- trunk/18xx/rails/game/TrainManager.java Modified: trunk/18xx/rails/game/TrainManager.java =================================================================== --- trunk/18xx/rails/game/TrainManager.java 2011-04-03 11:56:18 UTC (rev 1508) +++ trunk/18xx/rails/game/TrainManager.java 2011-04-03 11:57:06 UTC (rev 1509) @@ -41,6 +41,9 @@ // Non-game attributes protected Portfolio ipo = null; + + // For initialisation only + boolean trainPriceAtFaceValueIfDifferentPresidents = false; /** * No-args constructor. @@ -84,8 +87,7 @@ Tag rulesTag = tag.getChild("TrainBuyingRules"); if (rulesTag != null) { // A 1851 special - gameManager.setGameParameter(GameDef.Parm.FIXED_PRICE_TRAINS_BETWEEN_PRESIDENTS, - rulesTag.getChild("FaceValueIfDifferentPresidents") != null); + trainPriceAtFaceValueIfDifferentPresidents = rulesTag.getChild("FaceValueIfDifferentPresidents") != null; } // Finish initialisation of the train types @@ -131,6 +133,10 @@ if (removeTrain) { gameManager.setGameParameter(GameDef.Parm.REMOVE_TRAIN_BEFORE_SR, true); } + + // Train trading between different players at face value only (1851) + gameManager.setGameParameter(GameDef.Parm.FIXED_PRICE_TRAINS_BETWEEN_PRESIDENTS, + trainPriceAtFaceValueIfDifferentPresidents); } public void addTrain (String uniqueID, TrainI train) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ev...@us...> - 2011-04-03 11:56:25
|
Revision: 1508 http://rails.svn.sourceforge.net/rails/?rev=1508&view=rev Author: evos Date: 2011-04-03 11:56:18 +0000 (Sun, 03 Apr 2011) Log Message: ----------- 18TN Initial commit. Added Paths: ----------- trunk/18xx/data/18TN/CompanyManager.xml trunk/18xx/data/18TN/Game.xml trunk/18xx/data/18TN/Map.xml trunk/18xx/data/18TN/StockMarket.xml trunk/18xx/data/18TN/TileSet.xml trunk/18xx/data/18TN/Tiles.xml Added: trunk/18xx/data/18TN/CompanyManager.xml =================================================================== --- trunk/18xx/data/18TN/CompanyManager.xml (rev 0) +++ trunk/18xx/data/18TN/CompanyManager.xml 2011-04-03 11:56:18 UTC (rev 1508) @@ -0,0 +1,102 @@ +<?xml version="1.0"?> +<CompanyManager> + <CompanyType name="Private" class="rails.game.PrivateCompany"> + <ClosingConditions> + <Phase>5</Phase> + </ClosingConditions> + <Tradeable toCompany="yes" lowerPriceFactor="0.5" upperPriceFactor="2.0"/> + <Tradeable toPlayer="yes"/> + </CompanyType> + <CompanyType name="Public" class="rails.game.PublicCompany"> + <CanBuyPrivates/> + <PoolPaysOut/> + <Float percentage="60"/> + <ShareUnit percentage="10"/> + <BaseTokens> + <!-- HomeBase lay options: "whenStarted", "whenFloated", "firstOR" (default) --> + <HomeBase lay="firstOR"/> + <!-- LayCost methods: only "sequence" (1830 style) implemented so far (default) --> + <LayCost method="sequence" cost="0,40,100"/> + </BaseTokens> + <Certificate type="President" shares="2"/> + <Certificate shares="1" number="8"/> + <Trains number="4,4,3,2"/> + <CanUseSpecialProperties/> + <TileLays> + <Number colour="yellow" phase="3,4,5,6,8" number="2"/> + </TileLays> + </CompanyType> + + <Company name="TCC" type="Private" basePrice="20" revenue="5" + longname="Tennessee Copper Company"> + <Blocking hex="H17"/> + <SpecialProperties> + <SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay"> + <SpecialTileLay location="H17" extra="yes" free="yes"/> + </SpecialProperty> + </SpecialProperties> + </Company> + <Company name="ET&WNC" type="Private" basePrice="40" revenue="10" + longname="East Tennessee and Western North Carolina"> + <Blocking hex="F19"/> + <SpecialProperties> + <SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay"> + <SpecialTileLay location="F19" extra="yes" free="yes"/> + </SpecialProperty> + </SpecialProperties> + </Company> + <Company name="M&C" type="Private" basePrice="70" revenue="15" + longname="Memphis and Charleston Railroad"> + <Blocking hex="H5"/> + <SpecialProperties> + <SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay"> + <SpecialTileLay location="H5" extra="yes" free="yes"/> + </SpecialProperty> + </SpecialProperties> + </Company> + <Company name="O&W" type="Private" basePrice="100" revenue="20" + longname="Oneida and Western Railroad"> + <Blocking hex="E16"/> + <SpecialProperties> + <SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay"> + <SpecialTileLay location="E16" extra="yes" free="yes"/> + </SpecialProperty> + </SpecialProperties> + </Company> + + + <Company name="GMO" type="Public" tokens="4" fgColour="FFFFFF" bgColour="B22222" + longname="Gulf, Mobile and Ohio Railroad"> + <Home hex="G6"/> + </Company> + <Company name="IC" type="Public" tokens="3" fgColour="FFFFFF" bgColour="228B22" + longname="Illinois Central Railroad"> + <Home hex="D7"/> + </Company> + <Company name="L&N" type="Public" tokens="4" fgColour="FFFFFF" bgColour="1C86EE" + longname="Louisville and Nashville Railroad"> + <Home hex="B13"/> + <Float percentage="20"/> + </Company> + <Company name="NC" type="Public" tokens="2" fgColour="FFFFFF" bgColour="FF0000" + longname="Nashville, Chattanooga and St. Louis Railway"> + <Home hex="H15"/> + </Company> + <Company name="SOU" type="Public" tokens="4" fgColour="000000" bgColour="7CFC00" + longname="Southern Railway"> + <Home hex="F17"/> + </Company> + <Company name="TC" type="Public" tokens="2" fgColour="FFFFFF" bgColour="000000" + longname="Tennessee Central Railway"> + <Home hex="F11"/> + </Company> + + <StartPacket roundClass="rails.game.StartRound_1830"> + <Bidding initial="5" minimum="5" increment="1"/> + <Item name="TCC" type="Private" basePrice="20"/> + <Item name="ET&WNC" type="Private" basePrice="40"/> + <Item name="M&C" type="Private" basePrice="70"/> + <Item name="O&W" type="Private" basePrice="100"/> + <Item name="L&N" type="Public" president="yes" basePrice="175"/> + </StartPacket> +</CompanyManager> Property changes on: trunk/18xx/data/18TN/CompanyManager.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/18xx/data/18TN/Game.xml =================================================================== --- trunk/18xx/data/18TN/Game.xml (rev 0) +++ trunk/18xx/data/18TN/Game.xml 2011-04-03 11:56:18 UTC (rev 1508) @@ -0,0 +1,103 @@ +<?xml version="1.0"?> +<ComponentManager> + <Component name="GameManager" class="rails.game.GameManager"> + <Game name="18TN"/> + + <GameParameters> + <PlayerShareLimit percentage="60"> + <!-- Option "NumberOfPlayers" is automatically set + by the game engine --> + <IfOption name="NumberOfPlayers" value="2"> + <IfOption name="TwoPlayersCertLimit70Percent" value="yes"> + <Attributes percentage="70"/> + </IfOption> + </IfOption> + </PlayerShareLimit> + <BankPoolLimit percentage="50"/> + <StockRound> + <NoSaleInFirstSR/> + </StockRound> + </GameParameters> + <EndOfGame> + <Bankruptcy/> + <BankBreaks limit="0" finish="setOfORs"/> + <!-- "Runs out"; when "broken", -1 is the limit --> + </EndOfGame> + </Component> + <Component name="PlayerManager" class="rails.game.PlayerManager"> + + <Players number="3" cash="600" certLimit="16"/> + <Players number="4" cash="450" certLimit="12"/> + <Players number="5" cash="360" certLimit="10"/> + + </Component> + <Component name="Bank" class="rails.game.Bank"> + <Bank amount="8000"/> + <Money format="$@"/> + </Component> + <Component name="TileManager" class="rails.game.TileManager" + file="TileSet.xml"/> + <Component name="Map" class="rails.game.MapManager" file="Map.xml"/> + <Component name="CompanyManager" class="rails.game.CompanyManager" + file="CompanyManager.xml"/> + <Component name="StockMarket" class="rails.game.StockMarket" + file="StockMarket.xml"/> + <Component name="TrainManager" class="rails.game.TrainManager"> + <Defaults> + <Reach base="stops" countTowns="yes"/> + <!-- Alternative values: + base="hexes" for H-trains as in 1826, 1849 etc. + countTowns="no" for all trains in 1841, 18EU, etc., + where towns score but do not count against the train length. + Otherwise, towns are counted as minor or major stops, + depending on the presence or absence of a "minorStops" value. + --> + <Score towns="yes"/> + <!-- Alternative values: + towns="no" for trains that ignore towns (e.g. 1826 TGV). + cities="double" if city-revenue is doubled (e.g. 1826 TGV). + --> + </Defaults> + <Train name="2" majorStops="2" cost="80" amount="5" obsoleting="yes"/> + <Train name="3" majorStops="3" cost="180" amount="5" obsoleting="yes" startPhase="3"/> + <Train name="4" majorStops="4" cost="300" amount="3" obsoleting="yes" 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" + rustedTrain="3" /> + <Train name="8" majorStops="8" cost="700" amount="8" startPhase="8" + rustedTrain="4" /> + + </Component> + <Component name="PhaseManager" class="rails.game.PhaseManager"> + <!-- Note: released and rusted trains are now specified per Train + but could as well be moved here. To be sorted out when we do 18US. --> + <!-- Each Phase's defaults are the previous one's values --> + <Phase name="2" > + <Tiles colour="yellow"/> + <Privates sellingAllowed="no"/> + <OperatingRounds number="1"/> + <Trains tradingAllowed="yes"/> + </Phase> + <Phase name="3"> + <Tiles colour="yellow,green"/> + <Privates sellingAllowed="yes"/> + <OperatingRounds number="2"/> + </Phase> + <Phase name="4"> + <Tiles colour="yellow,green"/> + </Phase> + <Phase name="5"> + <Tiles colour="yellow,green,brown"/> + <!--Privates close="yes"/--> + <OperatingRounds number="3"/> + <OffBoardRevenue step="2"/> + </Phase> + <Phase name="6"> + <Tiles colour="yellow,green,brown"/> + </Phase> + <Phase name="8"> + <Tiles colour="yellow,green,brown"/> + </Phase> + </Component> +</ComponentManager> \ No newline at end of file Property changes on: trunk/18xx/data/18TN/Game.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/18xx/data/18TN/Map.xml =================================================================== --- trunk/18xx/data/18TN/Map.xml (rev 0) +++ trunk/18xx/data/18TN/Map.xml 2011-04-03 11:56:18 UTC (rev 1508) @@ -0,0 +1,77 @@ +<Map mapClass="rails.ui.swing.hexmap.EWHexMap" tileOrientation="EW" + letterOrientation="vertical" even="A"> + +<Hex name="A16" tile="-902" city="Cincinnati" orientation="1" value="50,80"/> +<Hex name="B13" tile="-10" city="Louisville"/> +<Hex name="B15" tile="0" cost="60" /> +<Hex name="B17" tile="-10" city="Lexington"/> +<Hex name="C4" tile="-902" city="Saint Louis" value="40,60"/> +<Hex name="C6" tile="0" /> +<Hex name="C8" tile="0" cost="40" /> +<Hex name="C12" tile="9" /> +<Hex name="C14" tile="0" cost="60" /> +<Hex name="C16" tile="-1" city="Danville"/> +<Hex name="C18" tile="0" cost="60" /> +<Hex name="D5" tile="0" cost="60" /> +<Hex name="D7" tile="-10" cost="40" /> +<Hex name="D9" tile="0" /> +<Hex name="D11" tile="4" city="Bowling Green"/> +<Hex name="D13" tile="0" /> +<Hex name="D15" tile="0" cost="60" /> +<Hex name="D17" tile="0" /> +<Hex name="D19" tile="0" cost="60" /> +<Hex name="E4" tile="0" cost="60" /> +<Hex name="E6" tile="0" /> +<Hex name="E8" tile="0" cost="40" /> +<Hex name="E10" tile="-1" city="Clarksville"/> +<Hex name="E12" tile="0" /> +<Hex name="E14" tile="0" /> +<Hex name="E16" tile="0" cost="60" /> +<Hex name="E18" tile="0" /> +<Hex name="E20" tile="0" /> +<Hex name="E22" tile="-902" city="Bristol/Coalfields" orientation="2" value="60,40"/> +<Hex name="F3" tile="0" cost="60" /> +<Hex name="F5" tile="-1" city="Dyersburg"/> +<Hex name="F7" tile="0" /> +<Hex name="F9" tile="0" cost="40" /> +<Hex name="F11" tile="-10" city="Nashville" cost="40" /> +<Hex name="F13" tile="-1" city="Lebanon"/> +<Hex name="F15" tile="0" cost="60" /> +<Hex name="F17" tile="-10" city="Knoxville" cost="40" /> +<Hex name="F19" tile="0" /> +<Hex name="F21" tile="0" cost="120" /> +<Hex name="G2" tile="0" /> +<Hex name="G4" tile="0" cost="60" /> +<Hex name="G6" tile="6" city="Jackson"/> +<Hex name="G8" tile="0" cost="40" /> +<Hex name="G10" tile="0" /> +<Hex name="G12" tile="-10" city="Murfreesboro"/> +<Hex name="G14" tile="0" cost="60" /> +<Hex name="G16" tile="0" cost="40" /> +<Hex name="G18" tile="0" cost="120" /> +<Hex name="G20" tile="0" cost="120" /> +<Hex name="H1" tile="-903" city="Little Rock" orientation="5" value="20,40"/> +<Hex name="H3" tile="-10" city="Memphis" cost="60" /> +<Hex name="H5" tile="0" /> +<Hex name="H7" tile="-10" city="Corinth"/> +<Hex name="H9" tile="0" cost="40" /> +<Hex name="H11" tile="0" cost="60" /> +<Hex name="H13" tile="0" cost="60" /> +<Hex name="H15" tile="6" city="Chattanooga" orientation="2"/> +<Hex name="H17" tile="0" cost="120" /> +<Hex name="I2" tile="0" /> +<Hex name="I4" tile="0" /> +<Hex name="I6" tile="0" /> +<Hex name="I8" tile="0" /> +<Hex name="I10" tile="-1" city="Huntsville" cost="40" /> +<Hex name="I12" tile="0" cost="40" /> +<Hex name="I14" tile="0" cost="60" /> +<Hex name="I16" tile="0" cost="60" /> +<Hex name="J5" tile="-902" city="Gulf Coast" orientation="4" value="30,50"/> +<Hex name="J11" tile="-143" city="Birmingham" orientation="5" value="30,40"/> +<Hex name="J13" tile="0" cost="60" /> +<Hex name="J15" tile="0" /> +<Hex name="J17" tile="-902" city="Atlanta" orientation="3" value="40,60"/> + + +</Map> \ No newline at end of file Property changes on: trunk/18xx/data/18TN/Map.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/18xx/data/18TN/StockMarket.xml =================================================================== --- trunk/18xx/data/18TN/StockMarket.xml (rev 0) +++ trunk/18xx/data/18TN/StockMarket.xml 2011-04-03 11:56:18 UTC (rev 1508) @@ -0,0 +1,91 @@ +<StockMarket type="rectangular"> + <!-- Note two supported colour specification formats: + RGB decimal with commas and RGB hexadecimal without commas --> + <StockSpaceType name="yellow" colour="255,255,0"> + <NoCertLimit/> + </StockSpaceType> + <StockSpaceType name="green" colour="458B00"> + <NoCertLimit/> + <NoHoldLimit/> + </StockSpaceType> + +<StockSpace name="A1" price="60"/> +<StockSpace name="A2" price="55"/> +<StockSpace name="A3" price="50"/> +<StockSpace name="A4" price="45" type="yellow"/> +<StockSpace name="A5" price="40" type="green"/> +<StockSpace name="A6" price="35" type="green"/> +<StockSpace name="A7" price="25" type="green"/> +<StockSpace name="B1" price="70"/> +<StockSpace name="B2" price="60"/> +<StockSpace name="B3" price="55"/> +<StockSpace name="B4" price="50" type="yellow"/> +<StockSpace name="B5" price="45" type="yellow"/> +<StockSpace name="B6" price="40" type="green"/> +<StockSpace name="B7" price="30" type="green"/> +<StockSpace name="C1" price="80"/> +<StockSpace name="C2" price="70"/> +<StockSpace name="C3" price="60"/> +<StockSpace name="C4" price="55"/> +<StockSpace name="C5" price="50" type="yellow"/> +<StockSpace name="C6" price="45" type="yellow"/> +<StockSpace name="C7" price="40" type="green"/> +<StockSpace name="D1" price="90"/> +<StockSpace name="D2" price="80"/> +<StockSpace name="D3" price="70"> + <StartSpace/> +</StockSpace> +<StockSpace name="D4" price="65"> + <StartSpace/> +</StockSpace> +<StockSpace name="D5" price="60"/> +<StockSpace name="D6" price="55" type="yellow"/> +<StockSpace name="D7" price="50" type="yellow"/> +<StockSpace name="E1" price="100"/> +<StockSpace name="E2" price="90"> + <StartSpace/> +</StockSpace> +<StockSpace name="E3" price="80"> + <StartSpace/> +</StockSpace> +<StockSpace name="E4" price="75"> + <StartSpace/> +</StockSpace> +<StockSpace name="E5" price="70"/> +<StockSpace name="E6" price="65" type="yellow"/> +<StockSpace name="E7" price="60" type="yellow"/> +<StockSpace name="F1" price="110"/> +<StockSpace name="F2" price="100"/> +<StockSpace name="F3" price="90"/> +<StockSpace name="F4" price="80"/> +<StockSpace name="F5" price="75"/> +<StockSpace name="G1" price="120"/> +<StockSpace name="G2" price="110"/> +<StockSpace name="G3" price="100"/> +<StockSpace name="G4" price="85"/> +<StockSpace name="G5" price="80"/> +<StockSpace name="H1" price="130"/> +<StockSpace name="H2" price="120"/> +<StockSpace name="H3" price="110"/> +<StockSpace name="H4" price="90"/> +<StockSpace name="I1" price="150"/> +<StockSpace name="I2" price="130"/> +<StockSpace name="I3" price="120"/> +<StockSpace name="I4" price="100"/> +<StockSpace name="J1" price="170"/> +<StockSpace name="J2" price="150"/> +<StockSpace name="J3" price="130"/> +<StockSpace name="K1" price="190"/> +<StockSpace name="K2" price="170"/> +<StockSpace name="K3" price="150"/> +<StockSpace name="L1" price="210"/> +<StockSpace name="L2" price="190"/> +<StockSpace name="L3" price="170"/> +<StockSpace name="M1" price="230"/> +<StockSpace name="M2" price="210"/> +<StockSpace name="N1" price="250"/> +<StockSpace name="N2" price="230"/> +<StockSpace name="O1" price="275"/> +<StockSpace name="O2" price="250"/> +<StockSpace name="P1" price="300"/> +</StockMarket> Property changes on: trunk/18xx/data/18TN/StockMarket.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/18xx/data/18TN/TileSet.xml =================================================================== --- trunk/18xx/data/18TN/TileSet.xml (rev 0) +++ trunk/18xx/data/18TN/TileSet.xml 2011-04-03 11:56:18 UTC (rev 1508) @@ -0,0 +1,159 @@ +<TileManager tiles="Tiles.xml"> + + <Tile id="0"> + <Upgrade id="7,8,9" /> + </Tile> + <Tile id="-1"> + <Upgrade id="3,4,58" /> + </Tile> + <Tile id="-10"> + <Upgrade id="5,6,57" /> + </Tile> + + <Tile id="-143" /> + <Tile id="-902" /> + <Tile id="-903" /> + + <Tile id="3" quantity="2" > + <Upgrade id="141,142,143" /> + </Tile> + + <Tile id="4" quantity="3" > + <Upgrade id="141,142" /> + </Tile> + + <Tile id="5" quantity="3" > + <Upgrade id="14,15,619" hex="-F11"/> + <Upgrade id="599" hex="F11"/> + </Tile> + + <Tile id="6" quantity="3" > + <Upgrade id="14,15,619" hex="-H15,-F11"/> + <Upgrade id="598" hex="H15"/> + <Upgrade id="599" hex="F11"/> + </Tile> + + <Tile id="7" quantity="4" > + <Upgrade id="18,28,29" /> + </Tile> + + <Tile id="8" quantity="13" > + <Upgrade id="16,17,19,23,24,25,28,29" /> + </Tile> + + <Tile id="9" quantity="12" > + <Upgrade id="18,19,20,23,24" /> + </Tile> + + <Tile id="57" quantity="4" > + <Upgrade id="14,15" hex="-F11"/> + <Upgrade id="599" hex="F11"/> + </Tile> + + <Tile id="58" quantity="4" > + <Upgrade id="141,142,143,144" /> + </Tile> + + <Tile id="14" quantity="3" > + <Upgrade id="63" hex="-H3"/> + <Upgrade id="170" hex="H3"/> + </Tile> + + <Tile id="15" quantity="3" > + <Upgrade id="63" hex="-H3"/> + <Upgrade id="170" hex="H3"/> + </Tile> + + <Tile id="16" quantity="1" > + <Upgrade id="43,70" /> + </Tile> + + <Tile id="17" quantity="1" > + <Upgrade id="47" /> + </Tile> + + <Tile id="18" quantity="1" > + <Upgrade id="43" /> + </Tile> + + <Tile id="19" quantity="1" > + <Upgrade id="45,46" /> + </Tile> + + <Tile id="20" quantity="2" > + <Upgrade id="44,47" /> + </Tile> + + <Tile id="23" quantity="4" > + <Upgrade id="41,43,45,47" /> + </Tile> + + <Tile id="24" quantity="4" > + <Upgrade id="42,43,46,47" /> + </Tile> + + <Tile id="25" quantity="2" > + <Upgrade id="40,45,46" /> + </Tile> + + <Tile id="28" quantity="2" > + <Upgrade id="39,43,45,70" /> + </Tile> + + <Tile id="29" quantity="2" > + <Upgrade id="39,43,45,70" /> + </Tile> + + <Tile id="141" quantity="2" > + <Upgrade id="145,146,147" /> + </Tile> + + <Tile id="142" quantity="2" > + <Upgrade id="145,146,147" /> + </Tile> + + <Tile id="143" quantity="1" > + <Upgrade id="146,147" /> + </Tile> + + <Tile id="144" quantity="1" > + <Upgrade id="147" /> + </Tile> + + <Tile id="619" quantity="2" > + <Upgrade id="63" /> + </Tile> + + <Tile id="39" quantity="2" /> + <Tile id="40" quantity="2" /> + <Tile id="41" quantity="3" /> + <Tile id="42" quantity="3" /> + <Tile id="43" quantity="2" /> + <Tile id="44" quantity="1" /> + <Tile id="45" quantity="1" /> + <Tile id="46" quantity="1" /> + <Tile id="47" quantity="2" /> + <Tile id="63" quantity="4" /> + <Tile id="70" quantity="1" /> + <Tile id="145" quantity="2" /> + <Tile id="146" quantity="2" /> + <Tile id="147" quantity="2" /> + + <Tile id="170" quantity="170" > + <Upgrade id="600" /> + </Tile> + + <Tile id="598" quantity="1" > + <Upgrade id="170" /> + </Tile> + + <Tile id="599" quantity="1" > + <Upgrade id="170" /> + </Tile> + + <Tile id="600" quantity="1" /> + + + + +</TileManager> Property changes on: trunk/18xx/data/18TN/TileSet.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/18xx/data/18TN/Tiles.xml =================================================================== --- trunk/18xx/data/18TN/Tiles.xml (rev 0) +++ trunk/18xx/data/18TN/Tiles.xml 2011-04-03 11:56:18 UTC (rev 1508) @@ -0,0 +1,216 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?><Tiles><Tile colour="white" id="0" name="empty"/><Tile colour="white" id="-1" name="1 village"> + <Station id="city1" position="002" type="Town"/> + </Tile><Tile colour="white" id="-10" name="1 city"> + <Station id="city1" position="302" slots="1" type="City"/> + </Tile><Tile colour="fixed" id="-143" name="-143"> + <Station id="city1" position="0" type="Town" value="10"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side2"/> + </Tile><Tile colour="red" id="-902" name="OM 2 way"> + <Station id="city1" position="0" type="OffMapCity" value="-1"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side1"/> + </Tile><Tile colour="red" id="-903" name="OM 3 way"> + <Station id="city1" position="0" type="OffMapCity" value="-1"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side1"/> + </Tile><Tile colour="yellow" id="3" name="3"> + <Station id="city1" position="452" type="Town" value="10"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side4"/> + </Tile><Tile colour="yellow" id="4" name="4"> + <Station id="city1" position="0" type="Town" value="10"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side0"/> + </Tile><Tile colour="yellow" id="5" name="5"> + <Station id="city1" position="0" slots="1" type="City" value="20"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side2"/> + </Tile><Tile colour="yellow" id="6" name="6"> + <Station id="city1" position="0" slots="1" type="City" value="20"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side2"/> + </Tile><Tile colour="yellow" id="7" name="7"> + <Track from="side3" gauge="normal" to="side4"/> + </Tile><Tile colour="yellow" id="8" name="8"> + <Track from="side3" gauge="normal" to="side5"/> + </Tile><Tile colour="yellow" id="9" name="9"> + <Track from="side3" gauge="normal" to="side0"/> + </Tile><Tile colour="yellow" id="57" name="57"> + <Station id="city1" position="0" slots="1" type="City" value="20"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side0"/> + </Tile><Tile colour="yellow" id="58" name="58"> + <Station id="city1" position="401" type="Town" value="10"/> + <Track from="city1" gauge="normal" to="side5"/> + <Track from="city1" gauge="normal" to="side3"/> + </Tile><Tile colour="green" id="14" name="14"> + <Station id="city1" position="0" slots="2" type="City" value="30"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side0"/> + </Tile><Tile colour="green" id="15" name="15"> + <Station id="city1" position="0" slots="2" type="City" value="30"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + <Track from="city1" gauge="normal" to="side0"/> + </Tile><Tile colour="green" id="16" name="16"> + <Track from="side3" gauge="normal" to="side5"/> + <Track from="side4" gauge="normal" to="side0"/> + </Tile><Tile colour="green" id="17" name="17"> + <Track from="side0" gauge="normal" to="side2"/> + <Track from="side3" gauge="normal" to="side5"/> + </Tile><Tile colour="green" id="18" name="18"> + <Track from="side3" gauge="normal" to="side0"/> + <Track from="side4" gauge="normal" to="side5"/> + </Tile><Tile colour="green" id="19" name="19"> + <Track from="side5" gauge="normal" to="side1"/> + <Track from="side0" gauge="normal" to="side3"/> + </Tile><Tile colour="green" id="20" name="20"> + <Track from="side1" gauge="normal" to="side4"/> + <Track from="side3" gauge="normal" to="side0"/> + </Tile><Tile colour="green" id="23" name="23"> + <Track from="side4" gauge="normal" to="side0"/> + <Track from="side0" gauge="normal" to="side3"/> + </Tile><Tile colour="green" id="24" name="24"> + <Track from="side3" gauge="normal" to="side5"/> + <Track from="side3" gauge="normal" to="side0"/> + </Tile><Tile colour="green" id="25" name="25"> + <Track from="side1" gauge="normal" to="side3"/> + <Track from="side3" gauge="normal" to="side5"/> + </Tile><Tile colour="green" id="28" name="28"> + <Track from="side3" gauge="normal" to="side5"/> + <Track from="side4" gauge="normal" to="side5"/> + </Tile><Tile colour="green" id="29" name="29"> + <Track from="side3" gauge="normal" to="side4"/> + <Track from="side3" gauge="normal" to="side5"/> + </Tile><Tile colour="green" id="141" name="141"> + <Station id="city1" position="0" type="Town" value="10"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile><Tile colour="green" id="142" name="142"> + <Station id="city1" position="0" type="Town" value="10"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile><Tile colour="green" id="143" name="143"> + <Station id="city1" position="0" type="Town" value="10"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side2"/> + </Tile><Tile colour="green" id="144" name="144"> + <Station id="city1" position="0" type="Town" value="10"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side4"/> + </Tile><Tile colour="green" id="619" name="619"> + <Station id="city1" position="0" slots="2" type="City" value="30"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile><Tile colour="brown" id="39" name="39"> + <Track from="side3" gauge="normal" to="side4"/> + <Track from="side3" gauge="normal" to="side5"/> + <Track from="side4" gauge="normal" to="side5"/> + </Tile><Tile colour="brown" id="40" name="40"> + <Track from="side1" gauge="normal" to="side3"/> + <Track from="side1" gauge="normal" to="side5"/> + <Track from="side3" gauge="normal" to="side5"/> + </Tile><Tile colour="brown" id="41" name="41"> + <Track from="side4" gauge="normal" to="side0"/> + <Track from="side4" gauge="normal" to="side3"/> + <Track from="side0" gauge="normal" to="side3"/> + </Tile><Tile colour="brown" id="42" name="42"> + <Track from="side3" gauge="normal" to="side5"/> + <Track from="side3" gauge="normal" to="side0"/> + <Track from="side5" gauge="normal" to="side0"/> + </Tile><Tile colour="brown" id="43" name="43"> + <Track from="side3" gauge="normal" to="side5"/> + <Track from="side3" gauge="normal" to="side0"/> + <Track from="side4" gauge="normal" to="side5"/> + <Track from="side4" gauge="normal" to="side0"/> + </Tile><Tile colour="brown" id="44" name="44"> + <Track from="side3" gauge="normal" to="side0"/> + <Track from="side1" gauge="normal" to="side0"/> + <Track from="side3" gauge="normal" to="side4"/> + <Track from="side1" gauge="normal" to="side4"/> + </Tile><Tile colour="brown" id="45" name="45"> + <Track from="side1" gauge="normal" to="side5"/> + <Track from="side1" gauge="normal" to="side3"/> + <Track from="side5" gauge="normal" to="side0"/> + <Track from="side3" gauge="normal" to="side0"/> + </Tile><Tile colour="brown" id="46" name="46"> + <Track from="side1" gauge="normal" to="side5"/> + <Track from="side1" gauge="normal" to="side0"/> + <Track from="side3" gauge="normal" to="side5"/> + <Track from="side3" gauge="normal" to="side0"/> + </Tile><Tile colour="brown" id="47" name="47"> + <Track from="side3" gauge="normal" to="side0"/> + <Track from="side3" gauge="normal" to="side1"/> + <Track from="side4" gauge="normal" to="side0"/> + <Track from="side4" gauge="normal" to="side1"/> + </Tile><Tile colour="brown" id="63" name="63"> + <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"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile><Tile colour="brown" id="70" name="70"> + <Track from="side3" gauge="normal" to="side5"/> + <Track from="side3" gauge="normal" to="side4"/> + <Track from="side5" gauge="normal" to="side0"/> + <Track from="side4" gauge="normal" to="side0"/> + </Tile><Tile colour="brown" id="145" name="145"> + <Station id="city1" position="0" type="Town" value="20"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile><Tile colour="brown" id="146" name="146"> + <Station id="city1" position="0" type="Town" value="20"/> + <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="side5"/> + </Tile><Tile colour="brown" id="147" name="147"> + <Station id="city1" position="0" type="Town" value="20"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile><Tile colour="brown" id="170" name="170"> + <Station id="city1" position="0" slots="2" type="City" value="50"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side3"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile><Tile colour="green" id="598" name="598"> + <Station id="city1" position="0" slots="2" type="City" value="40"/> + <Track from="side1" gauge="normal" to="city1"/> + <Track from="city1" gauge="normal" to="side5"/> + <Track from="city1" gauge="normal" to="side3"/> + </Tile><Tile colour="green" id="599" name="599"> + <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"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile><Tile colour="gray" id="600" name="600"> + <Station id="city1" position="0" slots="3" type="City" value="60"/> + <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"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile></Tiles> \ No newline at end of file Property changes on: trunk/18xx/data/18TN/Tiles.xml ___________________________________________________________________ Added: svn:mime-type + text/plain This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |