From 27766d35ed0fd1fc5e5e1f28281afded7e67a813 Mon Sep 17 00:00:00 2001
From: wdbee <wdbee@30fe4595-0a0c-4342-8851-515496e4dcbd>
Date: Thu, 3 Dec 2009 21:37:16 +0000
Subject: [PATCH] git-svn-id:
 https://svn.code.sf.net/p/speed-dreams/code/trunk@1927
 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 0a05b1630a2255fbc39af7fed6a8a1dd2d09e158
Former-commit-id: 5d43325f33295f03c7b387603d056f4722714abe
---
 .../simplix_trb1/car1-trb1/alpine-1.xml       | 29 ++++++++++++++
 .../simplix_trb1/car1-trb1/e-track-4.xml      | 19 +++++++++
 .../simplix_trb1/car2-trb1/Corkscrew.xml      | 23 +++++++++++
 .../simplix_trb1/car2-trb1/alpine-1.xml       | 23 +++++++++++
 .../simplix_trb1/car2-trb1/default.xml        |  2 +-
 .../simplix_trb1/car2-trb1/e-track-4.xml      | 17 ++++++++
 .../simplix_trb1/car3-trb1/e-track-4.xml      | 18 +++++++++
 .../simplix_trb1/car4-trb1/e-track-4.xml      | 18 +++++++++
 .../simplix_trb1/car5-trb1/e-track-2.xml      | 36 +++++++++++++++++
 .../simplix_trb1/car5-trb1/e-track-4.xml      | 18 +++++++++
 .../simplix_trb1/car6-trb1/e-track-2.xml      | 40 +++++++++++++++++++
 .../simplix_trb1/car6-trb1/e-track-4.xml      | 19 +++++++++
 .../simplix_trb1/car7-trb1/e-track-4.xml      | 19 +++++++++
 .../simplix/simplix_trb1/tracks/Corkscrew.xml |  8 ++--
 .../simplix/simplix_trb1/tracks/alpine-1.xml  |  6 +--
 .../simplix/simplix_trb1/tracks/alpine-2.xml  | 12 +++---
 .../simplix/simplix_trb1/tracks/e-track-1.xml | 10 ++---
 .../simplix/simplix_trb1/tracks/e-track-2.xml |  4 +-
 .../simplix/simplix_trb1/tracks/e-track-3.xml |  4 +-
 src/drivers/simplix/src/unitclothoid.cpp      | 16 +++++---
 20 files changed, 313 insertions(+), 28 deletions(-)
 create mode 100644 src/drivers/simplix/simplix_trb1/car1-trb1/alpine-1.xml
 create mode 100644 src/drivers/simplix/simplix_trb1/car1-trb1/e-track-4.xml
 create mode 100644 src/drivers/simplix/simplix_trb1/car2-trb1/Corkscrew.xml
 create mode 100644 src/drivers/simplix/simplix_trb1/car2-trb1/alpine-1.xml
 create mode 100644 src/drivers/simplix/simplix_trb1/car2-trb1/e-track-4.xml
 create mode 100644 src/drivers/simplix/simplix_trb1/car3-trb1/e-track-4.xml
 create mode 100644 src/drivers/simplix/simplix_trb1/car4-trb1/e-track-4.xml
 create mode 100644 src/drivers/simplix/simplix_trb1/car5-trb1/e-track-2.xml
 create mode 100644 src/drivers/simplix/simplix_trb1/car5-trb1/e-track-4.xml
 create mode 100644 src/drivers/simplix/simplix_trb1/car6-trb1/e-track-2.xml
 create mode 100644 src/drivers/simplix/simplix_trb1/car6-trb1/e-track-4.xml
 create mode 100644 src/drivers/simplix/simplix_trb1/car7-trb1/e-track-4.xml

