New upstream version 5.1.0upstream/5.1.0

1 files changed, 55 insertions, 27 deletions

diff --git a/app/lib/params/lgb.xtp b/app/lib/params/lgb.xtp
index 3a740cf..7c00155 100644
--- a/app/lib/params/lgb.xtp
+++ b/app/lib/params/lgb.xtp
@@ -49,6 +49,12 @@ TURNOUT G "LGB	Straight 150mm	10150"
 	E 5.905512 0.000000 90.000000
 	S 0 0.000000 0.000000 0.000000 5.905512 0.000000
 	END
+TURNOUT G "LGB	Reverse Loop Track 150mm	10151"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 5.905512 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 5.905512 0.000000
+	END
 TURNOUT G "LGB	Insulated Double 150mm	10152"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
@@ -61,7 +67,7 @@ TURNOUT G "LGB	Insulated Single 150mm	10153"
 	E 5.905512 0.000000 90.000000
 	S 0 0.000000 0.000000 0.000000 5.905512 0.000000
 	END
-TURNOUT G "LGB	Bumper	10320"
+TURNOUT G "LGB	Bumper(old timer)	10320"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 5.905512 0.000000 90.000000
@@ -93,49 +99,49 @@ TURNOUT G "LGB	Straight 1200mm	10610"
 	END
 
 SUBCONTENTS LGB Curve Track
-TURNOUT G "LGB	Curved R1 30°	11000"
+TURNOUT G "LGB	Curved R1 30°	11000"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 11.811024 3.164754 60.000000
 	C 0 0.000000 -23.622047 0.000000 23.622047 150.000000 30.000000
 	END
-TURNOUT G "LGB	Curved R1 15°	11020"
+TURNOUT G "LGB	Curved R1 15°	11020"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 6.113836 0.804902 75.000000
 	C 0 0.000000 -23.622047 0.000000 23.622047 165.000000 15.000000
 	END
-TURNOUT G "LGB	Curved R1 7.5°	11040"
+TURNOUT G "LGB	Curved R1 7.5°	11040"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 3.083296 0.202090 82.500000
 	C 0 0.000000 -23.622047 0.000000 23.622047 172.500000 7.500000
 	END
-TURNOUT G "LGB	Curved Insulated Double R1 15°	11152"
+TURNOUT G "LGB	Curved Insulated Double R1 15°	11152"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 6.113836 0.804902 75.000000
 	C 0 0.000000 -23.622047 0.000000 23.622047 165.000000 15.000000
 	END
-TURNOUT G "LGB	Curved R2 30°	15000"
+TURNOUT G "LGB	Curved R2 30°	15000"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 15.354331 4.114181 60.000000
 	C 0 0.000000 -30.708661 0.000000 30.708661 150.000000 30.000000
 	END
-TURNOUT G "LGB	Curved R3 22.5°	16000"
+TURNOUT G "LGB	Curved R3 22.5°	16000"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 18.004201 3.581258 67.500000
 	C 0 0.000000 -47.047224 0.000000 47.047224 157.500000 22.500000
 	END
-TURNOUT G "LGB	Curved R5 15°	18000"
+TURNOUT G "LGB	Curved R5 15°	18000"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 23.640165 3.112287 75.000000
 	C 0 0.000000 -91.338583 0.000000 91.338583 165.000000 15.000000
 	END
-TURNOUT G "LGB	Curved R5 7.5°	18020"
+TURNOUT G "LGB	Curved R5 7.5°	18020"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 11.922077 0.781414 82.500000
@@ -203,6 +209,17 @@ TURNOUT G "LGB	Electric Double-Slip Switch	12260"
 	C 0 0.000000 19.314484 3.540000 -19.314484 0.000000 22.500000
 	C 0 0.000000 -19.314484 11.223780 19.314484 180.000000 22.500000
 	END
+TURNOUT G "LGB	Manual Switch R3 Left	16140"
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	E 0.000000 0.000000 270.000000
+	E 17.322835 0.000000 90.000000
+	E 18.004201 3.581258 67.500000
+	S 0 0.000000 0.000000 0.000000 1.770110 0.000000
+	S 0 0.000000 1.770110 0.000000 17.322835 0.000000
+	C 0 0.000000 -38.148607 1.770161 38.148607 157.499924 22.500152
+	S 0 0.000000 16.369032 2.903924 18.004201 3.581258
+	END
 TURNOUT G "LGB	Electric Switch R3 Left	16150"
 	P "Normal" 1 2
 	P "Reverse" 1 3 4
@@ -214,6 +231,17 @@ TURNOUT G "LGB	Electric Switch R3 Left	16150"
 	C 0 0.000000 -38.148607 1.770161 38.148607 157.499924 22.500152
 	S 0 0.000000 16.369032 2.903924 18.004201 3.581258
 	END
+TURNOUT G "LGB	Manual Switch R3 Right	16040"
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	E 0.000000 0.000000 270.000000
+	E 17.322835 0.000000 90.000000
+	E 18.004201 -3.581258 112.500000
+	S 0 0.000000 0.000000 0.000000 1.770110 0.000000
+	S 0 0.000000 1.770110 0.000000 17.322835 0.000000
+	C 0 0.000000 38.148607 1.769959 -38.148607 0.000076 22.500152
+	S 0 0.000000 16.369032 -2.903924 18.004201 -3.581258
+	END
 TURNOUT G "LGB	Electric Switch R3 Right	16050"
 	P "Normal" 1 2
 	P "Reverse" 1 3 4
