Merge branch 'new-liveries-rollmaterial' of https://github.com/Rollma…

…terial/simutrans-pak128.britain.git

Pak128.Britain-Extended.vcxproj

@@ -1090,6 +1090,7 @@
     <None Include="trains\br-312.dat" />
     <None Include="trains\br-314.dat" />
     <None Include="trains\br-318.dat" />
+    <None Include="trains\br-320.dat" />
     <None Include="trains\br-321.dat" />
     <None Include="trains\br-323.dat" />
     <None Include="trains\br-325.dat" />

trains/br-153.dat

@@ -73,6 +73,8 @@ Constraint[Next][13]=none
 liverytype[0]=Regional-Railways-Standard
 liverytype[1]=One
 liverytype[2]=Anglia-original
+liverytype[3]=NXEA
+liverytype[4]=Abellio-Greater-Anglia
 
 EmptyImage[E][0]=./railcars/br-153-rr_E.0.0
 EmptyImage[SE][0]=./railcars/br-153-rr_SE.0.0
@@ -100,6 +102,24 @@ EmptyImage[W][2]=./railcars/br-153-anglia_W.0.0
 EmptyImage[NW][2]=./railcars/br-153-anglia_NW.0.0
 EmptyImage[N][2]=./railcars/br-153-anglia_N.0.0
 EmptyImage[NE][2]=./railcars/br-153-anglia_NE.0.0
+
+EmptyImage[E][3]=./railcars/br-153-nxea_E.0.0
+EmptyImage[SE][3]=./railcars/br-153-nxea_SE.0.0
+EmptyImage[S][3]=./railcars/br-153-nxea_S.0.0
+EmptyImage[SW][3]=./railcars/br-153-nxea_SW.0.0
+EmptyImage[W][3]=./railcars/br-153-nxea_W.0.0
+EmptyImage[NW][3]=./railcars/br-153-nxea_NW.0.0
+EmptyImage[N][3]=./railcars/br-153-nxea_N.0.0
+EmptyImage[NE][3]=./railcars/br-153-nxea_NE.0.0
+
+EmptyImage[E][4]=./railcars/br-153-abellio_E.0.0
+EmptyImage[SE][4]=./railcars/br-153-abellio_SE.0.0
+EmptyImage[S][4]=./railcars/br-153-abellio_S.0.0
+EmptyImage[SW][4]=./railcars/br-153-abellio_SW.0.0
+EmptyImage[W][4]=./railcars/br-153-abellio_W.0.0
+EmptyImage[NW][4]=./railcars/br-153-abellio_NW.0.0
+EmptyImage[N][4]=./railcars/br-153-abellio_N.0.0
+EmptyImage[NE][4]=./railcars/br-153-abellio_NE.0.0
 -----
 
 obj=vehicle
@@ -177,6 +197,8 @@ Constraint[Next][13]=none
 liverytype[0]=Regional-Railways-Standard
 liverytype[1]=One
 liverytype[2]=Anglia-original
+liverytype[3]=NXEA
+liverytype[4]=Abellio-Greater-Anglia
 
 EmptyImage[E][0]=./railcars/br-153-rr_E.0.0
 EmptyImage[SE][0]=./railcars/br-153-rr_SE.0.0
@@ -204,4 +226,22 @@ EmptyImage[W][2]=./railcars/br-153-anglia_W.0.0
 EmptyImage[NW][2]=./railcars/br-153-anglia_NW.0.0
 EmptyImage[N][2]=./railcars/br-153-anglia_N.0.0
 EmptyImage[NE][2]=./railcars/br-153-anglia_NE.0.0
