diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 6cfaf74d452..4612ccc93ed 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -214,6 +214,7 @@ 1. [ELEC] The BCL opens the contactor on entering the EMER ELEC situation - @davidwalschots (David Walschots) 1. [ELEC] The BCL opens the contactor when in EMER ELEC and over three minutes have passed with the APU MASTER SW in the ON position - @davidwalschots (David Walschots) 1. [ELEC] When the battery push button is in the OFF position, the BCL is not powered. This means that any conditions which depend on external factors (such as APU start) or the timers for certain conditions are not remembered - @davidwalschots (David Walschots) +1. [MISC] Added functionality to the console/floor light switch - @ImenesFBW (Imenes) ## 0.5.2 1. [CDU] Changing CRZ/DES speed to acknowledge any speed restriction - @Watsi01 (RogePete) diff --git a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/approach.FLT b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/approach.FLT index 117526b41ea..ac2304a4053 100644 --- a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/approach.FLT +++ b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/approach.FLT @@ -261,6 +261,8 @@ CabinLights=True GlareshieldLights=False PedestalLights=False Potentiometer.7=0 +Potentiometer.8=0 +Potentiometer.9=0 Potentiometer.86=0.5 Potentiometer.88=0.5 Potentiometer.89=0.5 diff --git a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/apron.FLT b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/apron.FLT index b41ce011b91..c63ce1d5c6e 100644 --- a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/apron.FLT +++ b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/apron.FLT @@ -265,6 +265,8 @@ CabinLights=False GlareshieldLights=False PedestalLights=False Potentiometer.7=0 +Potentiometer.8=0 +Potentiometer.9=0 Potentiometer.84=0 Potentiometer.85=0 Potentiometer.86=0 diff --git a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/cruise.FLT b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/cruise.FLT index 14047b0f9a2..cb7135a0947 100644 --- a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/cruise.FLT +++ b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/cruise.FLT @@ -261,6 +261,8 @@ CabinLights=True GlareshieldLights=False PedestalLights=False Potentiometer.7=0 +Potentiometer.8=0 +Potentiometer.9=0 Potentiometer.84=0.5 Potentiometer.85=0.5 Potentiometer.86=0.5 diff --git a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/final.FLT b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/final.FLT index 97ab97afb1a..b0c75c1b05d 100644 --- a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/final.FLT +++ b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/final.FLT @@ -261,6 +261,8 @@ CabinLights=False GlareshieldLights=False PedestalLights=False Potentiometer.7=0 +Potentiometer.8=0 +Potentiometer.9=0 Potentiometer.84=0.5 Potentiometer.85=0.5 Potentiometer.87=0.5 diff --git a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/hangar.flt b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/hangar.flt index 1368d1f1be4..eb5ea4c6bdb 100644 --- a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/hangar.flt +++ b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/hangar.flt @@ -245,6 +245,8 @@ CabinLights=False GlareshieldLights=False PedestalLights=False Potentiometer.7=0 +Potentiometer.8=0 +Potentiometer.9=0 Potentiometer.84=0 Potentiometer.85=0 Potentiometer.86=0 diff --git a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/model/A320_NEO_INTERIOR.xml b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/model/A320_NEO_INTERIOR.xml index 7bfd8675abd..4ed0b02226d 100644 --- a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/model/A320_NEO_INTERIOR.xml +++ b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/model/A320_NEO_INTERIOR.xml @@ -486,6 +486,19 @@ 87 PA + + + + 8 + SWITCH_EFIS_CS_CONSOLE + SWITCH_EFIS_CS_CONSOLE + + + + 9 + SWITCH_EFIS_FO_CONSOLE + SWITCH_EFIS_FO_CONSOLE + @@ -3871,9 +3884,6 @@ PUSH_EFIS_FO_PFD - - SWITCH_EFIS_FO_CONSOLE - KNOB_EFIS_FO_LOUDSPKR diff --git a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/runway.FLT b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/runway.FLT index 0770bb19227..a5768da21cf 100644 --- a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/runway.FLT +++ b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/runway.FLT @@ -270,6 +270,8 @@ CabinLights=False GlareshieldLights=False PedestalLights=False Potentiometer.7=0 +Potentiometer.8=0 +Potentiometer.9=0 Potentiometer.84=0.5 Potentiometer.85=0.5 Potentiometer.86=0.5 diff --git a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/systems.cfg b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/systems.cfg index e5f04eecaea..9740ccf299b 100644 --- a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/systems.cfg +++ b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/systems.cfg @@ -56,6 +56,8 @@ lightdef.49 = Type:2#Index:3#LocalPosition:0,0,6.9#LocalRotation:0,0,-50#EffectF lightdef.50 = Type:9#Index:1#LocalPosition:-70.6,-12.3,8.9#LocalRotation:-60,0,-70#EffectFile:LIGHT_A32NX_LogoLight(V)#PotentiometerIndex:1#EmMesh:LIGHT_ASOBO_LogoLeft lightdef.51 = Type:9#Index:2#LocalPosition:-70.6,12.3,8.9#LocalRotation:-60,0,70#EffectFile:LIGHT_A32NX_LogoLight(V)#PotentiometerIndex:1#EmMesh:LIGHT_ASOBO_LogoRight lightdef.52 = Type:13#Index:0#LocalPosition:36.5,0,6#LocalRotation:0,0,0#EffectFile:LIGHT_A32NX_CockpitMinimalAmbiantLarge#PotentiometerIndex:1 +lightdef.53 = Type:4#Index:3#LocalPosition:37,-4,5.1#LocalRotation:90,0,0#EffectFile:LIGHT_A32NX_Console#PotentiometerIndex:8 +lightdef.54 = Type:4#Index:3#LocalPosition:37,4,5.1#LocalRotation:90,0,0#EffectFile:LIGHT_A32NX_Console#PotentiometerIndex:9 [BRAKES] parking_brake = 1 ; BrakeTypes enum diff --git a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/taxi.flt b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/taxi.flt index c81b9d0ae11..69e4f617d77 100644 --- a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/taxi.flt +++ b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/taxi.flt @@ -110,6 +110,8 @@ TailhookState=0 FoldingWingsHandle=False FoldingWingsState=0, 0 Potentiometer.7=0.5 +Potentiometer.8=0 +Potentiometer.9=0 Potentiometer.84=0.5 Potentiometer.85=0.5 Potentiometer.87=0.5 diff --git a/A32NX/effects/LIGHT_A32NX_Console.fx b/A32NX/effects/LIGHT_A32NX_Console.fx new file mode 100644 index 00000000000..0bfe65bcbeb --- /dev/null +++ b/A32NX/effects/LIGHT_A32NX_Console.fx @@ -0,0 +1,77 @@ +[Library Effect] +Lifetime=5 +Version=2.00 +Radius=-1 + +[Properties] +Spot=1 +Tower=1 +Map=1 + +[Emitter.0] +Lifetime=1.00, 1.00 +Delay=0.00, 0.00 +Bounce=0.00 +Light=1 +No Interpolate=1 +Rate=1.00, 1.00 +X Emitter Velocity=0.00, 0.00 +Y Emitter Velocity=0.00, 0.00 +Z Emitter Velocity=0.00, 0.00 +Drag=0.00, 0.00 +X Particle Velocity=0.00, 0.00 +Y Particle Velocity=0.00, 0.00 +Z Particle Velocity=0.00, 0.00 +X Rotation=0.00, 0.00 +Y Rotation=0.00, 0.00 +Z Rotation=0.00, 0.00 +X Offset=0.0, 0.0 +Y Offset=0.0, 0.0 +Z Offset=0.0, 0.0 + +[Particle.0] +Lifetime=0.00, 0.00 +Type=19 +X Scale=0.75, 0.75 +Y Scale=0.75, 0.75 +Z Scale=0.00, 0.00 +X Scale Rate=0.00, 0.00 +Y Scale Rate=0.00, 0.00 +Z Scale Rate=0.00, 0.00 +Drag=0.00, 0.00 +Color Rate=0.00, 0.00 +X Offset=0.00, 0.00 +Y Offset=0.00, 0.00 +Z Offset=0.00, 0.00 +Fade In=0.50, 0.50 +Fade Out=0.50, 0.50 +Rotation=0.00, 0.00 +Static=1 +Face=1, 1, 1 + +[ParticleAttributes.0] +Blend Mode=2 +Bounce=0.00 +Color Start=255, 179, 117, 10 +Color End=248, 156, 106, 10 +Jitter Distance=0.00 +Jitter Time=0.00 +uv1=0.00, 0.00 +uv2=1.0, 1.0 +X Scale Goal=0.00 +Y Scale Goal=0.00 +Z Scale Goal=0.00 +Extrude Length=0.00 +Extrude Pitch Max=0.00 +Extrude Heading Max=0.00 + +[LightAttributes.0] +Type=spot +Size=0.02 +Range=2.0 +Intensity=0.8 +Softness=0.1 +SpotInner=45 +SpotOuter=81 +Volumetric=1 +ScatDir=1 \ No newline at end of file diff --git a/src/behavior/src/A32NX_Interior_Misc.xml b/src/behavior/src/A32NX_Interior_Misc.xml index 34d6558455e..5bab1ff883a 100644 --- a/src/behavior/src/A32NX_Interior_Misc.xml +++ b/src/behavior/src/A32NX_Interior_Misc.xml @@ -306,6 +306,27 @@ + + +