diff --git a/src/drivers/simplix/simplix_trb1/car1-trb1/alpine-1.xml b/src/drivers/simplix/simplix_trb1/car1-trb1/alpine-1.xml
new file mode 100644
index 000000000..c4bba670f
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car1-trb1/alpine-1.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- 
+    file          : alpine-1.xml 
+    created       : 01 Dec 2007
+    last modified : 03 Dec 2009
+    copyright     : (C) 2007-2009 Wolf-Dieter Beelitz
+
+    SIMPLIX TRB1 - CAR1-TRB1
+-->
+<!--    This program is free software; you can redistribute it and/or modify  -->
+<!--    it under the terms of the GNU General Public License as published by  -->
+<!--    the Free Software Foundation; either version 2 of the License, or     -->
+<!--    (at your option) any later version.                                   -->
+<!DOCTYPE params SYSTEM "../../../src/libs/tgf/params.dtd">
+<params name="car1-trb1" type="template" mode="mw">
+	<section name="Rear Anti-Roll Bar">
+		<attnum name="spring" unit="lbs/in" min="0" max="5000" val="500"/>
+	</section>
+	<section name="Rear Right Suspension">
+		<attnum name="spring" unit="lbs/in" min="0" max="10000" val="3500"/>
+	</section>
+	<section name="Rear Left Suspension">
+		<attnum name="spring" unit="lbs/in" min="0" max="10000" val="3500"/>
+	</section>
+	<section name="simplix private">
+		<attnum name="scale bump" min="0" max="1" val="0.2"/>
+		<attnum name="scale bump outer" min="0" max="2" val="0.3"/>
+	</section>
+</params>
diff --git a/src/drivers/simplix/simplix_trb1/car1-trb1/e-track-4.xml b/src/drivers/simplix/simplix_trb1/car1-trb1/e-track-4.xml
new file mode 100644
index 000000000..0e55aebf9
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car1-trb1/e-track-4.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- 
+    file          : e-track-4.xml 
+    created       : 01 Dec 2007
+    last modified : 03 Dec 2009
+    copyright     : (C) 2007-2009 Wolf-Dieter Beelitz
+
+    SIMPLIX TRB1 - CAR1-TRB1
+-->
+<!--    This program is free software; you can redistribute it and/or modify  -->
+<!--    it under the terms of the GNU General Public License as published by  -->
+<!--    the Free Software Foundation; either version 2 of the License, or     -->
+<!--    (at your option) any later version.                                   -->
+<!DOCTYPE params SYSTEM "../../../src/libs/tgf/params.dtd">
+<params name="car1-trb1" type="template" mode="mw">
+	<section name="Rear Differential">
+		<attnum name="ratio" min="0" max="10" val="3.25"/>
+	</section>
+</params>
diff --git a/src/drivers/simplix/simplix_trb1/car2-trb1/Corkscrew.xml b/src/drivers/simplix/simplix_trb1/car2-trb1/Corkscrew.xml
new file mode 100644
index 000000000..3f03a2daa
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car2-trb1/Corkscrew.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- 
+    file          : Corkscrew.xml 
+    created       : 28 Mar 2008
+    last modified : 03 Dec 2009
+    copyright     : (C) 2008-2009 Wolf-Dieter Beelitz; Jürgen Schüssler
+-->
+<!--    This program is free software; you can redistribute it and/or modify  -->
+<!--    it under the terms of the GNU General Public License as published by  -->
+<!--    the Free Software Foundation; either version 2 of the License, or     -->
+<!--    (at your option) any later version.                                   -->
+<!DOCTYPE params SYSTEM "../../../src/libs/tgf/params.dtd">
+<params name="car2-trb1" type="template" mode="mw">
+	<section name="Front Wing">
+		<attnum name="angle" unit="deg" min="0" max="12" val="12"/>
+	</section>
+	<section name="Rear Wing">
+		<attnum name="angle" unit="deg" min="0" max="18" val="18"/>
+	</section>
+	<section name="Rear Anti-Roll Bar">
+		<attnum name="spring" unit="lbs/in" min="0" max="5000" val="1000"/>
+	</section>
+</params>
diff --git a/src/drivers/simplix/simplix_trb1/car2-trb1/alpine-1.xml b/src/drivers/simplix/simplix_trb1/car2-trb1/alpine-1.xml
new file mode 100644
index 000000000..cb56961a1
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car2-trb1/alpine-1.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- 
+    file          : alpine-1.xml 
+    created       : 28 Mar 2008
+    last modified : 03 Dec 2009
+    copyright     : (C) 2008-2009 Wolf-Dieter Beelitz; Jürgen Schüssler
+-->
+<!--    This program is free software; you can redistribute it and/or modify  -->
+<!--    it under the terms of the GNU General Public License as published by  -->
+<!--    the Free Software Foundation; either version 2 of the License, or     -->
+<!--    (at your option) any later version.                                   -->
+<!DOCTYPE params SYSTEM "../../../src/libs/tgf/params.dtd">
+<params name="car2-trb1" type="template" mode="mw">
+	<section name="Rear Anti-Roll Bar">
+		<attnum name="spring" unit="lbs/in" min="0" max="5000" val="1000"/>
+	</section>
+	<section name="Rear Right Suspension">
+		<attnum name="spring" unit="lbs/in" min="0" max="10000" val="4000"/>
+	</section>
+	<section name="Rear Left Suspension">
+		<attnum name="spring" unit="lbs/in" min="0" max="10000" val="4000"/>
+	</section>
+</params>
diff --git a/src/drivers/simplix/simplix_trb1/car2-trb1/default.xml b/src/drivers/simplix/simplix_trb1/car2-trb1/default.xml
index 9b30b2ef8..6c3370ac4 100644
--- a/src/drivers/simplix/simplix_trb1/car2-trb1/default.xml
+++ b/src/drivers/simplix/simplix_trb1/car2-trb1/default.xml
@@ -56,7 +56,7 @@
 		<attnum name="bellcrank" min="1" max="5" val="2.5"/>
 	</section>
 	<section name="Rear Anti-Roll Bar">