+
+EmptyImage[E][3]=./railcars/br-153-nxea_E.0.0
+EmptyImage[SE][3]=./railcars/br-153-nxea_SE.0.0
+EmptyImage[S][3]=./railcars/br-153-nxea_S.0.0
+EmptyImage[SW][3]=./railcars/br-153-nxea_SW.0.0
+EmptyImage[W][3]=./railcars/br-153-nxea_W.0.0
+EmptyImage[NW][3]=./railcars/br-153-nxea_NW.0.0
+EmptyImage[N][3]=./railcars/br-153-nxea_N.0.0
+EmptyImage[NE][3]=./railcars/br-153-nxea_NE.0.0
+
+EmptyImage[E][4]=./railcars/br-153-abellio_E.0.0
+EmptyImage[SE][4]=./railcars/br-153-abellio_SE.0.0
+EmptyImage[S][4]=./railcars/br-153-abellio_S.0.0
+EmptyImage[SW][4]=./railcars/br-153-abellio_SW.0.0
+EmptyImage[W][4]=./railcars/br-153-abellio_W.0.0
+EmptyImage[NW][4]=./railcars/br-153-abellio_NW.0.0
+EmptyImage[N][4]=./railcars/br-153-abellio_N.0.0
+EmptyImage[NE][4]=./railcars/br-153-abellio_NE.0.0
 --

trains/br-156.dat

@@ -60,6 +60,8 @@ liverytype[1]=One
 liverytype[2]=Provincial
 liverytype[3]=Strathclyde-orange-black
 liverytype[4]=Strathclyde-carmine-cream
+liverytype[5]=NXEA
+liverytype[6]=Abellio-Greater-Anglia
 
 EmptyImage[E][0]=./railcars/br-156-a-rr_E.0.0
 EmptyImage[SE][0]=./railcars/br-156-a-rr_SE.0.0
@@ -106,6 +108,24 @@ EmptyImage[NW][4]=./railcars/br-156-a-spt-cc_NW.0.0
 EmptyImage[N][4]=./railcars/br-156-a-spt-cc_N.0.0
 EmptyImage[NE][4]=./railcars/br-156-a-spt-cc_NE.0.0
 
+EmptyImage[E][5]=./railcars/br-156-a-nx_E.0.0
+EmptyImage[SE][5]=./railcars/br-156-a-nx_SE.0.0
+EmptyImage[S][5]=./railcars/br-156-a-nx_S.0.0
+EmptyImage[SW][5]=./railcars/br-156-a-nx_SW.0.0
+EmptyImage[W][5]=./railcars/br-156-a-nx_W.0.0
+EmptyImage[NW][5]=./railcars/br-156-a-nx_NW.0.0
+EmptyImage[N][5]=./railcars/br-156-a-nx_N.0.0
+EmptyImage[NE][5]=./railcars/br-156-a-nx_NE.0.0
+
+EmptyImage[E][6]=./railcars/br-156-a-abellio_E.0.0
+EmptyImage[SE][6]=./railcars/br-156-a-abellio_SE.0.0
+EmptyImage[S][6]=./railcars/br-156-a-abellio_S.0.0
+EmptyImage[SW][6]=./railcars/br-156-a-abellio_SW.0.0
+EmptyImage[W][6]=./railcars/br-156-a-abellio_W.0.0
+EmptyImage[NW][6]=./railcars/br-156-a-abellio_NW.0.0
+EmptyImage[N][6]=./railcars/br-156-a-abellio_N.0.0
+EmptyImage[NE][6]=./railcars/br-156-a-abellio_NE.0.0
+
 -----
 
 obj=vehicle
@@ -170,6 +190,8 @@ liverytype[1]=One
 liverytype[2]=Provincial
 liverytype[3]=Strathclyde-orange-black
 liverytype[4]=Strathclyde-carmine-cream
+liverytype[5]=NXEA
+liverytype[6]=Abellio-Greater-Anglia
 
 EmptyImage[E][0]=./railcars/br-156-a-rr_E.0.0
 EmptyImage[SE][0]=./railcars/br-156-a-rr_SE.0.0
