[Rails-commits] 18xx/data/1830 CompanyManager.xml,1.32,1.33

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

Update of /cvsroot/rails/18xx/data/1830
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7192/data/1830

Modified Files:
	CompanyManager.xml 
Log Message:
Info: replaced Privates by Companies. Now covers all (private and public) company types, as defined in the XML.
Info display also extended. 1830 and 1835 done, others remain.


Index: CompanyManager.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1830/CompanyManager.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** CompanyManager.xml	3 Feb 2010 20:28:23 -0000	1.32
--- CompanyManager.xml	4 Feb 2010 21:27:59 -0000	1.33
***************
*** 19,27 ****
  	</CompanyType>
  	<Company name="SVNRR" type="Private" basePrice="20" revenue="5"
! 			longName="Schuylkill Valley Navigation &amp; Railroad Company">
  		<Blocking hex="G15"/>
  	</Company>
  	<Company name="C&amp;StL" type="Private" basePrice="40" revenue="10"
! 			longName="Champlain &amp; St.Lawrence">
  		<Blocking hex="B20"/>
  		<SpecialProperties>
--- 19,27 ----
  	</CompanyType>
  	<Company name="SVNRR" type="Private" basePrice="20" revenue="5"
! 			longname="Schuylkill Valley Navigation &amp; Railroad Company">
  		<Blocking hex="G15"/>
  	</Company>
  	<Company name="C&amp;StL" type="Private" basePrice="40" revenue="10"
! 			longname="Champlain &amp; St.Lawrence">
  		<Blocking hex="B20"/>
  		<SpecialProperties>
***************
*** 32,36 ****
  	</Company>
  	<Company name="D&amp;H" type="Private" basePrice="70" revenue="15"
! 		longName="Delaware &amp; Hudson">
  		<Blocking hex="F16"/>
  		<SpecialProperties>
--- 32,36 ----
  	</Company>
  	<Company name="D&amp;H" type="Private" basePrice="70" revenue="15"
! 		longname="Delaware &amp; Hudson">
  		<Blocking hex="F16"/>
  		<SpecialProperties>
***************
*** 44,48 ****
  	</Company>
  	<Company name="M&amp;H" type="Private" basePrice="110" revenue="20"
! 		longName="Mohawk &amp; Hudson">
  		<Blocking hex="D18"/>
  		<SpecialProperties>
--- 44,48 ----
  	</Company>
  	<Company name="M&amp;H" type="Private" basePrice="110" revenue="20"
! 		longname="Mohawk &amp; Hudson">
  		<Blocking hex="D18"/>
  		<SpecialProperties>
***************
*** 53,62 ****
  	</Company>
  	<Company name="C&amp;A" type="Private" basePrice="160" revenue="25"
! 		longName="Camden &amp; Amboy">
  		<Info key="ComesWithCertificate" parm="PRR,10"/>
  		<Blocking hex="H18"/>
  	</Company>
  	<Company name="B&amp;O" type="Private" basePrice="220" revenue="30"
! 		longName="Baltimore &amp; Ohio">
  		<Info key="ComesWithPresidency" parm="B&amp;O,20"/>
  		<Blocking hex="I13,I15"/>
--- 53,62 ----
  	</Company>
  	<Company name="C&amp;A" type="Private" basePrice="160" revenue="25"
! 		longname="Camden &amp; Amboy">
  		<Info key="ComesWithCertificate" parm="PRR,10"/>
  		<Blocking hex="H18"/>
  	</Company>
  	<Company name="B&amp;O" type="Private" basePrice="220" revenue="30"
! 		longname="Baltimore &amp; Ohio">
  		<Info key="ComesWithPresidency" parm="B&amp;O,20"/>
  		<Blocking hex="I13,I15"/>
***************
*** 65,91 ****
  	<!-- Note two supported colour specification formats:
  	     RGB decimal with commas and RGB hexadecimal without commas -->
! 	<Company name="B&amp;O" type="Public" tokens="3" fgColour="255,255,255" bgColour="0,0,255">
  		<FirstTrainCloses type="Private" name="B&amp;O"/>
  		<Home hex="I15"/>
  	</Company>
! 	<Company name="PRR" type="Public" tokens="4" fgColour="FFFFFF" bgColour="008000">
  		<Home hex="H12"/>
  	</Company>
! 	<Company name="NYNH" type="Public" tokens="2" fgColour="000000" bgColour="FF8000">
  		<Home hex="G19" city="2"/>
  	</Company>
! 	<Company name="NYC" type="Public" tokens="4" fgColour="FFFFFF" bgColour="000000">
  		<Home hex="E19"/>
  	</Company>
! 	<Company name="Erie" type="Public" tokens="3" fgColour="000000" bgColour="FFFF00">
! 		<Home hex="E11" city="0"/>
  	</Company>
! 	<Company name="B&amp;M" type="Public" tokens="2" fgColour="000000" bgColour="60E060">
  		<Home hex="E23"/>
  	</Company>
! 	<Company name="C&amp;O" type="Public" tokens="3" fgColour="000000" bgColour="A0E0FF">
  		<Home hex="F6"/>
  	</Company>
! 	<Company name="CPR" type="Public" tokens="4" fgColour="FFFFFF" bgColour="FF0000">
  		<Home hex="A19"/>
  	</Company>
--- 65,99 ----
  	<!-- Note two supported colour specification formats:
  	     RGB decimal with commas and RGB hexadecimal without commas -->
! 	<Company name="B&amp;O" type="Public" tokens="3" fgColour="255,255,255" bgColour="0,0,255"
! 			longname="Baltimore &amp; Ohio">
  		<FirstTrainCloses type="Private" name="B&amp;O"/>
  		<Home hex="I15"/>
  	</Company>
! 	<Company name="PRR" type="Public" tokens="4" fgColour="FFFFFF" bgColour="008000"
! 			longname="Pennsylvania Railroad">
  		<Home hex="H12"/>
  	</Company>
! 	<Company name="NYNH" type="Public" tokens="2" fgColour="000000" bgColour="FF8000"
! 			longname="New York, New Haven &amp; Hartford">
  		<Home hex="G19" city="2"/>
  	</Company>
! 	<Company name="NYC" type="Public" tokens="4" fgColour="FFFFFF" bgColour="000000"
! 			longname="New York Central">
  		<Home hex="E19"/>
  	</Company>
! 	<Company name="Erie" type="Public" tokens="3" fgColour="000000" bgColour="FFFF00"
! 			longname="Erie Railroad">
! 		<Home hex="E11"/>
  	</Company>
! 	<Company name="B&amp;M" type="Public" tokens="2" fgColour="000000" bgColour="60E060"
! 			longname="Boston &amp; Maine">
  		<Home hex="E23"/>
  	</Company>
! 	<Company name="C&amp;O" type="Public" tokens="3" fgColour="000000" bgColour="A0E0FF"
! 			longname="Chesapeake &amp; Ohio">
  		<Home hex="F6"/>
  	</Company>
! 	<Company name="CPR" type="Public" tokens="4" fgColour="FFFFFF" bgColour="FF0000"
! 			longname="Canadian Pacific Railroad">
  		<Home hex="A19"/>
  	</Company>