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 37e5e131..f2f83a2d 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -4863,6 +4863,32 @@ bool XUSCHF5XTAMHasLongSignal() // ) // + || + // + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMAMCTrendsUp) && + ( + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + mConditions.isXTDSignalUnderBear + // + || + // + (mConditions.isXTDBearishVale && + mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -4971,7 +4997,36 @@ bool XUSCHF5XTAMHasLongSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + // Check if SC Fast Under Slow ... + ((mConditions.isXCHMASCFastUnderSlow || + mConditions.isXCHMASCFastCrossedUnderSlow) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderMediest) + // + ) + // + ) + // + || + // + (mConditions.isXCHLHSameHHs && + mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) + // + ) + // + ) + // + ) // ) // @@ -5186,6 +5241,40 @@ bool XUSCHF5XTAMHasLongSignal() // ) // + || + // + // Check if MC Fast Under Slow ... + ((mConditions.isXCHMAMCFastUnderSlow || + mConditions.isXCHMAMCFastCrossedUnderSlow) && + ( + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + ((mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXLHPriceCrossedOverSignal && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -5223,6 +5312,24 @@ bool XUSCHF5XTAMHasLongSignal() // ) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXTSCurrentMax && + mConditions.isXTDBearishVale && + mConditions.isXCHMASCOverMax && + mConditions.isXCHMALCTrendsUp && + mConditions.isXLHHighAttachedHH) + // + ) + // + ) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 9ffcb5f9..51476664 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -20,7 +20,7 @@ Resolve XUSCHF5 XTD All Guard Attacks in All Markets ... XTAM ----- Resolve XUSCHF5 XTAM All Stopouts in All Markets ... -Resolve XUSCHF5 XTAM Longs All Critical Guard Attacks in AMarkets-Real ... +Resolve XUSCHF5 XTAM Longs All Critical Guard Attacks in OANDA ... Resolve XUSCHF5 XTAM Shorts All Critical Guard Attacks in All Markets ... Resolve XUSCHF5 XTAM 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 37e5e131..f2f83a2d 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -4863,6 +4863,32 @@ bool XUSCHF5XTAMHasLongSignal() // ) // + || + // + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMAMCTrendsUp) && + ( + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + mConditions.isXTDSignalUnderBear + // + || + // + (mConditions.isXTDBearishVale && + mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -4971,7 +4997,36 @@ bool XUSCHF5XTAMHasLongSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + // Check if SC Fast Under Slow ... + ((mConditions.isXCHMASCFastUnderSlow || + mConditions.isXCHMASCFastCrossedUnderSlow) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderMediest) + // + ) + // + ) + // + || + // + (mConditions.isXCHLHSameHHs && + mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) + // + ) + // + ) + // + ) // ) // @@ -5186,6 +5241,40 @@ bool XUSCHF5XTAMHasLongSignal() // ) // + || + // + // Check if MC Fast Under Slow ... + ((mConditions.isXCHMAMCFastUnderSlow || + mConditions.isXCHMAMCFastCrossedUnderSlow) && + ( + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + ((mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXLHPriceCrossedOverSignal && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -5223,6 +5312,24 @@ bool XUSCHF5XTAMHasLongSignal() // ) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXTSCurrentMax && + mConditions.isXTDBearishVale && + mConditions.isXCHMASCOverMax && + mConditions.isXCHMALCTrendsUp && + mConditions.isXLHHighAttachedHH) + // + ) + // + ) + // ) // ) diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 37e5e131..f2f83a2d 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -4863,6 +4863,32 @@ bool XUSCHF5XTAMHasLongSignal() // ) // + || + // + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMAMCTrendsUp) && + ( + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + mConditions.isXTDSignalUnderBear + // + || + // + (mConditions.isXTDBearishVale && + mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -4971,7 +4997,36 @@ bool XUSCHF5XTAMHasLongSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + // Check if SC Fast Under Slow ... + ((mConditions.isXCHMASCFastUnderSlow || + mConditions.isXCHMASCFastCrossedUnderSlow) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderMediest) + // + ) + // + ) + // + || + // + (mConditions.isXCHLHSameHHs && + mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) + // + ) + // + ) + // + ) // ) // @@ -5186,6 +5241,40 @@ bool XUSCHF5XTAMHasLongSignal() // ) // + || + // + // Check if MC Fast Under Slow ... + ((mConditions.isXCHMAMCFastUnderSlow || + mConditions.isXCHMAMCFastCrossedUnderSlow) && + ( + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + ((mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXLHPriceCrossedOverSignal && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -5223,6 +5312,24 @@ bool XUSCHF5XTAMHasLongSignal() // ) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXTSCurrentMax && + mConditions.isXTDBearishVale && + mConditions.isXCHMASCOverMax && + mConditions.isXCHMALCTrendsUp && + mConditions.isXLHHighAttachedHH) + // + ) + // + ) + // ) // )