fly/A320-family
1
0
Fork 0
Code Activity

Merge branch '3D' into 3D-canvas

Browse source
This commit is contained in:
legoboyvdlp R 2021-08-01 19:30:29 +01:00
commit 11824ed3f9
6 changed files with 73 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
A320-main.xml
View file

@ -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>

24
AircraftConfig/acconfig.nas
View file

@ -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();
}

86
AircraftConfig/groundservices.xml
View file

@ -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>

2
Nasal/Libraries/libraries.nas
View file

@ -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);

10
Sounds/A320-common-sound.xml
View file

@ -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>

2
revision.txt
View file

@ -1 +1 @@
48
49