From 34d11e5f0c1cee5351cdb61087eb81fb8cd3a539 Mon Sep 17 00:00:00 2001
From: Justin Nicholson <justi.n.icholson@gmail.com>
Date: Mon, 15 Aug 2022 22:24:59 -0700
Subject: [PATCH] split menubars into indiv set files

---
 MiG-21-set-common.xml | 173 ----------------------------------------
 MiG-21I-set.xml       | 139 ++++++++++++++++++++++++++++++++-
 MiG-21MF-75-set.xml   | 178 ++++++++++++++++++++++++++++++++++++++++++
 MiG-21bis-set.xml     | 178 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 494 insertions(+), 174 deletions(-)

diff --git a/MiG-21-set-common.xml b/MiG-21-set-common.xml
index 1e81b97..a45e463 100644
--- a/MiG-21-set-common.xml
+++ b/MiG-21-set-common.xml
@@ -64,179 +64,6 @@
 
         <menubar>
             <default>
-                <menu n="100">
-                    <label>MiG-21</label>
-                    <enabled type="bool">true</enabled>
-                    <item>
-                        <label>Autostart/Shutdown</label>
-                        <binding>
-                            <command>nasal</command>
-                            <script>mig21.autostart(1)</script>
-                        </binding>
-                    </item>
-                    <item>
-                        <label>Select Livery</label>
-                        <binding>
-                            <command>nasal</command>
-                            <script>aircraft.livery.dialog.toggle()</script>
-                        </binding>
-                    </item>
-                    <item>
-                        <label>Show Stores Dialog</label>
-                        <binding>
-                            <command>nasal</command><![CDATA[some stuff]]>
-                            <script>
-                                canvas_window.showStoresDialog();
-                            </script>
-                        </binding>
-                    </item>
-                    <item>
-                        <label>Select Radio Config File</label>
-                        <binding>
-                            <command>nasal</command>
-                            <script>mig21.get_radio_file_gui();</script>
-                        </binding>
-                    </item>
-                    <item>
-                        <label>VOR/ILS Radio</label>
-                        <binding>
-                            <command>nasal</command>
-                            <script>dialog.nav_radio_dialog.open()</script>
-                        </binding>
-                    </item>
-                    <item>
-                        <label>Comm Radio</label>
-                        <binding>
-                            <command>nasal</command>
-                            <script>dialog.comm_radio_dialog.open()</script>
-                        </binding>
-                    </item>
-                    <item>
-                        <label>ADF Radio</label>
-                        <binding>
-                            <command>nasal</command>
-                            <script>dialog.adf_radio_dialog.open()</script>
-                        </binding>
-                    </item>
-                    <item>
-                        <label>Smokepod Color</label>
-                        <binding>
-                            <command>nasal</command>
-                            <script>dialog.smokepod_dialog.open()</script>
-                        </binding>
-                    </item>
-                    <item>
-                        <label>Repack Chute</label>
-                        <binding>
-                            <command>property-assign</command>
-                            <property>/controls/flight/chute_jettisoned</property>
-                            <value>0</value>
-                        </binding>
-                        <binding>
-                            <command>property-assign</command>
-                            <property>/fdm/jsbsim/systems/chute/deploy-rqst</property>
-                            <value>0</value>
-                        </binding>
-                    </item>
-                    <item>
-                        <label>Reload Flares/Chaff</label>
-                        <binding>
-                            <command>property-assign</command>
-                            <property>/ai/submodels/submodel[0]/count</property>
-                            <value>60</value>
-                        </binding>
-                        <binding>
-                            <command>property-assign</command>
-                            <property>/ai/submodels/submodel[1]/count</property>
-                            <value>60</value>
-                        </binding>
-                        <binding>
-                            <command>property-assign</command>
-                            <property>/ai/submodels/submodel[2]/count</property>
-                            <value>60</value>
-                        </binding>
-                        <binding>
-                            <command>property-assign</command>
-                            <property>/ai/submodels/submodel[3]/count</property>
-                            <value>60</value>
-                        </binding>
-                    </item>
-                    <item>
-                        <label>Gunsight</label>
-                        <binding>
-                            <command>nasal</command>
-                            <script>dialog.gunsight_dialog.open()</script>
-                        </binding>
-                    </item>
-                    <item>
-                        <label>Training</label>
-                        <binding>
-                            <command>nasal</command>
-                            <script>dialog.mig28_dialog.open()</script>
-                        </binding>
-                    </item>
-                    <item>
-                        <label>Fuel to full</label>
-                        <binding>
-                            <command>nasal</command>
-                            <script>
-                                if (getprop("/gear/gear/wow") == 1) {
-                                    setprop("/consumables/fuel/tank/level-norm", 1);
-                                    setprop("/consumables/fuel/tank[1]/level-norm", 1);
-                                    setprop("/consumables/fuel/tank[2]/level-norm", 1);
-                                    setprop("/consumables/fuel/tank[3]/level-norm", 1);
-                                    setprop("/consumables/fuel/tank[4]/level-norm", 1);
-                                    setprop("/consumables/fuel/tank[5]/level-norm", 1);
-                                    setprop("/consumables/fuel/tank[6]/level-norm", 1);
-                                    setprop("/consumables/fuel/tank[7]/level-norm", 1);
-                                    setprop("/consumables/fuel/tank[8]/level-norm", 1);
-                                    setprop("/consumables/fuel/tank[9]/level-norm", 1);
-                                    setprop("/consumables/fuel/tank[10]/level-norm", 1);
-                                    setprop("/consumables/fuel/tank[11]/level-norm", 1);
-                                    setprop("/consumables/fuel/tank[12]/level-norm", 1);
-                                    setprop("/consumables/fuel/tank[13]/level-norm", 1);
-                                    setprop("/consumables/fuel/tank[14]/level-norm", 1);
-                                }
-                            </script>
-                        </binding>
-                    </item>
-                    <item>
-                        <label>Toggle Damage</label>
-                        <binding>
-                            <command>nasal</command>
-                            <script>
-                                mig21.toggle_damage();
-                            </script>
-                        </binding>
-                    </item>
-                    <item>
-                        <label>Tacview Record</label>
-                        <binding>
-                            <command>nasal</command>
-                            <script>
-                                if (tacview.starttime == 0) {
-                                    tacview.startwrite();
-                                } else {
-                                    tacview.stopwrite();
-                                }
-                            </script>
-                        </binding>
-                    </item>
-                    <item>
-                        <label>Event Log</label>
-                        <binding>
-                            <command>dialog-show</command>
-                            <dialog-name>flightlog</dialog-name>
-                        </binding>
-                    </item>
-                    <item>
-                        <label>Toggle Headshake</label>
-                        <binding>
-                            <command>property-toggle</command>
-                            <property>/sim/enable-headshake</property>
-                        </binding>
-                    </item>
-                </menu>
                 <menu n="101">
                     <label>Dev</label>
                     <!--<item>