-		<attnum name="spring" unit="lbs/in" min="0" max="5000" val="2000"/>
+		<attnum name="spring" unit="lbs/in" min="0" max="5000" val="1000"/>
 		<attnum name="suspension course" unit="m" min="0" max="0.2" val="0.2"/>
 		<attnum name="bellcrank" min="1" max="5" val="2.5"/>
 	</section>
diff --git a/src/drivers/simplix/simplix_trb1/car2-trb1/e-track-4.xml b/src/drivers/simplix/simplix_trb1/car2-trb1/e-track-4.xml
new file mode 100644
index 000000000..65eb647d9
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car2-trb1/e-track-4.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- 
+    file          : e-track-4.xml 
+    created       : 28 Mar 2008
+    last modified : 03 Dec 2009
+    copyright     : (C) 2008-2009 Wolf-Dieter Beelitz; Jürgen Schüssler
+-->
+<!--    This program is free software; you can redistribute it and/or modify  -->
+<!--    it under the terms of the GNU General Public License as published by  -->
+<!--    the Free Software Foundation; either version 2 of the License, or     -->
+<!--    (at your option) any later version.                                   -->
+<!DOCTYPE params SYSTEM "../../../src/libs/tgf/params.dtd">
+<params name="car2-trb1" type="template" mode="mw">
+	<section name="Rear Differential">
+		<attnum name="ratio" min="0" max="10" val="2.95"/>
+	</section>
+</params>
diff --git a/src/drivers/simplix/simplix_trb1/car3-trb1/e-track-4.xml b/src/drivers/simplix/simplix_trb1/car3-trb1/e-track-4.xml
new file mode 100644
index 000000000..f413fd9f7
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car3-trb1/e-track-4.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- 
+    file          : e-track-4.xml 
+    created       : 28 Mar 2008
+    last modified : 03 Dec 2009
+    copyright     : (C) 2008-2009 Wolf-Dieter Beelitz; Jürgen Schüssler
+-->
+<!--    This program is free software; you can redistribute it and/or modify  -->
+<!--    it under the terms of the GNU General Public License as published by  -->
+<!--    the Free Software Foundation; either version 2 of the License, or     -->
+<!--    (at your option) any later version.                                   -->
+<!DOCTYPE params SYSTEM "../../../src/libs/tgf/params.dtd">
+<params name="car3-trb1" type="template" mode="mw">
+	<section name="Rear Differential">
+		<attnum name="ratio" min="0" max="10" val="2.95"/>
+	</section>
+</params>
+
diff --git a/src/drivers/simplix/simplix_trb1/car4-trb1/e-track-4.xml b/src/drivers/simplix/simplix_trb1/car4-trb1/e-track-4.xml
new file mode 100644
index 000000000..2e850729d
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car4-trb1/e-track-4.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- 
+    file          : e-track-4.xml 
+    created       : 28 Mar 2008
+    last modified : 03 Dec 2009
+    copyright     : (C) 2008-2009 Wolf-Dieter Beelitz; Jürgen Schüssler
+-->
+<!--    This program is free software; you can redistribute it and/or modify  -->
+<!--    it under the terms of the GNU General Public License as published by  -->
+<!--    the Free Software Foundation; either version 2 of the License, or     -->
+<!--    (at your option) any later version.                                   -->
+<!DOCTYPE params SYSTEM "../../../src/libs/tgf/params.dtd">
+<params name="car4-trb1" type="template" mode="mw">
+	<section name="Rear Differential">
+		<attnum name="ratio" min="0" max="10" val="2.95"/>
+	</section>
+</params>
+
diff --git a/src/drivers/simplix/simplix_trb1/car5-trb1/e-track-2.xml b/src/drivers/simplix/simplix_trb1/car5-trb1/e-track-2.xml
new file mode 100644
index 000000000..47230384d
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car5-trb1/e-track-2.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- 
+    file          : default.xml 
+    created       : 28 Mar 2008
+    last modified : 26 Nov 2008
+    copyright     : (C) 2008 Wolf-Dieter Beelitz; Jürgen Schüssler
+-->
+<!--    This program is free software; you can redistribute it and/or modify  -->
+<!--    it under the terms of the GNU General Public License as published by  -->
+<!--    the Free Software Foundation; either version 2 of the License, or     -->
+<!--    (at your option) any later version.                                   -->
+<!DOCTYPE params SYSTEM "../../../src/libs/tgf/params.dtd">
+<params name="car5-trb1" type="template" mode="mw">
+	<section name="Front Wing">
+		<attnum name="angle" unit="deg" min="0" max="11" val="11"/>
+	</section>
+	<section name="Rear Wing">
+		<attnum name="angle" unit="deg" min="0" max="16" val="16"/>
+	</section>
+	<section name="Front Anti-Roll Bar">
+		<attnum name="spring" unit="lbs/in" min="0" max="5000" val="1000"/>
+	</section>
+	<section name="Front Right Suspension">
+		<attnum name="spring" min="0" max="10000" unit="lbs/in" val="3500"/>
+	</section>
+	<section name="Front Left Suspension">
+		<attnum name="spring" min="0" max="10000" unit="lbs/in" val="3500"/>
+	</section>
+	<section name="Rear Right Suspension">
+		<attnum name="spring" min="0" max="10000" unit="lbs/in" val="3000"/>
+	</section>
+	<section name="Rear Left Suspension">
+		<attnum name="spring" min="0" max="10000" unit="lbs/in" val="3000"/>
+	</section>
+</params>
+
diff --git a/src/drivers/simplix/simplix_trb1/car5-trb1/e-track-4.xml b/src/drivers/simplix/simplix_trb1/car5-trb1/e-track-4.xml
new file mode 100644
index 000000000..a54a081ee
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car5-trb1/e-track-4.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- 
+    file          : e-track-4.xml 
+    created       : 28 Mar 2008
+    last modified : 03 Dec 2009
+    copyright     : (C) 2008-2009 Wolf-Dieter Beelitz; Jürgen Schüssler
+-->
+<!--    This program is free software; you can redistribute it and/or modify  -->
+<!--    it under the terms of the GNU General Public License as published by  -->
+<!--    the Free Software Foundation; either version 2 of the License, or     -->
+<!--    (at your option) any later version.                                   -->
+<!DOCTYPE params SYSTEM "../../../src/libs/tgf/params.dtd">
+<params name="car5-trb1" type="template" mode="mw">
+	<section name="Rear Differential">
+		<attnum name="ratio" min="0" max="10" val="4.0"/>
+	</section>
+</params>
+
diff --git a/src/drivers/simplix/simplix_trb1/car6-trb1/e-track-2.xml b/src/drivers/simplix/simplix_trb1/car6-trb1/e-track-2.xml
new file mode 100644
index 000000000..519e1cfbd
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car6-trb1/e-track-2.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- 
+    file          : default.xml 
+    created       : 01 Dec 2007
+    last modified : 26 Nov 2008
+    copyright     : (C) 2007-2008 Wolf-Dieter Beelitz
+
+    SIMPLIX TRB1A - CAR6-TRB1
+-->
+<!--    This program is free software; you can redistribute it and/or modify  -->
+<!--    it under the terms of the GNU General Public License as published by  -->
+<!--    the Free Software Foundation; either version 2 of the License, or     -->
+<!--    (at your option) any later version.                                   -->
+<!DOCTYPE params SYSTEM "../../../src/libs/tgf/params.dtd">
+<params name="car6-trb1" type="template" mode="mw">
+	<section name="Front Wing">
+		<attnum name="angle" unit="deg" min="0" max="12" val="12"/>
+	</section>
+	<section name="Rear Wing">
+		<attnum name="angle" unit="deg" min="0" max="17" val="17"/>
+	</section>
+	<section name="Front Anti-Roll Bar">
+		<attnum name="spring" unit="lbs/in" min="0" max="5000" val="1000"/>
+	</section>
+	<section name="Rear Anti-Roll Bar">
+		<attnum name="spring" unit="lbs/in" min="0" max="5000" val="600"/>
+	</section>
+	<section name="Front Right Suspension">
+		<attnum name="spring" unit="lbs/in" min="0" max="10000" val="3200"/>
+	</section>
+	<section name="Front Left Suspension">
+		<attnum name="spring" unit="lbs/in" min="0" max="10000" val="3200"/>
+	</section>
+	<section name="Rear Right Suspension">
+		<attnum name="spring" unit="lbs/in" min="0" max="10000" val="3500"/>
+	</section>
+	<section name="Rear Left Suspension">
+		<attnum name="spring" unit="lbs/in" min="0" max="10000" val="3500"/>
+	</section>
+</params>
diff --git a/src/drivers/simplix/simplix_trb1/car6-trb1/e-track-4.xml b/src/drivers/simplix/simplix_trb1/car6-trb1/e-track-4.xml
new file mode 100644
index 000000000..868a7e0ce
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car6-trb1/e-track-4.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- 
+    file          : e-track-4.xml 
+    created       : 01 Dec 2007
+    last modified : 03 Dec 2009
+    copyright     : (C) 2007-2009 Wolf-Dieter Beelitz
+
+    SIMPLIX TRB1A - CAR6-TRB1
+-->
+<!--    This program is free software; you can redistribute it and/or modify  -->
+<!--    it under the terms of the GNU General Public License as published by  -->
+<!--    the Free Software Foundation; either version 2 of the License, or     -->
+<!--    (at your option) any later version.                                   -->
+<!DOCTYPE params SYSTEM "../../../src/libs/tgf/params.dtd">
+<params name="car6-trb1" type="template" mode="mw">
+	<section name="Rear Differential">
+		<attnum name="ratio" min="0" max="10" val="3.15"/>
+	</section>
+</params>
diff --git a/src/drivers/simplix/simplix_trb1/car7-trb1/e-track-4.xml b/src/drivers/simplix/simplix_trb1/car7-trb1/e-track-4.xml
new file mode 100644
index 000000000..057f0e860
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car7-trb1/e-track-4.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- 
+    file          : e-track-4.xml 
+    created       : 01 Dec 2007
+    last modified : 03 Dec 2009
+    copyright     : (C) 2007-2009 Wolf-Dieter Beelitz
+
+    SIMPLIX TRB1 - CAR7-TRB1
+-->
+<!--    This program is free software; you can redistribute it and/or modify  -->
+<!--    it under the terms of the GNU General Public License as published by  -->
+<!--    the Free Software Foundation; either version 2 of the License, or     -->
+<!--    (at your option) any later version.                                   -->
+<!DOCTYPE params SYSTEM "../../../src/libs/tgf/params.dtd">
+<params name="car7-trb1" type="template" mode="mw">
+	<section name="Rear Differential">
+		<attnum name="ratio" min="0" max="10" val="4.0"/>
+	</section>
+</params>
diff --git a/src/drivers/simplix/simplix_trb1/tracks/Corkscrew.xml b/src/drivers/simplix/simplix_trb1/tracks/Corkscrew.xml
index b0a237265..02185fd5a 100644
--- a/src/drivers/simplix/simplix_trb1/tracks/Corkscrew.xml
+++ b/src/drivers/simplix/simplix_trb1/tracks/Corkscrew.xml
@@ -23,10 +23,10 @@
 		<attnum name="pit long offset" min="-5" max="5" val="0.0"/>
 		<attnum name="pit scale brake" val="1.0"/>
 		<attnum name="pit stop dist" val="1.5"/>
