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 264b21a1..f9456d13 100644 --- a/BKP/Main/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 @@ -7915,19 +7915,30 @@ bool XAU5XOBDLHHasLongSignal() // || // - (mConditions.isXCHMALCVale && + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXCHMALCVale && mConditions.isXCHMALCTrendsUp && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXTDBullUnderBear && mConditions.isXCHMAMCTrendsDown && - mConditions.isXCHMAMCFastOverSlow) + mConditions.isXTDSignalUnderBear && + mConditions.isXCHMAMCFastOverSlow && + mConditions.isXTSCurrentUnderFarest) // || // - (mConditions.isXTMBearish && + (mConditions.isXAMAVale && + mConditions.isXTMBearish && mConditions.isXAMABearish && + mConditions.isXCHMASCVale && + mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXTMStartBearish && mConditions.isXCHLHSCMCLLSame && mConditions.isXTDBullUnderBear && mConditions.isXTDSignalUnderBear && - mConditions.isXTSCurrentUnderFarest) + mConditions.isXLHPriceCrossedUnderSignal) // ) // @@ -8337,7 +8348,42 @@ bool XAU5XOBDLHHasShortSignal() !mConditions.isXLHHHSameInLength) && // ( - false) + // + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMAMCFastOverSlow) && + (mConditions.isXCHMALCPeak && + mConditions.isXCHMALCTrendsUp && + mConditions.isXCHMALCFastOverSlow)) + // + || + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXTDBullOverBear && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDSignalOverBear && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest) + // + || + // + (mConditions.isXCHLHSameHHs && + mConditions.isXCHMASCOverMax && + mConditions.isXLHLLIncreased && + mConditions.isXTMStartBullish && + mConditions.isXTDBullOverBear && + mConditions.isXAMAStartBullish && + mConditions.isXCHMASCTrendsDown && + mConditions.isXTDSignalUnderBear && + mConditions.isXCHMASCFastUnderSlow && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXLHPriceCrossedOverSignal) + // + ) // ) // @@ -8363,7 +8409,54 @@ bool XAU5XOBDLHHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + ((mConditions.isXCHMAMCPeak && + mConditions.isXTDBullOverBear && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHMASCTrendsDown) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTDSignalVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCOverMax && + mConditions.isXTDBullishVale && + mConditions.isXTDSignalUnderBear && + mConditions.isXCHMASCFastOverSlow) + // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXCHMASCPeak && + mConditions.isXCHMALCTrendsDown) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTDBearishVale && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXTDSignalOverBear && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest) + // + || + // + (mConditions.isXCHMALCVale && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentOverNearest) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // 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 264b21a1..f9456d13 100644 --- a/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 +++ b/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 @@ -7915,19 +7915,30 @@ bool XAU5XOBDLHHasLongSignal() // || // - (mConditions.isXCHMALCVale && + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXCHMALCVale && mConditions.isXCHMALCTrendsUp && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXTDBullUnderBear && mConditions.isXCHMAMCTrendsDown && - mConditions.isXCHMAMCFastOverSlow) + mConditions.isXTDSignalUnderBear && + mConditions.isXCHMAMCFastOverSlow && + mConditions.isXTSCurrentUnderFarest) // || // - (mConditions.isXTMBearish && + (mConditions.isXAMAVale && + mConditions.isXTMBearish && mConditions.isXAMABearish && + mConditions.isXCHMASCVale && + mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXTMStartBearish && mConditions.isXCHLHSCMCLLSame && mConditions.isXTDBullUnderBear && mConditions.isXTDSignalUnderBear && - mConditions.isXTSCurrentUnderFarest) + mConditions.isXLHPriceCrossedUnderSignal) // ) // @@ -8337,7 +8348,42 @@ bool XAU5XOBDLHHasShortSignal() !mConditions.isXLHHHSameInLength) && // ( - false) + // + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMAMCFastOverSlow) && + (mConditions.isXCHMALCPeak && + mConditions.isXCHMALCTrendsUp && + mConditions.isXCHMALCFastOverSlow)) + // + || + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXTDBullOverBear && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDSignalOverBear && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest) + // + || + // + (mConditions.isXCHLHSameHHs && + mConditions.isXCHMASCOverMax && + mConditions.isXLHLLIncreased && + mConditions.isXTMStartBullish && + mConditions.isXTDBullOverBear && + mConditions.isXAMAStartBullish && + mConditions.isXCHMASCTrendsDown && + mConditions.isXTDSignalUnderBear && + mConditions.isXCHMASCFastUnderSlow && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXLHPriceCrossedOverSignal) + // + ) // ) // @@ -8363,7 +8409,54 @@ bool XAU5XOBDLHHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + ((mConditions.isXCHMAMCPeak && + mConditions.isXTDBullOverBear && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHMASCTrendsDown) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTDSignalVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCOverMax && + mConditions.isXTDBullishVale && + mConditions.isXTDSignalUnderBear && + mConditions.isXCHMASCFastOverSlow) + // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXCHMASCPeak && + mConditions.isXCHMALCTrendsDown) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTDBearishVale && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXTDSignalOverBear && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest) + // + || + // + (mConditions.isXCHMALCVale && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentOverNearest) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Projects/XAU5/Settings/shorts.vbb.set b/Projects/XAU5/Settings/shorts.vbb.set index 2f527015..19dfe310 100644 Binary files a/Projects/XAU5/Settings/shorts.vbb.set and b/Projects/XAU5/Settings/shorts.vbb.set differ diff --git a/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 index b3c11059..f9456d13 100644 --- a/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 @@ -8348,7 +8348,42 @@ bool XAU5XOBDLHHasShortSignal() !mConditions.isXLHHHSameInLength) && // ( - false) + // + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMAMCFastOverSlow) && + (mConditions.isXCHMALCPeak && + mConditions.isXCHMALCTrendsUp && + mConditions.isXCHMALCFastOverSlow)) + // + || + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXTDBullOverBear && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDSignalOverBear && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest) + // + || + // + (mConditions.isXCHLHSameHHs && + mConditions.isXCHMASCOverMax && + mConditions.isXLHLLIncreased && + mConditions.isXTMStartBullish && + mConditions.isXTDBullOverBear && + mConditions.isXAMAStartBullish && + mConditions.isXCHMASCTrendsDown && + mConditions.isXTDSignalUnderBear && + mConditions.isXCHMASCFastUnderSlow && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXLHPriceCrossedOverSignal) + // + ) // ) // @@ -8374,7 +8409,54 @@ bool XAU5XOBDLHHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + ((mConditions.isXCHMAMCPeak && + mConditions.isXTDBullOverBear && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHMASCTrendsDown) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTDSignalVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCOverMax && + mConditions.isXTDBullishVale && + mConditions.isXTDSignalUnderBear && + mConditions.isXCHMASCFastOverSlow) + // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXCHMASCPeak && + mConditions.isXCHMALCTrendsDown) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTDBearishVale && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXTDSignalOverBear && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest) + // + || + // + (mConditions.isXCHMALCVale && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentOverNearest) + // + ) + // + ) + // + ) + // + ) + // + ) // ) //