diff --git a/MiG-21I-set.xml b/MiG-21I-set.xml
index 3d84c5e..c3e21f5 100644
--- a/MiG-21I-set.xml
+++ b/MiG-21I-set.xml
@@ -88,6 +88,138 @@
         <model>
             <path>Aircraft/MiG-21bis/Models/MiG-21I.xml</path>
         </model>
+
+        <menubar>
+            <default>
+                <menu n="100">
+                    <label>MiG-21</label>
+                    <enabled type="bool">true</enabled>
+                    <item>
+                        <label>Autostart/Shutdown</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>mig21.autostart(1)</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Select Livery</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>aircraft.livery.dialog.toggle()</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Select Radio Config File</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>mig21.get_radio_file_gui();</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>VOR/ILS Radio</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>dialog.nav_radio_dialog.open()</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Comm Radio</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>dialog.comm_radio_dialog.open()</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>ADF Radio</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>dialog.adf_radio_dialog.open()</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Smokepod Color</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>dialog.smokepod_dialog.open()</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Repack Chute</label>
+                        <binding>
+                            <command>property-assign</command>
+                            <property>/controls/flight/chute_jettisoned</property>
+                            <value>0</value>
+                        </binding>
+                        <binding>
+                            <command>property-assign</command>
+                            <property>/fdm/jsbsim/systems/chute/deploy-rqst</property>
+                            <value>0</value>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Fuel to full</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>
+                                if (getprop("/gear/gear/wow") == 1) {
+                                    setprop("/consumables/fuel/tank/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[1]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[2]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[3]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[4]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[5]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[6]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[7]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[8]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[9]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[10]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[11]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[12]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[13]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[14]/level-norm", 1);
+                                }
+                            </script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Toggle Damage</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>
+                                mig21.toggle_damage();
+                            </script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Tacview Record</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>
+                                if (tacview.starttime == 0) {
+                                    tacview.startwrite();
+                                } else {
+                                    tacview.stopwrite();
+                                }
+                            </script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Event Log</label>
+                        <binding>
+                            <command>dialog-show</command>
+                            <dialog-name>flightlog</dialog-name>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Toggle Headshake</label>
+                        <binding>
+                            <command>property-toggle</command>
+                            <property>/sim/enable-headshake</property>
+                        </binding>
+                    </item>
+                </menu>
+            </default>
+        </menubar>
     </sim>
 
     <!-- Nasal Scripts -->
