Merge branch 'master' into soundfix

This commit is contained in:
legoboyvdlp R 2019-09-01 18:48:20 +01:00
commit e1cbd717a8
8 changed files with 44 additions and 14 deletions

View file

@ -21,6 +21,13 @@
</livery> </livery>
</model> </model>
<rating>
<FDM type="int">4</FDM>
<systems type="int">5</systems>
<cockpit type="int">5</cockpit>
<model type="int">4</model>
</rating>
<previews> <previews>
<preview> <preview>
<type>exterior</type> <type>exterior</type>

View file

@ -21,6 +21,13 @@
</livery> </livery>
</model> </model>
<rating>
<FDM type="int">4</FDM>
<systems type="int">5</systems>
<cockpit type="int">5</cockpit>
<model type="int">4</model>
</rating>
<previews> <previews>
<preview> <preview>
<type>exterior</type> <type>exterior</type>

View file

@ -21,6 +21,13 @@
</livery> </livery>
</model> </model>
<rating>
<FDM type="int">4</FDM>
<systems type="int">5</systems>
<cockpit type="int">5</cockpit>
<model type="int">4</model>
</rating>
<previews> <previews>
<preview> <preview>
<type>exterior</type> <type>exterior</type>

View file

@ -9,13 +9,6 @@
<status>Pre V1.0</status> <status>Pre V1.0</status>
<rating>
<FDM type="int">4</FDM>
<systems type="int">5</systems>
<cockpit type="int">5</cockpit>
<model type="int">4</model>
</rating>
<hud n="0"> <hud n="0">
<enable3d n="0">false</enable3d> <enable3d n="0">false</enable3d>
<enable3d n="1">false</enable3d> <enable3d n="1">false</enable3d>

View file

@ -21,6 +21,13 @@
</livery> </livery>
</model> </model>
<rating>
<FDM type="int">4</FDM>
<systems type="int">5</systems>
<cockpit type="int">5</cockpit>
<model type="int">4</model>
</rating>
<previews> <previews>
<preview> <preview>
<type>exterior</type> <type>exterior</type>

View file

@ -21,6 +21,13 @@
</livery> </livery>
</model> </model>
<rating>
<FDM type="int">4</FDM>
<systems type="int">5</systems>
<cockpit type="int">5</cockpit>
<model type="int">4</model>
</rating>
<previews> <previews>
<preview> <preview>
<type>exterior</type> <type>exterior</type>

View file

@ -331,13 +331,13 @@ var ITAF = {
if (Internal.altTemp >= Position.indicatedAltitudeFtTemp) { if (Internal.altTemp >= Position.indicatedAltitudeFtTemp) {
Output.thrMode.setValue(2); Output.thrMode.setValue(2);
Text.thr.setValue("PITCH"); Text.thr.setValue("PITCH");
if (Internal.flchActive) { if (Internal.flchActive) { # Set before mode change to prevent it from overwriting by mistake
Text.vert.setValue("SPD CLB"); Text.vert.setValue("SPD CLB");
} }
} else { } else {
Output.thrMode.setValue(1); Output.thrMode.setValue(1);
Text.thr.setValue("PITCH"); Text.thr.setValue("PITCH");
if (Internal.flchActive) { if (Internal.flchActive) { # Set before mode change to prevent it from overwriting by mistake
Text.vert.setValue("SPD DES"); Text.vert.setValue("SPD DES");
} }
} }
@ -649,10 +649,12 @@ var ITAF = {
Text.vert.setValue("ALT CAP"); Text.vert.setValue("ALT CAP");
} else if (n == 4) { # FLCH } else if (n == 4) { # FLCH
Output.apprArm.setBoolValue(0); Output.apprArm.setBoolValue(0);
Output.vert.setValue(1); if (abs(Input.altDiff) >= 125) { # SPD CLB or SPD DES
Internal.alt.setValue(Input.alt.getValue()); if (Input.alt.getValue() >= Position.indicatedAltitudeFt.getValue()) { # Usually set Thrust Mode Selector, but we do it now due to timer lag
Internal.altDiff = Internal.alt.getValue() - Position.indicatedAltitudeFt.getValue(); Text.vert.setValue("SPD CLB");
if (abs(Internal.altDiff) >= 250) { # SPD CLB or SPD DES } else {
Text.vert.setValue("SPD DES");
}
Internal.altCaptureActive = 0; Internal.altCaptureActive = 0;
Output.vert.setValue(4); Output.vert.setValue(4);
Internal.flchActive = 1; Internal.flchActive = 1;

View file

@ -1 +1 @@
4803 4804