Sim: Minor tweaks, and implementing various bugfixes

- Fixes in systems - Minor issues fixed - Renamed aircraft to "MD-11" - Updated FGFS requirement to 2019.2.0 (nightly is fine) - Some other random bullshit
Octal450 · Apr 17, 2020 · 7689366 · 7689366
1 parent 91652a1
commit 7689366
Show file tree

Hide file tree

Showing 201 changed files with 33,251 additions and 54,536 deletions.
diff --git a/AircraftConfig/about.xml b/AircraftConfig/about.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
+<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
 
 <!-- MD-11 Aircraft Config Dialog -->
 
@@ -34,34 +34,26 @@
 
 		<text>
 			<halign>left</halign>
-			<label>MD-11 by Immersive Design Group</label>
-		</text>
-		<text>
-			<halign>left</halign>
-			<label>Joshua Davidson (Octal450), Jonanthan Redpath (legoboyvdlp)</label>
+			<label>McDonnell Douglas MD-11</label>
 		</text>
 
 		<hrule/>
 
 		<text>
 			<halign>left</halign>
-			<label>FDM: Joshua Davidson (Octal450)</label>
-		</text>
-		<text>
-			<halign>left</halign>
-			<label>Systems: Joshua Davidson (Octal450)</label>
+			<label>Flight Dyanmics: Josh Davidson (Octal450)</label>
 		</text>
 		<text>
 			<halign>left</halign>
-			<label>Cockpit: Jormapaappa1235, John Williams (tikibar), Joshua Davidson (Octal450)</label>
+			<label>Systems: Josh Davidson (Octal450)</label>
 		</text>
 		<text>
 			<halign>left</halign>
-			<label>Instruments: Joshua Davidson (Octal450)</label>
+			<label>Displays: Josh Davidson (Octal450)</label>
 		</text>
 		<text>
 			<halign>left</halign>
-			<label>Pre V1.0, Shared Libraries 1.5.1</label>
+			<label>3D/Textures: Semir Gebran/CaptB, John Williams (tikibar), and Jormapaappa1235</label>
 		</text>
 
 	</group>

diff --git a/AircraftConfig/ac_init.xml b/AircraftConfig/ac_init.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
+<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
 
 <!-- MD-11 Aircraft Config Dialog -->
 

diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas
@@ -1,5 +1,5 @@
 # Aircraft Config Center
