From 94d95810bad1c5dd3e9664b7aa9aee4339a58d9d Mon Sep 17 00:00:00 2001
From: "Nikolai V. Chr" <emptyyetfull@gmail.com>
Date: Wed, 23 Nov 2022 10:58:27 +0100
Subject: [PATCH] SA-6: Adjustment of launch positions

---
 SA-6/Models/SA-6.xml        | 32 ++++++++++++++++++++++++++++++++
 SA-6/Nasal/fire-control.nas |  2 +-
 SA-6/SA-6-set.xml           | 18 +++++++++---------
 3 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/SA-6/Models/SA-6.xml b/SA-6/Models/SA-6.xml
index 7bf15d4..b102eab 100644
--- a/SA-6/Models/SA-6.xml
+++ b/SA-6/Models/SA-6.xml
@@ -35,6 +35,38 @@
   </axis>
  </animation>
 
+ <animation>
+  <type>rotate</type>
+  <object-name>launcher</object-name>
+  <property>sim/multiplay/generic/float[5]</property>
+  <factor>1.0</factor>
+  <offset-deg>-33</offset-deg>
+  <axis>   
+   <x1-m> 1.30999 </x1-m>
+   <y1-m> -0.949105 </y1-m>
+   <z1-m> 2.1287 </z1-m>
+   <x2-m> 1.30999 </x2-m>
+   <y2-m> 0.949105 </y2-m>
+   <z2-m> 2.1287 </z2-m>
+  </axis>
+ </animation>
+
+ <animation>
+  <type>rotate</type>
+  <object-name>launcherBase</object-name>
+  <property>sim/multiplay/generic/float[5]</property>
+  <factor>-1.0</factor>
+  <offset-deg>33</offset-deg>
+  <axis>   
+   <x1-m> 1.30999 </x1-m>
+   <y1-m> -0.949105 </y1-m>
+   <z1-m> 2.1287 </z1-m>
+   <x2-m> 1.30999 </x2-m>
+   <y2-m> 0.949105 </y2-m>
+   <z2-m> 2.1287 </z2-m>
+  </axis>
+ </animation>
+
 <animation>
   <type>select</type>
   <object-name>MissileL</object-name>
diff --git a/SA-6/Nasal/fire-control.nas b/SA-6/Nasal/fire-control.nas
index bda6a45..7c3c369 100644
--- a/SA-6/Nasal/fire-control.nas
+++ b/SA-6/Nasal/fire-control.nas
@@ -24,7 +24,7 @@ var mutexLock = thread.newlock();
 
 var setupTime = 300;#minimum 'launcher_tilt_time' secs no matter what, due to anim and stuff.
 var reload_time = 600;
-var launcher_final_tilt_deg  = 45;
+var launcher_final_tilt_deg  = 33;
 var launcher_start_tilt_deg  =  0;
 var launcher_tilt_time       = 15;
 var sam_align_to_target      =  0;
diff --git a/SA-6/SA-6-set.xml b/SA-6/SA-6-set.xml
index af70f41..5193d51 100644
--- a/SA-6/SA-6-set.xml
+++ b/SA-6/SA-6-set.xml
@@ -203,25 +203,25 @@
             <trigger type="bool">false</trigger>
             <station n="1">
                 <offsets>
-                    <x-m type="double">  12</x-m>
-                    <y-m type="double">   0</y-m>
-                    <z-m type="double">   3</z-m>
+                    <x-m type="double"> 0.0</x-m>
+                    <y-m type="double">  -1</y-m>
+                    <z-m type="double"> 3.75</z-m>
                 </offsets>
                 <trigger type="bool">false</trigger>
             </station>
             <station n="2">
                 <offsets>
-                    <x-m type="double">  12</x-m>
+                    <x-m type="double"> 0.0</x-m>
                     <y-m type="double">   0</y-m>
-                    <z-m type="double">   3</z-m>
+                    <z-m type="double"> 3.75</z-m>
                 </offsets>
                 <trigger type="bool">false</trigger>
             </station>
             <station n="3">
                 <offsets>
-                    <x-m type="double">  12</x-m>
-                    <y-m type="double">   0</y-m>
-                    <z-m type="double">   3</z-m>
+                    <x-m type="double"> 0.0</x-m>
+                    <y-m type="double">   1</y-m>
+                    <z-m type="double"> 3.75</z-m>
                 </offsets>
                 <trigger type="bool">false</trigger>
             </station>
@@ -299,7 +299,7 @@
                     <rail type="bool">true</rail>
                     <rail-length-m type="double">7.5</rail-length-m>
                     <rail-point-forward type="bool">false</rail-point-forward>
-                    <rail-pitch-deg type="double">45</rail-pitch-deg>
+                    <rail-pitch-deg type="double">33</rail-pitch-deg>
                     <rail-heading-deg type="double">0</rail-heading-deg>
                     <proportionality-constant type="double">3</proportionality-constant>
                     <class type="string">A</class>