@@ -216,6 +238,24 @@ EmptyImage[NW][4]=./railcars/br-156-a-spt-cc_NW.0.0
 EmptyImage[N][4]=./railcars/br-156-a-spt-cc_N.0.0
 EmptyImage[NE][4]=./railcars/br-156-a-spt-cc_NE.0.0
 
+EmptyImage[E][5]=./railcars/br-156-a-nx_E.0.0
+EmptyImage[SE][5]=./railcars/br-156-a-nx_SE.0.0
+EmptyImage[S][5]=./railcars/br-156-a-nx_S.0.0
+EmptyImage[SW][5]=./railcars/br-156-a-nx_SW.0.0
+EmptyImage[W][5]=./railcars/br-156-a-nx_W.0.0
+EmptyImage[NW][5]=./railcars/br-156-a-nx_NW.0.0
+EmptyImage[N][5]=./railcars/br-156-a-nx_N.0.0
+EmptyImage[NE][5]=./railcars/br-156-a-nx_NE.0.0
+
+EmptyImage[E][6]=./railcars/br-156-a-abellio_E.0.0
+EmptyImage[SE][6]=./railcars/br-156-a-abellio_SE.0.0
+EmptyImage[S][6]=./railcars/br-156-a-abellio_S.0.0
+EmptyImage[SW][6]=./railcars/br-156-a-abellio_SW.0.0
+EmptyImage[W][6]=./railcars/br-156-a-abellio_W.0.0
+EmptyImage[NW][6]=./railcars/br-156-a-abellio_NW.0.0
+EmptyImage[N][6]=./railcars/br-156-a-abellio_N.0.0
+EmptyImage[NE][6]=./railcars/br-156-a-abellio_NE.0.0
+
 ---
 
 obj=vehicle
@@ -279,6 +319,8 @@ liverytype[1]=One
 liverytype[2]=Provincial
 liverytype[3]=Strathclyde-orange-black
 liverytype[4]=Strathclyde-carmine-cream
+liverytype[5]=NXEA
+liverytype[6]=Abellio-Greater-Anglia
 
 EmptyImage[E][0]=./railcars/br-156-b-rr_E.0.0
 EmptyImage[SE][0]=./railcars/br-156-b-rr_SE.0.0
@@ -324,4 +366,22 @@ EmptyImage[W][4]=./railcars/br-156-b-spt-cc_W.0.0
 EmptyImage[NW][4]=./railcars/br-156-b-spt-cc_NW.0.0
 EmptyImage[N][4]=./railcars/br-156-b-spt-cc_N.0.0
 EmptyImage[NE][4]=./railcars/br-156-b-spt-cc_NE.0.0
+
+EmptyImage[E][5]=./railcars/br-156-b-nx_E.0.0
+EmptyImage[SE][5]=./railcars/br-156-b-nx_SE.0.0
+EmptyImage[S][5]=./railcars/br-156-b-nx_S.0.0
+EmptyImage[SW][5]=./railcars/br-156-b-nx_SW.0.0
+EmptyImage[W][5]=./railcars/br-156-b-nx_W.0.0
+EmptyImage[NW][5]=./railcars/br-156-b-nx_NW.0.0
+EmptyImage[N][5]=./railcars/br-156-b-nx_N.0.0
+EmptyImage[NE][5]=./railcars/br-156-b-nx_NE.0.0
+
+EmptyImage[E][6]=./railcars/br-156-b-abellio_E.0.0
+EmptyImage[SE][6]=./railcars/br-156-b-abellio_SE.0.0
+EmptyImage[S][6]=./railcars/br-156-b-abellio_S.0.0
+EmptyImage[SW][6]=./railcars/br-156-b-abellio_SW.0.0
+EmptyImage[W][6]=./railcars/br-156-b-abellio_W.0.0
+EmptyImage[NW][6]=./railcars/br-156-b-abellio_NW.0.0
+EmptyImage[N][6]=./railcars/br-156-b-abellio_N.0.0
+EmptyImage[NE][6]=./railcars/br-156-b-abellio_NE.0.0
 --

