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 e436fedf..017a3d23 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -3895,7 +3895,56 @@ bool XUSCHF5XSIHasLongSignal() mConditions.isXLHHHSameInLength) && // ( - false) + // + // Check if SC Fast Under Slow ... + ((mConditions.isXCHMASCFastUnderSlow || + mConditions.isXCHMASCFastCrossedUnderSlow) && + ( + // + (mConditions.isXCHMASCVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderFarest) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXCHMAMCFastOverSlow) + // + || + // + (mConditions.isXCHMASCTrendsUp && + ( + // + (mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) + // + || + // + (mConditions.isXTMBearish && + mConditions.isXTSAllSame && + mConditions.isXAMABearish && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -3921,7 +3970,43 @@ bool XUSCHF5XSIHasLongSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + // Check if SC Fast Under Slow ... + ((mConditions.isXCHMASCFastUnderSlow || + mConditions.isXCHMASCFastCrossedUnderSlow) && + ( + // + (mConditions.isXCHMASCVale && + mConditions.isXCHMASCTrendsUp) + // + || + // + ((mConditions.isXCHMASCVale && + mConditions.isXCHMAMCVale) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) + // + || + // + (mConditions.isXTMVale && + mConditions.isXAMAVale && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderFarest) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 293d5c18..7e22bdce 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -18,4 +18,5 @@ Alpari Resolve XUSCHF5 XTD Longs All Stopouts in MetaQuotes, HFMarkets ... Resolve XUSCHF5 XTAM Longs All Stopouts in MetaQuotes ... -Resolve XUSCHF5 XTAM Longs All Stopouts in Errante, Alpari ... \ No newline at end of file +Resolve XUSCHF5 XTAM Longs All Stopouts in Errante, Alpari ... +Resolve XUSCHF5 XSI Longs All Stopouts in AMarkets-Real ... \ No newline at end of file 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 e436fedf..017a3d23 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -3895,7 +3895,56 @@ bool XUSCHF5XSIHasLongSignal() mConditions.isXLHHHSameInLength) && // ( - false) + // + // Check if SC Fast Under Slow ... + ((mConditions.isXCHMASCFastUnderSlow || + mConditions.isXCHMASCFastCrossedUnderSlow) && + ( + // + (mConditions.isXCHMASCVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderFarest) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXCHMAMCFastOverSlow) + // + || + // + (mConditions.isXCHMASCTrendsUp && + ( + // + (mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) + // + || + // + (mConditions.isXTMBearish && + mConditions.isXTSAllSame && + mConditions.isXAMABearish && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -3921,7 +3970,43 @@ bool XUSCHF5XSIHasLongSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + // Check if SC Fast Under Slow ... + ((mConditions.isXCHMASCFastUnderSlow || + mConditions.isXCHMASCFastCrossedUnderSlow) && + ( + // + (mConditions.isXCHMASCVale && + mConditions.isXCHMASCTrendsUp) + // + || + // + ((mConditions.isXCHMASCVale && + mConditions.isXCHMAMCVale) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) + // + || + // + (mConditions.isXTMVale && + mConditions.isXAMAVale && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderFarest) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Projects/XUSCHF5/Settings/XSI.set b/Projects/XUSCHF5/Settings/XSI.set new file mode 100644 index 00000000..2053035d Binary files /dev/null and b/Projects/XUSCHF5/Settings/XSI.set differ diff --git a/Projects/XUSCHF5/Settings/XTD.set b/Projects/XUSCHF5/Settings/XTD.set index ac8921a9..4a587b01 100644 Binary files a/Projects/XUSCHF5/Settings/XTD.set and b/Projects/XUSCHF5/Settings/XTD.set differ diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index e436fedf..017a3d23 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -3895,7 +3895,56 @@ bool XUSCHF5XSIHasLongSignal() mConditions.isXLHHHSameInLength) && // ( - false) + // + // Check if SC Fast Under Slow ... + ((mConditions.isXCHMASCFastUnderSlow || + mConditions.isXCHMASCFastCrossedUnderSlow) && + ( + // + (mConditions.isXCHMASCVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderFarest) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXCHMAMCFastOverSlow) + // + || + // + (mConditions.isXCHMASCTrendsUp && + ( + // + (mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) + // + || + // + (mConditions.isXTMBearish && + mConditions.isXTSAllSame && + mConditions.isXAMABearish && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -3921,7 +3970,43 @@ bool XUSCHF5XSIHasLongSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + // Check if SC Fast Under Slow ... + ((mConditions.isXCHMASCFastUnderSlow || + mConditions.isXCHMASCFastCrossedUnderSlow) && + ( + // + (mConditions.isXCHMASCVale && + mConditions.isXCHMASCTrendsUp) + // + || + // + ((mConditions.isXCHMASCVale && + mConditions.isXCHMAMCVale) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) + // + || + // + (mConditions.isXTMVale && + mConditions.isXAMAVale && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderFarest) + // + ) + // + ) + // + ) + // + ) + // + ) // ) //