Merge pull request #1447 from Working-Title-MSFS-Mods/cj4-prerelease-…

…0.12.11

Cj4 prerelease 0.12.11

PackageDefinitions/workingtitle-aircraft-cj4-metapackage.xml

@@ -1,4 +1,4 @@
-<AssetPackage Name="workingtitle-aircraft-cj4" Version="0.12.10">
+<AssetPackage Name="workingtitle-aircraft-cj4" Version="0.12.11">
 	<ItemSettings>
 		<ContentType>CUSTOM</ContentType>
 		<Title>CJ4</Title>

PackageDefinitions/workingtitle-aircraft-cj4.xml

@@ -1,4 +1,4 @@
-<AssetPackage Name="workingtitle-aircraft-cj4" Version="0.12.10">
+<AssetPackage Name="workingtitle-aircraft-cj4" Version="0.12.11">
 	<ItemSettings>
 		<ContentType>CUSTOM</ContentType>
 		<Title>CJ4</Title>

README.md

@@ -12,6 +12,6 @@ You can keep track of Updates and Progress on Discord [https://discord.com/invit
 
 Project | Description | Current Version | Documentation
 --------|-------------|-----------------|--------------
-CJ4 | Performance and avionics improvements for the Citation CJ4 | [v0.12.9](https://github.com/Working-Title-MSFS-Mods/fspackages/releases/tag/cj4-v0.12.9) | [docs](https://github.com/Working-Title-MSFS-Mods/fspackages/tree/main/docs/workingtitle-cj4)
+CJ4 | Performance and avionics improvements for the Citation CJ4 | [v0.12.11](https://github.com/Working-Title-MSFS-Mods/fspackages/releases/tag/cj4-v0.12.11) | [docs](https://github.com/Working-Title-MSFS-Mods/fspackages/tree/main/docs/workingtitle-cj4)
 G3000 | Fixes and enhancements for the stock G3000 avionics package | [v0.7.6](https://github.com/Working-Title-MSFS-Mods/fspackages/releases/tag/g3000-v0.7.6) | [docs](https://github.com/Working-Title-MSFS-Mods/fspackages/tree/main/docs/workingtitle-g3000)
 GX | Fixes and enhancements for the stock G3X Touch avionics package | [v0.1.0](https://github.com/Working-Title-MSFS-Mods/fspackages/releases/tag/gx-v0.1.0) | [docs](https://github.com/Working-Title-MSFS-Mods/fspackages/tree/main/docs/workingtitle-gx)

docs/workingtitle-cj4/CHANGES.md

@@ -1,5 +1,5 @@
 # Working Title CJ4 v0.12.10
-Welcome to the Working Title CJ4 v0.12.10. This version contains a few important fixes for bugs found since the SU7 release.
+Welcome to the Working Title CJ4 v0.12.11. This version contains a few Quality of Life fixes.
 
 Thanks to everyone, as always, for your contributions! We really love working with you all.
 
@@ -21,8 +21,10 @@ Installation is easy, simply copy the `workingtitle-aircraft-cj4` folder inside
 **Important: We recommend that you fully delete the previous `workingtitle-aircraft-cj4` folder before copying this release.**
 
 ## Fixes
-- Fixed an issue where ILS would not auto-tune, auto-switch, or track for some ILS frequencies
-- LNAV should no longer fail to provide guidance while a flight plan change is pending execution
+- Fix aural warnings and chimes playing after plane spawns
+- Fix gear up/down sounds playing at inappropriate times
+- Adjust excessive Standby Attitude Indicator brightness
+- SAI brightness now automatically adjusts to daylight conditions
 
 ## ⚠️ Known Issues
 * Wing Light Button does not light up.

docs/workingtitle-cj4/Working Title CJ4 v0.12.10 Changes.md

@@ -0,0 +1,37 @@
+# Working Title CJ4 v0.12.10
+Welcome to the Working Title CJ4 v0.12.10. This version contains a few important fixes for bugs found since the SU7 release.
+
+Thanks to everyone, as always, for your contributions! We really love working with you all.
+
+## Note about Liveries
+To accommodate for future work on the CJ4 there have been model changes made to the plane in SU7. This means that all liveries that still fully override panel.cfg with their own version (which they really shouldn't) won't work anymore. 
+You will notice a bad livery or other mods interferring by having all white screens in the cockpit.  
+
+Liveries should use the method as described in our [Repainter's Guide](https://www.workingtitle.aero/packages/cj4/guides/repainter).
+Many liveries already use that method and should work alright after the update.
+
+## READ THE GUIDE
+Please, please, please read the operators guide for instructions on using features. A lot of hard work went into writing the guide and the Discord channels are clogged with questions that are readily answered in the guide.
+
+GUIDES: https://www.workingtitle.aero/packages/cj4/guides/
+
+## Installation
+Installation is easy, simply copy the `workingtitle-aircraft-cj4` folder inside the zip file to your MSFS Community folder. 
+
+**Important: We recommend that you fully delete the previous `workingtitle-aircraft-cj4` folder before copying this release.**
+
+## Fixes
+- Fixed an issue where ILS would not auto-tune, auto-switch, or track for some ILS frequencies
+- LNAV should no longer fail to provide guidance while a flight plan change is pending execution
+
+## ⚠️ Known Issues
+* Wing Light Button does not light up.
+* The Lower CCP LONG Press does not work for reselecting charts - we will look further at this.
+* B/C button throws an error in the FMC - do not use B/C for now.
+* Some "lettered" or non-runway-specific approaches now appear as something like RNAV A - 00 and do not allow the selection of a landing runway, preventing using the Approach Refs page - this is something we will be working to address in the future.
+* Some external applications that use the GPS/Flight plan SimVars may not function correctly or as expected when FP Sync is off.
+* Loading and saving flights can have bad results.
+* Custom liveries can render FADEC inoperative if they ship with a panel.cfg. Painters should reference our new [Repainter's Guide](https://www.workingtitle.aero/packages/cj4/guides/repainter) for solutions.
+* Autopilot modes cannot be triggered via key bindings or controllers and must currently be triggered in the cockpit with the mouse. External binding applications are adding support for LVars and HEvents. Used SimVars are documented in our [Guide on SimVars](https://www.workingtitle.aero/packages/cj4/guides/simvars).
+* Sometimes a heading to altitude instruction on takeoff will display further than the first RNAV fix on an RNAV departure procedure; in these cases the workaround is to cross-check the DP chart and remove the erroneous waypoint either by deleting the heading to altitude fix or dropping the first RNAV fix onto the magenta line in the LEGS page.
+* Due to sim autopilot bank rate limitations, the aircraft may overshoot on certain RNP approaches with tight turns. If you encounter this, we recommend hand flying the approach with the given lateral and vertical guidance.

src/workingtitle-aircraft-cj4/SimObjects/Airplanes/Asobo_CJ4/model/CJ4_Cockpit.xml

@@ -208,6 +208,7 @@
 			</Component>
 
 			<UseTemplate Name="ASOBO_AS3000_Screen_Template">
+				<SCREEN_EMISSIVE_CODE>0.7 (A:GLASSCOCKPIT AUTOMATIC BRIGHTNESS, Number) min </SCREEN_EMISSIVE_CODE>
 				<SCREEN_NODE_ID>AttitudeBackup_Screen</SCREEN_NODE_ID>
 				<KEY_PREFIX>CJ4_BackupDisplay</KEY_PREFIX>
 				<DISPLAY>BackupDisplay</DISPLAY>
@@ -298,7 +299,7 @@
 					<NODE_ID_CAS_PAGE>CCP_Push_casPage_2</NODE_ID_CAS_PAGE>
 					<NODE_ID_MENU_ADV>CCP_Knob_Inner_2</NODE_ID_MENU_ADV>
 					<NODE_ID_DATA>CCP_Knob_Outer_2</NODE_ID_DATA>
-					<ANIM_NAME_DATA_PUSH>CCP_Knob_Outer_Push_2</ANIM_NAME_DATA_PUSH>
+					<ANIM_NAME_DATA_PUSH>CCP_Knob_Inner_Push_2</ANIM_NAME_DATA_PUSH>
 					<NODE_ID_ENG>CCP_Push_eng_2</NODE_ID_ENG>
 					<NODE_ID_UPR_MENU>CCP_Push_uprMenu_2</NODE_ID_UPR_MENU>
 					<NODE_ID_RANGE_STICK>CCP_Joystick_2</NODE_ID_RANGE_STICK>

src/workingtitle-aircraft-cj4/SimObjects/Airplanes/Asobo_CJ4/sound/sound.xml

@@ -303,18 +303,32 @@
 		</Sound>
 
 		<Sound WwiseData="true" WwiseEvent="WT_chime" LocalVar="SEATBELT_LIGHT_ON" Continuous="false">
-			<Range UpperBound="0" />
+			<Requires SimVar="CIRCUIT ON" Index="37" Units="BOOL">
+					<Range LowerBound="1" />
+			</Requires>
+			<Requires LocalVar="SEATBELT_LIGHT_ON" Units="BOOL" Index="0">
+				<Range UpperBound="0" />
+			</Requires>
 		</Sound>
 
 		<Sound WwiseData="true" WwiseEvent="WT_chime" LocalVar="SAFETY_LIGHT_ON" Continuous="false">
-			<Range UpperBound="0" />
+			<Requires SimVar="CIRCUIT ON" Index="37" Units="BOOL">
+					<Range LowerBound="1" />
+			</Requires>
+			<Requires LocalVar="SAFETY_LIGHT_ON" Units="BOOL" Index="0">
+				<Range UpperBound="0" />
+			</Requires>			
 		</Sound>
 
-		<Sound WwiseData="true" WwiseEvent="WT_AP_Disconnect" SimVar="AUTOPILOT MASTER" Units="BOOL" Continuous="false">
-			<Range UpperBound="0" />
+		<Sound WwiseData="true" WwiseEvent="WT_AP_Disconnect" SimVar="AUTOPILOT MASTER" Units="BOOL" Index="0" Continuous="false">
+			<Requires SimVar="CIRCUIT ON" Index="37" Units="BOOL">
+					<Range LowerBound="1" />
+			</Requires>
+			<Requires SimVar="AUTOPILOT MASTER" Units="BOOL" Index="0">
+				<Range UpperBound="0" />
+			</Requires>
 		</Sound>
 
-
 		<!--      PASSENGER AIR     -->
 
 		<Sound WwiseData="true" WwiseEvent="WT_air_fan" ViewPoint="Inside" NodeName="PASSENGER_KNOB_AIR_1" LocalVar="PASSENGER_KNOB_AIR_1" Units="PERCENT" Index="1" Continuous="true">
@@ -347,17 +361,21 @@
 		</Sound>
 
 		<Sound WwiseEvent="WT_gear_down" WwiseData="true" FadeOutType="2" Continuous="false" FadeOutTime="1" SimVar="GEAR HANDLE POSITION" Units="NUMBER">
-			<Range LowerBound="1" />
 			<Requires SimVar="SIM ON GROUND" Units="BOOLEAN">
 				<Range UpperBound="0" />
 			</Requires>
+			<Requires SimVar="GEAR HANDLE POSITION" Units="NUMBER">
+				<Range LowerBound="1" />
+			</Requires>
 		</Sound>
 
 		<Sound WwiseEvent="WT_gear_up" WwiseData="true" FadeOutType="2" Continuous="false" FadeOutTime="1" SimVar="GEAR HANDLE POSITION" Units="NUMBER">
-			<Range UpperBound="0" />
 			<Requires SimVar="SIM ON GROUND" Units="BOOLEAN">
 				<Range UpperBound="0" />
 			</Requires>
+			<Requires SimVar="GEAR HANDLE POSITION" Units="NUMBER">
+				<Range UpperBound="0" />
+			</Requires>
 		</Sound>
 
 		<Sound WwiseEvent="WT_spoiler_drag" WwiseData="true" FadeOutType="2" Continuous="true" FadeOutTime="1" SimVar="SPOILERS LEFT POSITION" Units="PERCENT" Index="0">
@@ -374,6 +392,9 @@
 
 		<Sound WwiseData="true" WwiseEvent="WT_altitude_alerter" LocalVar="WT_CJ4_Altitude_Alerter_Active" Units="NUMBER" Continuous="false">
 			<Range LowerBound="1.0" />
+			<Requires SimVar="SIM ON GROUND" Units="BOOLEAN">
+				<Range UpperBound="0" />
+			</Requires>
 		</Sound>
 
 		<Sound WwiseData="true" WwiseEvent="WT_aural_overspeed" SimVar="OVERSPEED WARNING" Units="BOOL" Index="0">

src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/FMC/CJ4_FMC.js

@@ -77,7 +77,7 @@ class CJ4_FMC extends FMCMainDisplay {
         SimVar.SetSimVarValue("L:WT_CJ4_INHIBIT_SEQUENCE", "number", 0);
         SimVar.SetSimVarValue("L:WT_CJ4_TFC_ALT_ABOVE_ENABLED", "number", 1);
         SimVar.SetSimVarValue("L:WT_CJ4_TFC_ALT_BELOW_ENABLED", "number", 1);
-        SimVar.SetSimVarValue("L:AS3000_Brightness", "number", 3.0);
+        SimVar.SetSimVarValue("L:AS3000_Brightness", "number", 2.0);
         this._nearest = undefined;
         /** @type {CJ4_FMC_NavigationService} */
         this._navigationService = new CJ4_FMC_NavigationService(this);

src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/FMC/CJ4_FMC_InitRefIndexPage.js

@@ -1269,7 +1269,7 @@ class CJ4_FMC_InitRefIndexPage {
             ["Working-Title-MSFS-Mods[white s-text]"],
             [""],
             [" VERSION[blue]"],
-            ["0.12.10[s-text white]"],
+            ["0.12.11[s-text white]"],
             [""],
             [""],
             [""],