-		<attnum name="scale_mu" min="0.1" max="2.0" val="0.85"/>
-		<attnum name="scale bump" min="0" max="1" val="0.30"/>
-		<attnum name="scale bump outer" min="0" max="2" val="0.50"/>
-		<attnum name="offset skill" val="0.00"/>
+		<attnum name="scale_mu" min="0.1" max="2.0" val="0.9"/>
+		<attnum name="scale bump" min="0" max="1" val="0.25"/>
+		<attnum name="scale bump outer" min="0" max="2" val="0.40"/>
+		<attnum name="offset skill" val="0.10"/>
 		<attnum name="scale skill" val="1.0"/>
 	</section>
 </params>
diff --git a/src/drivers/simplix/simplix_trb1/tracks/alpine-1.xml b/src/drivers/simplix/simplix_trb1/tracks/alpine-1.xml
index 8ecff5520..1eeb7b94e 100644
--- a/src/drivers/simplix/simplix_trb1/tracks/alpine-1.xml
+++ b/src/drivers/simplix/simplix_trb1/tracks/alpine-1.xml
@@ -2,7 +2,7 @@
 <!-- 
     file          : alpine-1.xml 
     created       : 28 Mar 2008 
-    last modified : 29 Nov 2009
+    last modified : 03 Dec 2009
     copyright     : (C) 2008-2009 Wolf-Dieter Beelitz
 -->
 <!--    This program is free software; you can redistribute it and/or modify  -->
