From 205dd22d79c5a918b463278c06be60f6f9e26188 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Wed, 25 Oct 2017 19:54:22 -0400 Subject: [PATCH] Revert "A32X: bugfix pneumatics" This reverts commit 7aeee17754e1ba996f803f43c3feb1441c355507. --- Nasal/pneumatics.nas | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/Nasal/pneumatics.nas b/Nasal/pneumatics.nas index 20b4a878..22f82c77 100644 --- a/Nasal/pneumatics.nas +++ b/Nasal/pneumatics.nas @@ -177,17 +177,11 @@ var master_pneu = func { # Air Sources/PSI if (rpmapu >= 94.9 and bleedapu_sw and !bleedapu_fail) { - setprop("/systems/pneumatic/bleedapu", 37); + setprop("/systems/pneumatic/bleedapu", 34); } else { setprop("/systems/pneumatic/bleedapu", 0); } - if (groundair_supp) { - setprop("/systems/pneumatic/groundair", 39); - } else { - setprop("/systems/pneumatic/groundair", 0); - } - ground = getprop("/systems/pneumatic/groundair"); bleedapu = getprop("/systems/pneumatic/bleedapu"); @@ -206,31 +200,33 @@ var master_pneu = func { xbleed = getprop("/systems/pneumatic/xbleed", 0); if (stateL == 3 and bleed1_sw and !bleedeng1_fail) { - setprop("/systems/pneumatic/bleed1", 35); + setprop("/systems/pneumatic/bleed1", 31); } else { setprop("/systems/pneumatic/bleed1", 0); } if (stateR == 3 and bleed2_sw and !bleedeng2_fail) { - setprop("/systems/pneumatic/bleed2", 36); + setprop("/systems/pneumatic/bleed2", 32); } else { setprop("/systems/pneumatic/bleed2", 0); } bleed1 = getprop("/systems/pneumatic/bleed1"); bleed2 = getprop("/systems/pneumatic/bleed2"); - totalpsi = getprop("/systems/pneumatic/total-psi"); if (bleed1 >= 11 and (stateR != 3 or !bleed2_sw or bleedeng2_fail) and xbleed == 1) { - setprop("/systems/pneumatic/bleed2", bleed1 / 2); + setprop("/systems/pneumatic/bleed2", 31); } if (bleed2 >= 11 and (stateL != 3 or !bleed1_sw or bleedeng1_fail) and xbleed == 1) { - setprop("/systems/pneumatic/bleed1", bleed2 / 2); + setprop("/systems/pneumatic/bleed1", 32); } + bleed1 = getprop("/systems/pneumatic/bleed1"); + bleed2 = getprop("/systems/pneumatic/bleed2"); + if (stateL == 1 or stateR == 1) { - setprop("/systems/pneumatic/start-psi", totalpsi); + setprop("/systems/pneumatic/start-psi", 18); } else { setprop("/systems/pneumatic/start-psi", 0); } @@ -261,13 +257,18 @@ var master_pneu = func { pack_psi = getprop("/systems/pneumatic/pack-psi"); start_psi = getprop("/systems/pneumatic/start-psi"); - if ((bleed1 + bleed2 + bleedapu + ground) > 50) { - setprop("/systems/pneumatic/total-psi", 50); + if ((bleed1 + bleed2 + bleedapu) > 42) { + setprop("/systems/pneumatic/total-psi", 42); } else { total_psi_calc = ((bleed1 + bleed2 + bleedapu + ground) - start_psi - pack_psi); setprop("/systems/pneumatic/total-psi", total_psi_calc); } - + + if (groundair_supp) { + setprop("/systems/pneumatic/groundair", 39); + } else { + setprop("/systems/pneumatic/groundair", 0); + } if (engantiice1 and bleed1 > 20) { # shut down anti-ice if bleed is lost else turn it on setprop("/controls/deice/lengine", 0);