diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a7927f..8098d5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,59 @@ +# 21/05/2022 v1.0.2a-beta +Fixed issues +.Interference issue with All Modules + Reworked mod logic. + The mod only starts if the aircraft is supported. + +Su-27/J-11A +.Moved Scan Zone Left +.Moved Scan Zone Right +--Todo Code Scan Zone Return to center +.Removed Scan Zone Up +.Removed Scan Zone Down +.Added Scan Zone Up/Down + +Su-33 +.Moved Scan Zone Left +.Moved Scan Zone Right +--Todo Code Scan Zone Return to center +.Removed Scan Zone Up +.Removed Scan Zone Down +.Added Scan Zone Up/Down + +MiG-29A/G/S +.Added Scan Zone Up/Down + +Su-25T +.Removed HOTAS Target Lock (Handle) +.Added HOTAS Quick A-A to A-G Switch + +Su-25 +.Removed HOTAS Target Lock (Handle) +.Added HOTAS Quick A-A to A-G Switch +.Fixed ASP-17 Glass Up/Down (Only cycled down) + +F-15C +.Added Bingo Fuel Index CW/CCW +.Label_Change Radar Off + > Radar On/Off +.Label_Change Parking Brakes + > Emergency Brakes + (Left Click):Engage + (Right Click):Disengage +.Added_Message Emergency Brakes now triggers a user message +A-10A +.Label_Change Wheel Brake + > Emergency Brakes + (Left Click):Engage + (Right Click):Disengage +.Added_Message Emergency Brakes now triggers a user message + + + + # 12/05/2022 v1.0.1c-beta Fixed issues - .Interference issue with F-16I SUFA Module +.Interference issue with F-16I SUFA Module F-15C .Added HOTAS Target Lock .Added HOTAS Radar - Return To Search/NDTWS @@ -101,10 +154,10 @@ F-15C # 09/05/2022 v0.3.0-alpha Fixed issues - .Interference issue with Eurofighter Module - .Interference issue with PUCARA Module - .Interference issue with WW1FlyingCircus Module - .Interference issue with RAFB Module +.Interference issue with Eurofighter Module +.Interference issue with PUCARA Module +.Interference issue with WW1FlyingCircus Module +.Interference issue with RAFB Module .Issue with Ripple Quantity Select/SPPU select on Su-25T,Su-25 General Improvement @@ -311,9 +364,9 @@ Known issues Changelog now in descending order Fixed issues - .Interference issue with AH-64D Module - .Interference issue with AH-6 Module - .Interference issue with Rafale Module +.Interference issue with AH-64D Module +.Interference issue with AH-6 Module +.Interference issue with Rafale Module .Some buttons were not giving consistent output .Position of connectors was not updated @@ -395,7 +448,7 @@ Su-27/J-11A # 16/02/2022 v0.1.7-alpha Fixed issues - .Interference issue with Bell-47 Module +.Interference issue with Bell-47 Module Enhancements Su-25T @@ -447,23 +500,23 @@ Added MiG-29S and Mig-29A Support # 12/02/2022 v0.1.6-alpha Fixed issues - .Interference issue with F-5E-3 Module - .Interference issue with AV8BNA Module - .Interference issue with Spitfire LF Mk. IX Module - .Interference issue with Bf-109K-4 Module - .Interference issue with P-47D-40 Module - .Interference issue with P-47D-30bl1 Module - .Interference issue with SA342L Module - .Interference issue with SA342M Module - .Interference issue with SA342Minigun Module - .Interference issue with SA342Mistral Module - .Interference issue with C-101CC Module - .Interference issue with C-101EB Module - .Interference issue with FW-190A8 Module - .Interference issue with L-39C Module - .Interference issue with L-39ZA Module - .Interference issue with P-51D-30-NA Module - .Interference issue with P-51D Module +.Interference issue with F-5E-3 Module +.Interference issue with AV8BNA Module +.Interference issue with Spitfire LF Mk. IX Module +.Interference issue with Bf-109K-4 Module +.Interference issue with P-47D-40 Module +.Interference issue with P-47D-30bl1 Module +.Interference issue with SA342L Module +.Interference issue with SA342M Module +.Interference issue with SA342Minigun Module +.Interference issue with SA342Mistral Module +.Interference issue with C-101CC Module +.Interference issue with C-101EB Module +.Interference issue with FW-190A8 Module +.Interference issue with L-39C Module +.Interference issue with L-39ZA Module +.Interference issue with P-51D-30-NA Module +.Interference issue with P-51D Module Su-25T . Solved Su-25T Possible bug between Attitude Hold Autopilot and Auto pilot Reset #32 @@ -481,9 +534,9 @@ Su-25T # 09/02/2022 v0.1.5-alpha Fixed issues - .Interference issue with Yak-52 Module - .Interference issue with MOSQUITOFBMKVI Module - .Interference issue with Mi-8MT Module +.Interference issue with Yak-52 Module +.Interference issue with MOSQUITOFBMKVI Module +.Interference issue with Mi-8MT Module Enhancements Added Su-25T Support .Added Altimeter Pressure Increase/Decrease @@ -521,8 +574,8 @@ Added Su-25T Support # 05/02/2022 v0.1.4-alpha Fixed issues - .Interference issue with Su-25T Module - .Interference issue with TF-51D Module +.Interference issue with Su-25T Module +.Interference issue with TF-51D Module Su-27/33/J-11A .AP Auto button should be Attitude Hold #21 ."Toggle Mirrors" action still appears when cockpit is open #24 diff --git a/Cockpit/Scripts/SYSTEMS/clickable.lua b/Cockpit/Scripts/SYSTEMS/clickable.lua index ba81e63..8677ccf 100644 --- a/Cockpit/Scripts/SYSTEMS/clickable.lua +++ b/Cockpit/Scripts/SYSTEMS/clickable.lua @@ -15,10 +15,13 @@ local aircraft = get_aircraft_type() local mastermode = 0 local mastermodeF15 = 0 local radarScanAreaf15 = 1 -local selecter_timer = 0 +local selecter_timer = 0 +local radar_pos_az = 0 local planeradar_timer = 0 +local bingo_timer = 0 local chutestate local CLIC_MODE_AA_COUNTER +local CLIC_MODE_QUICK_COUNTER -------------------------------------------------------------------- --local test = get_param_handle("BASE_SENSOR_RIGHT_THROTTLE_POS") @@ -27,11 +30,12 @@ local CLIC_MODE_AA_COUNTER function post_initialize() - print_message_to_user("v1.0.1c-beta",10) + print_message_to_user("v1.0.2a-beta",10) print_message_to_user(aircraft,10) dispatch_action(nil,Keys.iCommandCockpitClickModeOnOff) chutestate = 0 CLIC_MODE_AA_COUNTER = 0 + CLIC_MODE_QUICK_COUNTER = 0 --dump("list_cockpit_params",list_cockpit_params()) local birth = LockOn_Options.init_conditions.birth_place @@ -138,8 +142,12 @@ function SetCommand(command,value) end - if command == device_commands.CLIC_ASP then - dispatch_action(nil,Keys.iCommandPlaneHUDFilterOnOff) + + if command == device_commands.CLIC_ASP and value >0 then + dispatch_action(0,Keys.iCommandPlaneHUDFilterOnOff,-1.0) + end + if command == device_commands.CLIC_ASP and value <0 then + dispatch_action(0,Keys.iCommandPlaneHUDFilterOnOff,1.0) end if command == device_commands.CLIC_TRIM_L then dispatch_action(nil,Keys.iCommandPlaneTrimLeft) @@ -255,6 +263,24 @@ function SetCommand(command,value) end + if command == device_commands.CLIC_MODE_QUICK and value ==1 then + CLIC_MODE_QUICK_COUNTER = CLIC_MODE_QUICK_COUNTER +1 + if mastermode == 6 then + dispatch_action(nil,Keys.iCommandPlaneModeGrid) + + end + mastermode = 0 + + if CLIC_MODE_QUICK_COUNTER == 1 then + dispatch_action(nil,Keys.iCommandPlaneModeFI0) + end + if CLIC_MODE_QUICK_COUNTER == 2 then + dispatch_action(nil,Keys.iCommandPlaneModeGround) + CLIC_MODE_QUICK_COUNTER = 0 + end + + end + if command == device_commands.CLIC_MODE then @@ -352,6 +378,14 @@ function SetCommand(command,value) if command == device_commands.CLIC_AUTO_GCA and value == 1 then dispatch_action(nil,Keys.iCommandPlaneSAUHRadio) + end + if command == device_commands.CLIC_AUTO_PATH and value == 1 then + dispatch_action(nil,Keys.iCommandPlaneRouteAutopilot) + + end + if command == device_commands.CLIC_AUTO_REAP and value == 1 then + dispatch_action(nil,Keys.iCommandPlaneStabHrad) + end if command == device_commands.CLIC_AUTO_DAMPER then dispatch_action(nil,Keys.iCommandPlaneStabHbarBank) @@ -455,34 +489,41 @@ function SetCommand(command,value) if command == device_commands.CLIC_TV and value ==1 then dispatch_action(nil,Keys.iCommandPlaneEOSOnOff) end - - if command == device_commands.CLIC_SCAN_L then - dispatch_action(nil,Keys.iCommandSelecterLeft) - if value ~=1 then - dispatch_action(nil,Keys.iCommandSelecterStop) - end - end - - if command == device_commands.CLIC_SCAN_R then - dispatch_action(nil,Keys.iCommandSelecterRight) - if value ~=1 then + + if command == device_commands.CLIC_SCAN_L then + dispatch_action(nil,Keys.iCommandSelecterLeft) + if value ~=1 then dispatch_action(nil,Keys.iCommandSelecterStop) + end end - end - if command == device_commands.CLIC_SCAN_U then - dispatch_action(nil,Keys.iCommandSelecterUp) - if value ~=1 then - dispatch_action(nil,Keys.iCommandSelecterStop) + if command == device_commands.CLIC_SCAN_R then + dispatch_action(nil,Keys.iCommandSelecterRight) + + if value ~=1 then + dispatch_action(nil,Keys.iCommandSelecterStop) + end end - end - - if command == device_commands.CLIC_SCAN_D then - dispatch_action(nil,Keys.iCommandSelecterDown) - if value ~=1 then - dispatch_action(nil,Keys.iCommandSelecterStop) + + if command == device_commands.CLIC_SCAN_EL then + selecter_timer = 0.025 + + if command == device_commands.CLIC_SCAN_EL and value ==-1 then + dispatch_action(nil,Keys.iCommandSelecterDown) + --print_message_to_user("iCommandSelecterDown") + end + if command == device_commands.CLIC_SCAN_EL and value ==1 then + dispatch_action(nil,Keys.iCommandSelecterUp) + --print_message_to_user("iCommandSelecterUp") + end end - end + + + + + + + @@ -699,6 +740,14 @@ function SetCommand(command,value) dispatch_action(nil,Keys.iCommandChangeRippleIntervalDown) end + if command == device_commands.CLIC_EMERGENCY_BRAKES_ON and value == 1 then + dispatch_action(nil,Keys.iCommandPlaneWheelBrakeOn) + print_message_to_user("Emergency Brakes\nEngaged") + end + if command == device_commands.CLIC_EMERGENCY_BRAKES_OFF and value == 1 then + dispatch_action(nil,Keys.iCommandPlaneWheelBrakeOff) + print_message_to_user("Emergency Brakes\nDisengaged") + end --F-15C Specifics if aircraft=="F-15C" then if command == device_commands.CLIC_FIRE and value == 1 then @@ -710,12 +759,17 @@ function SetCommand(command,value) if command == device_commands.CLIC_LANDING_LIGHTS_F15 then dispatch_action(nil,Keys.iCommandPlaneHeadLightOnOff) end - if command == device_commands.CLIC_PARKING_BRAKES_F15_ON and value == 1 then - dispatch_action(nil,Keys.iCommandPlaneWheelBrakeOn) - end - if command == device_commands.CLIC_PARKING_BRAKES_F15_OFF and value == 1 then - dispatch_action(nil,Keys.iCommandPlaneWheelBrakeOff) + + if command == device_commands.CLIC_BINGO then + bingo_timer = 0.25 + + if value ==-1 then + dispatch_action(0,Keys.iCommandPlaneFSQuantityIndicatorSelectorINT,-1) + elseif value ==1 then + dispatch_action(0,Keys.iCommandPlaneFSQuantityIndicatorSelectorINT,1) + end end + end -- Master Combat Mode Controls -- To be reworked to implement the Navigation mod which has two sub mods, which causes problems. @@ -803,6 +857,15 @@ function update() dispatch_action(nil,Keys.iCommandPlaneRadarStop) end end + if bingo_timer > 0 then + bingo_timer = bingo_timer - update_time_step + if bingo_timer <= 0 then + bingo_timer = 0 + dispatch_action(0,Keys.iCommandPlaneFSQuantityIndicatorSelectorINT,0) + + end + end + end need_to_be_closed = false -- close lua state after initialization diff --git a/Cockpit/Scripts/clickabledata.lua b/Cockpit/Scripts/clickabledata.lua index e8c21a8..c40e5ca 100644 --- a/Cockpit/Scripts/clickabledata.lua +++ b/Cockpit/Scripts/clickabledata.lua @@ -68,7 +68,7 @@ elements["PNT_AIRBRAKE"] = default_button("Airbrake", elements["PNT_CTM_ONCE"] = default_button("Countermeasures Release", devices.CLICKABLE, device_commands.CLIC_CTM_ONCE ) elements["PNT_UNLOCK"] = default_button("Target Unlock", devices.CLICKABLE, device_commands.CLIC_LOCK_REL ) elements["PNT_LOCK"] = default_button("Target Lock", devices.CLICKABLE, device_commands.CLIC_LOCK ) -elements["PNT_LOCK_STICK"] = default_button("Target Lock", devices.CLICKABLE, device_commands.CLIC_LOCK ) +elements["PNT_MODE_STICK"] = default_button("Quick A-A to A-G Switch", devices.CLICKABLE, device_commands.CLIC_MODE_QUICK ) elements["PNT_AUTO_LEVEL_STICK"] = default_button("Autopilot - Transition To Level Flight Control", devices.CLICKABLE, device_commands.CLIC_AUTO_LEVEL ) elements["PNT_AUTO_RESET_STICK"] = default_button("Autopilot Reset", devices.CLICKABLE, device_commands.CLIC_AUTO_STOP ) elements["PNT_MIRROR_L"] = default_button("Toggle Mirrors", devices.CLICKABLE, device_commands.CLIC_MIRROR ) @@ -99,8 +99,9 @@ elements["PNT_AUTO_DAMPER"] = default_button("Autopilot - Damper", elements["PNT_AUTO_ATT_HOLD"] = default_button("Autopilot - Attitude Hold", devices.CLICKABLE, device_commands.CLIC_AUTO_ALT ) elements["PNT_AUTO_ALT_HOLD"] = default_button("Autopilot - Transition To Level Flight Control", devices.CLICKABLE, device_commands.CLIC_AUTO_LEVEL ) elements["PNT_AUTO_GCA"] = default_button("Autopilot - Ground Collision Avoidance", devices.CLICKABLE, device_commands.CLIC_AUTO_GCA ) +--elements["PNT_AUTO_PATH"] = default_button("Autopilot - Path Control", devices.CLICKABLE, device_commands.CLIC_AUTO_PATH ) --To Test +--elements["PNT_AUTO_REAP"] = default_button("Autopilot - Reapproach", devices.CLICKABLE, device_commands.CLIC_AUTO_REAP ) --To Test elements["PNT_AIRBRAKE"] = default_button("Airbrake", devices.CLICKABLE, device_commands.CLIC_AIRBRAKE ) - elements["PNT_CTM_ONCE"] = default_button("Countermeasures Release", devices.CLICKABLE, device_commands.CLIC_CTM_ONCE ) elements["PNT_UNLOCK"] = default_button("Target Unlock", devices.CLICKABLE, device_commands.CLIC_LOCK_REL ) elements["PNT_LOCK"] = default_button("Target Lock", devices.CLICKABLE, device_commands.CLIC_LOCK ) @@ -120,7 +121,8 @@ elements["PNT_CTM"] = default_button("Countermeasures Continuous elements["PNT_NAVPROGRAM"] = default_axis_limited("Navigation Modes", devices.CLICKABLE, device_commands.CLIC_NAVMODES ) elements["PNT_MODE"] = default_axis_limited("Master Modes Select", devices.CLICKABLE, device_commands.CLIC_MODE ) elements["PNT_LANDING_LIGHTS"] = default_button("Gear Light Near/Far/Off", devices.CLICKABLE, device_commands.CLIC_LANDING_LIGHTS) - +elements["PNT_SCAN_EL"] = default_axis_limited("Scan Zone Up/Down", devices.CLICKABLE, device_commands.CLIC_SCAN_EL,0,0,100/15,false, false, {-1,1}) +elements["PNT_SCAN_EL"].cycle = false end @@ -153,8 +155,9 @@ elements["PNT_HUD_REP"] = default_button("HDD, HUD Repeater Mode On/ elements["PNT_ENG_INLET"] = default_button("Engine Inlet Grids Auto/Off", devices.CLICKABLE, device_commands.CLIC_ENG_INLET ) elements["PNT_SCAN_L"] = default_button("Scan Zone Left", devices.CLICKABLE, device_commands.CLIC_SCAN_L ) elements["PNT_SCAN_R"] = default_button("Scan Zone Right", devices.CLICKABLE, device_commands.CLIC_SCAN_R ) -elements["PNT_SCAN_U"] = default_button("Scan Zone Up", devices.CLICKABLE, device_commands.CLIC_SCAN_U ) -elements["PNT_SCAN_D"] = default_button("Scan Zone Down", devices.CLICKABLE, device_commands.CLIC_SCAN_D ) +elements["PNT_SCAN_EL"] = default_axis_limited("Scan Zone Up/Down", devices.CLICKABLE, device_commands.CLIC_SCAN_EL,0,0,100/15,false, false, {-1,1}) +elements["PNT_SCAN_EL"].cycle = false +--elements["PNT_SCAN_C"] = default_button("Scan Zone Center", devices.CLICKABLE, device_commands.CLIC_SCAN_C ) elements["PNT_LIGHT"] = default_button("Illumination Cockpit", devices.CLICKABLE, device_commands.CLIC_COCKPITLIGHT ) elements["PNT_CTM"] = default_button("Countermeasures Continuously Dispense", devices.CLICKABLE, device_commands.CLIC_CTM ) elements["PNT_LANDING_LIGHTS"] = default_button("Gear Light Near/Far/Off", devices.CLICKABLE, device_commands.CLIC_LANDING_LIGHTS) @@ -202,7 +205,7 @@ elements["PNT_CTM_CHAFF"] = default_button("Countermeasures Chaff Disp elements["PNT_CTM_FLARE"] = default_button("Countermeasures Flares Dispense", devices.CLICKABLE, device_commands.CLIC_CTM_FLARE ) elements["PNT_FLAPS_MULTI"] = default_button("Flaps Up/Down", devices.CLICKABLE, device_commands.CLIC_FLAPS_MULTI ) elements["PNT_FLAPS_LAND"] = default_button("Flaps Landing Position", devices.CLICKABLE, device_commands.CLIC_FLAPS_LAND ) -elements["PNT_ASP-17"] = default_axis_limited("ASP-17 Glass Up/Down", devices.CLICKABLE, device_commands.CLIC_ASP ) +elements["PNT_ASP-17"] = default_axis_limited("ASP-17 Glass Up/Down", devices.CLICKABLE, device_commands.CLIC_ASP,nil, 0, 1,true,true) elements["PNT_FLAPS_MULTI_BIS"] = default_button("Flaps Up/Down", devices.CLICKABLE, device_commands.CLIC_FLAPS_MULTI ) elements["PNT_AIRBRAKE"] = default_button("Airbrake", devices.CLICKABLE, device_commands.CLIC_AIRBRAKE ) elements["PNT_NAVPROGRAM"] = default_button("Navigation Modes", devices.CLICKABLE, device_commands.CLIC_NAVMODES ) @@ -216,7 +219,7 @@ elements["PNT_MIRROR_L"] = default_button("Toggle Mirrors", elements["PNT_MIRROR_R"] = default_button("Toggle Mirrors", devices.CLICKABLE, device_commands.CLIC_MIRROR ) elements["PNT_AUTO_LEVEL_STICK"] = default_button("Autopilot - Transition To Level Flight Control", devices.CLICKABLE, device_commands.CLIC_AUTO_LEVEL ) elements["PNT_AUTO_RESET_STICK"] = default_button("Autopilot Reset", devices.CLICKABLE, device_commands.CLIC_AUTO_STOP ) - +elements["PNT_MODE_STICK"] = default_button("Quick A-A to A-G Switch", devices.CLICKABLE, device_commands.CLIC_MODE_QUICK ) elements["PNT_TARGET_UD"] = default_axis_limited("Target Designator Up/Down", devices.CLICKABLE, device_commands.CLIC_TARGET_UD,0,0,100/15,false, false, {0,1}) elements["PNT_TARGET_UD"].cycle = false elements["PNT_TARGET_LR"] = default_axis_limited("Target Designator Left/Right", devices.CLICKABLE, device_commands.CLIC_TARGET_LR,0,0,100/15,false, false, {0,1}) @@ -245,7 +248,8 @@ elements["PNT_MIRROR_U"] = default_button("Toggle Mirrors", elements["PNT_MIRROR_L"] = default_button("Toggle Mirrors", devices.CLICKABLE, device_commands.CLIC_MIRROR ) elements["PNT_MIRROR_R"] = default_button("Toggle Mirrors", devices.CLICKABLE, device_commands.CLIC_MIRROR ) elements["PNT_FUEL_PROBE"] = default_button("Refueling Bay", devices.CLICKABLE, device_commands.CLIC_RBOOM ) -elements["PNT_WHEEL_BRAKE"] = default_button("Wheel Brake", devices.CLICKABLE, device_commands.CLIC_WHEELBRAKE ) +elements["PNT_BRAKE"] = default_button_tumb("Emergency Brakes\n(Left Click):Engage\n(Right Click):Disengage",devices.CLICKABLE, device_commands.CLIC_EMERGENCY_BRAKES_ON,device_commands.CLIC_EMERGENCY_BRAKES_OFF) +elements["PNT_BRAKE"].stop_action = nil elements["PNT_PRS_SGL"] = default_axis_limited("PRS/SGL Release Submodes Cycle", devices.CLICKABLE, device_commands.CLIC_PRS_SGL ) elements["PNT_CYCL01"] = default_button("Weapon Change", devices.CLICKABLE, device_commands.CLIC_STATION ) elements["PNT_CYCL02"] = default_button("Weapon Change", devices.CLICKABLE, device_commands.CLIC_STATION ) @@ -260,7 +264,7 @@ elements["PNT_MIRROR_L"] = default_button("Toggle Mirrors", elements["PNT_MIRROR_R"] = default_button("Toggle Mirrors", devices.CLICKABLE, device_commands.CLIC_MIRROR ) elements["PNT_HUD_BRT_BIS"] = default_axis_limited("HUD Brightness Up/Down", devices.CLICKABLE, device_commands.CLIC_HUD_BRT,nil, 0, 1,true,true) elements["PNT_EJECT_BIS"] = default_button("Eject (3 times)", devices.CLICKABLE, device_commands.CLIC_EJECT ) -elements["PNT_MODE_F15"] = default_axis_limited("Master Combat Mode \nBeyond Visual Range\nClose Air Combat Vertical Scan \nClose Air Combat Bore \nLongitudinal Missile Aiming /FLOOD mode", +elements["PNT_MODE_F15"] = default_axis_limited("Master Combat Mode \nBeyond Visual Range\nClose Air Combat Vertical Scan \nClose Air Combat Bore \nLongitudinal Missile Aiming /FLOOD mode", devices.CLICKABLE, device_commands.CLIC_MODE_F15) elements["PNT_JETTINSON_TANK"] = default_button("Fuel Tanks Jettison", devices.CLICKABLE, device_commands.CLIC_JETTINSON_TANK) elements["PNT_JETTINSON_TANK_BIS"] = default_button("Fuel Tanks Jettison", devices.CLICKABLE, device_commands.CLIC_JETTINSON_TANK) @@ -277,7 +281,7 @@ elements["PNT_RWR_MULTI"].class = {class_type.TUMB, class_type.LEV} elements["PNT_RWR_MULTI"].relative = {false,true} elements["PNT_RWR_MULTI"].arg_lim = {{0, 1}, {-1, 1}} elements["PNT_RWR_MULTI"].stop_action = {device_commands.CLIC_RWR_SOUND, 0} -elements["PNT_SCAN_RDR"] = default_axis_limited("Radar Off", devices.CLICKABLE, device_commands.CLIC_RADAR_ON_OFF_F15 ) +elements["PNT_SCAN_RDR"] = default_axis_limited("Radar On/Off", devices.CLICKABLE, device_commands.CLIC_RADAR_ON_OFF_F15 ) elements["PNT_RADAR_FREQ"] = default_axis_limited("Radar Pulse Repeat Frequency Select", devices.CLICKABLE, device_commands.CLIC_RADAR_FREQ_F15 ) elements["PNT_RADAR_MODE"] = default_button("Radar RWS/TWS Mode Select", devices.CLICKABLE, Keys.iCommandPlaneRadarChangeMode ) elements["PNT_RADAR_MODE"].stop_action = nil @@ -312,11 +316,14 @@ elements["PNT_FLAPS_MULTI_BIS"] = default_button("Flaps Up/Down", elements["PNT_STATION"] = default_button("Weapon Change", devices.CLICKABLE, device_commands.CLIC_STATION ) elements["PNT_CTM_ONCE"] = default_button("Countermeasures Release", devices.CLICKABLE, device_commands.CLIC_CTM_ONCE ) elements["PNT_LANDING_LIGHTS"] = default_button("Gear Light Near/Far/Off", devices.CLICKABLE, device_commands.CLIC_LANDING_LIGHTS_F15) -elements["PNT_BRAKE"] = default_button_tumb("Parking Brakes\n(Left Click):Engage\n(Right Click):Disengage",devices.CLICKABLE, device_commands.CLIC_PARKING_BRAKES_F15_ON,device_commands.CLIC_PARKING_BRAKES_F15_OFF) +elements["PNT_BRAKE"] = default_button_tumb("Emergency Brakes\n(Left Click):Engage\n(Right Click):Disengage",devices.CLICKABLE, device_commands.CLIC_EMERGENCY_BRAKES_ON,device_commands.CLIC_EMERGENCY_BRAKES_OFF) elements["PNT_BRAKE"].stop_action = nil elements["PNT_STICK_LOCK"] = default_button("Target Lock", devices.CLICKABLE, device_commands.CLIC_LOCK ) elements["PNT_STICK_UNLOCK"] = default_button("Radar - Return To Search/NDTWS", devices.CLICKABLE, device_commands.CLIC_LOCK_REL ) elements["PNT_STICK_STATION"] = default_button("Weapon Change", devices.CLICKABLE, device_commands.CLIC_STATION ) elements["PNT_STICK_SHOOT"] = default_button("Weapon Release", devices.CLICKABLE, device_commands.CLIC_FIRE ) +elements["PNT_FUEL_BINGO"] = default_axis_limited("Bingo Fuel Index CW/CCW", devices.CLICKABLE, device_commands.CLIC_BINGO,nil, 0, 100/15,true,true) + + end \ No newline at end of file diff --git a/Cockpit/Scripts/command_defs.lua b/Cockpit/Scripts/command_defs.lua index 1987105..365874c 100644 --- a/Cockpit/Scripts/command_defs.lua +++ b/Cockpit/Scripts/command_defs.lua @@ -132,6 +132,7 @@ Keys = iCommandPlaneWheelBrakeOn = 74; iCommandPlaneWheelBrakeOff = 75; iCommandChangeReleaseMode = 284; + iCommandPlaneFSQuantityIndicatorSelectorINT = 1092; @@ -152,6 +153,8 @@ device_commands = CLIC_FUEL_DUMP_ON = counter(), CLIC_FUEL_DUMP_OFF = counter(), CLIC_FUEL_DUMP = counter(), + CLIC_BINGO = counter(), + CLIC_BINGO_STOP = counter(), CLIC_AUTO_DAMPER = counter(), CLIC_AUTO_STOP = counter(), CLIC_AUTO_BARO = counter(), @@ -160,6 +163,8 @@ device_commands = CLIC_AUTO_RADAR = counter(), CLIC_AUTO_ALT = counter(), CLIC_AUTO_GCA = counter(), + CLIC_AUTO_PATH = counter(), + CLIC_AUTO_REAP = counter(), CLIC_HUD_REPEATER = counter(), CLIC_POWER = counter(), @@ -191,9 +196,10 @@ device_commands = CLIC_RADAR_RANGE = counter(), CLIC_SCAN_L = counter(), CLIC_SCAN_R = counter(), - CLIC_SCAN_U = counter(), - CLIC_SCAN_D = counter(), + CLIC_SCAN_C = counter(), + CLIC_SCAN_EL = counter(), CLIC_MODE = counter(), + CLIC_MODE_QUICK = counter(), CLIC_MODE_F15 = counter(), CLIC_HUD_COLOR = counter(), CLIC_HUD_BRT = counter(), @@ -204,8 +210,8 @@ device_commands = CLIC_MIRROR_UPDU = counter(), CLIC_ENG_INLET = counter(), CLIC_EMER_BRAKE = counter(), - CLIC_PARKING_BRAKES_F15_ON = counter(), - CLIC_PARKING_BRAKES_F15_OFF = counter(), + CLIC_EMERGENCY_BRAKES_ON = counter(), + CLIC_EMERGENCY_BRAKES_OFF = counter(), CLIC_NOSE_WHEEL = counter(), CLIC_AUTOTHRUST = counter(), CLIC_AUTOTHRUST_I = counter(), diff --git a/Cockpit/Scripts/device_init.lua b/Cockpit/Scripts/device_init.lua index 52d074d..84c0f13 100644 --- a/Cockpit/Scripts/device_init.lua +++ b/Cockpit/Scripts/device_init.lua @@ -1,16 +1,10 @@ dofile(LockOn_Options.script_path.."devices.lua") +dofile(LockOn_Options.script_path.."supported.lua") --Call lua file to detect current aircraft dofile(LockOn_Options.common_script_path.."tools.lua") -layoutGeometry = {} -attributes = { - --"support_for_cws", -} +if supported == true then --Mod launching logic. MainPanel = {"ccMainPanel",LockOn_Options.script_path.."mainpanel_init.lua", {} } - creators = {} - creators[devices.CLICKABLE] = {"avLuaDevice" ,LockOn_Options.script_path.."SYSTEMS/clickable.lua"} creators[devices.PNT_UPD] = {"avLuaDevice" ,LockOn_Options.script_path.."SYSTEMS/PNT_update.lua"} - -indicators = {} - +end \ No newline at end of file diff --git a/Cockpit/Scripts/supported.lua b/Cockpit/Scripts/supported.lua new file mode 100644 index 0000000..9c545af --- /dev/null +++ b/Cockpit/Scripts/supported.lua @@ -0,0 +1,15 @@ +local aircraft = get_aircraft_type() --Reading the variable +if aircraft == "Su-27" or + aircraft == "Su-33" or + aircraft == "J-11A" or + aircraft == "Su-25T" or + aircraft == "Su-25" or + aircraft =="MiG-29A" or + aircraft =="MiG-29G" or + aircraft =="MiG-29S" or + aircraft =="A-10A" or + aircraft =="F-15C" then +supported = true --The mod will start + else +supported = false --The mod will not start +end \ No newline at end of file diff --git a/INSTALL.txt b/INSTALL.txt index 6d1b096..bc40d20 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -1,4 +1,4 @@ -# CLICKABLE-FC3 +# RedK0d Clickable A partially clickable mod for the FC3 Planes # INSTALLATION diff --git a/Options/options.dlg b/Options/options.dlg index 098a861..8bea8ad 100644 --- a/Options/options.dlg +++ b/Options/options.dlg @@ -16,7 +16,7 @@ dialog = { ["x"] = 0, ["y"] = 0, }, - ["text"] = "CLICKABLE-FC3", + ["text"] = "RedK0d Clickable", ["tooltip"] = "", ["visible"] = true, ["zindex"] = 0, diff --git a/README.md b/README.md index 20c4a2b..53b4edb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# CLICKABLE-FC3 +# RedK0d Clickable A partially clickable mod for the FC3 Planes Supported diff --git a/Shapes/A-10A-CLICKABLE.edm b/Shapes/A-10A-CLICKABLE.edm index 6071c44..68ffeae 100644 Binary files a/Shapes/A-10A-CLICKABLE.edm and b/Shapes/A-10A-CLICKABLE.edm differ diff --git a/Shapes/F-15C-CLICKABLE.edm b/Shapes/F-15C-CLICKABLE.edm index 5762e7d..cdb65cc 100644 Binary files a/Shapes/F-15C-CLICKABLE.edm and b/Shapes/F-15C-CLICKABLE.edm differ diff --git a/Shapes/MIG-29-CLICKABLE.edm b/Shapes/MIG-29-CLICKABLE.edm index 94e0150..2535afa 100644 Binary files a/Shapes/MIG-29-CLICKABLE.edm and b/Shapes/MIG-29-CLICKABLE.edm differ diff --git a/Shapes/SU-25-CLICKABLE.edm b/Shapes/SU-25-CLICKABLE.edm index 6b6eddb..f296c52 100644 Binary files a/Shapes/SU-25-CLICKABLE.edm and b/Shapes/SU-25-CLICKABLE.edm differ diff --git a/Shapes/SU-25T-CLICKABLE.edm b/Shapes/SU-25T-CLICKABLE.edm index aa7e64e..288bcb3 100644 Binary files a/Shapes/SU-25T-CLICKABLE.edm and b/Shapes/SU-25T-CLICKABLE.edm differ diff --git a/Shapes/SU-27-CLICKABLE.edm b/Shapes/SU-27-CLICKABLE.edm index 88a628e..727bb19 100644 Binary files a/Shapes/SU-27-CLICKABLE.edm and b/Shapes/SU-27-CLICKABLE.edm differ diff --git a/Shapes/SU-33-CLICKABLE.edm b/Shapes/SU-33-CLICKABLE.edm index 0e3bd0d..a0292ad 100644 Binary files a/Shapes/SU-33-CLICKABLE.edm and b/Shapes/SU-33-CLICKABLE.edm differ diff --git a/entry.lua b/entry.lua index a88f6ac..2f92ef9 100644 --- a/entry.lua +++ b/entry.lua @@ -1,29 +1,31 @@ -declare_plugin("CLICKABLE-FC3_Module", +declare_plugin("RedK0d Clickable", { installed = true, dirName = current_mod_path, - displayName = "CLICKABLE-FC3_Module", - shortName = "CLICKABLE-FC3_Module", - fileMenuName = "CLICKABLE-FC3_Module", + displayName = "RedK0d Clickable", + shortName = "RedK0d Clickable", + fileMenuName = "RedK0d Clickable", + version = "v1.0.2a-beta", + state = "installed", developerName = "RedK0d", - info = "CLICKABLE-FC3_Module", + info = "RedK0d Clickable", load_immediately = true, binaries = {}, Skins = { { - name = _("CLICKABLE-FC3_Module"), + name = ("RedK0d Clickable"), dir = "Skins" }, }, Options = { { - name = _("CLICKABLE-FC3_Module"), - nameId = "CLICKABLE-FC3_Module", + name = ("RedK0d Clickable"), + nameId = "RedK0d Clickable", dir = "Options", CLSID = "{FC3 CLICKABLE}" }, @@ -52,103 +54,6 @@ add_plugin_systems('CLICKABLE-FC3_Module','*',path, ["Su-25"] = {enable_options_key_for_unit = 'Su25_enabled'}, ["A-10A"] = {enable_options_key_for_unit = 'A10a_enabled'}, ["F-15C"] = {enable_options_key_for_unit = 'F15c_enabled'}, - - --Excluded, list to be enlarged to avoid conflicts - ["RAFB"] = {enable_options_key_for_unit='dontuseit'}, - ["F-16I"] = {enable_options_key_for_unit='dontuseit'}, - ["F-16C"] = {enable_options_key_for_unit='dontuseit'}, --Check and delete if not needed - ["F-16C-BARAK 2020"] = {enable_options_key_for_unit='dontuseit'}, --Check and delete if not needed - ["Eurofighter"] = {enable_options_key_for_unit='dontuseit'}, - ["PUCARA"] = {enable_options_key_for_unit='dontuseit'}, - ["Fokker-DR1"] = {enable_options_key_for_unit='dontuseit'}, - ["Sopwith-Triplan"] = {enable_options_key_for_unit='dontuseit'}, - ["Fokker-EVD-VIII"] = {enable_options_key_for_unit='dontuseit'}, - ["Felixstowe-F2"] = {enable_options_key_for_unit='dontuseit'}, - ["Gotha-GVb"] = {enable_options_key_for_unit='dontuseit'}, - ["Nieuport17"] = {enable_options_key_for_unit='dontuseit'}, - ["AlbatrosDVa"] = {enable_options_key_for_unit='dontuseit'}, - ["Bristol_M1C"] = {enable_options_key_for_unit='dontuseit'}, - ["SPAD-SXIII"] = {enable_options_key_for_unit='dontuseit'}, - ["RAFSE5a"] = {enable_options_key_for_unit='dontuseit'}, - ["Fokker-Eindecker-EIII"] = {enable_options_key_for_unit='dontuseit'}, - ["FokkerDVII"] = {enable_options_key_for_unit='dontuseit'}, - ["Sopwith-Camel"] = {enable_options_key_for_unit='dontuseit'}, - ["SopwithCuckooT1"] = {enable_options_key_for_unit='dontuseit'}, - ["AH-64D_BLK_II"] = {enable_options_key_for_unit='dontuseit'}, - ["AH-6"] = {enable_options_key_for_unit='dontuseit'}, - ["Rafale_C"] = {enable_options_key_for_unit='dontuseit'}, - ["Rafale_M"] = {enable_options_key_for_unit='dontuseit'}, - ["Rafale_B"] = {enable_options_key_for_unit='dontuseit'}, - ["Rafale_A_S"] = {enable_options_key_for_unit='dontuseit'}, - ["Bell-47"] = {enable_options_key_for_unit='dontuseit'}, - ["AV8BNA"] = {enable_options_key_for_unit='dontuseit'}, - ["SpitfireLFMkIXCW"] = {enable_options_key_for_unit='dontuseit'}, - ["SpitfireLFMkIX"] = {enable_options_key_for_unit='dontuseit'}, - ["F-5E-3"] = {enable_options_key_for_unit='dontuseit'}, - ["Mi-8MT"] = {enable_options_key_for_unit='dontuseit'}, - ["F-14"] = {enable_options_key_for_unit='dontuseit'}, - ["F-14A-135-GR"] = {enable_options_key_for_unit='dontuseit'}, - ["Yak-52"] = {enable_options_key_for_unit='dontuseit'}, - ["Bf-109K-4"] = {enable_options_key_for_unit='dontuseit'}, - ["Christen Eagle II"] = {enable_options_key_for_unit='dontuseit'}, - ["MiG-19P"] = {enable_options_key_for_unit='dontuseit'}, - ["MiG-21Bis"] = {enable_options_key_for_unit='dontuseit'}, - ["MosquitoFBMkVI"] = {enable_options_key_for_unit='dontuseit'}, - ["P-47D-30"] = {enable_options_key_for_unit='dontuseit'}, - ["P-47D-40"] = {enable_options_key_for_unit='dontuseit'}, - ["P-47D-30bl1"] = {enable_options_key_for_unit='dontuseit'}, - ["SA342L"] = {enable_options_key_for_unit='dontuseit'}, - ["SA342M"] = {enable_options_key_for_unit='dontuseit'}, - ["SA342Minigun"] = {enable_options_key_for_unit='dontuseit'}, - ["SA342Mistral"] = {enable_options_key_for_unit='dontuseit'}, - ["A-4E-C"] = {enable_options_key_for_unit='dontuseit'}, - ["F-22A"] = {enable_options_key_for_unit='dontuseit'}, - ["Hercules"] = {enable_options_key_for_unit='dontuseit'}, - ["T-45"] = {enable_options_key_for_unit='dontuseit'}, - ["A-29B"] = {enable_options_key_for_unit='dontuseit'}, - ["C-101CC"] = {enable_options_key_for_unit='dontuseit'}, - ["C-101EB"] = {enable_options_key_for_unit='dontuseit'}, - ["F-5E"] = {enable_options_key_for_unit='dontuseit'}, - ["F-86F"] = {enable_options_key_for_unit='dontuseit'}, - ["F-14B"] = {enable_options_key_for_unit='dontuseit'}, - ["F/A-18C"] = {enable_options_key_for_unit='dontuseit'}, - ["FW-190D9"] = {enable_options_key_for_unit='dontuseit'}, - ["FW-190A8"] = {enable_options_key_for_unit='dontuseit'}, - ["I-16"] = {enable_options_key_for_unit='dontuseit'}, - ["JF-17"] = {enable_options_key_for_unit='dontuseit'}, - ["Ka-50"] = {enable_options_key_for_unit='dontuseit'}, - ["L-39C"] = {enable_options_key_for_unit='dontuseit'}, - ["L-39ZA"] = {enable_options_key_for_unit='dontuseit'}, - ["M-2000C"] = {enable_options_key_for_unit='dontuseit'}, - ["Mi-24P"] = {enable_options_key_for_unit='dontuseit'}, - ["Mi-8MTV2"] = {enable_options_key_for_unit='dontuseit'}, - ["MiG-15bis"] = {enable_options_key_for_unit='dontuseit'}, - ["DH.98"] = {enable_options_key_for_unit='dontuseit'}, - ["P-51D-30-NA"] = {enable_options_key_for_unit='dontuseit'}, - ["P-51D"] = {enable_options_key_for_unit='dontuseit'}, - ["UH-1H"] = {enable_options_key_for_unit='dontuseit'}, - ["F-16C_50"] = {enable_options_key_for_unit='dontuseit'}, - ["FA-18C_hornet"] = {enable_options_key_for_unit='dontuseit'}, - ["AJS37"] = {enable_options_key_for_unit='dontuseit'}, - ["MOSQUITOFBMKVI"] = {enable_options_key_for_unit='dontuseit'}, - ["VSN_F104G"] = {enable_options_key_for_unit='dontuseit'}, - ["VSN_F104S"] = {enable_options_key_for_unit='dontuseit'}, - ["F-117"] = {enable_options_key_for_unit='dontuseit'}, - ["JAS39Gripen"] = {enable_options_key_for_unit='dontuseit'}, - ["JAS39Gripen_AG"] = {enable_options_key_for_unit='dontuseit'}, - ["Su-30MKI"] = {enable_options_key_for_unit='dontuseit'}, - ["Su-30MKA"] = {enable_options_key_for_unit='dontuseit'}, - ["Su-30MKM"] = {enable_options_key_for_unit='dontuseit'}, - ["Su-30SM"] = {enable_options_key_for_unit='dontuseit'}, - ["Su-30M2"] = {enable_options_key_for_unit='dontuseit'}, - ["Su-30MKK"] = {enable_options_key_for_unit='dontuseit'}, - ["J-16"] = {enable_options_key_for_unit='dontuseit'}, - ["UH-60L"] = {enable_options_key_for_unit='dontuseit'}, - ["F-86F Sabre"] = {enable_options_key_for_unit='dontuseit'}, - ["A-10C_2"] = {enable_options_key_for_unit='dontuseit'}, - ["TF-51D"] = {enable_options_key_for_unit='dontuseit'}, - - } ) plugin_done()