trains/br-312.dat

@@ -52,7 +52,8 @@ Constraint[Next][0]=BR-312-MBSO
 liverytype[0]=BR-Blue
 liverytype[1]=BR-Large-Logo
 liverytype[2]=NSE-Standard
-
+# For contemporary First Great Eastern
+liverytype[3]=Anglia-original
 
 EmptyImage[E][0]=./railcars/br-312-driving-front_E.0.0
 EmptyImage[SE][0]=./railcars/br-312-driving-front_SE.0.0
@@ -81,6 +82,14 @@ EmptyImage[NW][2]=./railcars/br-312-driving-front-nse_NW.0.0
 EmptyImage[N][2]=./railcars/br-312-driving-front-nse_N.0.0
 EmptyImage[NE][2]=./railcars/br-312-driving-front-nse_NE.0.0
 
+EmptyImage[E][3]=./railcars/br-312-driving-front-fge_E.0.0
+EmptyImage[SE][3]=./railcars/br-312-driving-front-fge_SE.0.0
+EmptyImage[S][3]=./railcars/br-312-driving-front-fge_S.0.0
+EmptyImage[SW][3]=./railcars/br-312-driving-front-fge_SW.0.0
+EmptyImage[W][3]=./railcars/br-312-driving-front-fge_W.0.0
+EmptyImage[NW][3]=./railcars/br-312-driving-front-fge_NW.0.0
+EmptyImage[N][3]=./railcars/br-312-driving-front-fge_N.0.0
+EmptyImage[NE][3]=./railcars/br-312-driving-front-fge_NE.0.0
 ---
 
 obj=vehicle
@@ -131,6 +140,8 @@ Constraint[Next][1]=BR-312-DTCOL
 liverytype[0]=BR-Blue
 liverytype[1]=BR-Large-Logo
 liverytype[2]=NSE-Standard
+# For contemporary First Great Eastern
+liverytype[3]=Anglia-original
 
 EmptyImage[E][0]=./railcars/br-312-pantograph_E.0.0
 EmptyImage[SE][0]=./railcars/br-312-pantograph_SE.0.0
@@ -159,7 +170,14 @@ EmptyImage[NW][2]=./railcars/br-312-pantograph-nse_NW.0.0
 EmptyImage[N][2]=./railcars/br-312-pantograph-nse_N.0.0
 EmptyImage[NE][2]=./railcars/br-312-pantograph-nse_NE.0.0
 
-
+EmptyImage[E][3]=./railcars/br-312-pantograph-fge_E.0.0
+EmptyImage[SE][3]=./railcars/br-312-pantograph-fge_SE.0.0
+EmptyImage[S][3]=./railcars/br-312-pantograph-fge_S.0.0
+EmptyImage[SW][3]=./railcars/br-312-pantograph-fge_SW.0.0
+EmptyImage[W][3]=./railcars/br-312-pantograph-fge_W.0.0
+EmptyImage[NW][3]=./railcars/br-312-pantograph-fge_NW.0.0
+EmptyImage[N][3]=./railcars/br-312-pantograph-fge_N.0.0
+EmptyImage[NE][3]=./railcars/br-312-pantograph-fge_NE.0.0
 ---
 
 obj=vehicle
@@ -208,6 +226,8 @@ Constraint[Next][0]=BR-312-DTCOL
 liverytype[0]=BR-Blue
 liverytype[1]=BR-Large-Logo
 liverytype[2]=NSE-Standard
+# For contemporary First Great Eastern
+liverytype[3]=Anglia-original
 
 EmptyImage[E][0]=./railcars/br-312-trailer_E.0.0
 EmptyImage[SE][0]=./railcars/br-312-trailer_SE.0.0
