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/mrklnz.xtp | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to 'app/lib/params/mrklnz.xtp')

diff --git a/app/lib/params/mrklnz.xtp b/app/lib/params/mrklnz.xtp
index f47602c..1298241 100644
--- a/app/lib/params/mrklnz.xtp
+++ b/app/lib/params/mrklnz.xtp
@@ -156,9 +156,11 @@ TURNOUT Z  "Märklin	Crossing	8559"
 
 SUBCONTENTS Märklin Z-Scale - Turnouts(Switches)
 # Double Slipswitch Design by Dirk Husemann - 11.280000 13.000000 11.2800
-TURNOUT Z "Märklin	Double Slip	8560"
-	P "Normal" 1 2 3 0 4 5 6
-	P "Reverse" 1 7 6 0 4 8 3
+TURNOUT Z "Märklin	Double Slip	8560" 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 4.440945 0.000000 90.000000
 	E 0.056911 0.499498 283.000000
@@ -354,7 +356,7 @@ STRUCTURE Z "Märklin	Track Bumper 15mm	8991"
 	L3 0 0.013333 -0.395000 0.197500 0 0.000000 -0.197500 0
 	L3 0 0.013333 -0.395000 -0.197500 0 0.000000 0.197500 0
 	END
-TURNOUT Z "Märklin	Transfer Table	8994"
+TURNOUT Z "Märklin	Transfer Table	8994" 512
 	P "P1" 1 2 3
 	P "P2" 4 5 6
 	P "P3" 7 8 9
@@ -398,7 +400,7 @@ TURNOUT Z "Märklin	Transfer Table	8994"
 	L3 0 0.026667 5.529333 0.407333 0 7.893333 0.407333 0
 	L3 0 0.026667 0.801333 0.407333 0 3.165333 0.407333 0
 	END
-TURNOUT Z "Märklin	Turntable	8599"
+TURNOUT Z "Märklin	Turntable	8599" 512
 	P "1" 1 2 3
 	P "2" 4 5 6
 	P "3" 7 8 9
@@ -411,18 +413,18 @@ TURNOUT Z "Märklin	Turntable	8599"
 	P "10" 28 29 30
 	P "11" 31 32 33
 	P "12" 34 35 36
-	P "13" -3 -2 -1
-	P "14" -6 -5 -4
-	P "15" -9 -8 -7
-	P "16" -12 -11 -10
-	P "17" -15 -14 -13
-	P "18" -18 -17 -16
-	P "19" -21 -20 -19
-	P "20" -24 -23 -22
-	P "21" -27 -26 -25
-	P "22" -30 -29 -28
-	P "23" -33 -32 -31
-	P "24" -36 -35 -34
+#	P "13" -3 -2 -1
+#	P "14" -6 -5 -4
+#	P "15" -9 -8 -7
+#	P "16" -12 -11 -10
+#	P "17" -15 -14 -13
+#	P "18" -18 -17 -16
+#	P "19" -21 -20 -19
+#	P "20" -24 -23 -22
+#	P "21" -27 -26 -25
+#	P "22" -30 -29 -28
+#	P "23" -33 -32 -31
+#	P "24" -36 -35 -34
 	E 0.000000 3.346457 0.000000
 	E -0.000000 -3.346457 180.000000
 	E 0.866127 3.232429 15.000000
-- 
cgit v1.2.3