Merge pull request #12 from legoboyvdlp/dev
keep aligned with head repo
This commit is contained in:
Andrea Vezzali
GitHub
commit
03584e4067
3 changed files with 71 additions and 72 deletions
|
|
@ -1451,28 +1451,6 @@
|
|||
<script>libraries.fovZoom(0);</script>
|
||||
</binding>
|
||||
</key>
|
||||
<key n="33">
|
||||
<name>PAGE UP</name>
|
||||
<desc>Throttle Increase</desc>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
setprop("controls/engines/engine[0]/throttle", getprop("controls/engines/engine[0]/throttle") + 0.01);
|
||||
setprop("controls/engines/engine[1]/throttle", getprop("controls/engines/engine[0]/throttle") + 0.01); # Not a typo, always use engine[0] as a reference
|
||||
</script>
|
||||
</binding>
|
||||
</key>
|
||||
<key n="34">
|
||||
<name>PAGE DN</name>
|
||||
<desc>Throttle Decrease</desc>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
setprop("controls/engines/engine[0]/throttle", getprop("controls/engines/engine[0]/throttle") - 0.01);
|
||||
setprop("controls/engines/engine[1]/throttle", getprop("controls/engines/engine[0]/throttle") - 0.01); # Not a typo, always use engine[0] as a reference
|
||||
</script>
|
||||
</binding>
|
||||
</key>
|
||||
<key n="49">
|
||||
<name>1</name>
|
||||
<desc>Captain View/Elevator Trim Up</desc>
|
||||
|
|
@ -1531,8 +1509,7 @@
|
|||
</condition>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
setprop("controls/engines/engine[0]/throttle", getprop("controls/engines/engine[0]/throttle") - 0.01);
|
||||
setprop("controls/engines/engine[1]/throttle", getprop("controls/engines/engine[0]/throttle") - 0.01); # Not a typo, always use engine[0] as a reference
|
||||
controls.incThrottle(-0.01, -1.0);
|
||||
</script>
|
||||
</binding>
|
||||
</key>
|
||||
|
|
@ -1659,8 +1636,7 @@
|
|||
</condition>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
setprop("controls/engines/engine[0]/throttle", getprop("controls/engines/engine[0]/throttle") + 0.01);
|
||||
setprop("controls/engines/engine[1]/throttle", getprop("controls/engines/engine[0]/throttle") + 0.01); # Not a typo, always use engine[0] as a reference
|
||||
controls.incThrottle(0.01, 1.0);
|
||||
</script>
|
||||
</binding>
|
||||
</key>
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 126 KiB After Width: | Height: | Size: 92 KiB |
|
|
@ -100,23 +100,37 @@ var apuBleedChk = maketimer(0.1, func {
|
|||
|
||||
# Various Other Stuff
|
||||
var doIdleThrust = func {
|
||||
# Idle does not respect selected engines, because it is used to respond
|
||||
# to "Retard" and both engines must be idle for spoilers to deploy
|
||||
setprop("controls/engines/engine[0]/throttle", 0.0);
|
||||
setprop("controls/engines/engine[1]/throttle", 0.0);
|
||||
}
|
||||
|
||||
var doCLThrust = func {
|
||||
setprop("controls/engines/engine[0]/throttle", 0.63);
|
||||
setprop("controls/engines/engine[1]/throttle", 0.63);
|
||||
if (getprop("sim/input/selected/engine[0]") == 1) {
|
||||
setprop("controls/engines/engine[0]/throttle", 0.63);
|
||||
}
|
||||
if (getprop("sim/input/selected/engine[1]") == 1) {
|
||||
setprop("controls/engines/engine[1]/throttle", 0.63);
|
||||
}
|
||||
}
|
||||
|
||||
var doMCTThrust = func {
|
||||
setprop("controls/engines/engine[0]/throttle", 0.8);
|
||||
setprop("controls/engines/engine[1]/throttle", 0.8);
|
||||
if (getprop("sim/input/selected/engine[0]") == 1) {
|
||||
setprop("controls/engines/engine[0]/throttle", 0.8);
|
||||
}
|
||||
if (getprop("sim/input/selected/engine[1]") == 1) {
|
||||
setprop("controls/engines/engine[1]/throttle", 0.8);
|
||||
}
|
||||
}
|
||||
|
||||
var doTOGAThrust = func {
|
||||
setprop("controls/engines/engine[0]/throttle", 1.0);
|
||||
setprop("controls/engines/engine[1]/throttle", 1.0);
|
||||
if (getprop("sim/input/selected/engine[0]") == 1) {
|
||||
setprop("controls/engines/engine[0]/throttle", 1.0);
|
||||
}
|
||||
if (getprop("sim/input/selected/engine[1]") == 1) {
|
||||
setprop("controls/engines/engine[1]/throttle", 1.0);
|
||||
}
|
||||
}
|
||||
|
||||
# Reverse Thrust System
|
||||
|
|
@ -124,15 +138,19 @@ var toggleFastRevThrust = func {
|
|||
var state1 = getprop("systems/thrust/state1");
|
||||
var state2 = getprop("systems/thrust/state2");
|
||||
if (state1 == "IDLE" and state2 == "IDLE" and getprop("controls/engines/engine[0]/reverser") == "0" and getprop("controls/engines/engine[1]/reverser") == "0" and getprop("gear/gear[1]/wow") == 1 and getprop("gear/gear[2]/wow") == 1) {
|
||||
interpolate("/engines/engine[0]/reverser-pos-norm", 1, 1.4);
|
||||
interpolate("/engines/engine[1]/reverser-pos-norm", 1, 1.4);
|
||||
setprop("controls/engines/engine[0]/reverser", 1);
|
||||
setprop("controls/engines/engine[1]/reverser", 1);
|
||||
setprop("controls/engines/engine[0]/throttle-rev", 0.65);
|
||||
setprop("controls/engines/engine[1]/throttle-rev", 0.65);
|
||||
setprop("fdm/jsbsim/propulsion/engine[0]/reverser-angle-rad", 3.14);
|
||||
setprop("fdm/jsbsim/propulsion/engine[1]/reverser-angle-rad", 3.14);
|
||||
} else if ((getprop("controls/engines/engine[0]/reverser") == "1") or (getprop("controls/engines/engine[1]/reverser") == "1") and (getprop("gear/gear[1]/wow") == 1) and (getprop("gear/gear[2]/wow") == 1)) {
|
||||
if (getprop("sim/input/selected/engine[0]") == 1) {
|
||||
interpolate("/engines/engine[0]/reverser-pos-norm", 1, 1.4);
|
||||
setprop("controls/engines/engine[0]/reverser", 1);
|
||||
setprop("controls/engines/engine[0]/throttle-rev", 0.65);
|
||||
setprop("fdm/jsbsim/propulsion/engine[0]/reverser-angle-rad", 3.14);
|
||||
}
|
||||
if (getprop("sim/input/selected/engine[1]") == 1) {
|
||||
interpolate("/engines/engine[1]/reverser-pos-norm", 1, 1.4);
|
||||
setprop("controls/engines/engine[1]/reverser", 1);
|
||||
setprop("controls/engines/engine[1]/throttle-rev", 0.65);
|
||||
setprop("fdm/jsbsim/propulsion/engine[1]/reverser-angle-rad", 3.14);
|
||||
}
|
||||
} else if ((getprop("controls/engines/engine[0]/reverser") == "1") or (getprop("controls/engines/engine[1]/reverser") == "1")) {
|
||||
setprop("controls/engines/engine[0]/throttle-rev", 0);
|
||||
setprop("controls/engines/engine[1]/throttle-rev", 0);
|
||||
interpolate("/engines/engine[0]/reverser-pos-norm", 0, 1.0);
|
||||
|
|
@ -145,54 +163,59 @@ var toggleFastRevThrust = func {
|
|||
}
|
||||
|
||||
var doRevThrust = func {
|
||||
if (getprop("controls/engines/engine[0]/reverser") == "1" and getprop("controls/engines/engine[1]/reverser") == "1" and getprop("gear/gear[1]/wow") == 1 and getprop("gear/gear[2]/wow") == 1) {
|
||||
var pos1 = getprop("controls/engines/engine[0]/throttle-rev");
|
||||
var pos2 = getprop("controls/engines/engine[1]/throttle-rev");
|
||||
if (pos1 < 0.649) {
|
||||
setprop("controls/engines/engine[0]/throttle-rev", pos1 + 0.15);
|
||||
if (getprop("gear/gear[1]/wow") != 1 and getprop("gear/gear[2]/wow") != 1) {
|
||||
# Can't select reverse if not on the ground
|
||||
return;
|
||||
}
|
||||
if (getprop("sim/input/selected/engine[0]") == 1 and getprop("controls/engines/engine[0]/reverser") == "1") {
|
||||
var pos = getprop("controls/engines/engine[0]/throttle-rev");
|
||||
if (pos < 0.649) {
|
||||
setprop("controls/engines/engine[0]/throttle-rev", pos + 0.15);
|
||||
}
|
||||
if (pos2 < 0.649) {
|
||||
setprop("controls/engines/engine[1]/throttle-rev", pos2 + 0.15);
|
||||
}
|
||||
if (getprop("sim/input/selected/engine[1]") == 1 and getprop("controls/engines/engine[1]/reverser") == "1") {
|
||||
var pos = getprop("controls/engines/engine[1]/throttle-rev");
|
||||
if (pos < 0.649) {
|
||||
setprop("controls/engines/engine[1]/throttle-rev", pos + 0.15);
|
||||
}
|
||||
}
|
||||
var state1 = getprop("systems/thrust/state1");
|
||||
var state2 = getprop("systems/thrust/state2");
|
||||
if (state1 == "IDLE" and state2 == "IDLE" and getprop("controls/engines/engine[0]/reverser") == "0" and getprop("controls/engines/engine[1]/reverser") == "0" and getprop("gear/gear[1]/wow") == 1 and getprop("gear/gear[2]/wow") == 1) {
|
||||
if (getprop("sim/input/selected/engine[0]") == 1 and state1 == "IDLE" and getprop("controls/engines/engine[0]/reverser") == "0") {
|
||||
setprop("controls/engines/engine[0]/throttle-rev", 0.05);
|
||||
setprop("controls/engines/engine[1]/throttle-rev", 0.05);
|
||||
interpolate("/engines/engine[0]/reverser-pos-norm", 1, 1.4);
|
||||
interpolate("/engines/engine[1]/reverser-pos-norm", 1, 1.4);
|
||||
setprop("controls/engines/engine[0]/reverser", 1);
|
||||
setprop("controls/engines/engine[1]/reverser", 1);
|
||||
setprop("fdm/jsbsim/propulsion/engine[0]/reverser-angle-rad", 3.14);
|
||||
}
|
||||
if (getprop("sim/input/selected/engine[1]") == 1 and state2 == "IDLE" and getprop("controls/engines/engine[1]/reverser") == "0") {
|
||||
setprop("controls/engines/engine[1]/throttle-rev", 0.05);
|
||||
interpolate("/engines/engine[1]/reverser-pos-norm", 1, 1.4);
|
||||
setprop("controls/engines/engine[1]/reverser", 1);
|
||||
setprop("fdm/jsbsim/propulsion/engine[1]/reverser-angle-rad", 3.14);
|
||||
}
|
||||
}
|
||||
|
||||
var unRevThrust = func {
|
||||
if (getprop("controls/engines/engine[0]/reverser") == "1" or getprop("controls/engines/engine[1]/reverser") == "1") {
|
||||
var pos1 = getprop("controls/engines/engine[0]/throttle-rev");
|
||||
var pos2 = getprop("controls/engines/engine[1]/throttle-rev");
|
||||
if (pos1 > 0.051) {
|
||||
setprop("controls/engines/engine[0]/throttle-rev", pos1 - 0.15);
|
||||
if (getprop("sim/input/selected/engine[0]") == 1 and getprop("controls/engines/engine[0]/reverser") == "1") {
|
||||
var pos = getprop("controls/engines/engine[0]/throttle-rev");
|
||||
if (pos > 0.051) {
|
||||
setprop("controls/engines/engine[0]/throttle-rev", pos - 0.15);
|
||||
} else {
|
||||
unRevThrust_b();
|
||||
setprop("controls/engines/engine[0]/throttle-rev", 0);
|
||||
interpolate("/engines/engine[0]/reverser-pos-norm", 0, 1.0);
|
||||
setprop("fdm/jsbsim/propulsion/engine[0]/reverser-angle-rad", 0);
|
||||
setprop("controls/engines/engine[0]/reverser", 0);
|
||||
}
|
||||
if (pos2 > 0.051) {
|
||||
setprop("controls/engines/engine[1]/throttle-rev", pos2 - 0.15);
|
||||
}
|
||||
if (getprop("sim/input/selected/engine[1]") == 1 and getprop("controls/engines/engine[1]/reverser") == "1") {
|
||||
var pos = getprop("controls/engines/engine[1]/throttle-rev");
|
||||
if (pos > 0.051) {
|
||||
setprop("controls/engines/engine[1]/throttle-rev", pos - 0.15);
|
||||
} else {
|
||||
unRevThrust_b();
|
||||
setprop("controls/engines/engine[1]/throttle-rev", 0);
|
||||
interpolate("/engines/engine[1]/reverser-pos-norm", 0, 1.0);
|
||||
setprop("fdm/jsbsim/propulsion/engine[1]/reverser-angle-rad", 0);
|
||||
setprop("controls/engines/engine[1]/reverser", 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var unRevThrust_b = func {
|
||||
setprop("controls/engines/engine[0]/throttle-rev", 0);
|
||||
setprop("controls/engines/engine[1]/throttle-rev", 0);
|
||||
interpolate("/engines/engine[0]/reverser-pos-norm", 0, 1.0);
|
||||
interpolate("/engines/engine[1]/reverser-pos-norm", 0, 1.0);
|
||||
setprop("fdm/jsbsim/propulsion/engine[0]/reverser-angle-rad", 0);
|
||||
setprop("fdm/jsbsim/propulsion/engine[1]/reverser-angle-rad", 0);
|
||||
setprop("controls/engines/engine[0]/reverser", 0);
|
||||
setprop("controls/engines/engine[1]/reverser", 0);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue