From: Freek D. <mac...@us...> - 2010-01-31 22:16:13
|
Update of /cvsroot/rails/18xx/data/18Kaas In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32289/data/18Kaas Modified Files: CompanyManager.xml Map.xml StockMarket.xml TileSet.xml Log Message: Fix indentation: XML files contain tabs Index: Map.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18Kaas/Map.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Map.xml 8 Nov 2009 14:46:16 -0000 1.5 --- Map.xml 31 Jan 2010 22:16:03 -0000 1.6 *************** *** 33,38 **** <Hex name="G6" tile="0" cost="80"/> <Hex name="G8" tile="-11" cost="80" label="B+" city="Haarlem"/> ! <Hex name="G10" tile="-22" orientation="5" city="Amsterdam"/><!-- not the right tile! TBD --> ! <Hex name="G12" tile="0" cost="80"/><!-- not the right tile, should be empty yellow--> <Hex name="G14" tile="0"/> <Hex name="G16" tile="-20" cost="80" label="OO" city="Apeldoorn/Deventer"/> --- 33,38 ---- <Hex name="G6" tile="0" cost="80"/> <Hex name="G8" tile="-11" cost="80" label="B+" city="Haarlem"/> ! <Hex name="G10" tile="-22" orientation="5" city="Amsterdam"/><!-- TODO: not the right tile! TBD --> ! <Hex name="G12" tile="0" cost="80"/><!-- FIXME: not the right tile, should be empty yellow--> <Hex name="G14" tile="0"/> <Hex name="G16" tile="-20" cost="80" label="OO" city="Apeldoorn/Deventer"/> *************** *** 70,74 **** <Hex name="K16" tile="-10" cost="120" city="Venlo"/> <Hex name="K18" tile="-901" orientation="2" value="2" city="Ruhrgebied"/> ! <Hex name="L1" tile="-901" orientation="5" value="10,60" city="Engeland"/> <Hex name="L3" tile="-10"/> <Hex name="L5" tile="0"/> --- 70,74 ---- <Hex name="K16" tile="-10" cost="120" city="Venlo"/> <Hex name="K18" tile="-901" orientation="2" value="2" city="Ruhrgebied"/> ! <Hex name="L1" tile="-901" orientation="5" value="10,60" city="Engeland"/> <Hex name="L3" tile="-10"/> <Hex name="L5" tile="0"/> Index: TileSet.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18Kaas/TileSet.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TileSet.xml 27 Jan 2010 20:40:12 -0000 1.4 --- TileSet.xml 31 Jan 2010 22:16:04 -0000 1.5 *************** *** 54,58 **** <Tile id="14" quantity="3"> <Upgrade id="63" hex="!I12"/> ! <Upgrade id="9220" hex="I12"/> </Tile> <Tile id="15" quantity="2"> --- 54,58 ---- <Tile id="14" quantity="3"> <Upgrade id="63" hex="!I12"/> ! <Upgrade id="9220" hex="I12"/> </Tile> <Tile id="15" quantity="2"> *************** *** 114,118 **** <Tile id="62" quantity="1" /> <Tile id="63" quantity="3" /> ! <Tile id="9220" quantity="1" /> <Tile id="64" quantity="1" /> <Tile id="65" quantity="1" /> --- 114,118 ---- <Tile id="62" quantity="1" /> <Tile id="63" quantity="3" /> ! <Tile id="9220" quantity="1" /> <Tile id="64" quantity="1" /> <Tile id="65" quantity="1" /> Index: StockMarket.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18Kaas/StockMarket.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** StockMarket.xml 13 Dec 2009 16:39:49 -0000 1.2 --- StockMarket.xml 31 Jan 2010 22:16:03 -0000 1.3 *************** *** 1,147 **** <StockMarket type="rectangular"> ! <StockSpaceType name="yellow" colour="FFFF00"> ! <NoCertLimit/> ! </StockSpaceType> ! <StockSpaceType name="orange" colour="FF8000"> ! <NoCertLimit/> ! <NoHoldLimit/> ! </StockSpaceType> ! <StockSpaceType name="brown" colour="884000"> ! <NoCertLimit/> ! <NoHoldLimit/> ! <NoBuyLimit/> ! </StockSpaceType> ! ! <StockSpace name="A1" price="60" type="yellow"/> ! <StockSpace name="A2" price="53" type="yellow"/> ! <StockSpace name="A3" price="46" type="yellow"/> ! <StockSpace name="A4" price="39" type="orange"/> ! <StockSpace name="A5" price="32" type="orange"/> ! <StockSpace name="A6" price="25" type="brown"/> ! <StockSpace name="A7" price="18" type="brown"/> ! <StockSpace name="A8" price="10" type="brown"/> ! <StockSpace name="B1" price="67" /> ! <StockSpace name="B2" price="60" type="yellow"/> ! <StockSpace name="B3" price="55" type="yellow"/> ! <StockSpace name="B4" price="48" type="yellow"/> ! <StockSpace name="B5" price="41" type="orange"/> ! <StockSpace name="B6" price="34" type="orange"/> ! <StockSpace name="B7" price="27" type="brown"/> ! <StockSpace name="B8" price="20" type="brown"/> ! <StockSpace name="B9" price="10" type="brown"/> ! <StockSpace name="C1" price="71" /> ! <StockSpace name="C2" price="66" /> ! <StockSpace name="C3" price="60" type="yellow"/> ! <StockSpace name="C4" price="54" type="yellow"/> ! <StockSpace name="C5" price="48" type="yellow"/> ! <StockSpace name="C6" price="42" type="orange"/> ! <StockSpace name="C7" price="36" type="orange"/> ! <StockSpace name="C8" price="30" type="brown"/> ! <StockSpace name="C9" price="20" type="brown"/> ! <StockSpace name="C10" price="10" type="brown"/> ! <StockSpace name="D1" price="76" /> ! <StockSpace name="D2" price="70" /> ! <StockSpace name="D3" price="65" /> ! <StockSpace name="D4" price="60" type="yellow"/> ! <StockSpace name="D5" price="55" type="yellow"/> ! <StockSpace name="D6" price="50" type="yellow"/> ! <StockSpace name="D7" price="45" type="orange"/> ! <StockSpace name="D8" price="40" type="orange"/> ! <StockSpace name="D9" price="30" type="brown"/> ! <StockSpace name="D10" price="20" type="brown"/> ! <StockSpace name="D11" price="10" type="brown"/> ! <StockSpace name="E1" price="82" /> ! <StockSpace name="E2" price="76" /> ! <StockSpace name="E3" price="70" /> ! <StockSpace name="E4" price="66" /> ! <StockSpace name="E5" price="62" /> ! <StockSpace name="E6" price="58" type="yellow"/> ! <StockSpace name="E7" price="54" type="yellow"/> ! <StockSpace name="E8" price="50" type="yellow"/> ! <StockSpace name="E9" price="40" type="orange"/> ! <StockSpace name="E10" price="30" type="brown"/> ! <StockSpace name="E11" price="20" type="brown"/> ! <StockSpace name="F1" price="90" /> ! <StockSpace name="F2" price="82" /> ! <StockSpace name="F3" price="76" /> ! <StockSpace name="F4" price="71" /> ! <StockSpace name="F5" price="67" /> ! <StockSpace name="F6" price="65" /> ! <StockSpace name="F7" price="63" /> ! <StockSpace name="F8" price="60" type="yellow"/> ! <StockSpace name="F9" price="50" type="yellow"/> ! <StockSpace name="F10" price="40" type="orange"/> ! <StockSpace name="F11" price="30" type="brown"/> ! <StockSpace name="G1" price="100" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G2" price="90" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G3" price="82" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G4" price="76" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G5" price="71" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G6" price="67" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G7" price="67" /> ! <StockSpace name="G8" price="67" /> ! <StockSpace name="G9" price="60" type="yellow"/> ! <StockSpace name="G10" price="50" type="yellow"/> ! <StockSpace name="G11" price="40" type="orange"/> ! <StockSpace name="H1" price="112" /> ! <StockSpace name="H2" price="100" /> ! <StockSpace name="H3" price="90" /> ! <StockSpace name="H4" price="82" /> ! <StockSpace name="H5" price="76" /> ! <StockSpace name="H6" price="71" /> ! <StockSpace name="H7" price="69" /> ! <StockSpace name="H8" price="68" /> ! <StockSpace name="I1" price="126" /> ! <StockSpace name="I2" price="112" /> ! <StockSpace name="I3" price="100" /> ! <StockSpace name="I4" price="90" /> ! <StockSpace name="I5" price="82" /> ! <StockSpace name="I6" price="75" /> ! <StockSpace name="I7" price="70" /> ! <StockSpace name="J1" price="142" /> ! <StockSpace name="J2" price="126" /> ! <StockSpace name="J3" price="111" /> ! <StockSpace name="J4" price="100" /> ! <StockSpace name="J5" price="90" /> ! <StockSpace name="J6" price="80" /> ! <StockSpace name="K1" price="160" /> ! <StockSpace name="K2" price="142" /> ! <StockSpace name="K3" price="125" /> ! <StockSpace name="K4" price="110" /> ! <StockSpace name="K5" price="100" /> ! <StockSpace name="L1" price="180" /> ! <StockSpace name="L2" price="160" /> ! <StockSpace name="L3" price="140" /> ! <StockSpace name="L4" price="120" /> ! <StockSpace name="M1" price="200" /> ! <StockSpace name="M2" price="180" /> ! <StockSpace name="M3" price="155" /> ! <StockSpace name="M4" price="130" /> ! <StockSpace name="N1" price="225" /> ! <StockSpace name="N2" price="200" /> ! <StockSpace name="N3" price="170" /> ! <StockSpace name="O1" price="250" /> ! <StockSpace name="O2" price="220" /> ! <StockSpace name="O3" price="185" /> ! <StockSpace name="P1" price="275" /> ! <StockSpace name="P2" price="240" /> ! <StockSpace name="P3" price="200" /> ! <StockSpace name="Q1" price="300" /> ! <StockSpace name="Q2" price="260" /> ! <StockSpace name="R1" price="325" /> ! <StockSpace name="R2" price="280" /> ! <StockSpace name="S1" price="350" /> ! <StockSpace name="S2" price="300" /> </StockMarket> --- 1,147 ---- <StockMarket type="rectangular"> ! <StockSpaceType name="yellow" colour="FFFF00"> ! <NoCertLimit/> ! </StockSpaceType> ! <StockSpaceType name="orange" colour="FF8000"> ! <NoCertLimit/> ! <NoHoldLimit/> ! </StockSpaceType> ! <StockSpaceType name="brown" colour="884000"> ! <NoCertLimit/> ! <NoHoldLimit/> ! <NoBuyLimit/> ! </StockSpaceType> ! ! <StockSpace name="A1" price="60" type="yellow"/> ! <StockSpace name="A2" price="53" type="yellow"/> ! <StockSpace name="A3" price="46" type="yellow"/> ! <StockSpace name="A4" price="39" type="orange"/> ! <StockSpace name="A5" price="32" type="orange"/> ! <StockSpace name="A6" price="25" type="brown"/> ! <StockSpace name="A7" price="18" type="brown"/> ! <StockSpace name="A8" price="10" type="brown"/> ! <StockSpace name="B1" price="67" /> ! <StockSpace name="B2" price="60" type="yellow"/> ! <StockSpace name="B3" price="55" type="yellow"/> ! <StockSpace name="B4" price="48" type="yellow"/> ! <StockSpace name="B5" price="41" type="orange"/> ! <StockSpace name="B6" price="34" type="orange"/> ! <StockSpace name="B7" price="27" type="brown"/> ! <StockSpace name="B8" price="20" type="brown"/> ! <StockSpace name="B9" price="10" type="brown"/> ! <StockSpace name="C1" price="71" /> ! <StockSpace name="C2" price="66" /> ! <StockSpace name="C3" price="60" type="yellow"/> ! <StockSpace name="C4" price="54" type="yellow"/> ! <StockSpace name="C5" price="48" type="yellow"/> ! <StockSpace name="C6" price="42" type="orange"/> ! <StockSpace name="C7" price="36" type="orange"/> ! <StockSpace name="C8" price="30" type="brown"/> ! <StockSpace name="C9" price="20" type="brown"/> ! <StockSpace name="C10" price="10" type="brown"/> ! <StockSpace name="D1" price="76" /> ! <StockSpace name="D2" price="70" /> ! <StockSpace name="D3" price="65" /> ! <StockSpace name="D4" price="60" type="yellow"/> ! <StockSpace name="D5" price="55" type="yellow"/> ! <StockSpace name="D6" price="50" type="yellow"/> ! <StockSpace name="D7" price="45" type="orange"/> ! <StockSpace name="D8" price="40" type="orange"/> ! <StockSpace name="D9" price="30" type="brown"/> ! <StockSpace name="D10" price="20" type="brown"/> ! <StockSpace name="D11" price="10" type="brown"/> ! <StockSpace name="E1" price="82" /> ! <StockSpace name="E2" price="76" /> ! <StockSpace name="E3" price="70" /> ! <StockSpace name="E4" price="66" /> ! <StockSpace name="E5" price="62" /> ! <StockSpace name="E6" price="58" type="yellow"/> ! <StockSpace name="E7" price="54" type="yellow"/> ! <StockSpace name="E8" price="50" type="yellow"/> ! <StockSpace name="E9" price="40" type="orange"/> ! <StockSpace name="E10" price="30" type="brown"/> ! <StockSpace name="E11" price="20" type="brown"/> ! <StockSpace name="F1" price="90" /> ! <StockSpace name="F2" price="82" /> ! <StockSpace name="F3" price="76" /> ! <StockSpace name="F4" price="71" /> ! <StockSpace name="F5" price="67" /> ! <StockSpace name="F6" price="65" /> ! <StockSpace name="F7" price="63" /> ! <StockSpace name="F8" price="60" type="yellow"/> ! <StockSpace name="F9" price="50" type="yellow"/> ! <StockSpace name="F10" price="40" type="orange"/> ! <StockSpace name="F11" price="30" type="brown"/> ! <StockSpace name="G1" price="100" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G2" price="90" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G3" price="82" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G4" price="76" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G5" price="71" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G6" price="67" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G7" price="67" /> ! <StockSpace name="G8" price="67" /> ! <StockSpace name="G9" price="60" type="yellow"/> ! <StockSpace name="G10" price="50" type="yellow"/> ! <StockSpace name="G11" price="40" type="orange"/> ! <StockSpace name="H1" price="112" /> ! <StockSpace name="H2" price="100" /> ! <StockSpace name="H3" price="90" /> ! <StockSpace name="H4" price="82" /> ! <StockSpace name="H5" price="76" /> ! <StockSpace name="H6" price="71" /> ! <StockSpace name="H7" price="69" /> ! <StockSpace name="H8" price="68" /> ! <StockSpace name="I1" price="126" /> ! <StockSpace name="I2" price="112" /> ! <StockSpace name="I3" price="100" /> ! <StockSpace name="I4" price="90" /> ! <StockSpace name="I5" price="82" /> ! <StockSpace name="I6" price="75" /> ! <StockSpace name="I7" price="70" /> ! <StockSpace name="J1" price="142" /> ! <StockSpace name="J2" price="126" /> ! <StockSpace name="J3" price="111" /> ! <StockSpace name="J4" price="100" /> ! <StockSpace name="J5" price="90" /> ! <StockSpace name="J6" price="80" /> ! <StockSpace name="K1" price="160" /> ! <StockSpace name="K2" price="142" /> ! <StockSpace name="K3" price="125" /> ! <StockSpace name="K4" price="110" /> ! <StockSpace name="K5" price="100" /> ! <StockSpace name="L1" price="180" /> ! <StockSpace name="L2" price="160" /> ! <StockSpace name="L3" price="140" /> ! <StockSpace name="L4" price="120" /> ! <StockSpace name="M1" price="200" /> ! <StockSpace name="M2" price="180" /> ! <StockSpace name="M3" price="155" /> ! <StockSpace name="M4" price="130" /> ! <StockSpace name="N1" price="225" /> ! <StockSpace name="N2" price="200" /> ! <StockSpace name="N3" price="170" /> ! <StockSpace name="O1" price="250" /> ! <StockSpace name="O2" price="220" /> ! <StockSpace name="O3" price="185" /> ! <StockSpace name="P1" price="275" /> ! <StockSpace name="P2" price="240" /> ! <StockSpace name="P3" price="200" /> ! <StockSpace name="Q1" price="300" /> ! <StockSpace name="Q2" price="260" /> ! <StockSpace name="R1" price="325" /> ! <StockSpace name="R2" price="280" /> ! <StockSpace name="S1" price="350" /> ! <StockSpace name="S2" price="300" /> </StockMarket> Index: CompanyManager.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18Kaas/CompanyManager.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CompanyManager.xml 17 Jan 2010 14:05:48 -0000 1.9 --- CompanyManager.xml 31 Jan 2010 22:16:03 -0000 1.10 *************** *** 10,23 **** <Certificate type="President" shares="2"/> <Certificate shares="1" number="8"/> ! <BaseTokens> ! <LayCost method="sequence" cost="0,40,100"/> ! </BaseTokens> <Trains number="4,4,3,2"/> </CompanyType> <Company name="SVNRR" type="Private" basePrice="20" revenue="5"> ! <Blocking hex="H9"/> ! </Company> <Company name="C&StL" type="Private" basePrice="40" revenue="10"> ! <Blocking hex="D15"/> <SpecialProperties> <SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay"> --- 10,23 ---- <Certificate type="President" shares="2"/> <Certificate shares="1" number="8"/> ! <BaseTokens> ! <LayCost method="sequence" cost="0,40,100"/> ! </BaseTokens> <Trains number="4,4,3,2"/> </CompanyType> <Company name="SVNRR" type="Private" basePrice="20" revenue="5"> ! <Blocking hex="H9"/> ! </Company> <Company name="C&StL" type="Private" basePrice="40" revenue="10"> ! <Blocking hex="D15"/> <SpecialProperties> <SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay"> *************** *** 27,31 **** </Company> <Company name="D&H" type="Private" basePrice="70" revenue="15"> ! <Blocking hex="K16"/> <SpecialProperties> <SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay"> --- 27,31 ---- </Company> <Company name="D&H" type="Private" basePrice="70" revenue="15"> ! <Blocking hex="K16"/> <SpecialProperties> <SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay"> *************** *** 38,42 **** </Company> <Company name="M&H" type="Private" basePrice="110" revenue="20"> ! <Blocking hex="D9"/> <SpecialProperties> <SpecialProperty condition="ifOwnedByPlayer" when="anyTime" class="rails.game.special.ExchangeForShare"> --- 38,42 ---- </Company> <Company name="M&H" type="Private" basePrice="110" revenue="20"> ! <Blocking hex="D9"/> <SpecialProperties> <SpecialProperty condition="ifOwnedByPlayer" when="anyTime" class="rails.game.special.ExchangeForShare"> *************** *** 46,78 **** </Company> <Company name="C&A" type="Private" basePrice="160" revenue="25"> ! <Blocking hex="J7"/> ! </Company> <Company name="B&O" type="Private" basePrice="220" revenue="30"> ! <Blocking hex="G6,G8"/> ! </Company> <Company name="B&O" type="Public" tokens="3" fgColour="FFFFFF" bgColour="0000FF"> <FirstTrainCloses type="Private" name="B&O"/> ! <Home hex="G8"/> </Company> <Company name="PRR" type="Public" tokens="4" fgColour="FFFFFF" bgColour="008000"> ! <Home hex="I12"/> </Company> <Company name="NYNH" type="Public" tokens="2" fgColour="000000" bgColour="FF8000"> ! <Home hex="G10" city="2"/> </Company> <Company name="NYC" type="Public" tokens="4" fgColour="FFFFFF" bgColour="000000"> ! <Home hex="E10"/> </Company> <Company name="Erie" type="Public" tokens="3" fgColour="000000" bgColour="FFFF00"> ! <Home hex="G16"/> </Company> <Company name="B&M" type="Public" tokens="2" fgColour="000000" bgColour="60E060"> ! <Home hex="K8"/> </Company> <Company name="C&O" type="Public" tokens="3" fgColour="000000" bgColour="A0E0FF"> ! <Home hex="O16"/> </Company> <Company name="CPR" type="Public" tokens="4" fgColour="FFFFFF" bgColour="FF0000"> ! <Home hex="B17"/> </Company> <StartPacket roundClass="rails.game.StartRound_1830"> --- 46,78 ---- </Company> <Company name="C&A" type="Private" basePrice="160" revenue="25"> ! <Blocking hex="J7"/> ! </Company> <Company name="B&O" type="Private" basePrice="220" revenue="30"> ! <Blocking hex="G6,G8"/> ! </Company> <Company name="B&O" type="Public" tokens="3" fgColour="FFFFFF" bgColour="0000FF"> <FirstTrainCloses type="Private" name="B&O"/> ! <Home hex="G8"/> </Company> <Company name="PRR" type="Public" tokens="4" fgColour="FFFFFF" bgColour="008000"> ! <Home hex="I12"/> </Company> <Company name="NYNH" type="Public" tokens="2" fgColour="000000" bgColour="FF8000"> ! <Home hex="G10" city="2"/> </Company> <Company name="NYC" type="Public" tokens="4" fgColour="FFFFFF" bgColour="000000"> ! <Home hex="E10"/> </Company> <Company name="Erie" type="Public" tokens="3" fgColour="000000" bgColour="FFFF00"> ! <Home hex="G16"/> </Company> <Company name="B&M" type="Public" tokens="2" fgColour="000000" bgColour="60E060"> ! <Home hex="K8"/> </Company> <Company name="C&O" type="Public" tokens="3" fgColour="000000" bgColour="A0E0FF"> ! <Home hex="O16"/> </Company> <Company name="CPR" type="Public" tokens="4" fgColour="FFFFFF" bgColour="FF0000"> ! <Home hex="B17"/> </Company> <StartPacket roundClass="rails.game.StartRound_1830"> |