@@ -118,6 +250,11 @@
 
     </nasal>
 
-    <payload include="Systems/weaponset-analogue.xml"/>
+    <payload include="Systems/weaponset-analogue.xml">
+        <armament>
+            <msg type="bool">false</msg>
+            <damage type="bool">false</damage>
+        </armament>
+    </payload>
 
 </PropertyList>
diff --git a/MiG-21MF-75-set.xml b/MiG-21MF-75-set.xml
index 078e77c..ee79d7a 100644
--- a/MiG-21MF-75-set.xml
+++ b/MiG-21MF-75-set.xml
@@ -82,6 +82,184 @@
         <model>
             <path>Aircraft/MiG-21bis/Models/MiG-21MF-75.xml</path>
         </model>
+
+                <menubar>
+            <default>
+                <menu n="100">
+                    <label>MiG-21</label>
+                    <enabled type="bool">true</enabled>
+                    <item>
+                        <label>Autostart/Shutdown</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>mig21.autostart(1)</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Select Livery</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>aircraft.livery.dialog.toggle()</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Show Stores Dialog</label>
+                        <binding>
+                            <command>nasal</command><![CDATA[some stuff]]>
+                            <script>
+                                canvas_window.showStoresDialog();
+                            </script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Select Radio Config File</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>mig21.get_radio_file_gui();</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>VOR/ILS Radio</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>dialog.nav_radio_dialog.open()</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Comm Radio</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>dialog.comm_radio_dialog.open()</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>ADF Radio</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>dialog.adf_radio_dialog.open()</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Smokepod Color</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>dialog.smokepod_dialog.open()</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Repack Chute</label>
+                        <binding>
+                            <command>property-assign</command>
+                            <property>/controls/flight/chute_jettisoned</property>
+                            <value>0</value>
+                        </binding>
+                        <binding>
+                            <command>property-assign</command>
+                            <property>/fdm/jsbsim/systems/chute/deploy-rqst</property>
+                            <value>0</value>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Reload Flares/Chaff</label>
+                        <binding>
+                            <command>property-assign</command>
+                            <property>/ai/submodels/submodel[0]/count</property>
+                            <value>60</value>
+                        </binding>
+                        <binding>
+                            <command>property-assign</command>
+                            <property>/ai/submodels/submodel[1]/count</property>
+                            <value>60</value>
+                        </binding>
+                        <binding>
+                            <command>property-assign</command>
+                            <property>/ai/submodels/submodel[2]/count</property>
+                            <value>60</value>
+                        </binding>
+                        <binding>
+                            <command>property-assign</command>
+                            <property>/ai/submodels/submodel[3]/count</property>
+                            <value>60</value>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Gunsight</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>dialog.gunsight_dialog.open()</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Training</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>dialog.mig28_dialog.open()</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Fuel to full</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>
+                                if (getprop("/gear/gear/wow") == 1) {
+                                    setprop("/consumables/fuel/tank/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[1]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[2]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[3]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[4]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[5]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[6]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[7]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[8]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[9]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[10]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[11]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[12]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[13]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[14]/level-norm", 1);
+                                }
+                            </script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Toggle Damage</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>
+                                mig21.toggle_damage();
+                            </script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Tacview Record</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>
+                                if (tacview.starttime == 0) {
+                                    tacview.startwrite();
+                                } else {
+                                    tacview.stopwrite();
+                                }
+                            </script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Event Log</label>
+                        <binding>
+                            <command>dialog-show</command>
+                            <dialog-name>flightlog</dialog-name>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Toggle Headshake</label>
+                        <binding>
+                            <command>property-toggle</command>
+                            <property>/sim/enable-headshake</property>
+                        </binding>
+                    </item>
+                </menu>
+            </default>
+        </menubar>
     </sim>
 
 
