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 82829630..6c01dfd6 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -10460,6 +10460,19 @@ bool XUSCHF5XTSFIHasShortSignal() // || // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXFIOverZero && + mConditions.isXCHLHMCLCLLSame) + // + ) + // + ) + // + || + // (mConditions.isXTMVale && mConditions.isXAMAVale && mConditions.isXCHMALCVale && @@ -10537,11 +10550,21 @@ bool XUSCHF5XTSFIHasShortSignal() // || // - (mConditions.isXTMBullish && - mConditions.isXCHMALCVale && - mConditions.isXAMANeutural && - mConditions.isXTMStartBullish && - mConditions.isXCHMASCUnderMin) + ((mConditions.isXTMBullish && + mConditions.isXAMANeutural) && + ( + // + mConditions.isXTDBullOverBear + // + || + // + (mConditions.isXCHMALCVale && + mConditions.isXTMStartBullish && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) // ) // @@ -10791,6 +10814,20 @@ bool XUSCHF5XTSFIHasShortSignal() // ) // + || + // + (mConditions.isXCHMAMCFastOverSlow && + ( + // + (mConditions.isXTMVale && + mConditions.isXCHMASCVale && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // ) // ) @@ -11110,12 +11147,34 @@ bool XUSCHF5XTSFIHasShortSignal() // || // + (mConditions.isXTMNeutural && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // (mConditions.isXAMANeutural && mConditions.isXCHMAMCPeak && mConditions.isXCHMASCOverMax && mConditions.isXCHLHMCLCHHSame && mConditions.isXCHLHMCLCLLSame) // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCPeak && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) + // + ) + // + ) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index bb35692b..a3fa1bc8 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 OANDA ... +Resolve XUSCHF5 XTSFI Shorts All Critical Guard Attacks in MetaQuotes ... 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 82829630..6c01dfd6 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -10460,6 +10460,19 @@ bool XUSCHF5XTSFIHasShortSignal() // || // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXFIOverZero && + mConditions.isXCHLHMCLCLLSame) + // + ) + // + ) + // + || + // (mConditions.isXTMVale && mConditions.isXAMAVale && mConditions.isXCHMALCVale && @@ -10537,11 +10550,21 @@ bool XUSCHF5XTSFIHasShortSignal() // || // - (mConditions.isXTMBullish && - mConditions.isXCHMALCVale && - mConditions.isXAMANeutural && - mConditions.isXTMStartBullish && - mConditions.isXCHMASCUnderMin) + ((mConditions.isXTMBullish && + mConditions.isXAMANeutural) && + ( + // + mConditions.isXTDBullOverBear + // + || + // + (mConditions.isXCHMALCVale && + mConditions.isXTMStartBullish && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) // ) // @@ -10791,6 +10814,20 @@ bool XUSCHF5XTSFIHasShortSignal() // ) // + || + // + (mConditions.isXCHMAMCFastOverSlow && + ( + // + (mConditions.isXTMVale && + mConditions.isXCHMASCVale && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // ) // ) @@ -11110,12 +11147,34 @@ bool XUSCHF5XTSFIHasShortSignal() // || // + (mConditions.isXTMNeutural && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // (mConditions.isXAMANeutural && mConditions.isXCHMAMCPeak && mConditions.isXCHMASCOverMax && mConditions.isXCHLHMCLCHHSame && mConditions.isXCHLHMCLCLLSame) // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCPeak && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) + // + ) + // + ) + // ) // ) diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 82829630..6c01dfd6 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -10460,6 +10460,19 @@ bool XUSCHF5XTSFIHasShortSignal() // || // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXFIOverZero && + mConditions.isXCHLHMCLCLLSame) + // + ) + // + ) + // + || + // (mConditions.isXTMVale && mConditions.isXAMAVale && mConditions.isXCHMALCVale && @@ -10537,11 +10550,21 @@ bool XUSCHF5XTSFIHasShortSignal() // || // - (mConditions.isXTMBullish && - mConditions.isXCHMALCVale && - mConditions.isXAMANeutural && - mConditions.isXTMStartBullish && - mConditions.isXCHMASCUnderMin) + ((mConditions.isXTMBullish && + mConditions.isXAMANeutural) && + ( + // + mConditions.isXTDBullOverBear + // + || + // + (mConditions.isXCHMALCVale && + mConditions.isXTMStartBullish && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) // ) // @@ -10791,6 +10814,20 @@ bool XUSCHF5XTSFIHasShortSignal() // ) // + || + // + (mConditions.isXCHMAMCFastOverSlow && + ( + // + (mConditions.isXTMVale && + mConditions.isXCHMASCVale && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // ) // ) @@ -11110,12 +11147,34 @@ bool XUSCHF5XTSFIHasShortSignal() // || // + (mConditions.isXTMNeutural && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // (mConditions.isXAMANeutural && mConditions.isXCHMAMCPeak && mConditions.isXCHMASCOverMax && mConditions.isXCHLHMCLCHHSame && mConditions.isXCHLHMCLCLLSame) // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCPeak && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) + // + ) + // + ) + // ) // )