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 87b2dd75..f46c5835 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -10922,19 +10922,50 @@ bool XUSCHF5XTSFIHasShortSignal() // || // - (mConditions.isXTMVale && - mConditions.isXCHMASCUnderMin && - mConditions.isXCHMAMCFastOverSlow) + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + ((mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) && + ( + // + (mConditions.isXCHMASCUnderMin && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXRSICrossedUnderShortExit) + // + || + // + (mConditions.isXCHMALCFastOverSlow && + ( + // + (mConditions.isXCHMALCTrendsDown && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // || // - (mConditions.isXTMBearish && - mConditions.isXAMABearish && + (mConditions.isXTMVale && mConditions.isXCHMASCUnderMin && - mConditions.isXTDBullUnderBear && - mConditions.isXTDSignalUnderBear && - mConditions.isXCHMALCFastOverSlow && - mConditions.isXRSICrossedUnderShortExit) + mConditions.isXCHMAMCFastOverSlow) // || // @@ -11390,6 +11421,35 @@ bool XUSCHF5XTSFIHasShortSignal() // ) // + || + // + (mConditions.isXCHMALCFastOverSlow && + ( + // + ((mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHMASCVale && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMASCCrossedUnderMin) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -11535,6 +11595,33 @@ bool XUSCHF5XTSFIHasShortSignal() // || // + (mConditions.isXCHMAMCFastOverSlow && + ( + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastUnderSlow) + // + || + // + (mConditions.isXTMEndBullish && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) + // + ) + // + || + // (mConditions.isXCHLHMCLCLLSame && mConditions.isXTDBullUnderBear && mConditions.isXTDSignalUnderBear && diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 395afc22..c4fa3ab9 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -35,7 +35,7 @@ XTSFI ------ Resolve XUSCHF5 XTSFI All Stopouts in All Markets ... Resolve XUSCHF5 XTSFI All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XTSFI All Guard Attacks in AMarkets-Demo ... +Resolve XUSCHF5 XTSFI All Guard Attacks in AMarkets-Demo, IFCMarkets ... XOBDLH 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 87b2dd75..f46c5835 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -10922,19 +10922,50 @@ bool XUSCHF5XTSFIHasShortSignal() // || // - (mConditions.isXTMVale && - mConditions.isXCHMASCUnderMin && - mConditions.isXCHMAMCFastOverSlow) + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + ((mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) && + ( + // + (mConditions.isXCHMASCUnderMin && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXRSICrossedUnderShortExit) + // + || + // + (mConditions.isXCHMALCFastOverSlow && + ( + // + (mConditions.isXCHMALCTrendsDown && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // || // - (mConditions.isXTMBearish && - mConditions.isXAMABearish && + (mConditions.isXTMVale && mConditions.isXCHMASCUnderMin && - mConditions.isXTDBullUnderBear && - mConditions.isXTDSignalUnderBear && - mConditions.isXCHMALCFastOverSlow && - mConditions.isXRSICrossedUnderShortExit) + mConditions.isXCHMAMCFastOverSlow) // || // @@ -11390,6 +11421,35 @@ bool XUSCHF5XTSFIHasShortSignal() // ) // + || + // + (mConditions.isXCHMALCFastOverSlow && + ( + // + ((mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHMASCVale && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMASCCrossedUnderMin) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -11535,6 +11595,33 @@ bool XUSCHF5XTSFIHasShortSignal() // || // + (mConditions.isXCHMAMCFastOverSlow && + ( + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastUnderSlow) + // + || + // + (mConditions.isXTMEndBullish && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) + // + ) + // + || + // (mConditions.isXCHLHMCLCLLSame && mConditions.isXTDBullUnderBear && mConditions.isXTDSignalUnderBear && diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 87b2dd75..f46c5835 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -10922,19 +10922,50 @@ bool XUSCHF5XTSFIHasShortSignal() // || // - (mConditions.isXTMVale && - mConditions.isXCHMASCUnderMin && - mConditions.isXCHMAMCFastOverSlow) + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + ((mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) && + ( + // + (mConditions.isXCHMASCUnderMin && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXRSICrossedUnderShortExit) + // + || + // + (mConditions.isXCHMALCFastOverSlow && + ( + // + (mConditions.isXCHMALCTrendsDown && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // || // - (mConditions.isXTMBearish && - mConditions.isXAMABearish && + (mConditions.isXTMVale && mConditions.isXCHMASCUnderMin && - mConditions.isXTDBullUnderBear && - mConditions.isXTDSignalUnderBear && - mConditions.isXCHMALCFastOverSlow && - mConditions.isXRSICrossedUnderShortExit) + mConditions.isXCHMAMCFastOverSlow) // || // @@ -11390,6 +11421,35 @@ bool XUSCHF5XTSFIHasShortSignal() // ) // + || + // + (mConditions.isXCHMALCFastOverSlow && + ( + // + ((mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHMASCVale && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMASCCrossedUnderMin) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -11535,6 +11595,33 @@ bool XUSCHF5XTSFIHasShortSignal() // || // + (mConditions.isXCHMAMCFastOverSlow && + ( + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastUnderSlow) + // + || + // + (mConditions.isXTMEndBullish && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) + // + ) + // + || + // (mConditions.isXCHLHMCLCLLSame && mConditions.isXTDBullUnderBear && mConditions.isXTDSignalUnderBear &&