diff --git a/html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/EICAS/Pages/B747_8_UpperEICAS.js b/html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/EICAS/Pages/B747_8_UpperEICAS.js index 8b99f0d62..81e6f7165 100644 --- a/html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/EICAS/Pages/B747_8_UpperEICAS.js +++ b/html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/EICAS/Pages/B747_8_UpperEICAS.js @@ -112,10 +112,10 @@ var B747_8_UpperEICAS; } } updateReferenceThrust() { - this.refThrust1.textContent = Math.min((Simplane.getEngineThrottleMaxThrust(0) * 10), 1150).toFixed(0); - this.refThrust2.textContent = Math.min((Simplane.getEngineThrottleMaxThrust(1) * 10), 1150).toFixed(0); - this.refThrust3.textContent = Math.min((Simplane.getEngineThrottleMaxThrust(2) * 10), 1150).toFixed(0); - this.refThrust4.textContent = Math.min((Simplane.getEngineThrottleMaxThrust(3) * 10), 1150).toFixed(0); + this.refThrust1.textContent = Math.min((Simplane.getEngineThrottleMaxThrust(0) * 10), 1060).toFixed(0); + this.refThrust2.textContent = Math.min((Simplane.getEngineThrottleMaxThrust(1) * 10), 1060).toFixed(0); + this.refThrust3.textContent = Math.min((Simplane.getEngineThrottleMaxThrust(2) * 10), 1060).toFixed(0); + this.refThrust4.textContent = Math.min((Simplane.getEngineThrottleMaxThrust(3) * 10), 1060).toFixed(0); return; } updatePressurisationValues() { diff --git a/html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/FMC/FMCMainDisplay.js b/html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/FMC/FMCMainDisplay.js index c4b7050d6..cd476774d 100644 --- a/html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/FMC/FMCMainDisplay.js +++ b/html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/FMC/FMCMainDisplay.js @@ -56,7 +56,12 @@ class FMCMainDisplay extends BaseAirliners { this.perfApprMDA = NaN; this.perfApprDH = NaN; this._flightPhases = ["PREFLIGHT", "TAXI", "TAKEOFF", "CLIMB", "CRUISE", "DESCENT", "APPROACH", "GOAROUND"]; - this.currentFlightPhase = FlightPhase.FLIGHT_PHASE_TAKEOFF; + if (!SimVar.GetSimVarValue("SIM ON GROUND","bool")) { + this.currentFlightPhase = FlightPhase.FLIGHT_PHASE_CLIMB; + } + else { + this.currentFlightPhase = FlightPhase.FLIGHT_PHASE_TAKEOFF; + } this._lockConnectIls = false; this._apNavIndex = 1; this._apLocalizerOn = false; diff --git a/html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/PFD/ILSIndicator.js b/html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/PFD/ILSIndicator.js index 53960d057..84e5581bf 100644 --- a/html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/PFD/ILSIndicator.js +++ b/html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/PFD/ILSIndicator.js @@ -219,7 +219,7 @@ class Jet_PFD_ILSIndicator extends HTMLElement { let isApproachLoaded = Simplane.getAutoPilotApproachLoaded(); let approachType = Simplane.getAutoPilotApproachType(); if (this.gs_cursorGroup && this.gsVisible) { - if (isApproachLoaded && approachType == 10) { + if (isApproachLoaded && (approachType == 10)) { let gsi = -SimVar.GetSimVarValue("GPS VERTICAL ERROR", "meters"); let delta = 0.5 + (gsi / 150.0) / 2; let y = this.gs_cursorMinY + (this.gs_cursorMaxY - this.gs_cursorMinY) * delta; @@ -227,22 +227,19 @@ class Jet_PFD_ILSIndicator extends HTMLElement { this.gs_cursorGroup.setAttribute("transform", "translate(" + this.gs_cursorPosX + ", " + y + ")"); //Diamond Parked at top if (delta >= 0.95) { - this.gs_cursorShapeUp.setAttribute("visibility", "visible"); this.gs_cursorShapeUp.setAttribute("fill", "transparent"); } //Diamond Parked at bottom else if (delta <= 0.05) { - this.gs_cursorShapeUp.setAttribute("visibility", "visible"); this.gs_cursorShapeUp.setAttribute("fill", "transparent"); } //Diamond in normal range else { - this.gs_cursorShapeUp.setAttribute("visibility", "visible"); this.gs_cursorShapeUp.setAttribute("fill", "#D570FF"); } - this.gs_cursorShapeUp.setAttribute("visibility", "hidden"); + this.gs_cursorShapeUp.setAttribute("visibility", "visible"); } - else if (localizer && localizer.id > 0 && (SimVar.GetSimVarValue("NAV HAS GLIDE SLOPE:" + localizer.id, "Bool") || (isApproachLoaded && (approachType == 4 || approachType == 10)))) { + else if (localizer && localizer.id > 0 && (SimVar.GetSimVarValue("NAV HAS GLIDE SLOPE:" + localizer.id, "Bool"))) { let gsi = -SimVar.GetSimVarValue("NAV GSI:" + localizer.id, "number") / 127.0; let delta = (gsi + 1.0) * 0.5; let y = this.gs_cursorMinY + (this.gs_cursorMaxY - this.gs_cursorMinY) * delta; @@ -257,6 +254,7 @@ class Jet_PFD_ILSIndicator extends HTMLElement { else { this.gs_cursorShapeUp.setAttribute("fill", "#D570FF"); } + this.gs_cursorShapeUp.setAttribute("visibility", "visible"); } else { this.gs_cursorShapeUp.setAttribute("visibility", "hidden"); diff --git a/layout.json b/layout.json index 3998cfc44..d634696c5 100644 --- a/layout.json +++ b/layout.json @@ -23,7 +23,7 @@ { "path": "html_ui/Pages/Salty/SaltyBase.js", "size": 239, - "date": 16197748176445506 + "date": 16198642021274762 }, { "path": "html_ui/Pages/Salty/SaltyConnection.js", @@ -42,8 +42,8 @@ }, { "path": "html_ui/Pages/Salty/SaltyPilots.js", - "size": 1042, - "date": 16197918963053906 + "size": 1026, + "date": 16197924116015696 }, { "path": "html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/EICAS/B747_8_EICAS.css", @@ -53,12 +53,12 @@ { "path": "html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/EICAS/B747_8_EICAS.html", "size": 3835, - "date": 16197858905332718 + "date": 16198031357636726 }, { "path": "html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/EICAS/B747_8_EICAS.js", "size": 9780, - "date": 16197858905342690 + "date": 16198031357646322 }, { "path": "html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/EICAS/Boeing_Common.js", @@ -187,8 +187,8 @@ }, { "path": "html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/EICAS/Pages/B747_8_UpperEICAS.js", - "size": 13216, - "date": 16197748176585140 + "size": 13280, + "date": 16198031566449984 }, { "path": "html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/FlightElements/Waypoint.js", @@ -203,12 +203,12 @@ { "path": "html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/FMC/B747_8_FMC.html", "size": 11976, - "date": 16197748176654954 + "date": 16198642021284738 }, { "path": "html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/FMC/B747_8_FMC_ApproachPage.js", "size": 3136, - "date": 16197858905352662 + "date": 16198031357666276 }, { "path": "html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/FMC/B747_8_FMC_DepArrIndexPage.js", @@ -233,7 +233,7 @@ { "path": "html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/FMC/B747_8_FMC_MainDisplay.js", "size": 55572, - "date": 16197748176684876 + "date": 16198180002647222 }, { "path": "html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/FMC/B747_8_FMC_MainDisplayPages.js", @@ -293,7 +293,7 @@ { "path": "html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/FMC/B747_8_FMC_TakeOffPage.js", "size": 8611, - "date": 16197858905362638 + "date": 16198031357666276 }, { "path": "html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/FMC/B747_8_FMC_ThrustLimPage.js", @@ -307,8 +307,8 @@ }, { "path": "html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/FMC/B747_8_FMC_VNAVPage.js", - "size": 5885, - "date": 16197748176744712 + "size": 5968, + "date": 16198031566460166 }, { "path": "html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/FMC/Boeing_FMC.js", @@ -503,7 +503,7 @@ { "path": "html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/FMC/OPTIONS/B747_8_FMC_IrsStatus.js", "size": 1541, - "date": 16197858905372610 + "date": 16198031357686234 }, { "path": "html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/FMC/OPTIONS/B747_8_FMC_Metar.js", @@ -797,8 +797,8 @@ }, { "path": "html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/PFD/ILSIndicator.js", - "size": 17967, - "date": 16197748177283276 + "size": 17748, + "date": 16198642207816198 }, { "path": "html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/PFD/VerticalSpeedIndicator.js", @@ -827,13 +827,13 @@ }, { "path": "SimObjects/Airplanes/Asobo_B747_8i/approach.FLT", - "size": 5376, - "date": 16197858904993630 + "size": 5401, + "date": 16198031566440022 }, { "path": "SimObjects/Airplanes/Asobo_B747_8i/apron.FLT", "size": 5243, - "date": 16197858905053470 + "date": 16198031357327188 }, { "path": "SimObjects/Airplanes/Asobo_B747_8i/cameras.cfg", @@ -843,12 +843,12 @@ { "path": "SimObjects/Airplanes/Asobo_B747_8i/Climb.flt", "size": 5406, - "date": 16197858904943758 + "date": 16198031357267344 }, { "path": "SimObjects/Airplanes/Asobo_B747_8i/cruise.FLT", "size": 5401, - "date": 16197858905103338 + "date": 16198031357377050 }, { "path": "SimObjects/Airplanes/Asobo_B747_8i/engines.cfg", @@ -858,37 +858,37 @@ { "path": "SimObjects/Airplanes/Asobo_B747_8i/final.FLT", "size": 5405, - "date": 16197858905153194 + "date": 16198031357436876 }, { "path": "SimObjects/Airplanes/Asobo_B747_8i/flight_model.cfg", "size": 44465, - "date": 16197748176315860 + "date": 16198106719792900 }, { "path": "SimObjects/Airplanes/Asobo_B747_8i/hangar.flt", "size": 4355, - "date": 16197858905213252 + "date": 16198031357506698 }, { "path": "SimObjects/Airplanes/Asobo_B747_8i/runway.FLT", "size": 5241, - "date": 16197858905262908 + "date": 16198031357566546 }, { "path": "SimObjects/Airplanes/Asobo_B747_8i/taxi.FLT", "size": 5170, - "date": 16197858905322744 + "date": 16198031357626376 }, { "path": "SimObjects/Airplanes/Asobo_B747_8i/model/747_8I.xml", "size": 14886, - "date": 16197748176315860 + "date": 16198094951398390 }, { "path": "SimObjects/Airplanes/Asobo_B747_8i/model/747_8I_INTERIOR.xml", "size": 191029, - "date": 16197748176325836 + "date": 16198165472295068 }, { "path": "SimObjects/Airplanes/Asobo_B747_8i/model/747_8I_INTERIOR_LOD00.gltf", @@ -918,7 +918,7 @@ { "path": "ModelBehaviorDefs/Asobo/Airliner/Boeing.xml", "size": 46577, - "date": 16197858904893902 + "date": 16198165526388142 } ] } \ No newline at end of file diff --git a/manifest.json b/manifest.json index cd338e54d..e27bb8608 100644 --- a/manifest.json +++ b/manifest.json @@ -21,5 +21,5 @@ "OlderHistory": "" } }, - "total_package_size": "00000000000013174725" + "total_package_size": "00000000000013174662" } \ No newline at end of file