@@ -23,11 +23,11 @@
 		<attnum name="pit long offset" min="-5" max="5" val="0.0"/>
 		<attnum name="pit scale brake" val="0.70"/>
 		<attnum name="pit stop dist" val="1.50"/>
-		<attnum name="scale_mu" min="0.1" max="2.0" val="1.0"/>
+		<attnum name="scale_mu" min="0.1" max="2.0" val="0.85"/>
 		<attnum name="scale bump" min="0" max="1" val="0.20"/>
 		<attnum name="scale bump outer" min="0" max="2" val="0.30"/>
 		<attnum name="lookaheadfactor" min="0.0" max="0.5" val="0.03"/>
-		<attnum name="offset skill" val="0.15"/>
+		<attnum name="offset skill" val="0.1"/>
 		<attnum name="scale skill" val="1.0"/>
 	</section>
 </params>
diff --git a/src/drivers/simplix/simplix_trb1/tracks/alpine-2.xml b/src/drivers/simplix/simplix_trb1/tracks/alpine-2.xml
index 982dcbb5d..d1752d954 100644
--- a/src/drivers/simplix/simplix_trb1/tracks/alpine-2.xml
+++ b/src/drivers/simplix/simplix_trb1/tracks/alpine-2.xml
@@ -2,7 +2,7 @@
 <!-- 
     file          : alpine-2.xml 
     created       : 28 Mar 2008 
