From 5d2c2b27a6323e2666378b986129b2a7c2c39e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sun, 6 Feb 2022 16:04:24 +0100
Subject: New upstream version 5.2.2GA

---
 app/lib/params/HO-Roco HO Code 83.xtp | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'app/lib/params/HO-Roco HO Code 83.xtp')

diff --git a/app/lib/params/HO-Roco HO Code 83.xtp b/app/lib/params/HO-Roco HO Code 83.xtp
index a66e761..b8d2ce7 100644
--- a/app/lib/params/HO-Roco HO Code 83.xtp	
+++ b/app/lib/params/HO-Roco HO Code 83.xtp	
@@ -127,7 +127,8 @@ TURNOUT HO "Roco	R9, R826.4mm/15d	42427"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 8.420790 -1.108618 105.000000
-	C 0 0 -32.535433 0.000046 32.535433 0.000000 15.000000
+# fix sign on X and R
+	C 0 0 32.535433 0.000046 -32.535433 0.000000 15.000000
 END
 TURNOUT HO "Roco	R10, R888.0mm/15d	42428"
 	P "Normal" 1
@@ -299,9 +300,11 @@ TURNOUT HO "Roco	EKW10, 345mm, R959mm/10d	42493"
 	C 0 0.000000 62.796695 1.297239 -62.796695 0.000076 10.000152
 	END
 SUBCONTENTS Roco HO - DoubleSlip Turnouts
-TURNOUT HO "Roco	DKW15, 230mm, R531mm/15d	42451"
-	P "Normal" 1 2 3 0 4 5 6
-	P "Reverse" 1 7 6 0 4 8 3
+TURNOUT HO "Roco	DKW15, 230mm, R531mm/15d	42451" 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 9.055118 0.000000 90.000000
 	E 0.154271 1.171812 285.000000
@@ -374,7 +377,8 @@ TURNOUT HO "Roco	K30, 119mm, 30d	42498"
 
 
 SUBCONTENTS Roco HO - Turn Table
-TURNOUT HO	"ROCO	Turntable 253mm Dia 9d 40P	42615"						
+TURNOUT HO	"ROCO	Turntable 253mm Dia 9d 40P	42615" 512
+# Move non-track segs to end
 	P	"1"	1						
 	P	"2"	2						
 	P	"3"	3						
@@ -395,10 +399,6 @@ TURNOUT HO	"ROCO	Turntable 253mm Dia 9d 40P	42615"
 	P	"18"	18						
 	P	"19"	19						
 	P	"20"	20						
-	G3	0	0.000000	0.129736	0.000000	0.000000	0		
-	A3	8424071	0.031250	4.980315	0.000000	0.000000	0	0.000000	360.000000
-	A3	8424071	0.031250	6.043307	0.000000	0.000000	0	0.000000	360.000000
-	A3	8424071	0.031250	1.245079	0.000000	0.000000	0	0.000000	360.000000
 	E	0.000000	4.980315	0.000000					
 	E	0.779093	4.918999	9.000000					
 	E	1.539002	4.736561	18.000000					
@@ -459,6 +459,10 @@ TURNOUT HO	"ROCO	Turntable 253mm Dia 9d 40P	42615"
 	S	16777215	0	2.261016	-4.437493	-2.261016	4.437493		
 	S	16777215	0	1.539002	-4.736561	-1.539002	4.736561		
 	S	16777215	0	0.779093	-4.918999	-0.779093	4.918999		
+	G3	0	0.000000	0.129736	0.000000	0.000000	0		
+	A3	8424071	0.031250	4.980315	0.000000	0.000000	0	0.000000	360.000000
+	A3	8424071	0.031250	6.043307	0.000000	0.000000	0	0.000000	360.000000
+	A3	8424071	0.031250	1.245079	0.000000	0.000000	0	0.000000	360.000000
 END									
 TURNOUT HO "Roco	TurnTable Track Connector	42616/617"
 	P "Normal" 1
-- 
cgit v1.2.3