diff --git a/Default Keybinds - Elite Dangerous/ED+HCS V2.3.11.1b.2.0.binds b/Default Keybinds - Elite Dangerous/ED+HCS V3.0.5b.3.0.binds similarity index 92% rename from Default Keybinds - Elite Dangerous/ED+HCS V2.3.11.1b.2.0.binds rename to Default Keybinds - Elite Dangerous/ED+HCS V3.0.5b.3.0.binds index 98c039a..e301f6d 100644 --- a/Default Keybinds - Elite Dangerous/ED+HCS V2.3.11.1b.2.0.binds +++ b/Default Keybinds - Elite Dangerous/ED+HCS V3.0.5b.3.0.binds @@ -1,5 +1,5 @@ - + en-GB @@ -355,11 +355,15 @@ - + + + - + + + @@ -609,31 +613,40 @@ + - - + + - + + + - + + + - + - + + + - + + + @@ -641,12 +654,16 @@ - - + + + + - - + + + + @@ -654,12 +671,16 @@ - - + + + + - - + + + + @@ -667,25 +688,33 @@ - - + + + + - - + + + + - - + + - + + + - + + + @@ -718,7 +747,7 @@ - + @@ -731,8 +760,8 @@ - - + + @@ -1102,11 +1131,11 @@ - - + + - + @@ -1176,7 +1205,7 @@ - + @@ -1190,9 +1219,9 @@ - - - + + + @@ -1223,11 +1252,11 @@ - + - + @@ -1255,4 +1284,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/README.md b/README.md index 78caa52..45afea1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Elite Dangerous Warthog Target Script (HCS Keys Binding) 2.3.11.1b 2017/08/12 +# Elite Dangerous Warthog Target Script (HCS Keys Binding) 3.0.2b 2018/03/07 -![ED LOGO](http://edassets.org/img/preview/elite-dangerous-logo_grey.png) +![ED LOGO](https://www.elitedangerous.com/_assets/img/logo-elite-dangerous.png) ***Special thanks go out to Aussiedroid, DarKcyde0, WraithMG11235, Synkc, Solarfly and Farinhir*** @@ -12,20 +12,23 @@ ### INSTALATION: * The Warthog Script can be run from any location. All files from __Thrustmaster Warthog Script__ folder need to be in the same folder. -* Copy the Elite Dangerous Binds Profile __ED+HCS V2.X.XX.XX.2.0.binds__ from __Default Keybinds - Elite Dangerous__ Folder to: +* Copy the Elite Dangerous Binds Profile __ED+HCS V3.X.XX.XX.3.0.binds__ from __Default Keybinds - Elite Dangerous__ Folder to: ``` \Users\\AppData\Local\Frontier Developments\Elite Dangerous\Options\Bindings ``` -* Just Drag&Drop __ED+HCS v2.3.tmc__ to TARGET Script Editor and Run. (Default script path can also be set in the options). Always make sure the script is running prior to starting Elite Dangerous. +* Just Drag&Drop __ED+HCS v3.0.tmc__ to TARGET Script Editor and Run. (Default script path can also be set in the options). Always make sure the script is running prior to starting Elite Dangerous. * Most commands can be tested prior to starting the game in Target Script Editor using the Debug Message, Event Tester and Device Analyzer. -* Launch Elite Dangerous, Options, Controls and chose the correct Binds Profile __ED+HCS V2.X.XX.XX.2.0.binds__ +* Launch Elite Dangerous, Options, Controls and chose the correct Binds Profile __ED+HCS V3.X.XX.XX.3.0.binds__ * Play :) - +### WARNING : If you want to change Bindings keys IN GAME, Make sure to use ENG(UK) Keyboard layout in Wndows. If you did not, your Bindings file will be unusable with the script. (ED change some keys inside the file, even if you don't change them, to the current windows keyboard layout) +--- +--- +--- ### BEFORE FLYING: ***First, I'm sorry for my English, as it is not my native language. You are Welcome to help me on my English Skill, and, obviously, with my Coding Skill (it is, also, not my native language) ;)*** -__All the Settings are in the Settings File__ : **ED+HCS v2.3_Settings.tmh** +__All the Settings are in the Settings File__ : **ED+HCS v3.0_Settings.tmh** __The Command's are on the Joystick and Throttle Chart : [S]ShortPress, [L]LongPress, [EL]ExtraLongPress, [S3]Modifier Key on Joystick__ @@ -104,9 +107,10 @@ center of the axis, and then apply it to the X and Y axis (Throttle Coolie Swit - [x] 3 Autopilot Mode : Easy Request and Cancel Docking procedure, Escape Fight and System Jump -### EXPLORER MODE: +### EXPLORER MODE (ENG L Throttle swith UP): -***Thinking to make a mode wich restore all the Original ED Gameplay with one Switch (without all the advanced option (like optimalPIP, PIP Preset's, SecureRetract,...) instead of explorer mode. Let me know what you think.*** - [x] Desactivate some advanced functions you don't need for Exploration with one switch: Automatic PIP Mode (for fire & hardpoints), Automatic retract Hardpoint when you stop fire,... (if activated). If switch off this mode, it will return to all your previous choices. -- [ ] You don't need to keep fire key pressed to scan system or use Scan (System, wake...), **If Explorer mode is enable**, just press and release.( This function work on both Fire, chose wich you want to assign to scan in Settings File : ExploreModeFire , Triger use for Scan : 0 is Tg1, 1 is S2, 2 is Tg1 and S2 ). **If Explorer mode is disable**, you can also use this function : Press [S3] & Fire 1 or/and Fire 2. (Warning : check TG1ScanDelay & S2ScanDelay in setting File. by default TG1ScanDelay is 6sec (system scan) and S2ScanDelay is 11sec (other scan)) \ No newline at end of file +- [ ] When You are in Explorer Mode Automatic System System Jump (long press speedbrake forward on your throttle arm) Work like this : target next system in route , set Full speed, then jump, then, when you enter your next system, set throttle speed to 0, then automatically push the fire button for discovery scan (so check the settings file to put your discovery scan on fire 1 or fire 2 as it is in game), then automatically target the nearest star. __YOU CAN DESACTIVATE AUTO DISCOVERY SCAN AND AUTO TARGET NEAREST STAR IN SETTINGS FILE : AutoDiscoveryScan & TargetNearestStar options. + PLEASE, IF YOU USE THIS, ALIGN TO YOU NEXT SYSTEM BEFORE PUSHING THE JUMP__ You can, also change delay Speed to 0 when entering system : FSDOFFDelay Or Automatic Scan when entering system : FSDJumpScanDelay +- [ ] You don't need to keep fire key pressed to scan system or use Scan (System, wake...), **If Explorer mode is enable**, just press and release.( This function work on both Fire, chose wich you want to assign to scan in Settings File : ExploreModeFire , Triger use for Scan : 0 is Tg1, 1 is S2, 2 is Tg1 and S2 ). **If Explorer mode is disable**, you can also use this function : Press [S3] & Fire 1 or/and Fire 2. (Warning : check TG1ScanDelay & S2ScanDelay in setting File. by default TG1ScanDelay is 6sec (system scan) and S2ScanDelay is 11sec (other scan)) diff --git a/Thrustmaster Warthog Chart/Elite Dangerous - Thrustmaster Warthog Chart - Throttle.jpg b/Thrustmaster Warthog Chart/Elite Dangerous - Thrustmaster Warthog Chart - Throttle.jpg index c3b2d14..8771683 100644 Binary files a/Thrustmaster Warthog Chart/Elite Dangerous - Thrustmaster Warthog Chart - Throttle.jpg and b/Thrustmaster Warthog Chart/Elite Dangerous - Thrustmaster Warthog Chart - Throttle.jpg differ diff --git a/Thrustmaster Warthog Script/ED+HCS v2.3.tmc b/Thrustmaster Warthog Script/ED+HCS v3.0.tmc similarity index 95% rename from Thrustmaster Warthog Script/ED+HCS v2.3.tmc rename to Thrustmaster Warthog Script/ED+HCS v3.0.tmc index b3296e8..a749701 100644 --- a/Thrustmaster Warthog Script/ED+HCS v2.3.tmc +++ b/Thrustmaster Warthog Script/ED+HCS v3.0.tmc @@ -1,5 +1,5 @@ -// Copyright (C) 2017 Thomas Duployez (CMDR Touille) -// V2.3.11.1b 2017/08 +// Copyright (C) 2018 Thomas Duployez (CMDR Touille) +// V3.0.2b 2018/03 // Distributed freely under the MIT License. // // Permission is hereby granted, free of charge, to any person obtaining a copy @@ -24,14 +24,14 @@ //--------------------------------------------------------------------------------------------------------------------------------------------------------------// include "target.tmh" -include "ED+HCS v2.3_Variables.tmh" -include "ED+HCS v2.3_Settings.tmh" -include "ED+HCS v2.3_USBKey.ttm" -include "ED+HCS v2.3_KeyBindings.ttm" -include "ED+HCS v2.3_Macros.tmh" -include "ED+HCS v2.3_Functions_HARDWARE.tmh" -include "ED+HCS v2.3_Functions_TOGGLE.tmh" -include "ED+HCS v2.3_Functions_CORE.tmh" +include "ED+HCS v3.0_Variables.tmh" +include "ED+HCS v3.0_Settings.tmh" +include "ED+HCS v3.0_USBKey.ttm" +include "ED+HCS v3.0_KeyBindings.ttm" +include "ED+HCS v3.0_Macros.tmh" +include "ED+HCS v3.0_Functions_HARDWARE.tmh" +include "ED+HCS v3.0_Functions_TOGGLE.tmh" +include "ED+HCS v3.0_Functions_CORE.tmh" //--------------------------------------------------------------------------------------------------------------------------------------------------------------// int main() @@ -96,7 +96,7 @@ int main() // ;) // //--------------------------------------------------------------------------------------------------------------------------------------------------------------// - printf("--------------------------V2.3.11.1b----2017/08/13------------------------\x0a"); + printf("--------------------------V3.0.2b-------2017/03/07------------------------\x0a"); printf("---------Enhanced Elite Dangerous Warthog Profile by CMDR Touille---------\x0a"); printf("------------------------------Fly Safe CMDR! o7---------------------------\x0a"); printf("-o/--o/--o/-Aussiedroid-DarKcyde0-WraithMG11235-Synkc-Solarfly-o/--o/--o/-\x0a"); @@ -299,7 +299,7 @@ int main() // -------------------------Speedbrake MapKey (&Throttle, T3_SPDF, TEMPO(EXEC("initFrameShiftDrive();"), EXEC("initSystemJump();"), ExtraPressDelay)); // Switch FORWARD -// MapKey (&Throttle, T3_SPDM, 0); // Switch MIDDLE +// MapKey (&Throttle, T3_SPDM, 0); // Switch MIDDLE MapKeyIO(&Throttle, T3_SPDB, EXEC("initToggleSuperCruiseMode();"), TEMPO(EXEC("initThrottleBoost();"), EXEC("initSuperCruise();"), LongPressDelay)); // Switch BACK HOLD // -------------------------Boat Switch @@ -313,7 +313,7 @@ int main() TEMPO(PULSE+DeployHeatSink, PULSE+ChargeECM, LongPressDelay), PULSE+MC_Primary_Utility ); -// MapKey(&Throttle, T3_CHM, 0); // Switch MIDDLE +// MapKey(&Throttle, T3_CHM, 0); // Switch MIDDLE MapKeyUMD(&Throttle, T3_CHB, // Switch BACK TEMPO(PULSE+FireChaffLauncher, PULSE+UseShieldCell, LongPressDelay), TEMPO(PULSE+FireChaffLauncher, PULSE+UseShieldCell, LongPressDelay), @@ -498,22 +498,6 @@ int EventHandle(int type, alias o, int x) initBACKLIGHT(LMFD_BL, vLMFDLightBackup); } - // Combine rudder toe brakes into new axis, mapped to DX_THROTTLE_AXIS -// if (&o == &TFRPRudder & (x == TRPLEFT | x == TRPRIGHT)) { -// if (TFRPRudder[TRPLEFT] < TFRPRudder[TRPRIGHT]) TRPCOMBO = TFRPRudder[TRPRIGHT]; -// else TRPCOMBO = TFRPRudder[TRPLEFT]; -// DXAxis (DX_THROTTLE_AXIS, -TRPCOMBO); -// } - - //Map the MODE_FILTERED TFRP through Target; we can Trim, set deadzones, J/Scurves, etc. -// if (&o == &TFRPRudder) { -// GetAxisData(&o, x); -// axdata.val = AxisVal(o[x], &axdata); -// if(x == TRPLEFT | x == TRPRIGHT) axdata.val = -axdata.val; //Reverse the Toe Brakes, TM why u do dis?? -// //axdata.locked = 1; //Uncomment to disable pedals but keep TRPCOMBO axis -// if(!axdata.locked & !axdata.relative) GameOutput(&o, x, axdata.val); -// } - //Map the MODE_FILTERED TFRP through Target; we can Trim, set deadzones, J/Scurves, etc. if(&o == &TFRPRudder){ GetAxisData(&o, x); diff --git a/Thrustmaster Warthog Script/ED+HCS v2.3_Functions_CORE.tmh b/Thrustmaster Warthog Script/ED+HCS v3.0_Functions_CORE.tmh similarity index 80% rename from Thrustmaster Warthog Script/ED+HCS v2.3_Functions_CORE.tmh rename to Thrustmaster Warthog Script/ED+HCS v3.0_Functions_CORE.tmh index 4d033fd..e9b90fb 100644 --- a/Thrustmaster Warthog Script/ED+HCS v2.3_Functions_CORE.tmh +++ b/Thrustmaster Warthog Script/ED+HCS v3.0_Functions_CORE.tmh @@ -1,5 +1,5 @@ -// Copyright (C) 2017 Thomas Duployez (CMDR Touille) -// V2.3.11.1b 2017/08 +// Copyright (C) 2018 Thomas Duployez (CMDR Touille) +// V3.0.2b 2018/03 // Distributed freely under the MIT License. // // Permission is hereby granted, free of charge, to any person obtaining a copy @@ -32,32 +32,32 @@ int initPIPPower(int x=0, int y=0, int z=0){ // Check Which Command to Send and if it need to be Send - if(x == 0 & y == 0 & z == 0){if(vOptimalPIP != 0){vOptimalPIP = 0; vPIP=!vPIP;}} //2 SYS 2 ENG 2 WEP (0) + if(x == 0 & y == 0 & z == 0 & vOptimalPIP != 0){vOptimalPIP = 0; vPIP=!vPIP;} //2 SYS 2 ENG 2 WEP (0) else if(z != MID | z == 0){ if(y != 0){ if(y == SYS){ - if (x == ENG){if(vOptimalPIP != 1){vOptimalPIP = 1; vPIP=!vPIP;}} //4 ENG 2 SYS (1) - else if(x == WEP){if(vOptimalPIP != 6){vOptimalPIP = 6; vPIP=!vPIP;}} //4 WEP 2 SYS (6) + if (x == ENG & vOptimalPIP != 1){vOptimalPIP = 1; vPIP=!vPIP;} //4 ENG 2 SYS (1) + else if(x == WEP & vOptimalPIP != 6){vOptimalPIP = 6; vPIP=!vPIP;} //4 WEP 2 SYS (6) } else if(y == ENG){ - if (x == SYS){if(vOptimalPIP != 3){vOptimalPIP = 3; vPIP=!vPIP;}} //4 SYS 2 ENG (3) - else if(x == WEP){if(vOptimalPIP != 5){vOptimalPIP = 5; vPIP=!vPIP;}} //4 WEP 2 ENG (5) + if (x == SYS & vOptimalPIP != 3){vOptimalPIP = 3; vPIP=!vPIP;} //4 SYS 2 ENG (3) + else if(x == WEP & vOptimalPIP != 5){vOptimalPIP = 5; vPIP=!vPIP;} //4 WEP 2 ENG (5) } else if(y == WEP){ - if (x == SYS){if(vOptimalPIP != 4){vOptimalPIP = 4; vPIP=!vPIP;}} //4 SYS 2 WEP (4) - else if(x == ENG){if(vOptimalPIP != 2){vOptimalPIP = 2; vPIP=!vPIP;}} //4 ENG 2 WEP (2) + if (x == SYS & vOptimalPIP != 4){vOptimalPIP = 4; vPIP=!vPIP;} //4 SYS 2 WEP (4) + else if(x == ENG & vOptimalPIP != 2){vOptimalPIP = 2; vPIP=!vPIP;} //4 ENG 2 WEP (2) } } else if(y == 0){ - if (x == SYS){if(vOptimalPIP != 10){vOptimalPIP = 10; vPIP=!vPIP;}} //4 SYS 1 ENG 1 WEP (10) - else if(x == ENG){if(vOptimalPIP != 11){vOptimalPIP = 11; vPIP=!vPIP;}} //4 ENG 1 WEP 1 SYS (11) - else if(x == WEP){if(vOptimalPIP != 12){vOptimalPIP = 12; vPIP=!vPIP;}} //4 WEP 1 SYS 1 ENG (12) + if (x == SYS & vOptimalPIP != 10){vOptimalPIP = 10; vPIP=!vPIP;} //4 SYS 1 ENG 1 WEP (10) + else if(x == ENG & vOptimalPIP != 11){vOptimalPIP = 11; vPIP=!vPIP;} //4 ENG 1 WEP 1 SYS (11) + else if(x == WEP & vOptimalPIP != 12){vOptimalPIP = 12; vPIP=!vPIP;} //4 WEP 1 SYS 1 ENG (12) } } else if(z == MID){ - if (y == SYS & x == ENG | y == ENG & x == SYS){if(vOptimalPIP != 7){vOptimalPIP = 7; vPIP=!vPIP;}} //3 SYS 3 ENG (7) - else if(y == ENG & x == WEP | y == WEP & x == ENG){if(vOptimalPIP != 8){vOptimalPIP = 8; vPIP=!vPIP;}} //3 ENG 3 WEP (8) - else if(y == SYS & x == WEP | y == WEP & x == SYS){if(vOptimalPIP != 9){vOptimalPIP = 9; vPIP=!vPIP;}} //3 SYS 3 WEP (9) + if (y == SYS & x == ENG | y == ENG & x == SYS & vOptimalPIP != 7){vOptimalPIP = 7; vPIP=!vPIP;} //3 SYS 3 ENG (7) + else if(y == ENG & x == WEP | y == WEP & x == ENG & vOptimalPIP != 8){vOptimalPIP = 8; vPIP=!vPIP;} //3 ENG 3 WEP (8) + else if(y == SYS & x == WEP | y == WEP & x == SYS & vOptimalPIP != 9){vOptimalPIP = 9; vPIP=!vPIP;} //3 SYS 3 WEP (9) } if(vPIP){ //If Previous Command is NOT the same as the New one, Push Command vPIP=!vPIP; @@ -77,7 +77,7 @@ if(z == 0 & z != MID) PIPz = 0; else if(z == MID) PIPz = PIPy; - // Send PIPS WIll keep both function if we need to reverse later (witout and with Lock) + // Send PIPS ActKey(KEYON+ CHAIN(LOCK+PULSE+ BalancePower, D(PIPPulseDelay),PIPx, D(PIPPulseDelay),PIPy, D(PIPPulseDelay),PIPx, D(PIPPulseDelay),PIPx, D(PIPPulseDelay),PIPz, LOCK)); } else{ @@ -91,7 +91,7 @@ //if(DebugMode){printf("Reset PIP ?: PIPRestore [%d] vOptimalPIP [%d]\x0a", j, vOptimalPIP);} if(DebugMode) printf("Restore Previous PIP [%d] (preset PIP 1-12)\x0a",j); if (j == 0) initPIPPower(); //2 SYS 2 ENG 2 WEP (0) - else if(j == 1) initPIPPower(ENG,SYS); //4 ENG 2 SYS (1) + else if(j == 1) initPIPPower(ENG,SYS); //4 ENG 2 SYS (1) else if(j == 2) initPIPPower(ENG,WEP); //4 ENG 2 WEP (2) else if(j == 3) initPIPPower(SYS,ENG); //4 SYS 2 ENG (3) else if(j == 4) initPIPPower(SYS,WEP); //4 SYS 2 WEP (4) @@ -112,12 +112,12 @@ //PIP Backup Management int initBackupPIPPower(int p=0){ if(p == 1 | p == 2 | p == 3 | p == 4 | p == 5){ - if (p == 1){if(vOptimalPIPFireBackup != vOptimalPIP & vOptimalPIP != 6){vOptimalPIPFireBackup = vOptimalPIP; vPIPB=!vPIPB;}} //OptimalPIPFireBackup (1) if the PIP it already 4 WEP 2 SYS (6) we don't save it again - else if(p == 2){if(vOptimalPIPHPBackup != vOptimalPIP){ vOptimalPIPHPBackup = vOptimalPIP; vPIPB=!vPIPB;}} //OptimalPIPHPBackup (2) 4 WEP 2 SYS (6) - else if(p == 3){if(vOptimalPIPEFBackup != vOptimalPIP){ vOptimalPIPEFBackup = vOptimalPIP; vPIPB=!vPIPB;}} //OptimalPIPEFBackup (3) 4 ENG 2 SYS (1) & 4 SYS 2 ENG (3) - else if(p == 4){if(vOptimalPIPGMBackup != vOptimalPIP){ vOptimalPIPGMBackup = vOptimalPIP; vPIPB=!vPIPB;}} //OptimalPIPGMBackup (4) 4 SYS 2 ENG (3) - else if(p == 5){if(vOptimalPIPCCBackup != vOptimalPIP){ vOptimalPIPCCBackup = vOptimalPIP; vPIPB=!vPIPB;}} //OptimalPIPCCBackup (5) 4 SYS 2 ENG (3) -// else if(p == 6){if(vOptimalPIPBoostBackup!= vOptimalPIP){ vOptimalPIPBoostBackup= vOptimalPIP; vPIPB=!vPIPB;}} //OptimalPIPBoostBackup(6) 4 ENG 2 SYS (1) + if (p == 1 & vOptimalPIPFireBackup != vOptimalPIP & vOptimalPIP != 6){vOptimalPIPFireBackup = vOptimalPIP; vPIPB=!vPIPB;} //OptimalPIPFireBackup (1) 4 WEP 2 SYS (6) Fire if the PIP it already 4 WEP 2 SYS (6) we don't save it again + else if(p == 2 & vOptimalPIPHPBackup != vOptimalPIP){ vOptimalPIPHPBackup = vOptimalPIP; vPIPB=!vPIPB;} //OptimalPIPHPBackup (2) 4 WEP 2 SYS (6) Hardpoints + else if(p == 3 & vOptimalPIPEFBackup != vOptimalPIP){ vOptimalPIPEFBackup = vOptimalPIP; vPIPB=!vPIPB;} //OptimalPIPEFBackup (3) 4 ENG 2 SYS (1) & 4 SYS 2 ENG (3) EscapeFight + else if(p == 4 & vOptimalPIPGMBackup != vOptimalPIP){ vOptimalPIPGMBackup = vOptimalPIP; vPIPB=!vPIPB;} //OptimalPIPGMBackup (4) 4 SYS 2 ENG (3) ToggleGameMenu + else if(p == 5 & vOptimalPIPCCBackup != vOptimalPIP){ vOptimalPIPCCBackup = vOptimalPIP; vPIPB=!vPIPB;} //OptimalPIPCCBackup (5) 4 SYS 2 ENG (3) ToggleCamera +// else if(p == 6 & vOptimalPIPBoostBackup!= vOptimalPIP){ vOptimalPIPBoostBackup= vOptimalPIP; vPIPB=!vPIPB;} //OptimalPIPBoostBackup(6) 4 ENG 2 SYS (1) ThrottleBoost } if(vPIPB){ vPIPB=!vPIPB; @@ -140,10 +140,14 @@ if(DebugMode) printf("Shut Down Silent Runing\x0a"); initToggleSilentRuning(); } - if(HardPointsonFireGameMode & !sHardPoints) initToggleHardpoints(); //Deploy Hardpoint if HardPointsonFireGameMode is Enable - if(OptimalPIPMode & !sExplorerMode){ //Backup Actual PIP Mode - initBackupPIPPower(OptimalPIPFireBackup); //Backup Actual PIP Mode OptimalPIPFireBackup (1) + if(OptimalPIPMode & !sExplorerMode) initBackupPIPPower(OptimalPIPFireBackup); //Backup Actual PIP Mode OptimalPIPFireBackup (1) + if(HardPointsonFireGameMode & !sHardPoints){ //Deploy Hardpoint if HardPointsonFireGameMode is Enable + initToggleHardpoints(); + //if(DebugMode) printf("Deploy Hardpoints On Fire\x0a"); + } + else if(OptimalPIPMode & !sExplorerMode){ //PIP Mode 4 WEP 2 SYS initPIPPower(WEP,SYS); //4 WEP 2 SYS (6) + //if(DebugMode) printf("OptimalPIPMode On Fire\x0a"); } if(Joystick[P_S3]){ if(Joystick[TG1] & !vScanPrimaryFire) vScanPrimaryFire=!vScanPrimaryFire; @@ -270,8 +274,38 @@ else{ initSecureRectract(); if(OptimalPIPMode) initPIPPower(ENG, SYS); //4 ENG 2 SYS (1) - ActKey(KEYON+PULSE+mSystemJump); - if(DebugMode | DebugMMode) printf("Engage System Jump\x0a"); + if(!sExplorerMode){ //Normal System Jump + ActKey(KEYON+PULSE+mSystemJump); + if(DebugMode | DebugMMode) printf("Engage System Jump\x0a"); + } + else{ //Explorer System Jump + ActKey(KEYON+PULSE+mExplorerSystemJump); + if(DebugMode | DebugMMode) printf("Engage Explorer System Jump\x0a"); + } + } + } + + //FUNCTION: Explorer System Jump Scan + int initExplorerSystemScan(){ + if(AutoDiscoveryScan){ + if(ExploreModeFire == 0 | ExploreModeFire == 2){ + ActKey(KEYON+DOWN+PrimaryFire); + DeferCall(PrimaryFireKeyScanDelay, &ActKey, KEYON+UP+PrimaryFire); + if(DebugMode | DebugMMode) printf("Primary Fire Explorer Mode\x0a"); + } + if(ExploreModeFire == 1 | ExploreModeFire == 2){ + ActKey(KEYON+DOWN+SecondaryFire); + DeferCall(SecondaryFireKeyScanDelay, &ActKey, KEYON+UP+SecondaryFire); + if(DebugMode | DebugMMode) printf("Secondary Fire Explorer Mode\x0a"); + } + } + } + + //FUNCTION: Explorer Target Nearest Star + int initTargetNearestStar(){ + if(TargetNearestStar){ + ActKey(KEYON+PULSE+mTargetNearestStar); + if(DebugMode | DebugMMode) printf("Target Nearest Star Explorer Mode\x0a"); } } diff --git a/Thrustmaster Warthog Script/ED+HCS v2.3_Functions_HARDWARE.tmh b/Thrustmaster Warthog Script/ED+HCS v3.0_Functions_HARDWARE.tmh similarity index 98% rename from Thrustmaster Warthog Script/ED+HCS v2.3_Functions_HARDWARE.tmh rename to Thrustmaster Warthog Script/ED+HCS v3.0_Functions_HARDWARE.tmh index 5877fbd..ad66a52 100644 --- a/Thrustmaster Warthog Script/ED+HCS v2.3_Functions_HARDWARE.tmh +++ b/Thrustmaster Warthog Script/ED+HCS v3.0_Functions_HARDWARE.tmh @@ -1,5 +1,5 @@ -// Copyright (C) 2017 Thomas Duployez (CMDR Touille) -// V2.3.11.1b 2017/08 +// Copyright (C) 2018 Thomas Duployez (CMDR Touille) +// V3.0.2b 2018/03 // Distributed freely under the MIT License. // // Permission is hereby granted, free of charge, to any person obtaining a copy @@ -289,9 +289,9 @@ //Joystick Curve Profile Three different presets are selectable On The Fly (FLAP position) int initSetJoystickCurves(){ - if (Throttle[T3_FLAPU]) vJoystickCurveProfile = 0; // Flaps UP - else if(Throttle[T3_FLAPD]) vJoystickCurveProfile = 2; // Flaps DOWN - else vJoystickCurveProfile = 1; // Flaps MIDDLE + if (Throttle[T3_FLAPU]) vJoystickCurveProfile = 0; // Flaps UP + else if(Throttle[T3_FLAPD]) vJoystickCurveProfile = 2; // Flaps DOWN + else vJoystickCurveProfile = 1; // Flaps MIDDLE initJoystickCurves(); } diff --git a/Thrustmaster Warthog Script/ED+HCS v2.3_Functions_TOGGLE.tmh b/Thrustmaster Warthog Script/ED+HCS v3.0_Functions_TOGGLE.tmh similarity index 99% rename from Thrustmaster Warthog Script/ED+HCS v2.3_Functions_TOGGLE.tmh rename to Thrustmaster Warthog Script/ED+HCS v3.0_Functions_TOGGLE.tmh index 11c9c70..3ec1b9d 100644 --- a/Thrustmaster Warthog Script/ED+HCS v2.3_Functions_TOGGLE.tmh +++ b/Thrustmaster Warthog Script/ED+HCS v3.0_Functions_TOGGLE.tmh @@ -1,5 +1,5 @@ -// Copyright (C) 2017 Thomas Duployez (CMDR Touille) -// V2.3.11.1b 2017/08 +// Copyright (C) 2018 Thomas Duployez (CMDR Touille) +// V3.0.2b 2018/03 // Distributed freely under the MIT License. // // Permission is hereby granted, free of charge, to any person obtaining a copy @@ -315,7 +315,7 @@ initLED(FA_LED, sFlightAssist); if(DebugMode & !FlightAssistGameMode) printf("EnhancedFAOFF [HOLD] [%d] [ENABLE:[1] DISABLE:[0]] Rcorrection [%d] [ENABLE:[1] DISABLE:[0]]\x0a", sFlightAssist, sRCorrection); } - + //TOGGLE: Reverse Throttle int initToggleReverseThrottle(){ if(Throttle[P_LTB]){ diff --git a/Thrustmaster Warthog Script/ED+HCS v2.3_KeyBindings.ttm b/Thrustmaster Warthog Script/ED+HCS v3.0_KeyBindings.ttm similarity index 97% rename from Thrustmaster Warthog Script/ED+HCS v2.3_KeyBindings.ttm rename to Thrustmaster Warthog Script/ED+HCS v3.0_KeyBindings.ttm index 8c68d74..ad42374 100644 --- a/Thrustmaster Warthog Script/ED+HCS v2.3_KeyBindings.ttm +++ b/Thrustmaster Warthog Script/ED+HCS v3.0_KeyBindings.ttm @@ -1,5 +1,5 @@ -// Copyright (C) 2017 Thomas Duployez (CMDR Touille) -// V2.3.11.1b 2017/08 +// Copyright (C) 2018 Thomas Duployez (CMDR Touille) +// V3.0.2b 2018/03 // Distributed freely under the MIT License. // // Permission is hereby granted, free of charge, to any person obtaining a copy @@ -150,12 +150,12 @@ // define MC_Pitch_Down // define MC_FOV_OUT // define MC_FOV_IN - define MC_Cycle_UI_Forwards USB_D // D + define MC_Cycle_UI_Forwards USB_D // D define MC_Cycle_UI_Backwards USB_A // A //CAMERA SUITE - define Previous_Camera USB_COMMA // , - define Next_Camera USB_PERIOD // . + define Previous_Camera USB_COMMA // , + define Next_Camera USB_PERIOD // . define Enter_Free_Camera USB_T // T // define Camera_1 USB_1 // 1 // define Camera_2 USB_2 // 2 @@ -199,6 +199,12 @@ // define HM_Undo // define HM_Redo // define HM_Toggle_Mouse_Rotation + + //GALNET AUDIO +// define GA_Play_Pause L_ALT+USB_SPACEBAR +// define GA_Skip_Forward L_ALT+USB_PAGEUP +// define GA_Skip_Backward L_ALT+USB_PAGEDOWN +// define GA_Clear_Queue L_ALT+USB_END //----EXTERNAL BINDINGS-----------------------------------------------------------------------------------------------------------------------------------------// diff --git a/Thrustmaster Warthog Script/ED+HCS v2.3_Macros.tmh b/Thrustmaster Warthog Script/ED+HCS v3.0_Macros.tmh similarity index 74% rename from Thrustmaster Warthog Script/ED+HCS v2.3_Macros.tmh rename to Thrustmaster Warthog Script/ED+HCS v3.0_Macros.tmh index 721e35f..cef2ec3 100644 --- a/Thrustmaster Warthog Script/ED+HCS v2.3_Macros.tmh +++ b/Thrustmaster Warthog Script/ED+HCS v3.0_Macros.tmh @@ -1,5 +1,5 @@ -// Copyright (C) 2017 Thomas Duployez (CMDR Touille) -// V2.3.11.1b 2017/08 +// Copyright (C) 2018 Thomas Duployez (CMDR Touille) +// V3.0.2b 2018/03 // Distributed freely under the MIT License. // // Permission is hereby granted, free of charge, to any person obtaining a copy @@ -28,11 +28,11 @@ // MediumPulseDelay 350 //Medium Delay 350 // // LongPulseDelay 500 //Long Delay 500 // // ExtraPulseDelay 2000 //Longest Delay 2000 // -// FSDOFFDelay 25000 //When to Press 0 Speed Key after Engaging FSD (Safe System Jump) Delay 25000 // +// FSDOFFDelay 34000 //When to Press 0 Speed Key after Engaging FSD (Explorer System Jump) // +// FSDJumpScanDelay 2000 //Delay to triger System Scan After Explorer System JUMP // //--------------------------------------------------------------------------------------------------------------------------------------------------------------// - int mRequestCancelDock, mSystemJump, mEscapeFight, mHeatSinkonSilentRuning, mClassifiedCamera; - + int mRequestCancelDock, mSystemJump, mEscapeFight, mHeatSinkonSilentRuning, mClassifiedCamera, mExplorerSystemJump, mTargetNearestStar; int initCustomCommands(){ //MACRO: Auto-Docking Request @@ -55,10 +55,34 @@ mSystemJump = CHAIN( PULSE+SelectNextSystemInRoute, D(ShortPulseDelay), PULSE+SetSpeed100, D(ExtraPulseDelay), - EXEC("initFrameShiftDrive();"), D(FSDOFFDelay), - PULSE+SetSpeed0 + EXEC("initFrameShiftDrive();") ); - + + //MACRO: Explorer Mode System Jump + mExplorerSystemJump = CHAIN( + PULSE+SelectNextSystemInRoute, D(ShortPulseDelay), + PULSE+SetSpeed100, D(ExtraPulseDelay), + EXEC("initFrameShiftDrive();"), D(FSDOFFDelay), + PULSE+SetSpeed0, D(FSDJumpScanDelay), + EXEC("initExplorerSystemScan();"), D(LongPulseDelay), + EXEC("initTargetNearestStar();") + ); + + //MACRO: Target Nearest Star + mTargetNearestStar = CHAIN( + LOCK+ + PULSE+TargetPanel, D(MiniPulseDelay), + PULSE+UILeft, D(MiniPulseDelay), + PULSE+UIUp, D(MiniPulseDelay), + PULSE+UIUp, D(MiniPulseDelay), + PULSE+UIUp, D(MiniPulseDelay), + PULSE+UIRight, D(MiniPulseDelay), + PULSE+UISelect, D(MiniPulseDelay), + PULSE+UISelect, D(MiniPulseDelay), + PULSE+UIBack, + LOCK + ); + //MACRO: Escape Fight mEscapeFight = CHAIN( PULSE+SetSpeed100, D(MediumPulseDelay), diff --git a/Thrustmaster Warthog Script/ED+HCS v2.3_Settings.tmh b/Thrustmaster Warthog Script/ED+HCS v3.0_Settings.tmh similarity index 95% rename from Thrustmaster Warthog Script/ED+HCS v2.3_Settings.tmh rename to Thrustmaster Warthog Script/ED+HCS v3.0_Settings.tmh index e250400..3e7c3b1 100644 --- a/Thrustmaster Warthog Script/ED+HCS v2.3_Settings.tmh +++ b/Thrustmaster Warthog Script/ED+HCS v3.0_Settings.tmh @@ -1,5 +1,5 @@ -// Copyright (C) 2017 Thomas Duployez (CMDR Touille) -// V2.3.11.1b 2017/08 +// Copyright (C) 2018 Thomas Duployez (CMDR Touille) +// V3.0.2b 2018/03 // Distributed freely under the MIT License. // // Permission is hereby granted, free of charge, to any person obtaining a copy @@ -57,8 +57,14 @@ define AfterburnerDetent 0 //Set to [1] if you use Hardware throttle Afterburner Detent. You can change CurveValue in initSetThrottleCurves(), if(AfterburnerDetent){...., Else [0] //That option change Throttle Curve and how SupercruiseOnThrottle work(Instead of 99%(hardware) throotle to engage supercruise it will reduce to 80%(hardware), around the hardware detent) +// define FAJoyMode 1 //Engage Flight Assist when Any Joystick Axis is 75% to 100% + + //Explorer Mode Settings MAKE SURE TO STAY IN NAVIGATION PANEL TO BE ABLE TO TAKE ADVANTAGE OF THIS WITHOUT ISSUE : ENG L Up throttle Switch UP define ExploreModeFire 0 //Triger use for Scan : [0] is Tg1, [1] is S2, [2] is Tg1 and S2. By default put your system scan on Tg1 and leave value to 0 Work only if ExplorerMode is Enable (throttle chart : switch UP) //That will keep key pressed x Sec , so you can just push TG1 and/or S2 and release to scan : That work with PrimaryFireKeyScanDelay and SecondaryKeyScanDelay (PRESS & PULSE DELAY SETTINGS bellow) + define AutoDiscoveryScan 1 //Automatic Discovery Scan When entering System when you use System Jump whil explorer mode is ON + define TargetNearestStar 1 //Automatic Target Nearest Star when entering System when you use System Jump whil explorer mode is ON + //--------------------------------------------------------------------------------------------------------------------------------------------------------------// // ------------Default States--------Can Be Switched On The Fly---[S3]Joystick Shift Key (see chart)---[S]Short---[L]Long---[EL]ExtraLong----------------------// @@ -202,9 +208,6 @@ define LongPulseDelay 500 //Long Delay 500 define ExtraPulseDelay 2000 //Longest Delay 2000 - //FSD OFF DELAY MACRO: Safe System Jump - define FSDOFFDelay 25000 //When to Press 0 Speed Key after Engaging FSD (Safe System Jump) Delay 25000 - //PIP DELAY define PIPPressDelay 350 //PIP Press Key Delay 350 define PIPPulseDelay 25 //PIP Pulse Delay PIP Initialisation 25 (you can up it up to 75 if needed) initPIPPower() @@ -212,10 +215,14 @@ //HeatSink On Silent Runing Deploy Delay if HeatSinkOnSilentRuning is set to [1] define HeatSinkonSilentRuningDelay 8000 + //FSD OFF / SCAN DELAY MACRO: + define FSDOFFDelay 34000 //Exit Explorer System Jump : When to Press 0 Speed Key after Engaging FSD (Explorer System Jump) + define FSDJumpScanDelay 2000 //Delay to triger System Scan After Explorer System Jump (when entering your next system) + //Scan Delay (keep key pressed for ...sec) when Explorer mode is [1] OR when you presse Triger [TG1] or [S2] whit [S3] pressed) //Ingame, Sytem Scan is 5s and other scan are 10s we put 1 more sec to be sure - define PrimaryFireKeyScanDelay 6000 //ExploreModeFire 0 or 2 TG1 Delay - define SecondaryFireKeyScanDelay 11000 //ExploreModeFire 1 or 2 S2 Delay + define PrimaryFireKeyScanDelay 6000 //ExploreModeFire 0 or 2 TG1 Delay + define SecondaryFireKeyScanDelay 11000 //ExploreModeFire 1 or 2 S2 Delay //--------------------------------------------------------------------------------------------------------------------------------------------------------------// //WARNING !!!!!!!!!!!!!!!!! I Suggest to Keep this setting at default value WIll remove this line when you will be able to make change without to much trouble // @@ -341,8 +348,7 @@ printf(" Silent Runing OFF On Fire-----------------%d\x0a", SilentRuningOFFonFire); printf(" Combine Pri+Sec Fire----------------------%d\x0a", sCombinedFire); printf(" Retract HardPoints On Fire----------------%d\x0a", StopFireRetractHardpoints); -// printf("--------------------------------------------------------------------------\x0a"); - printf(" Rotational Correction---------------------%d\x0a", sRCorrection); +// printf(" Rotational Correction---------------------%d\x0a", sRCorrection); // printf(" Landing Gears-----------------------------%d\x0a", sGears); // printf(" Cargo Scoop-------------------------------%d\x0a", sCargo); // printf(" Ship Lights-------------------------------%d\x0a", sLights); diff --git a/Thrustmaster Warthog Script/ED+HCS v2.3_USBKey.ttm b/Thrustmaster Warthog Script/ED+HCS v3.0_USBKey.ttm similarity index 99% rename from Thrustmaster Warthog Script/ED+HCS v2.3_USBKey.ttm rename to Thrustmaster Warthog Script/ED+HCS v3.0_USBKey.ttm index 682e158..c740336 100644 --- a/Thrustmaster Warthog Script/ED+HCS v2.3_USBKey.ttm +++ b/Thrustmaster Warthog Script/ED+HCS v3.0_USBKey.ttm @@ -1,5 +1,5 @@ -// Copyright (C) 2017 Thomas Duployez (CMDR Touille) -// V2.3.11.1b 2017/08 +// Copyright (C) 2018 Thomas Duployez (CMDR Touille) +// V3.0.2b 2018/03 // Distributed freely under the MIT License. // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/Thrustmaster Warthog Script/ED+HCS v2.3_Variables.tmh b/Thrustmaster Warthog Script/ED+HCS v3.0_Variables.tmh similarity index 97% rename from Thrustmaster Warthog Script/ED+HCS v2.3_Variables.tmh rename to Thrustmaster Warthog Script/ED+HCS v3.0_Variables.tmh index 7fd06ba..0d5c4a4 100644 --- a/Thrustmaster Warthog Script/ED+HCS v2.3_Variables.tmh +++ b/Thrustmaster Warthog Script/ED+HCS v3.0_Variables.tmh @@ -1,5 +1,5 @@ -// Copyright (C) 2017 Thomas Duployez (CMDR Touille) -// V2.3.11.1b 2017/08 +// Copyright (C) 2018 Thomas Duployez (CMDR Touille) +// V3.0.2b 2018/03 // Distributed freely under the MIT License. // // Permission is hereby granted, free of charge, to any person obtaining a copy @@ -133,7 +133,7 @@ //Game int sIDLE; //initToggleIDLEonThrottle() Throttle IDLE int sRT; //initToggleReverseThrottle() Reverse Throttle - int sFlightAssist; //initToggleEnhancedFAOFF() Flight Assist + int sFlightAssist; //initToggleEnhancedFAOFF() initAxisUpdateFA() Flight Assist int sGameMenu; //initGameMenu() Game Menu int sHeadLook; //initToogleHeadLook() Head Look int sExplorerMode; //initToggleExplorerMode() Desactivate Functions for Exploring (OptimalPIPMode when fire, StopFireRetractHardpoints ...)