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 fb170826..0f22ce68 100644 --- a/BKP/Main/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 @@ -7041,6 +7041,15 @@ bool XAU5XTSFIHasShortSignal() // || // + (mConditions.isXTMEndBearish && + mConditions.isXAMAEndBearish && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTSCurrentCrossedOverMediest) + // + || + // // Check LC Fast Over Slow ... ((mConditions.isXCHMALCFastOverSlow || mConditions.isXCHMALCFastCrossedOverSlow) && @@ -7138,6 +7147,32 @@ bool XAU5XTSFIHasShortSignal() mConditions.isXAMABearish && mConditions.isXTSCurrentOverMediest) && ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // + ((mConditions.isXCHMALCVale && + mConditions.isXTDBullishVale && + mConditions.isXTDSignalUnderBear) && + ( + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullUnderBear) + // + || + // + (mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + || // (mConditions.isXTDBullOverBear && mConditions.isXCHMASCFastCrossedUnderSlow && @@ -7199,6 +7234,16 @@ bool XAU5XTSFIHasShortSignal() mConditions.isXCHLHMCLCHHSame && mConditions.isXTSCurrentOverMediest) // + || + // + (mConditions.isXAMAVale && + mConditions.isXAMABearish && + mConditions.isXCHMAMCVale && + mConditions.isXTMNeutural && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentOverMediest) + // ) // ) @@ -7272,6 +7317,17 @@ bool XAU5XTSFIHasShortSignal() mConditions.isXTDSignalUnderBear && mConditions.isXTSCurrentOverMediest) // + || + // + (mConditions.isXAMAVale && + mConditions.isXTMNeutural && + mConditions.isXCHMALCPeak && + mConditions.isXAMABearish && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTSCurrentCrossedOverMediest) + // ) // ) @@ -7329,6 +7385,14 @@ bool XAU5XTSFIHasShortSignal() mConditions.isXTDSignalUnderBear && mConditions.isXTSCurrentOverMediest) // + || + // + (mConditions.isXTDBullUnderBear && + mConditions.isXCHMASCTrendsDown && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentOverMediest && + mConditions.isXCHMASCCrossedOverMin) + // ) // ) 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 fb170826..0f22ce68 100644 --- a/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 +++ b/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 @@ -7041,6 +7041,15 @@ bool XAU5XTSFIHasShortSignal() // || // + (mConditions.isXTMEndBearish && + mConditions.isXAMAEndBearish && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTSCurrentCrossedOverMediest) + // + || + // // Check LC Fast Over Slow ... ((mConditions.isXCHMALCFastOverSlow || mConditions.isXCHMALCFastCrossedOverSlow) && @@ -7138,6 +7147,32 @@ bool XAU5XTSFIHasShortSignal() mConditions.isXAMABearish && mConditions.isXTSCurrentOverMediest) && ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // + ((mConditions.isXCHMALCVale && + mConditions.isXTDBullishVale && + mConditions.isXTDSignalUnderBear) && + ( + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullUnderBear) + // + || + // + (mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + || // (mConditions.isXTDBullOverBear && mConditions.isXCHMASCFastCrossedUnderSlow && @@ -7199,6 +7234,16 @@ bool XAU5XTSFIHasShortSignal() mConditions.isXCHLHMCLCHHSame && mConditions.isXTSCurrentOverMediest) // + || + // + (mConditions.isXAMAVale && + mConditions.isXAMABearish && + mConditions.isXCHMAMCVale && + mConditions.isXTMNeutural && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentOverMediest) + // ) // ) @@ -7272,6 +7317,17 @@ bool XAU5XTSFIHasShortSignal() mConditions.isXTDSignalUnderBear && mConditions.isXTSCurrentOverMediest) // + || + // + (mConditions.isXAMAVale && + mConditions.isXTMNeutural && + mConditions.isXCHMALCPeak && + mConditions.isXAMABearish && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTSCurrentCrossedOverMediest) + // ) // ) @@ -7329,6 +7385,14 @@ bool XAU5XTSFIHasShortSignal() mConditions.isXTDSignalUnderBear && mConditions.isXTSCurrentOverMediest) // + || + // + (mConditions.isXTDBullUnderBear && + mConditions.isXCHMASCTrendsDown && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentOverMediest && + mConditions.isXCHMASCCrossedOverMin) + // ) // ) diff --git a/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 index fb170826..0f22ce68 100644 --- a/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 @@ -7041,6 +7041,15 @@ bool XAU5XTSFIHasShortSignal() // || // + (mConditions.isXTMEndBearish && + mConditions.isXAMAEndBearish && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTSCurrentCrossedOverMediest) + // + || + // // Check LC Fast Over Slow ... ((mConditions.isXCHMALCFastOverSlow || mConditions.isXCHMALCFastCrossedOverSlow) && @@ -7138,6 +7147,32 @@ bool XAU5XTSFIHasShortSignal() mConditions.isXAMABearish && mConditions.isXTSCurrentOverMediest) && ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // + ((mConditions.isXCHMALCVale && + mConditions.isXTDBullishVale && + mConditions.isXTDSignalUnderBear) && + ( + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullUnderBear) + // + || + // + (mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + || // (mConditions.isXTDBullOverBear && mConditions.isXCHMASCFastCrossedUnderSlow && @@ -7199,6 +7234,16 @@ bool XAU5XTSFIHasShortSignal() mConditions.isXCHLHMCLCHHSame && mConditions.isXTSCurrentOverMediest) // + || + // + (mConditions.isXAMAVale && + mConditions.isXAMABearish && + mConditions.isXCHMAMCVale && + mConditions.isXTMNeutural && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentOverMediest) + // ) // ) @@ -7272,6 +7317,17 @@ bool XAU5XTSFIHasShortSignal() mConditions.isXTDSignalUnderBear && mConditions.isXTSCurrentOverMediest) // + || + // + (mConditions.isXAMAVale && + mConditions.isXTMNeutural && + mConditions.isXCHMALCPeak && + mConditions.isXAMABearish && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTSCurrentCrossedOverMediest) + // ) // ) @@ -7329,6 +7385,14 @@ bool XAU5XTSFIHasShortSignal() mConditions.isXTDSignalUnderBear && mConditions.isXTSCurrentOverMediest) // + || + // + (mConditions.isXTDBullUnderBear && + mConditions.isXCHMASCTrendsDown && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentOverMediest && + mConditions.isXCHMASCCrossedOverMin) + // ) // )