diff --git a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 0a6e9e88..1af17210 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -1828,6 +1828,19 @@ bool XUSCHF5XTDHasLongSignal() ((mConditions.isXCHMALCFastUnderSlow || mConditions.isXCHMALCFastCrossedUnderSlow) && ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentUnderMediest) + // + ) + // + ) + // + || // (mConditions.isXCHMAMCPeak && mConditions.isXCHMALCVale && @@ -1984,17 +1997,43 @@ bool XUSCHF5XTDHasLongSignal() ( // (mConditions.isXCHMAMCVale && - mConditions.isXCHMAMCTrendsUp) - // - || - // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXCHMAMCVale && - mConditions.isXCHMALCVale && - mConditions.isXTSCurrentMax && - mConditions.isXCHMASCUnderMin && - mConditions.isXTDSignalCrossedOverBear) + ( + // + mConditions.isXCHMAMCTrendsUp + // + || + // + (mConditions.isXCHMALCVale && + ( + // + (mConditions.isXAMAEndBullish && + mConditions.isXLHHHDecreased && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXTSCurrentUnderFarest) + // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMASCUnderMin && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -2757,6 +2796,14 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // ) // ) @@ -2900,6 +2947,22 @@ bool XUSCHF5XTDHasLongSignal() // || // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + || + // (mConditions.isXCHMASCOverMax && mConditions.isXCHLHSCMCHHSame && mConditions.isXTSCurrentOverFarest && @@ -2919,6 +2982,15 @@ bool XUSCHF5XTDHasLongSignal() (mConditions.isXTSCurrentUnderNearest && mConditions.isXTSCurrentCrossedUnderNearest) // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXLHHighAttachedHH && + mConditions.isXRSICrossedOverLongExit && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) @@ -3138,6 +3210,32 @@ bool XUSCHF5XTDHasLongSignal() !mConditions.isXLHLLSameInLength) && // ( + // + // Check if MC Fast Under Slow ... + ((mConditions.isXCHMAMCFastUnderSlow || + mConditions.isXCHMAMCFastCrossedUnderSlow) && + ( + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) + // + || // // Check LC Fast Under Slow ... ((mConditions.isXCHMALCFastUnderSlow || @@ -3158,12 +3256,25 @@ bool XUSCHF5XTDHasLongSignal() // || // - (mConditions.isXCHMAMCPeak && - mConditions.isXCHMALCVale && - mConditions.isXTSCurrentMax && - mConditions.isXTSCurrentOverFarest && - mConditions.isXTSCurrentOverNearest && - mConditions.isXTSCurrentOverMediest) + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale) && + ( + // + (mConditions.isXLHHighAttachedHH && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXRSICrossedOverLongExit && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverNearest && + mConditions.isXTSCurrentOverMediest) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 1e055774..239c86b3 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -10,7 +10,7 @@ Alpari All Markets -Resolve XUSCHF5 XTD Longs All Critical Guard Attacks in AMarkets-Demo ... +Resolve XUSCHF5 XTD Longs All Critical Guard Attacks in IFCMarkets ... Resolve XUSCHF5 XTAM Longs All Critical Guard Attacks in All Markets ... Resolve XUSCHF5 XSI Longs All Critical Guard Attacks in All Markets ... Resolve XUSCHF5 XTSFI Longs All Critical Guard Attacks in All Markets ... diff --git a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 0a6e9e88..1af17210 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -1828,6 +1828,19 @@ bool XUSCHF5XTDHasLongSignal() ((mConditions.isXCHMALCFastUnderSlow || mConditions.isXCHMALCFastCrossedUnderSlow) && ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentUnderMediest) + // + ) + // + ) + // + || // (mConditions.isXCHMAMCPeak && mConditions.isXCHMALCVale && @@ -1984,17 +1997,43 @@ bool XUSCHF5XTDHasLongSignal() ( // (mConditions.isXCHMAMCVale && - mConditions.isXCHMAMCTrendsUp) - // - || - // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXCHMAMCVale && - mConditions.isXCHMALCVale && - mConditions.isXTSCurrentMax && - mConditions.isXCHMASCUnderMin && - mConditions.isXTDSignalCrossedOverBear) + ( + // + mConditions.isXCHMAMCTrendsUp + // + || + // + (mConditions.isXCHMALCVale && + ( + // + (mConditions.isXAMAEndBullish && + mConditions.isXLHHHDecreased && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXTSCurrentUnderFarest) + // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMASCUnderMin && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -2757,6 +2796,14 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // ) // ) @@ -2900,6 +2947,22 @@ bool XUSCHF5XTDHasLongSignal() // || // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + || + // (mConditions.isXCHMASCOverMax && mConditions.isXCHLHSCMCHHSame && mConditions.isXTSCurrentOverFarest && @@ -2919,6 +2982,15 @@ bool XUSCHF5XTDHasLongSignal() (mConditions.isXTSCurrentUnderNearest && mConditions.isXTSCurrentCrossedUnderNearest) // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXLHHighAttachedHH && + mConditions.isXRSICrossedOverLongExit && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) @@ -3138,6 +3210,32 @@ bool XUSCHF5XTDHasLongSignal() !mConditions.isXLHLLSameInLength) && // ( + // + // Check if MC Fast Under Slow ... + ((mConditions.isXCHMAMCFastUnderSlow || + mConditions.isXCHMAMCFastCrossedUnderSlow) && + ( + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) + // + || // // Check LC Fast Under Slow ... ((mConditions.isXCHMALCFastUnderSlow || @@ -3158,12 +3256,25 @@ bool XUSCHF5XTDHasLongSignal() // || // - (mConditions.isXCHMAMCPeak && - mConditions.isXCHMALCVale && - mConditions.isXTSCurrentMax && - mConditions.isXTSCurrentOverFarest && - mConditions.isXTSCurrentOverNearest && - mConditions.isXTSCurrentOverMediest) + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale) && + ( + // + (mConditions.isXLHHighAttachedHH && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXRSICrossedOverLongExit && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverNearest && + mConditions.isXTSCurrentOverMediest) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 0a6e9e88..1af17210 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -1828,6 +1828,19 @@ bool XUSCHF5XTDHasLongSignal() ((mConditions.isXCHMALCFastUnderSlow || mConditions.isXCHMALCFastCrossedUnderSlow) && ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentUnderMediest) + // + ) + // + ) + // + || // (mConditions.isXCHMAMCPeak && mConditions.isXCHMALCVale && @@ -1984,17 +1997,43 @@ bool XUSCHF5XTDHasLongSignal() ( // (mConditions.isXCHMAMCVale && - mConditions.isXCHMAMCTrendsUp) - // - || - // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXCHMAMCVale && - mConditions.isXCHMALCVale && - mConditions.isXTSCurrentMax && - mConditions.isXCHMASCUnderMin && - mConditions.isXTDSignalCrossedOverBear) + ( + // + mConditions.isXCHMAMCTrendsUp + // + || + // + (mConditions.isXCHMALCVale && + ( + // + (mConditions.isXAMAEndBullish && + mConditions.isXLHHHDecreased && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXTSCurrentUnderFarest) + // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMASCUnderMin && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -2757,6 +2796,14 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // ) // ) @@ -2900,6 +2947,22 @@ bool XUSCHF5XTDHasLongSignal() // || // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + || + // (mConditions.isXCHMASCOverMax && mConditions.isXCHLHSCMCHHSame && mConditions.isXTSCurrentOverFarest && @@ -2919,6 +2982,15 @@ bool XUSCHF5XTDHasLongSignal() (mConditions.isXTSCurrentUnderNearest && mConditions.isXTSCurrentCrossedUnderNearest) // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXLHHighAttachedHH && + mConditions.isXRSICrossedOverLongExit && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) @@ -3138,6 +3210,32 @@ bool XUSCHF5XTDHasLongSignal() !mConditions.isXLHLLSameInLength) && // ( + // + // Check if MC Fast Under Slow ... + ((mConditions.isXCHMAMCFastUnderSlow || + mConditions.isXCHMAMCFastCrossedUnderSlow) && + ( + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) + // + || // // Check LC Fast Under Slow ... ((mConditions.isXCHMALCFastUnderSlow || @@ -3158,12 +3256,25 @@ bool XUSCHF5XTDHasLongSignal() // || // - (mConditions.isXCHMAMCPeak && - mConditions.isXCHMALCVale && - mConditions.isXTSCurrentMax && - mConditions.isXTSCurrentOverFarest && - mConditions.isXTSCurrentOverNearest && - mConditions.isXTSCurrentOverMediest) + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale) && + ( + // + (mConditions.isXLHHighAttachedHH && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXRSICrossedOverLongExit && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverNearest && + mConditions.isXTSCurrentOverMediest) + // + ) + // + ) // ) //