diff --git a/MiG-21bis-set.xml b/MiG-21bis-set.xml
index 17c2565..3813cb2 100644
--- a/MiG-21bis-set.xml
+++ b/MiG-21bis-set.xml
@@ -88,6 +88,184 @@
         <model>
             <path>Aircraft/MiG-21bis/Models/MiG-21bis.xml</path>
         </model>
+
+                <menubar>
+            <default>
+                <menu n="100">
+                    <label>MiG-21</label>
+                    <enabled type="bool">true</enabled>
+                    <item>
+                        <label>Autostart/Shutdown</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>mig21.autostart(1)</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Select Livery</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>aircraft.livery.dialog.toggle()</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Show Stores Dialog</label>
+                        <binding>
+                            <command>nasal</command><![CDATA[some stuff]]>
+                            <script>
+                                canvas_window.showStoresDialog();
+                            </script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Select Radio Config File</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>mig21.get_radio_file_gui();</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>VOR/ILS Radio</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>dialog.nav_radio_dialog.open()</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Comm Radio</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>dialog.comm_radio_dialog.open()</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>ADF Radio</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>dialog.adf_radio_dialog.open()</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Smokepod Color</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>dialog.smokepod_dialog.open()</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Repack Chute</label>
+                        <binding>
+                            <command>property-assign</command>
+                            <property>/controls/flight/chute_jettisoned</property>
+                            <value>0</value>
+                        </binding>
+                        <binding>
+                            <command>property-assign</command>
+                            <property>/fdm/jsbsim/systems/chute/deploy-rqst</property>
+                            <value>0</value>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Reload Flares/Chaff</label>
+                        <binding>
+                            <command>property-assign</command>
+                            <property>/ai/submodels/submodel[0]/count</property>
+                            <value>60</value>
+                        </binding>
+                        <binding>
+                            <command>property-assign</command>
+                            <property>/ai/submodels/submodel[1]/count</property>
+                            <value>60</value>
+                        </binding>
+                        <binding>
+                            <command>property-assign</command>
+                            <property>/ai/submodels/submodel[2]/count</property>
+                            <value>60</value>
+                        </binding>
+                        <binding>
+                            <command>property-assign</command>
+                            <property>/ai/submodels/submodel[3]/count</property>
+                            <value>60</value>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Gunsight</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>dialog.gunsight_dialog.open()</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Training</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>dialog.mig28_dialog.open()</script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Fuel to full</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>
+                                if (getprop("/gear/gear/wow") == 1) {
+                                    setprop("/consumables/fuel/tank/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[1]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[2]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[3]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[4]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[5]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[6]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[7]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[8]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[9]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[10]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[11]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[12]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[13]/level-norm", 1);
+                                    setprop("/consumables/fuel/tank[14]/level-norm", 1);
+                                }
+                            </script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Toggle Damage</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>
+                                mig21.toggle_damage();
+                            </script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Tacview Record</label>
+                        <binding>
+                            <command>nasal</command>
+                            <script>
+                                if (tacview.starttime == 0) {
+                                    tacview.startwrite();
+                                } else {
+                                    tacview.stopwrite();
+                                }
+                            </script>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Event Log</label>
+                        <binding>
+                            <command>dialog-show</command>
+                            <dialog-name>flightlog</dialog-name>
+                        </binding>
+                    </item>
+                    <item>
+                        <label>Toggle Headshake</label>
+                        <binding>
+                            <command>property-toggle</command>
+                            <property>/sim/enable-headshake</property>
+                        </binding>
+                    </item>
+                </menu>
+            </default>
+        </menubar>
     </sim>