@@ -235,6 +255,15 @@ EmptyImage[W][2]=./railcars/br-312-trailer-nse_W.0.0
 EmptyImage[NW][2]=./railcars/br-312-trailer-nse_NW.0.0
 EmptyImage[N][2]=./railcars/br-312-trailer-nse_N.0.0
 EmptyImage[NE][2]=./railcars/br-312-trailer-nse_NE.0.0
+
+EmptyImage[E][3]=./railcars/br-312-trailer-fge_E.0.0
+EmptyImage[SE][3]=./railcars/br-312-trailer-fge_SE.0.0
+EmptyImage[S][3]=./railcars/br-312-trailer-fge_S.0.0
+EmptyImage[SW][3]=./railcars/br-312-trailer-fge_SW.0.0
+EmptyImage[W][3]=./railcars/br-312-trailer-fge_W.0.0
+EmptyImage[NW][3]=./railcars/br-312-trailer-fge_NW.0.0
+EmptyImage[N][3]=./railcars/br-312-trailer-fge_N.0.0
+EmptyImage[NE][3]=./railcars/br-312-trailer-fge_NE.0.0
 --
 
 obj=vehicle
@@ -290,6 +319,8 @@ Constraint[Next][5]=none
 liverytype[0]=BR-Blue
 liverytype[1]=BR-Large-Logo
 liverytype[2]=NSE-Standard
+# For contemporary First Great Eastern
+liverytype[3]=Anglia-original
 
 EmptyImage[E][0]=./railcars/br-312-driving-rear_E.0.0
 EmptyImage[SE][0]=./railcars/br-312-driving-rear_SE.0.0
@@ -317,4 +348,13 @@ EmptyImage[W][2]=./railcars/br-312-driving-rear-nse_W.0.0
 EmptyImage[NW][2]=./railcars/br-312-driving-rear-nse_NW.0.0
 EmptyImage[N][2]=./railcars/br-312-driving-rear-nse_N.0.0
 EmptyImage[NE][2]=./railcars/br-312-driving-rear-nse_NE.0.0
+
+EmptyImage[E][3]=./railcars/br-312-driving-rear-fge_E.0.0
+EmptyImage[SE][3]=./railcars/br-312-driving-rear-fge_SE.0.0
+EmptyImage[S][3]=./railcars/br-312-driving-rear-fge_S.0.0
+EmptyImage[SW][3]=./railcars/br-312-driving-rear-fge_SW.0.0
+EmptyImage[W][3]=./railcars/br-312-driving-rear-fge_W.0.0
+EmptyImage[NW][3]=./railcars/br-312-driving-rear-fge_NW.0.0
+EmptyImage[N][3]=./railcars/br-312-driving-rear-fge_N.0.0
+EmptyImage[NE][3]=./railcars/br-312-driving-rear-fge_NE.0.0
 --

trains/br-313.dat

@@ -6,7 +6,7 @@ speed=120
 power=328
 tractive_effort=45
 gear=80
-copyright=Kieron
+copyright=Kieron/Rollmaterial
 intro_year=1975
 intro_month=12
 retire_year=1991
@@ -42,6 +42,7 @@ Constraint[Next][0]=BR-313Pantograph
 
 liverytype[0]=BR-Blue
 liverytype[1]=NSE-Standard
+liverytype[2]=wagn-purple
 
 EmptyImage[E][0]=./railcars/br-313-a-bg_E.0.0
 EmptyImage[SE][0]=./railcars/br-313-a-bg_SE.0.0
@@ -61,6 +62,14 @@ EmptyImage[NW][1]=./railcars/br-313-a-nse_NW.0.0
 EmptyImage[N][1]=./railcars/br-313-a-nse_N.0.0
 EmptyImage[NE][1]=./railcars/br-313-a-nse_NE.0.0
 
