diff --git a/BKP/Main/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 b/BKP/Main/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 index 4952ea4f..b63ca648 100644 --- a/BKP/Main/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 @@ -1660,14 +1660,25 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXCHLHSCMCLLSame && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXTSCurrentCrossedOverFarest && - mConditions.isXTSCurrentCrossedOverNearest && - mConditions.isXTMNeutural && - mConditions.isXTMEndBullish) + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTDSignalCrossedOverBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + ) + // + ) // ) // @@ -1913,8 +1924,31 @@ bool XGPUS5XTDHasLongSignal() ( // (mConditions.isXCHMAMCVale && - mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMin) + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin) + // + || + // + ((mConditions.isXCHMALCVale && + mConditions.isXCHMASCUnderMin) && + ( + // + mConditions.isXCHLHMCLCLLSame + // + || + // + (mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) + // + ) + // + ) + // + ) + // + ) // ) // @@ -2057,6 +2091,20 @@ bool XGPUS5XTDHasLongSignal() // ) // + || + // + (mConditions.isXTDSignalCrossedOverBear && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest) + // + ) + // + ) + // ) // ) @@ -2615,6 +2663,12 @@ bool XGPUS5XTDHasLongSignal() (mConditions.isXTSAllSame && mConditions.isXTDSignalCrossedOverBear) // + || + // + (mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest && + mConditions.isXTSCurrentCrossedOverMediest) + // ) // ) @@ -2845,6 +2899,34 @@ bool XGPUS5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -3083,6 +3165,20 @@ bool XGPUS5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXLHHighAttachedHH) + // + ) + // + ) + // ) // ) @@ -3106,7 +3202,30 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMASCFastOverSlow) && ( // - false + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + mConditions.isXRSICrossedOverLongExit + // + || + // + (mConditions.isXTDSignalCrossedOverBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + ) + // + ) // ) // @@ -3687,6 +3806,27 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXLHLLIncreased && mConditions.isXTDSignalCrossedOverBear) // + || + // + ((mConditions.isXCHMAMCPeak && + mConditions.isXLHLLIncreased && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + (mConditions.isXTSCurrentUnderFarest && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXLHPriceCrossedOverSignal) + // + ) + // + ) + // + ) + // + ) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index b0461a82..97215241 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -14,7 +14,7 @@ Resolve Guard Attacks ... XTD ---- -Resolve XGBUS5 XTD Long Stopouts in OANDA ... +Resolve XGBUS5 XTD Long Stopouts in HFMarkets ... Resolve XGBUS5 XTD All Longs Critical Guard Attacks in All Markets ... Resolve XGBUS5 XTD All Guard Attacks in All Markets ... diff --git a/Projects/XGPUS5/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 b/Projects/XGPUS5/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 index 4952ea4f..b63ca648 100644 --- a/Projects/XGPUS5/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 +++ b/Projects/XGPUS5/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 @@ -1660,14 +1660,25 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXCHLHSCMCLLSame && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXTSCurrentCrossedOverFarest && - mConditions.isXTSCurrentCrossedOverNearest && - mConditions.isXTMNeutural && - mConditions.isXTMEndBullish) + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTDSignalCrossedOverBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + ) + // + ) // ) // @@ -1913,8 +1924,31 @@ bool XGPUS5XTDHasLongSignal() ( // (mConditions.isXCHMAMCVale && - mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMin) + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin) + // + || + // + ((mConditions.isXCHMALCVale && + mConditions.isXCHMASCUnderMin) && + ( + // + mConditions.isXCHLHMCLCLLSame + // + || + // + (mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) + // + ) + // + ) + // + ) + // + ) // ) // @@ -2057,6 +2091,20 @@ bool XGPUS5XTDHasLongSignal() // ) // + || + // + (mConditions.isXTDSignalCrossedOverBear && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest) + // + ) + // + ) + // ) // ) @@ -2615,6 +2663,12 @@ bool XGPUS5XTDHasLongSignal() (mConditions.isXTSAllSame && mConditions.isXTDSignalCrossedOverBear) // + || + // + (mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest && + mConditions.isXTSCurrentCrossedOverMediest) + // ) // ) @@ -2845,6 +2899,34 @@ bool XGPUS5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -3083,6 +3165,20 @@ bool XGPUS5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXLHHighAttachedHH) + // + ) + // + ) + // ) // ) @@ -3106,7 +3202,30 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMASCFastOverSlow) && ( // - false + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + mConditions.isXRSICrossedOverLongExit + // + || + // + (mConditions.isXTDSignalCrossedOverBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + ) + // + ) // ) // @@ -3687,6 +3806,27 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXLHLLIncreased && mConditions.isXTDSignalCrossedOverBear) // + || + // + ((mConditions.isXCHMAMCPeak && + mConditions.isXLHLLIncreased && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + (mConditions.isXTSCurrentUnderFarest && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXLHPriceCrossedOverSignal) + // + ) + // + ) + // + ) + // + ) + // ) // ) diff --git a/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 index 4952ea4f..b63ca648 100644 --- a/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 @@ -1660,14 +1660,25 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXCHLHSCMCLLSame && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXTSCurrentCrossedOverFarest && - mConditions.isXTSCurrentCrossedOverNearest && - mConditions.isXTMNeutural && - mConditions.isXTMEndBullish) + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTDSignalCrossedOverBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + ) + // + ) // ) // @@ -1913,8 +1924,31 @@ bool XGPUS5XTDHasLongSignal() ( // (mConditions.isXCHMAMCVale && - mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMin) + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin) + // + || + // + ((mConditions.isXCHMALCVale && + mConditions.isXCHMASCUnderMin) && + ( + // + mConditions.isXCHLHMCLCLLSame + // + || + // + (mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) + // + ) + // + ) + // + ) + // + ) // ) // @@ -2057,6 +2091,20 @@ bool XGPUS5XTDHasLongSignal() // ) // + || + // + (mConditions.isXTDSignalCrossedOverBear && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest) + // + ) + // + ) + // ) // ) @@ -2615,6 +2663,12 @@ bool XGPUS5XTDHasLongSignal() (mConditions.isXTSAllSame && mConditions.isXTDSignalCrossedOverBear) // + || + // + (mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest && + mConditions.isXTSCurrentCrossedOverMediest) + // ) // ) @@ -2845,6 +2899,34 @@ bool XGPUS5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -3083,6 +3165,20 @@ bool XGPUS5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXLHHighAttachedHH) + // + ) + // + ) + // ) // ) @@ -3106,7 +3202,30 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMASCFastOverSlow) && ( // - false + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + mConditions.isXRSICrossedOverLongExit + // + || + // + (mConditions.isXTDSignalCrossedOverBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + ) + // + ) // ) // @@ -3687,6 +3806,27 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXLHLLIncreased && mConditions.isXTDSignalCrossedOverBear) // + || + // + ((mConditions.isXCHMAMCPeak && + mConditions.isXLHLLIncreased && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + (mConditions.isXTSCurrentUnderFarest && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXLHPriceCrossedOverSignal) + // + ) + // + ) + // + ) + // + ) + // ) // )