-# Copyright (c) 2019 Joshua Davidson (Octal450)
+# Copyright (c) 2020 Josh Davidson (Octal450)
 
 var spinning = maketimer(0.05, func {
 	var spinning = getprop("/systems/acconfig/spinning");
@@ -31,8 +31,8 @@ setprop("/systems/acconfig/spinning", 0);
 setprop("/systems/acconfig/spin", "-");
 setprop("/systems/acconfig/new-revision", 0);
 setprop("/systems/acconfig/out-of-date", 0);
-setprop("/systems/acconfig/mismatch-code", "0x000");
-setprop("/systems/acconfig/mismatch-reason", "XX");
+setprop("/systems/acconfig/error-code", "0x000");
+setprop("/systems/acconfig/error-reason", "XX");
 setprop("/systems/acconfig/options/autopush/show-route", 1);
 setprop("/systems/acconfig/options/autopush/show-wingtip", 1);
 setprop("/systems/acconfig/options/deflected-aileron-equipped", 1);
@@ -45,27 +45,27 @@ setprop("/systems/acconfig/options/pfd-rate", 1);
 setprop("/systems/acconfig/options/revision", 0);
 setprop("/systems/acconfig/options/sd-rate", 1);
 setprop("/systems/acconfig/options/welcome-skip", 0);
-var main_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/main/dialog", "Aircraft/IDG-MD-11/AircraftConfig/main.xml");
-var welcome_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/welcome/dialog", "Aircraft/IDG-MD-11/AircraftConfig/welcome.xml");
-var ps_load_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/psload/dialog", "Aircraft/IDG-MD-11/AircraftConfig/psload.xml");
-var ps_loaded_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/psloaded/dialog", "Aircraft/IDG-MD-11/AircraftConfig/psloaded.xml");
-var init_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/init/dialog", "Aircraft/IDG-MD-11/AircraftConfig/ac_init.xml");
-var help_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/help/dialog", "Aircraft/IDG-MD-11/AircraftConfig/help.xml");
-var fctl_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/fctl/dialog", "Aircraft/IDG-MD-11/AircraftConfig/fctl.xml");
-var fail_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/fail/dialog", "Aircraft/IDG-MD-11/AircraftConfig/fail.xml");
-var about_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/about/dialog", "Aircraft/IDG-MD-11/AircraftConfig/about.xml");
-var update_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/update/dialog", "Aircraft/IDG-MD-11/AircraftConfig/update.xml");
-var updated_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/updated/dialog", "Aircraft/IDG-MD-11/AircraftConfig/updated.xml");
-var error_mismatch = gui.Dialog.new("sim/gui/dialogs/acconfig/error/mismatch/dialog", "Aircraft/IDG-MD-11/AircraftConfig/error-mismatch.xml");
-var du_quality = gui.Dialog.new("sim/gui/dialogs/acconfig/du-quality/dialog", "Aircraft/IDG-MD-11/AircraftConfig/du-quality.xml");
-var rendering_dlg = gui.Dialog.new("sim/gui/dialogs/rendering/dialog", "Aircraft/IDG-MD-11/AircraftConfig/rendering.xml");
+var main_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/main/dialog", "Aircraft/MD-11/AircraftConfig/main.xml");
+var welcome_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/welcome/dialog", "Aircraft/MD-11/AircraftConfig/welcome.xml");
+var ps_load_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/psload/dialog", "Aircraft/MD-11/AircraftConfig/psload.xml");
+var ps_loaded_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/psloaded/dialog", "Aircraft/MD-11/AircraftConfig/psloaded.xml");
+var init_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/init/dialog", "Aircraft/MD-11/AircraftConfig/ac_init.xml");
+var help_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/help/dialog", "Aircraft/MD-11/AircraftConfig/help.xml");
+var fctl_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/fctl/dialog", "Aircraft/MD-11/AircraftConfig/fctl.xml");
+var fail_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/fail/dialog", "Aircraft/MD-11/AircraftConfig/fail.xml");
+var about_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/about/dialog", "Aircraft/MD-11/AircraftConfig/about.xml");
+var update_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/update/dialog", "Aircraft/MD-11/AircraftConfig/update.xml");
+var updated_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/updated/dialog", "Aircraft/MD-11/AircraftConfig/updated.xml");
+var error = gui.Dialog.new("sim/gui/dialogs/acconfig/error/dialog", "Aircraft/MD-11/AircraftConfig/error.xml");
+var du_quality = gui.Dialog.new("sim/gui/dialogs/acconfig/du-quality/dialog", "Aircraft/MD-11/AircraftConfig/du-quality.xml");
+var rendering_dlg = gui.Dialog.new("sim/gui/dialogs/rendering/dialog", "Aircraft/MD-11/AircraftConfig/rendering.xml");
 spinning.start();
 init_dlg.open();
 
-http.load("https://raw.githubusercontent.com/Octal450/IDG-MD-11/master/revision.txt").done(func(r) setprop("/systems/acconfig/new-revision", r.response));
+http.load("https://raw.githubusercontent.com/Octal450/MD-11/master/revision.txt").done(func(r) setprop("/systems/acconfig/new-revision", r.response));
 var revisionFile = (getprop("/sim/aircraft-dir") ~ "/revision.txt");
 var current_revision = io.readfile(revisionFile);
-print("IDG MD-11 Revision: " ~ current_revision);
+print("MD-11 Revision: " ~ current_revision);
 setprop("/systems/acconfig/revision", current_revision);
 
 setlistener("/systems/acconfig/new-revision", func {
@@ -76,33 +76,33 @@ setlistener("/systems/acconfig/new-revision", func {
 	}
 });
 
-var mismatch_chk = func {
-	if (num(string.replace(getprop("/sim/version/flightgear"),".","")) < 201830) {
-		setprop("/systems/acconfig/mismatch-code", "0x121");
-		setprop("/systems/acconfig/mismatch-reason", "FGFS version is too old! Please update FlightGear to at least 2018.3.0.");
+var error_chk = func {
+	if (num(string.replace(getprop("/sim/version/flightgear"),".","")) < 201920) {
+		setprop("/systems/acconfig/error-code", "0x121");
+		setprop("/systems/acconfig/error-reason", "FGFS version is too old! Please update FlightGear to at least 2019.2.0.");
 		if (getprop("/systems/acconfig/out-of-date") != 1) {
-			error_mismatch.open();
+			error.open();
 		}
 		libraries.systemsLoop.stop();
-		print("Mismatch: 0x121");
+		print("error: 0x121");
 		welcome_dlg.close();
 	} else if (getprop("/gear/gear[0]/wow") == 0 or getprop("/position/altitude-ft") >= 15000) {
-		setprop("/systems/acconfig/mismatch-code", "0x223");
-		setprop("/systems/acconfig/mismatch-reason", "Preposterous configuration detected for initialization. Check your position or scenery.");
+		setprop("/systems/acconfig/error-code", "0x223");
+		setprop("/systems/acconfig/error-reason", "Preposterous configuration detected for initialization. Check your position or scenery.");
 		if (getprop("/systems/acconfig/out-of-date") != 1) {
-			error_mismatch.open();
+			error.open();
 		}
 		libraries.systemsLoop.stop();
-		print("Mismatch: 0x223");
+		print("error: 0x223");
 		welcome_dlg.close();
 	} else if (getprop("/systems/acconfig/libraries-loaded") != 1 or getprop("/systems/acconfig/property-tree-setup-loaded") != 1) {
-		setprop("/systems/acconfig/mismatch-code", "0x247");
-		setprop("/systems/acconfig/mismatch-reason", "System files are missing or damaged. Please download a new copy of the aircraft.");
+		setprop("/systems/acconfig/error-code", "0x247");
+		setprop("/systems/acconfig/error-reason", "System files are missing or damaged. Please download a new copy of the aircraft.");
 		if (getprop("/systems/acconfig/out-of-date") != 1) {
-			error_mismatch.open();
+			error.open();
 		}
 		libraries.systemsLoop.stop();
-		print("Mismatch: 0x247");
+		print("error: 0x247");
 		welcome_dlg.close();
 	}
 }
@@ -111,16 +111,16 @@ setlistener("/sim/signals/fdm-initialized", func {
 	init_dlg.close();
 	if (getprop("/systems/acconfig/out-of-date") == 1) {
 		update_dlg.open();
-		print("System: The IDG-MD-11 is out of date!");
+		print("System: The MD-11 is out of date!");
 	} 
-	mismatch_chk();
+	error_chk();
 	readSettings();
-	if (getprop("/systems/acconfig/out-of-date") != 1 and getprop("/systems/acconfig/options/revision") < current_revision and getprop("/systems/acconfig/mismatch-code") == "0x000") {
+	if (getprop("/systems/acconfig/out-of-date") != 1 and getprop("/systems/acconfig/options/revision") < current_revision and getprop("/systems/acconfig/error-code") == "0x000") {
 		updated_dlg.open();
 		if (getprop("/systems/acconfig/options/no-rendering-warn") != 1) {
 			renderingSettings.check();
 		}
-	} else if (getprop("/systems/acconfig/out-of-date") != 1 and getprop("/systems/acconfig/mismatch-code") == "0x000" and getprop("/systems/acconfig/options/welcome-skip") != 1) {
+	} else if (getprop("/systems/acconfig/out-of-date") != 1 and getprop("/systems/acconfig/error-code") == "0x000" and getprop("/systems/acconfig/options/welcome-skip") != 1) {
 		welcome_dlg.open();
 		if (getprop("/systems/acconfig/options/no-rendering-warn") != 1) {
 			renderingSettings.check();
@@ -161,7 +161,7 @@ var renderingSettings = {
 };
 
 var readSettings = func {
-	io.read_properties(getprop("/sim/fg-home") ~ "/Export/IDG-MD-11-config.xml", "/systems/acconfig/options");
+	io.read_properties(getprop("/sim/fg-home") ~ "/Export/MD-11-config.xml", "/systems/acconfig/options");
 	setprop("/sim/model/autopush/route/show", getprop("/systems/acconfig/options/autopush/show-route"));
 	setprop("/sim/model/autopush/route/show-wingtip", getprop("/systems/acconfig/options/autopush/show-wingtip"));
 	setprop("/controls/hydraulics/deflected-aileron-equipped", getprop("/systems/acconfig/options/deflected-aileron-equipped"));
@@ -175,7 +175,7 @@ var writeSettings = func {
 	setprop("/systems/acconfig/options/deflected-aileron-equipped", getprop("/controls/hydraulics/deflected-aileron-equipped"));
 	setprop("/systems/acconfig/options/irs-skip", getprop("/controls/irs/skip"));
 	setprop("/systems/acconfig/options/keyboard-mode", getprop("/options/system/keyboard-mode"));
-	io.write_properties(getprop("/sim/fg-home") ~ "/Export/IDG-MD-11-config.xml", "/systems/acconfig/options");
+	io.write_properties(getprop("/sim/fg-home") ~ "/Export/MD-11-config.xml", "/systems/acconfig/options");
 }
 
 ################
@@ -184,7 +184,7 @@ var writeSettings = func {
 
 # Cold and Dark
 var colddark = func {
-	if (getprop("/systems/acconfig/mismatch-code") == "0x000") {
+	if (getprop("/systems/acconfig/error-code") == "0x000") {
 		spinning.start();
 		ps_loaded_dlg.close();
 		ps_load_dlg.open();
@@ -232,7 +232,7 @@ var colddark_b = func {
 
 # Ready to Start Eng
 var beforestart = func {
-	if (getprop("/systems/acconfig/mismatch-code") == "0x000") {
+	if (getprop("/systems/acconfig/error-code") == "0x000") {
 		spinning.start();
 		ps_loaded_dlg.close();
 		ps_load_dlg.open();
@@ -294,7 +294,7 @@ var beforestart_b = func {
 
 # Ready to Taxi
 var taxi = func {
-	if (getprop("/systems/acconfig/mismatch-code") == "0x000") {
+	if (getprop("/systems/acconfig/error-code") == "0x000") {
 		spinning.start();
 		ps_loaded_dlg.close();
 		ps_load_dlg.open();
@@ -372,7 +372,7 @@ var taxi_d = func {
 
 # Ready to Takeoff
 var takeoff = func {
-	if (getprop("/systems/acconfig/mismatch-code") == "0x000") {
+	if (getprop("/systems/acconfig/error-code") == "0x000") {
 		# The same as taxi, except we set some things afterwards.
 		taxi();
 		var eng_one_chk_c = setlistener("/engines/engine[0]/state", func {

diff --git a/AircraftConfig/du-quality.xml b/AircraftConfig/du-quality.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
+<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
 
 <!-- MD-11 Aircraft Config Dialog -->
 

diff --git a/AircraftConfig/error-mismatch.xml → AircraftConfig/error.xml b/AircraftConfig/error-mismatch.xml → AircraftConfig/error.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
+<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
 
 <!-- MD-11 Aircraft Config Dialog -->
 
 <PropertyList>
 
-	<name>aircraft-config-mismatch</name>
+	<name>aircraft-config-error</name>
 	<layout>vbox</layout>
 	<color>
 		<red>0.5</red>
@@ -41,7 +41,7 @@
 		</text>
 		<text>
 			<halign>left</halign>
-			<label>The error code and cause are listed below. Please include this information if contacting IDG.</label>
+			<label>The error code and cause are listed below. Please include this information if contacting us.</label>
 		</text>
 
 		<hrule>
@@ -64,7 +64,7 @@
 			<text>
 				<border>1</border>
 				<label>99999</label>
-				<property>/systems/acconfig/mismatch-code</property>
+				<property>/systems/acconfig/error-code</property>
 				<live>1</live>
 			</text>
 		</group>
@@ -80,7 +80,7 @@
 			<text>
 				<border>1</border>
 				<label>9999999999999999999999999999999999</label>
-				<property>/systems/acconfig/mismatch-reason</property>
+				<property>/systems/acconfig/error-reason</property>
 				<live>1</live>
 			</text>
 		</group>
@@ -97,6 +97,21 @@
 
 	<group>
 		<layout>hbox</layout>
+		<button>
+			<color>
+				<red>0.6</red>
+				<green>0</green>
+				<blue>0</blue>
+				<alpha>0.95</alpha>
+			</color>
+			<halign>center</halign>
+			<legend>GitHub Issues</legend>
+			<pref-width>275</pref-width>
+			<binding>
+				<command>open-browser</command>
+				<path>http://github.com/Octal450/MD-11/issues</path>
+			</binding>
+		</button>
 		<button>
 			<color>
 				<red>0.6</red>
@@ -106,7 +121,7 @@
 			</color>
 			<halign>center</halign>
 			<legend>FlightGear Forums</legend>
-			<pref-width>550</pref-width>
+			<pref-width>275</pref-width>
 			<binding>
 				<command>open-browser</command>
 				<path>http://forum.flightgear.org</path>

diff --git a/AircraftConfig/fail.xml b/AircraftConfig/fail.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
+<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
 
 <!-- MD-11 Aircraft Config Dialog -->
 

diff --git a/AircraftConfig/fctl.xml b/AircraftConfig/fctl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
+<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
 
 <!-- MD-11 Aircraft Config Dialog -->
 

diff --git a/AircraftConfig/help.xml b/AircraftConfig/help.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
+<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
 
 <!-- MD-11 Aircraft Config Dialog -->
 
@@ -39,7 +39,7 @@
 
 		<text>
 			<halign>left</halign>
-			<label>IDG MD-11 Pre V1.0</label>
+			<label>MD-11 Pre V1.0</label>
 		</text>
 
 		<hrule/>

diff --git a/AircraftConfig/main.xml b/AircraftConfig/main.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
+<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
 
 <!-- MD-11 Aircraft Config Dialog -->
 

diff --git a/AircraftConfig/psload.xml b/AircraftConfig/psload.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
+<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
 
 <!-- MD-11 Aircraft Config Dialog -->
 

diff --git a/AircraftConfig/psloaded.xml b/AircraftConfig/psloaded.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
+<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
 
 <!-- MD-11 Aircraft Config Dialog -->