-    last modified : 29 Nov 2009
+    last modified : 03 Dec 2009
     copyright     : (C) 2008-2009 Wolf-Dieter Beelitz
 -->
 <!--    This program is free software; you can redistribute it and/or modify  -->
@@ -23,10 +23,10 @@
 		<attnum name="pit long offset" min="-5" max="5" val="0.0"/>
 		<attnum name="pit scale brake" val="1.0"/>
 		<attnum name="pit stop dist" val="1.5"/>
-		<attnum name="scale_mu" min="0.1" max="2.0" val="0.90"/>
-		<attnum name="scale bump" min="0" max="1" val="0.30"/>
-		<attnum name="scale bump outer" min="0" max="2" val="0.40"/>
-		<attnum name="offset skill" val="0.00"/>
-		<attnum name="scale skill" val="1.00"/>
+		<attnum name="scale_mu" min="0.1" max="2.0" val="0.95"/>
+		<attnum name="scale bump" min="0" max="1" val="0.25"/>
+		<attnum name="scale bump outer" min="0" max="2" val="0.35"/>
+		<attnum name="offset skill" val="0.0"/>
+		<attnum name="scale skill" val="1.25"/>
 	</section>
 </params>
diff --git a/src/drivers/simplix/simplix_trb1/tracks/e-track-1.xml b/src/drivers/simplix/simplix_trb1/tracks/e-track-1.xml
index 8ea5c9b4e..b5ac4dd64 100644
--- a/src/drivers/simplix/simplix_trb1/tracks/e-track-1.xml
+++ b/src/drivers/simplix/simplix_trb1/tracks/e-track-1.xml
@@ -2,7 +2,7 @@
 <!-- 
     file          : e-track-1.xml
     created       : 28 Mar 2008 
