New upstream version 5.2.2GAupstream/5.2.2GA

1 files changed, 26 insertions, 20 deletions

diff --git a/app/lib/params/N-PecoCode55Finescale.xtp b/app/lib/params/N-PecoCode55Finescale.xtp
index 8880114..c3344ef 100644
--- a/app/lib/params/N-PecoCode55Finescale.xtp
+++ b/app/lib/params/N-PecoCode55Finescale.xtp
@@ -94,30 +94,34 @@ TURNOUT N "Peco-55	3-Way Asymmetric	SL-E399F"
 	S 0 0.000000 0.421365 0.000000 6.033465 0.000000
 	END
 TURNOUT N  "Peco-55	Curved Right	SL-E386F"
-	P "Normal" 1 2 3
-	P "Reverse" 1 4 5 6
+	U "Cornu Curved Turnout" "" "Peco-55" "Left" "L" "Right" "R" 6.048031 19.633000 1.046457 17.992126 9.815000 0.526772 35.984252 6.137008 35.984252 0.812000 0.000000 0.000000 0
+	P "Normal" 1 2 3 4
+	P "Reverse" 1 2 5 6 7
 	E 0.000000 0.000000 270.000000
 	E 6.137008 -0.526772 99.815000
 	E 6.048031 -1.046457 109.633000
-	C 0 0.000000 35.984252 0.000000 -35.984252 0.000000 0.079612
-	C 0 0.000000 35.880126 0.011345 -35.880140 0.061728 9.688447
-	C 0 0.000000 36.000000 0.002864 -35.984333 9.735388 0.079612
-	C 0 0.000000 17.185618 0.172609 -17.185215 359.591225 10.119708
-	C 0 0.000000 18.699999 -0.281647 -18.642768 10.329528 9.301755
-	C 0 0.000000 18.000000 0.000137 -18.000011 19.473845 0.159155
+	C 0 0.000000 35.984252 0.000000 -35.984252 0.000000 0.318449
+	S 0 0.000000 0.199999 -0.000556 0.811855 -0.007644
+	C 0 0.000000 35.479016 0.040034 -35.478264 1.246526 8.325658
+	C 0 0.000000 35.984252 0.002864 -35.984333 9.496551 0.318449
+	C 0 0.000000 13.822756 0.627929 -13.829176 0.762400 10.700481
+	C 0 0.000000 20.780632 -0.994239 -20.598252 12.137227 7.119631
+	C 0 0.000000 17.992126 0.002783 -17.992594 18.996102 0.636898
 	END
 TURNOUT N  "Peco-55	Curved Left	SL-E387F"
-	P "Normal" 1 2 3
-	P "Reverse" 1 4 5 6
+	U "Cornu Curved Turnout" "" "Peco-55" "Left" "L" "Right" "R" 6.048031 19.633000 1.046457 17.992126 9.815000 0.526772 35.984252 6.137008 35.984252 0.812000 0.000000 0.000000 0
+	P "Normal" 1 2 3 4
+	P "Reverse" 1 2 5 6 7
 	E 0.000000 0.000000 270.000000
 	E 6.137008 0.526772 80.185000
 	E 6.048031 1.046457 70.367000
-	C 0 0.000000 35.984252 0.000000 35.984252 179.920388 0.079612
-	C 0 0.000000 -35.880126 0.011345 35.880140 170.249825 9.688447
-	C 0 0.000000 36.000000 0.002864 35.984333 170.185000 0.079612
-	C 0 0.000000 -17.185618 0.172609 17.185215 170.289067 10.119708
-	C 0 0.000000 -18.699999 -0.281647 18.642768 160.368717 9.301755
-	C 0 0.000000 18.000000 0.000137 18.000011 160.367000 0.159155
+	C 0 0.000000 -35.984252 0.000000 35.984252 179.681551 0.318449
+	S 0 0.000000 0.199999 0.000556 0.811855 0.007644
+	C 0 0.000000 -35.479016 0.040034 35.478264 170.427816 8.325658
+	C 0 0.000000 -35.984252 0.002864 35.984333 170.185000 0.318449
+	C 0 0.000000 -13.822756 0.627929 13.829176 168.537119 10.700481
+	C 0 0.000000 -20.780632 -0.994239 20.598252 160.743142 7.119631
+	C 0 0.000000 -17.992126 0.002783 17.992594 160.367000 0.636898
 	END
 TURNOUT N "Peco-55	Scissors Crossover	SL-E383F"
 	P "Normal" 1 2 3 0 4 5 6
@@ -152,9 +156,11 @@ TURNOUT N "Peco-55	Single Slip	SL-380F"
 	S 0 0.000000 5.321536 -0.403784 6.016938 -0.526409
 	C 0 0.000000 26.577553 0.706221 -26.577553 0.000076 10.000152
 	END
-TURNOUT N "Peco-55	Double Slip	SL-390F"
-	P "Normal" 1 2 3 0 4 5 6
-	P "Reverse" 1 7 6 0 4 8 3
+TURNOUT N "Peco-55	Double Slip	SL-390F" 512
+	P "Cross1" 1 2 3
+	P "Cross2" 4 5 6
+	P "Slip1" 1 7 6
+	P "Slip2" 4 8 3
 	E 0.000000 0.000000 270.000000
 	E 6.062992 0.000000 90.000000
 	E 0.046054 0.526409 280.000000
@@ -190,7 +196,7 @@ TURNOUT N "Peco-55	Short Crossing 20d	SL-E393F"
 	END
 
 SUBCONTENTS Peco Code 55 - Turn Tables
-TURNOUT N "Peco	Turn Table	NB-55"
+TURNOUT N "Peco	Turn Table	NB-55" 512
 	P "1" 1 2 3
 	P "2" 4 5 6
 	P "3" 7 8 9