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 3e9b822b..2168d6d9 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -5916,7 +5916,27 @@ bool XUSCHF5XTSFIHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHLHSameLLs && + mConditions.isXTSCurrentOverMediest) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -5981,7 +6001,28 @@ bool XUSCHF5XTSFIHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHLHSCMCLLSame && + mConditions.isXTSCurrentOverMediest) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -5994,7 +6035,30 @@ bool XUSCHF5XTSFIHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameLLs && + mConditions.isXLHHHDecreased && + mConditions.isXTSCurrentOverMediest) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -6022,7 +6086,65 @@ bool XUSCHF5XTSFIHasShortSignal() mConditions.isXLHHHSameInLength) && // ( - false) + // + // Check if MC Fast Over Slow ... + ((mConditions.isXCHMAMCFastOverSlow || + mConditions.isXCHMAMCFastCrossedOverSlow) && + ( + // + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMAMCTrendsUp) && + ( + // + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish) + // + ) + // + ) + // + )) + // + ) + // + ) + // + || + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + || + // + (mConditions.isXLHLLDecreased && + mConditions.isXLHPriceCrossedOverSignal) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -6035,7 +6157,29 @@ bool XUSCHF5XTSFIHasShortSignal() !mConditions.isXLHHHSameInLength) && // ( - false) + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTSCurrentOverMediest && + mConditions.isXLHPriceCrossedOverSignal && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index d866f63f..7f507b23 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -11,7 +11,7 @@ Alpari Resolve XUSCHF5 XTD Shorts All Stopouts in All Markets ... Resolve XUSCHF5 XTAM Shorts All Stopouts in All Markets ... Resolve XUSCHF5 XSI Shorts All Stopouts in All Markets ... -Resolve XUSCHF5 XTSFI Shorts All Stopouts in AMarkets-Real ... +Resolve XUSCHF5 XTSFI Shorts All Stopouts in GrowthNext ... Resolve XUSCHF5 XOBDLH Shorts All Stopouts in ... Resolve XUSCHF5 XCHMACC Shorts All Stopouts in ... Resolve XUSCHF5 XCHMAMX Shorts All Stopouts in ... 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 3e9b822b..2168d6d9 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -5916,7 +5916,27 @@ bool XUSCHF5XTSFIHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHLHSameLLs && + mConditions.isXTSCurrentOverMediest) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -5981,7 +6001,28 @@ bool XUSCHF5XTSFIHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHLHSCMCLLSame && + mConditions.isXTSCurrentOverMediest) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -5994,7 +6035,30 @@ bool XUSCHF5XTSFIHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameLLs && + mConditions.isXLHHHDecreased && + mConditions.isXTSCurrentOverMediest) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -6022,7 +6086,65 @@ bool XUSCHF5XTSFIHasShortSignal() mConditions.isXLHHHSameInLength) && // ( - false) + // + // Check if MC Fast Over Slow ... + ((mConditions.isXCHMAMCFastOverSlow || + mConditions.isXCHMAMCFastCrossedOverSlow) && + ( + // + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMAMCTrendsUp) && + ( + // + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish) + // + ) + // + ) + // + )) + // + ) + // + ) + // + || + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + || + // + (mConditions.isXLHLLDecreased && + mConditions.isXLHPriceCrossedOverSignal) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -6035,7 +6157,29 @@ bool XUSCHF5XTSFIHasShortSignal() !mConditions.isXLHHHSameInLength) && // ( - false) + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTSCurrentOverMediest && + mConditions.isXLHPriceCrossedOverSignal && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Projects/XUSCHF5/Settings/XTSFI.set b/Projects/XUSCHF5/Settings/XTSFI.set index b141eba6..6f26c6d6 100644 Binary files a/Projects/XUSCHF5/Settings/XTSFI.set and b/Projects/XUSCHF5/Settings/XTSFI.set differ diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 3e9b822b..2168d6d9 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -5916,7 +5916,27 @@ bool XUSCHF5XTSFIHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHLHSameLLs && + mConditions.isXTSCurrentOverMediest) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -5981,7 +6001,28 @@ bool XUSCHF5XTSFIHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHLHSCMCLLSame && + mConditions.isXTSCurrentOverMediest) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -5994,7 +6035,30 @@ bool XUSCHF5XTSFIHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameLLs && + mConditions.isXLHHHDecreased && + mConditions.isXTSCurrentOverMediest) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -6022,7 +6086,65 @@ bool XUSCHF5XTSFIHasShortSignal() mConditions.isXLHHHSameInLength) && // ( - false) + // + // Check if MC Fast Over Slow ... + ((mConditions.isXCHMAMCFastOverSlow || + mConditions.isXCHMAMCFastCrossedOverSlow) && + ( + // + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMAMCTrendsUp) && + ( + // + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish) + // + ) + // + ) + // + )) + // + ) + // + ) + // + || + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + || + // + (mConditions.isXLHLLDecreased && + mConditions.isXLHPriceCrossedOverSignal) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -6035,7 +6157,29 @@ bool XUSCHF5XTSFIHasShortSignal() !mConditions.isXLHHHSameInLength) && // ( - false) + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTSCurrentOverMediest && + mConditions.isXLHPriceCrossedOverSignal && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) + // + ) + // + ) + // + ) // ) //