@@ -247,7 +275,7 @@ TURNOUT G "LGB	Manual Switch R5 Right	18050"
 	C 0 0.000000 77.893327 1.769910 -77.893327 0.000076 15.000152
 	S 0 0.000000 21.930680 -2.654200 23.640165 -3.112287
 	END
-TURNOUT G "LGB	3-Way Switch R1	14236"
+TURNOUT G "LGB	3-Way Switch R1	12360"
 	P "Left" 1 2 3 4
 	P "Normal" 1 2 7
 	P "Right" 1 5 6
@@ -265,16 +293,16 @@ TURNOUT G "LGB	3-Way Switch R1	14236"
 	END
 
 SUBCONTENTS LGB Crossings
-TURNOUT G "LGB	Crossing 30°	13000"
+TURNOUT G "LGB	Crossing 30°	13000"
 	P "Normal" 1 0 2
 	E 0.000000 0.000000 270.000000
-	E 11.811024 0.000000 90.000000
-	E 0.092231 3.356299 300.000000
-	E 11.718793 -3.356299 120.000000
-	S 0 0.000000 0.000000 0.000000 11.811024 0.000000
-	S 0 0.000000 0.092231 3.356299 11.718793 -3.356299
-	END
-TURNOUT G "LGB	Crossing 90°	13100"
+	E 13.425197 0.000000 90.000000
+	E 1.598270 2.952747 300.000000
+	E 11.826927 -2.952747 120.000000
+	S 0 0.000000 0.000000 0.000000 13.425197 0.000000
+	S 0 0.000000 1.598270 2.952747 11.826927 -2.952747
+END
+TURNOUT G "LGB	Crossing 90°	13100"
 	P "Normal" 1 0 2
 	E 0.000000 0.000000 270.000000
 	E 5.905512 0.000000 90.000000
@@ -283,7 +311,7 @@ TURNOUT G "LGB	Crossing 90°	13100"
 	S 0 0.000000 0.000000 0.000000 5.905512 0.000000
 	S 0 0.000000 2.952756 3.641732 2.952756 -3.641732
 	END
-TURNOUT G "LGB	Crossing 22.5° R3	13200"
+TURNOUT G "LGB	Crossing 22.5° R3	13200"
 	P "Normal" 1 0 2
 	E 0.000000 0.000000 270.000000
 	E 14.763780 0.000000 90.000000
@@ -328,28 +356,28 @@ TURNOUT G "LGB	Turntable	14000"
 	E 5.574522 -13.458088 157.500000
 	E -5.574522 13.458088 337.500000
 	S 0 0 0.000000 14.566929 0.000000 9.251969
-	S 16777215 0 0.000000 9.251969 -0.000000 -9.251969
+	S 0 0 0.000000 9.251969 -0.000000 -9.251969
 	S 0 0 -0.000000 -9.251969 -0.000000 -14.566929
 	S 0 0 5.574522 13.458088 3.540575 8.547704
-	S 16777215 0 3.540575 8.547704 -3.540575 -8.547704
+	S 0 0 3.540575 8.547704 -3.540575 -8.547704
 	S 0 0 -3.540575 -8.547704 -5.574522 -13.458088
 	S 0 0 10.300374 10.300374 6.542130 6.542130
-	S 16777215 0 6.542130 6.542130 -6.542130 -6.542130
+	S 0 0 6.542130 6.542130 -6.542130 -6.542130
 	S 0 0 -6.542130 -6.542130 -10.300374 -10.300374
 	S 0 0 13.458088 5.574522 8.547704 3.540575
-	S 16777215 0 8.547704 3.540575 -8.547704 -3.540575
+	S 0 0 8.547704 3.540575 -8.547704 -3.540575
 	S 0 0 -8.547704 -3.540575 -13.458088 -5.574522
 	S 0 0 14.566929 0.000000 9.251969 0.000000
-	S 16777215 0 9.251969 0.000000 -9.251969 -0.000000
+	S 0 0 9.251969 0.000000 -9.251969 -0.000000
 	S 0 0 -9.251969 -0.000000 -14.566929 -0.000000
 	S 0 0 13.458088 -5.574522 8.547704 -3.540575
-	S 16777215 0 8.547704 -3.540575 -8.547704 3.540575
+	S 0 0 8.547704 -3.540575 -8.547704 3.540575
 	S 0 0 -8.547704 3.540575 -13.458088 5.574522
 	S 0 0 10.300374 -10.300374 6.542130 -6.542130
-	S 16777215 0 6.542130 -6.542130 -6.542130 6.542130
+	S 0 0 6.542130 -6.542130 -6.542130 6.542130
 	S 0 0 -6.542130 6.542130 -10.300374 10.300374
 	S 0 0 5.574522 -13.458088 3.540575 -8.547704
-	S 16777215 0 3.540575 -8.547704 -3.540575 8.547704
+	S 0 0 3.540575 -8.547704 -3.540575 8.547704
 	S 0 0 -3.540575 8.547704 -5.574522 13.458088
 	A 16711680 0 14.566929 0.000000 0.000000 0.000000 360.000000
 	A 16711680 0 9.251969 0.000000 0.000000 0.000000 360.000000