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 0c1405de..35e94ebf 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -10861,6 +10861,12 @@ bool XUSCHF5XTSFIHasShortSignal() mConditions.isXCHMALCPeak && mConditions.isXLHHHDecreased) // + || + // + (mConditions.isXAMAVale && + mConditions.isXCHMAMCVale && + mConditions.isXCHMASCUnderMin) + // ) // ) @@ -11232,6 +11238,37 @@ bool XUSCHF5XTSFIHasShortSignal() // || // + (mConditions.isXAMANeutural && + mConditions.isXCHMAMCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHLHMCLCLLSame) + // + || + // + (mConditions.isXCHLHMCLCLLSame && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCPeak && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) + // + ) + // + ) + // + || + // ((mConditions.isXTMNeutural && mConditions.isXCHLHMCLCLLSame) && ( @@ -11249,29 +11286,6 @@ bool XUSCHF5XTSFIHasShortSignal() // ) // - || - // - (mConditions.isXAMANeutural && - mConditions.isXCHMAMCPeak && - mConditions.isXCHMASCOverMax && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXCHLHMCLCLLSame) - // - || - // - ((mConditions.isXTMNeutural && - mConditions.isXAMANeutural) && - ( - // - (mConditions.isXCHMAMCPeak && - mConditions.isXCHMALCPeak && - mConditions.isXTDSignalVale && - mConditions.isXTDBullishVale) - // - ) - // - ) - // ) // ) @@ -11580,7 +11594,28 @@ bool XUSCHF5XTSFIHasShortSignal() mConditions.isXLHHHSameInLength) && // ( - false) + // + (mConditions.isXTSCurrentOverMediest && + ( + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTDBullOverBear && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMASCFastOverSlow) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 6678e0c3..4ca32054 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -34,7 +34,7 @@ Resolve XUSCHF5 XSI All Guard Attacks in All Markets ... XTSFI ------ Resolve XUSCHF5 XTSFI All Stopouts in All Markets ... -Resolve XUSCHF5 XTSFI Shorts All Critical Guard Attacks in AMarkets-Demo, IFCMarkets ... +Resolve XUSCHF5 XTSFI Shorts All Critical Guard Attacks in Alpari ... Resolve XUSCHF5 XTSFI All Guard Attacks in All Markets ... 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 0c1405de..35e94ebf 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -10861,6 +10861,12 @@ bool XUSCHF5XTSFIHasShortSignal() mConditions.isXCHMALCPeak && mConditions.isXLHHHDecreased) // + || + // + (mConditions.isXAMAVale && + mConditions.isXCHMAMCVale && + mConditions.isXCHMASCUnderMin) + // ) // ) @@ -11232,6 +11238,37 @@ bool XUSCHF5XTSFIHasShortSignal() // || // + (mConditions.isXAMANeutural && + mConditions.isXCHMAMCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHLHMCLCLLSame) + // + || + // + (mConditions.isXCHLHMCLCLLSame && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCPeak && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) + // + ) + // + ) + // + || + // ((mConditions.isXTMNeutural && mConditions.isXCHLHMCLCLLSame) && ( @@ -11249,29 +11286,6 @@ bool XUSCHF5XTSFIHasShortSignal() // ) // - || - // - (mConditions.isXAMANeutural && - mConditions.isXCHMAMCPeak && - mConditions.isXCHMASCOverMax && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXCHLHMCLCLLSame) - // - || - // - ((mConditions.isXTMNeutural && - mConditions.isXAMANeutural) && - ( - // - (mConditions.isXCHMAMCPeak && - mConditions.isXCHMALCPeak && - mConditions.isXTDSignalVale && - mConditions.isXTDBullishVale) - // - ) - // - ) - // ) // ) @@ -11580,7 +11594,28 @@ bool XUSCHF5XTSFIHasShortSignal() mConditions.isXLHHHSameInLength) && // ( - false) + // + (mConditions.isXTSCurrentOverMediest && + ( + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTDBullOverBear && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMASCFastOverSlow) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 0c1405de..35e94ebf 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -10861,6 +10861,12 @@ bool XUSCHF5XTSFIHasShortSignal() mConditions.isXCHMALCPeak && mConditions.isXLHHHDecreased) // + || + // + (mConditions.isXAMAVale && + mConditions.isXCHMAMCVale && + mConditions.isXCHMASCUnderMin) + // ) // ) @@ -11232,6 +11238,37 @@ bool XUSCHF5XTSFIHasShortSignal() // || // + (mConditions.isXAMANeutural && + mConditions.isXCHMAMCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHLHMCLCLLSame) + // + || + // + (mConditions.isXCHLHMCLCLLSame && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCPeak && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) + // + ) + // + ) + // + || + // ((mConditions.isXTMNeutural && mConditions.isXCHLHMCLCLLSame) && ( @@ -11249,29 +11286,6 @@ bool XUSCHF5XTSFIHasShortSignal() // ) // - || - // - (mConditions.isXAMANeutural && - mConditions.isXCHMAMCPeak && - mConditions.isXCHMASCOverMax && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXCHLHMCLCLLSame) - // - || - // - ((mConditions.isXTMNeutural && - mConditions.isXAMANeutural) && - ( - // - (mConditions.isXCHMAMCPeak && - mConditions.isXCHMALCPeak && - mConditions.isXTDSignalVale && - mConditions.isXTDBullishVale) - // - ) - // - ) - // ) // ) @@ -11580,7 +11594,28 @@ bool XUSCHF5XTSFIHasShortSignal() mConditions.isXLHHHSameInLength) && // ( - false) + // + (mConditions.isXTSCurrentOverMediest && + ( + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTDBullOverBear && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMASCFastOverSlow) + // + ) + // + ) + // + ) + // + ) + // + ) // ) //