diff --git a/BKP/Main/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 b/BKP/Main/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 index 0f22ce68..e79e3829 100644 --- a/BKP/Main/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 @@ -7226,6 +7226,12 @@ bool XAU5XTSFIHasShortSignal() ((mConditions.isXCHMALCFastOverSlow || mConditions.isXCHMALCFastCrossedOverSlow) && ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentOverMediest) + // + || // (mConditions.isXTMBearish && mConditions.isXAMABearish && @@ -7367,6 +7373,14 @@ bool XAU5XTSFIHasShortSignal() ((mConditions.isXCHMALCFastOverSlow || mConditions.isXCHMALCFastCrossedOverSlow) && ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural && + mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow && + mConditions.isXTSCurrentOverMediest) + // + || // (mConditions.isXAMAVale && mConditions.isXTMNeutural && @@ -7519,9 +7533,22 @@ bool XAU5XTSFIHasShortSignal() // || // - (mConditions.isXTDBearishVale && - mConditions.isXTDSignalOverBear && - mConditions.isXLHPriceCrossedOverSignal) + ((mConditions.isXTDBearishVale && + mConditions.isXTDSignalOverBear) && + ( + // + mConditions.isXLHPriceCrossedOverSignal + // + || + // + (mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) + // + ) + // + ) // ) // @@ -7555,6 +7582,22 @@ bool XAU5XTSFIHasShortSignal() // ) // + || + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + (mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTDBullCrossedOverBear) + // + ) + // + ) + // ) // ) diff --git a/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 b/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 index 0f22ce68..e79e3829 100644 --- a/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 +++ b/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 @@ -7226,6 +7226,12 @@ bool XAU5XTSFIHasShortSignal() ((mConditions.isXCHMALCFastOverSlow || mConditions.isXCHMALCFastCrossedOverSlow) && ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentOverMediest) + // + || // (mConditions.isXTMBearish && mConditions.isXAMABearish && @@ -7367,6 +7373,14 @@ bool XAU5XTSFIHasShortSignal() ((mConditions.isXCHMALCFastOverSlow || mConditions.isXCHMALCFastCrossedOverSlow) && ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural && + mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow && + mConditions.isXTSCurrentOverMediest) + // + || // (mConditions.isXAMAVale && mConditions.isXTMNeutural && @@ -7519,9 +7533,22 @@ bool XAU5XTSFIHasShortSignal() // || // - (mConditions.isXTDBearishVale && - mConditions.isXTDSignalOverBear && - mConditions.isXLHPriceCrossedOverSignal) + ((mConditions.isXTDBearishVale && + mConditions.isXTDSignalOverBear) && + ( + // + mConditions.isXLHPriceCrossedOverSignal + // + || + // + (mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) + // + ) + // + ) // ) // @@ -7555,6 +7582,22 @@ bool XAU5XTSFIHasShortSignal() // ) // + || + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + (mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTDBullCrossedOverBear) + // + ) + // + ) + // ) // ) diff --git a/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 index 0f22ce68..e79e3829 100644 --- a/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 @@ -7226,6 +7226,12 @@ bool XAU5XTSFIHasShortSignal() ((mConditions.isXCHMALCFastOverSlow || mConditions.isXCHMALCFastCrossedOverSlow) && ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentOverMediest) + // + || // (mConditions.isXTMBearish && mConditions.isXAMABearish && @@ -7367,6 +7373,14 @@ bool XAU5XTSFIHasShortSignal() ((mConditions.isXCHMALCFastOverSlow || mConditions.isXCHMALCFastCrossedOverSlow) && ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural && + mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow && + mConditions.isXTSCurrentOverMediest) + // + || // (mConditions.isXAMAVale && mConditions.isXTMNeutural && @@ -7519,9 +7533,22 @@ bool XAU5XTSFIHasShortSignal() // || // - (mConditions.isXTDBearishVale && - mConditions.isXTDSignalOverBear && - mConditions.isXLHPriceCrossedOverSignal) + ((mConditions.isXTDBearishVale && + mConditions.isXTDSignalOverBear) && + ( + // + mConditions.isXLHPriceCrossedOverSignal + // + || + // + (mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) + // + ) + // + ) // ) // @@ -7555,6 +7582,22 @@ bool XAU5XTSFIHasShortSignal() // ) // + || + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + (mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTDBullCrossedOverBear) + // + ) + // + ) + // ) // )