-    last modified : 29 Nov 2009
+    last modified : 03 Dec 2009
     copyright     : (C) 2008-2009 Wolf-Dieter Beelitz
 -->
 <!--    This program is free software; you can redistribute it and/or modify  -->
@@ -24,10 +24,10 @@
 		<attnum name="pit scale brake" val="1.0"/>
 		<attnum name="pit stop dist" val="1.5"/>
 		<attnum name="scale_mu" min="0.1" max="2.0" val="0.90"/>
-		<attnum name="scale bump" min="0" max="1" val="0.10"/>
-		<attnum name="scale bump outer" min="0" max="2" val="0.20"/>
+		<attnum name="scale bump" min="0" max="1" val="0.05"/>
+		<attnum name="scale bump outer" min="0" max="2" val="0.2100"/>
 		<attnum name="lookaheadfactor" min="0.0" max="0.5" val="0.10"/>
-		<attnum name="offset skill" val="0.00"/>
-		<attnum name="scale skill" val="1.0"/>
+		<attnum name="offset skill" val="0.10"/>
+		<attnum name="scale skill" val="0.80"/>
 	</section>
 </params>
diff --git a/src/drivers/simplix/simplix_trb1/tracks/e-track-2.xml b/src/drivers/simplix/simplix_trb1/tracks/e-track-2.xml
index 73545eb47..9116bd632 100644
--- a/src/drivers/simplix/simplix_trb1/tracks/e-track-2.xml
+++ b/src/drivers/simplix/simplix_trb1/tracks/e-track-2.xml
@@ -2,7 +2,7 @@
 <!-- 
     file          : e-track-2.xml
     created       : 28 Mar 2008 
-    last modified : 29 Nov 2009
+    last modified : 03 Dec 2009
     copyright     : (C) 2008-2009 Wolf-Dieter Beelitz
 -->
 <!--    This program is free software; you can redistribute it and/or modify  -->
