Merge pull request #1436 from c172p-team/Issue-1435

Issue 1435
c172p-team · Aug 10, 2023 · 0b256a8 · 0b256a8
2 parents c116c93 + e4b32f6
commit 0b256a8
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/Nasal/mooring.nas b/Nasal/mooring.nas
@@ -36,6 +36,20 @@ setlistener("/sim/signals/fdm-initialized",
             }
         }
         settimer(func{
+            var aircraft = getprop("sim/aircraft");
+            if (aircraft == "c172p"){
+                setprop("fdm/jsbsim/bushkit", 0);
+            } else if (aircraft == "c172p-bush26"){
+                setprop("fdm/jsbsim/bushkit", 1);
+            } else if (aircraft == "c172p-bush26"){
+                setprop("fdm/jsbsim/bushkit", 2);
+            } else if (aircraft == "c172p-floats"){
+                setprop("fdm/jsbsim/bushkit", 3);
+            } else if (aircraft == "c172p-amphibious"){
+                setprop("fdm/jsbsim/bushkit", 4);
+            } else if (aircraft == "c172p-ski"){
+                setprop("fdm/jsbsim/bushkit", 5);
+            }
             if (getprop("/controls/mooring/automatic") and getprop("/controls/mooring/allowed")) {
                 seaplane = Mooring.new();
             }
@@ -127,7 +141,6 @@ Mooring.presetharbour = func {
                 me.setmoorage(i, airport);
                 me.prepareseaplane();
                 c172p.oil_consumption.stop();
-                aircraft.data.add("/fdm/jsbsim/bushkit");
                 fgcommand("reposition");
                 break;
             }

diff --git a/gui/dialogs/aircraft-dialog.xml b/gui/dialogs/aircraft-dialog.xml
@@ -573,6 +573,8 @@
                                 setprop("controls/engines/engine/primer", 0);
                                 setprop("sim/model/c172p/engine_flag_0", 1);
                                 setprop("sim/model/c172p/engine_flag_1", 0);
+
+                                setprop("/sim/aircraft", "c172p");
                             </script>
                         </binding>
                         <binding>
@@ -625,6 +627,8 @@
                                 setprop("controls/engines/engine/primer", 0);
                                 setprop("sim/model/c172p/engine_flag_0", 1);
                                 setprop("sim/model/c172p/engine_flag_1", 0);
+
+                                setprop("/sim/aircraft", "c172p-bush26");
                             </script>
                         </binding>
                         <binding>
@@ -677,6 +681,8 @@
                                 setprop("controls/engines/engine/primer", 0);
                                 setprop("sim/model/c172p/engine_flag_0", 1);
                                 setprop("sim/model/c172p/engine_flag_1", 0);
+
+                                setprop("/sim/aircraft", "c172p-bush36");
                             </script>
                         </binding>
                         <binding>
@@ -728,6 +734,8 @@
                                 setprop("controls/engines/engine/primer", 0);
                                 setprop("sim/model/c172p/engine_flag_0", 0);
                                 setprop("sim/model/c172p/engine_flag_1", 1);
+
+                                setprop("/sim/aircraft", "c172p-floats");
                             </script>
                         </binding>
                         <binding>
@@ -795,6 +803,8 @@
                                 setprop("controls/engines/engine/primer", 0);
                                 setprop("sim/model/c172p/engine_flag_0", 0);
                                 setprop("sim/model/c172p/engine_flag_1", 1);
+
+                                setprop("/sim/aircraft", "c172p-amphibious");
                             </script>
                         </binding>
                         <binding>
@@ -852,6 +862,8 @@
                                 setprop("controls/engines/engine/primer", 0);
                                 setprop("sim/model/c172p/engine_flag_0", 0);
                                 setprop("sim/model/c172p/engine_flag_1", 1);
+
+                                setprop("/sim/aircraft", "c172p-ski");
                             </script>
                         </binding>
                         <binding>