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 90ec00dd..8a53c9b1 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -6093,7 +6093,71 @@ bool XUSCHF5XTSFIHasShortSignal() !mConditions.isXLHHHSameInLength) && // ( - false) + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + (mConditions.isXTSCurrentOverMediest && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + // Check LC Fast Under Slow ... + ((mConditions.isXCHMALCFastUnderSlow || + mConditions.isXCHMALCFastCrossedUnderSlow) && + ( + // + (mConditions.isXTSCurrentOverMediest && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) + // + ) + // + ) + // + || + // + (mConditions.isXTMVale && + mConditions.isXAMAVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -6163,10 +6227,29 @@ bool XUSCHF5XTSFIHasShortSignal() mConditions.isXAMABearish) && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXCHLHSameLLs && - mConditions.isXLHHHDecreased && - mConditions.isXTSCurrentOverMediest) + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameLLs && + mConditions.isXLHHHDecreased) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameLLs && + mConditions.isXTDSignalVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + || + // + (mConditions.isXLHHHDecreased && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 5a7c1c4e..81dbcc91 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 HFMarkets ... +Resolve XUSCHF5 XTSFI Shorts All Stopouts in AMarkets-Demo ... 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 90ec00dd..8a53c9b1 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -6093,7 +6093,71 @@ bool XUSCHF5XTSFIHasShortSignal() !mConditions.isXLHHHSameInLength) && // ( - false) + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + (mConditions.isXTSCurrentOverMediest && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + // Check LC Fast Under Slow ... + ((mConditions.isXCHMALCFastUnderSlow || + mConditions.isXCHMALCFastCrossedUnderSlow) && + ( + // + (mConditions.isXTSCurrentOverMediest && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) + // + ) + // + ) + // + || + // + (mConditions.isXTMVale && + mConditions.isXAMAVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -6163,10 +6227,29 @@ bool XUSCHF5XTSFIHasShortSignal() mConditions.isXAMABearish) && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXCHLHSameLLs && - mConditions.isXLHHHDecreased && - mConditions.isXTSCurrentOverMediest) + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameLLs && + mConditions.isXLHHHDecreased) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameLLs && + mConditions.isXTDSignalVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + || + // + (mConditions.isXLHHHDecreased && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 90ec00dd..8a53c9b1 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -6093,7 +6093,71 @@ bool XUSCHF5XTSFIHasShortSignal() !mConditions.isXLHHHSameInLength) && // ( - false) + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + (mConditions.isXTSCurrentOverMediest && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + // Check LC Fast Under Slow ... + ((mConditions.isXCHMALCFastUnderSlow || + mConditions.isXCHMALCFastCrossedUnderSlow) && + ( + // + (mConditions.isXTSCurrentOverMediest && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) + // + ) + // + ) + // + || + // + (mConditions.isXTMVale && + mConditions.isXAMAVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -6163,10 +6227,29 @@ bool XUSCHF5XTSFIHasShortSignal() mConditions.isXAMABearish) && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXCHLHSameLLs && - mConditions.isXLHHHDecreased && - mConditions.isXTSCurrentOverMediest) + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameLLs && + mConditions.isXLHHHDecreased) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameLLs && + mConditions.isXTDSignalVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + || + // + (mConditions.isXLHHHDecreased && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) // ) //