+EmptyImage[E][2]=./railcars/br-315-front-wagn_E.0.0
+EmptyImage[SE][2]=./railcars/br-315-front-wagn_SE.0.0
+EmptyImage[S][2]=./railcars/br-315-front-wagn_S.0.0
+EmptyImage[SW][2]=./railcars/br-315-front-wagn_SW.0.0
+EmptyImage[W][2]=./railcars/br-315-front-wagn_W.0.0
+EmptyImage[NW][2]=./railcars/br-315-front-wagn_NW.0.0
+EmptyImage[N][2]=./railcars/br-315-front-wagn_N.0.0
+EmptyImage[NE][2]=./railcars/br-315-front-wagn_NE.0.0
 ----
 
 obj=vehicle
@@ -70,7 +79,7 @@ speed=120
 power=0
 tractive_effort=0
 gear=80
-copyright=Kieron
+copyright=Kieron/Rollmaterial
 intro_year=1975
 intro_month=12
 retire_year=1991
@@ -103,6 +112,7 @@ Constraint[Next][0]=BR-313Rear
 
 liverytype[0]=BR-Blue
 liverytype[1]=NSE-Standard
+liverytype[2]=wagn-purple
 
 EmptyImage[E][0]=./railcars/br-313-b-bg_E.0.0
 EmptyImage[SE][0]=./railcars/br-313-b-bg_SE.0.0
@@ -122,6 +132,14 @@ EmptyImage[NW][1]=./railcars/br-313-b-nse_NW.0.0
 EmptyImage[N][1]=./railcars/br-313-b-nse_N.0.0
 EmptyImage[NE][1]=./railcars/br-313-b-nse_NE.0.0
 
+EmptyImage[E][2]=./railcars/br-315-panto-wagn_E.0.0
+EmptyImage[SE][2]=./railcars/br-315-panto-wagn_SE.0.0
+EmptyImage[S][2]=./railcars/br-315-panto-wagn_S.0.0
+EmptyImage[SW][2]=./railcars/br-315-panto-wagn_SW.0.0
+EmptyImage[W][2]=./railcars/br-315-panto-wagn_W.0.0
+EmptyImage[NW][2]=./railcars/br-315-panto-wagn_NW.0.0
+EmptyImage[N][2]=./railcars/br-315-panto-wagn_N.0.0
+EmptyImage[NE][2]=./railcars/br-315-panto-wagn_NE.0.0
 ----
 
 obj=vehicle
@@ -131,7 +149,7 @@ speed=120
 power=328
 gear=80
 tractive_effort=45
-copyright=Kieron
+copyright=Kieron/Rollmaterial
 intro_year=1975
 intro_month=12
 retire_year=1991
@@ -166,6 +184,7 @@ Constraint[Next][1]=none
 
 liverytype[0]=BR-Blue
 liverytype[1]=NSE-Standard
+liverytype[2]=wagn-purple
 
 EmptyImage[E][0]=./railcars/br-313-c-bg_E.0.0
 EmptyImage[SE][0]=./railcars/br-313-c-bg_SE.0.0
@@ -184,4 +203,13 @@ EmptyImage[W][1]=./railcars/br-313-c-nse_W.0.0
 EmptyImage[NW][1]=./railcars/br-313-c-nse_NW.0.0
 EmptyImage[N][1]=./railcars/br-313-c-nse_N.0.0
 EmptyImage[NE][1]=./railcars/br-313-c-nse_NE.0.0
+
+EmptyImage[E][2]=./railcars/br-315-rear-wagn_E.0.0
+EmptyImage[SE][2]=./railcars/br-315-rear-wagn_SE.0.0
+EmptyImage[S][2]=./railcars/br-315-rear-wagn_S.0.0
+EmptyImage[SW][2]=./railcars/br-315-rear-wagn_SW.0.0
+EmptyImage[W][2]=./railcars/br-315-rear-wagn_W.0.0
+EmptyImage[NW][2]=./railcars/br-315-rear-wagn_NW.0.0
+EmptyImage[N][2]=./railcars/br-315-rear-wagn_N.0.0
+EmptyImage[NE][2]=./railcars/br-315-rear-wagn_NE.0.0
 --