diff --git a/A320-main.xml b/A320-main.xml index 83186828..b2932c74 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -594,7 +594,7 @@ <z-offset-max-m type="float">300.0</z-offset-max-m> </current-view> - <minimum-fg-version>2019.2.0</minimum-fg-version> + <minimum-fg-version>2020.3.1</minimum-fg-version> <navdb> <min-runway-length-ft>3000</min-runway-length-ft> diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas index ba404947..99996ffb 100644 --- a/AircraftConfig/acconfig.nas +++ b/AircraftConfig/acconfig.nas @@ -106,14 +106,30 @@ setlistener("/systems/acconfig/new-revision", func { } }); +var fgfsMin = split(".", getprop("/sim/minimum-fg-version")); +var fgfsVer = split(".", getprop("/sim/version/flightgear")); + +var versionCheck = func() { + if (fgfsVer[0] < fgfsMin[0] or fgfsVer[1] < fgfsMin[1]) { + return 0; + } else if (fgfsVer[1] == fgfsMin[1]) { + if (fgfsVer[2] < fgfsMin[2]) { + return 0; + } else { + return 1; + } + } else { + return 1; + } +} + var mismatch_chk = func { - if (num(string.replace(getprop("/sim/version/flightgear"),".","")) < 201920) { + if (!versionCheck()) { setprop("/systems/acconfig/mismatch-code", "0x121"); - setprop("/systems/acconfig/mismatch-reason", "FGFS version is too old! Please update FlightGear to at least 2019.2.0."); + setprop("/systems/acconfig/mismatch-reason", "FGFS version is too old! Please update FlightGear to at least " ~ getprop("/sim/minimum-fg-version") ~ "."); if (getprop("/systems/acconfig/out-of-date") != 1) { error_mismatch.open(); } - libraries.systemsLoop.stop(); print("Mismatch: 0x121"); welcome_dlg.close(); } else if (getprop("/gear/gear[0]/wow") == 0 or getprop("/position/altitude-ft") >= 15000) { @@ -122,7 +138,6 @@ var mismatch_chk = func { if (getprop("/systems/acconfig/out-of-date") != 1) { error_mismatch.open(); } - libraries.systemsLoop.stop(); print("Mismatch: 0x223"); welcome_dlg.close(); } else if (getprop("/systems/acconfig/libraries-loaded") != 1) { @@ -131,7 +146,6 @@ var mismatch_chk = func { if (getprop("/systems/acconfig/out-of-date") != 1) { error_mismatch.open(); } - libraries.systemsLoop.stop(); print("Mismatch: 0x247"); welcome_dlg.close(); } diff --git a/AircraftConfig/groundservices.xml b/AircraftConfig/groundservices.xml index a296de37..4e96e4c6 100644 --- a/AircraftConfig/groundservices.xml +++ b/AircraftConfig/groundservices.xml @@ -172,25 +172,28 @@ </hrule> </group> - <checkbox> - <label>Front Left</label> - <halign>left</halign> - <property>/services/stairs/l1</property> - <binding> - <command>dialog-apply</command> - </binding> - <live>true</live> - </checkbox> + <group> + <layout>hbox</layout> + <checkbox> + <label>Front Left</label> + <halign>left</halign> + <property>/services/stairs/l1</property> + <binding> + <command>dialog-apply</command> + </binding> + <live>true</live> + </checkbox> - <checkbox> - <label>Rear Left</label> - <halign>left</halign> - <property>/services/stairs/l4</property> - <binding> - <command>dialog-apply</command> - </binding> - <live>true</live> - </checkbox> + <checkbox> + <label>Rear Left</label> + <halign>left</halign> + <property>/services/stairs/l4</property> + <binding> + <command>dialog-apply</command> + </binding> + <live>true</live> + </checkbox> + </group> <checkbox> <label>Stairway Cover</label> @@ -356,28 +359,31 @@ </hrule> </group> - <text> - <x>10</x> - <y>200</y> - <label>8888 litres</label><!-- placeholder for width --> - <format>%4.0f litres</format> - <property>/systems/oxygen/cockpit-oxygen/cockpit-bottle-L</property> - <live>true</live> - </text> - - <button> - <legend>Replace Oxygen Bottle</legend> - <halign>center</halign> - <padding>5</padding> - <enable> - <property>/gear/gear[1]/wow</property> - </enable> - <binding> - <command>property-assign</command> - <property>/systems/oxygen/cockpit-oxygen/cockpit-bottle-L</property> - <value>2183</value> - </binding> - </button> + <group> + <layout>hbox</layout> + <button> + <legend>Replace Oxygen Bottle</legend> + <halign>center</halign> + <padding>5</padding> + <enable> + <property>/gear/gear[1]/wow</property> + </enable> + <binding> + <command>property-assign</command> + <property>/systems/oxygen/cockpit-oxygen/cockpit-bottle-L</property> + <value>2183</value> + </binding> + </button> + + <text> + <x>10</x> + <y>200</y> + <label>8888 litres</label><!-- placeholder for width --> + <format>%4.0f litres</format> + <property>/systems/oxygen/cockpit-oxygen/cockpit-bottle-L</property> + <live>true</live> + </text> + </group> <button> <legend>Reset Pax Oxy Masks</legend> diff --git a/Nasal/Libraries/libraries.nas b/Nasal/Libraries/libraries.nas index e08c67bb..9e343e8d 100644 --- a/Nasal/Libraries/libraries.nas +++ b/Nasal/Libraries/libraries.nas @@ -188,7 +188,7 @@ var update_items = [ ]; var systemsLoop = func(notification) { - if (!systemsInitialized) { return; } + if (!systemsInitialized and getprop("/systems/acconfig/mismatch-code") != "0x000") { return; } systems.PNEU.loop(notification); systems.ADIRS.loop(notification); systems.BrakeSys.update(notification); diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml index 33c6ea2f..7129f3ac 100644 --- a/Sounds/A320-common-sound.xml +++ b/Sounds/A320-common-sound.xml @@ -1562,7 +1562,7 @@ </condition> <volume> <property>/sim/current-view/internal</property> - <factor>0.75</factor> + <factor>1.5</factor> </volume> </switch> @@ -1588,7 +1588,7 @@ </condition> <volume> <property>/sim/current-view/internal</property> - <factor>0.75</factor> + <factor>1.5</factor> </volume> </switch> @@ -1601,7 +1601,7 @@ </condition> <volume> <property>/sim/current-view/internal</property> - <factor>0.75</factor> + <factor>1.5</factor> </volume> </switch> @@ -1614,7 +1614,7 @@ </condition> <volume> <property>/sim/current-view/internal</property> - <factor>0.6</factor> + <factor>1.0</factor> </volume> </switch> @@ -1627,7 +1627,7 @@ </condition> <volume> <property>/sim/current-view/internal</property> - <factor>0.75</factor> + <factor>1.5</factor> </volume> </switch> diff --git a/revision.txt b/revision.txt index 31ff414b..2e66562e 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -48 \ No newline at end of file +49 \ No newline at end of file