@@ -30,6 +30,6 @@
 		<attnum name="scale bump outer" min="0" max="2" val="0.01"/>
 		<attnum name="lookaheadfactor" min="0.0" max="0.5" val="0.10"/>
 		<attnum name="offset skill" val="0.00"/>
-		<attnum name="scale skill" val="1.0"/>
+		<attnum name="scale skill" val="0.90"/>
 	</section>
 </params>
diff --git a/src/drivers/simplix/simplix_trb1/tracks/e-track-3.xml b/src/drivers/simplix/simplix_trb1/tracks/e-track-3.xml
index 116cc0ff3..92b4f92eb 100644
--- a/src/drivers/simplix/simplix_trb1/tracks/e-track-3.xml
+++ b/src/drivers/simplix/simplix_trb1/tracks/e-track-3.xml
@@ -23,11 +23,11 @@
 		<attnum name="pit long offset" min="-5" max="5" val="0.0"/>
 		<attnum name="pit scale brake" val="1.0"/>
 		<attnum name="pit stop dist" val="1.5"/>
-		<attnum name="scale_mu" min="0.1" max="2.0" val="0.90"/>
+		<attnum name="scale_mu" min="0.1" max="2.0" val="0.85"/>
 		<attnum name="scale bump" min="0" max="1" val="0.40"/>
 		<attnum name="scale bump outer" min="0" max="2" val="0.80"/>
 		<attnum name="lookaheadfactor" min="0.0" max="0.5" val="0.20"/>
 		<attnum name="offset skill" val="0.00"/>
-		<attnum name="scale skill" val="1.00"/>
+		<attnum name="scale skill" val="0.5"/>
 	</section>
 </params>
diff --git a/src/drivers/simplix/src/unitclothoid.cpp b/src/drivers/simplix/src/unitclothoid.cpp
index 3248926b9..059b3c76d 100644
--- a/src/drivers/simplix/src/unitclothoid.cpp
+++ b/src/drivers/simplix/src/unitclothoid.cpp
@@ -9,7 +9,7 @@
 //
 // File         : unitclothoid.cpp
 // Created      : 2007.11.25
-// Last changed : 2009.02.13
+// Last changed : 2009.12.03
 // Copyright    : © 2007-2009 Wolf-Dieter Beelitz
 // eMail        : wdb@wdbee.de
 // Version      : 2.00.000
@@ -558,6 +558,7 @@ void TClothoidLane::OptimisePath
 	TPathPt* L4 = &oPathPoints[0];
 	TPathPt* L5 = &oPathPoints[Step];
 	TPathPt* L6 = &oPathPoints[2 * Step];
+	TPathPt* LFly;
 
 	// Go forwards
 	int	K = 3 * Step;
@@ -571,20 +572,25 @@ void TClothoidLane::OptimisePath
 	  L4 = L5;
 	  L5 = L6;
 	  L6 = &oPathPoints[K];
+	  LFly = L3;  
 
 	  int Index = (K + Count - 3 * Step) % Count;
+      double Factor = 1.016f;
 
-	  if (BumpMod == 2 && L3->FlyHeight > 0.1)
+	  if (LFly->FlyHeight > 0.035)
+	  {
+		Optimise(Factor/100, L3, L0, L1, L2, L4, L5, L6, BumpMod);
+	  }
+	  else if (BumpMod == 2 && L3->FlyHeight > 0.1)
 	  {
 		//GfOut("OptimiseLine Index: %d\n",Index);
 		OptimiseLine(Index, Step, 0.1, L3, L2, L4);
 	  }
 	  else
 	  {
-//		Optimise(1.015, L3, L0, L1, L2, L4, L5, L6, BumpMod);
-		Optimise(1.016, L3, L0, L1, L2, L4, L5, L6, BumpMod);
+		Optimise(Factor, L3, L0, L1, L2, L4, L5, L6, BumpMod);
 	  }
-
+      //K = (K + Step) % Count; 
       K += Step;
 	  if (K >= Count)
 		K = 0;