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 d79b90c1..974fd265 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -5709,7 +5709,25 @@ bool XUSCHF5XTAMHasShortSignal() !mConditions.isXLHHHSameInLength) && // ( - false) + // + // Check if MC Fast Over Slow ... + ((mConditions.isXCHMAMCFastOverSlow || + mConditions.isXCHMAMCFastCrossedOverSlow) && + ( + // + (mConditions.isXAMABullish && + mConditions.isXCHMALCVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXTSCurrentOverFarest && + mConditions.isXCHMASCCrossedOverMin) + // + ) + // + ) + // + ) // ) // @@ -5841,6 +5859,39 @@ bool XUSCHF5XTAMHasShortSignal() // ) // + || + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + ((mConditions.isXTMStartBearish && + mConditions.isXAMAStartBearish) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXTDBullOverBear && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXLHLowAttachedLL) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -6106,15 +6157,25 @@ bool XUSCHF5XTAMHasShortSignal() // || // - (mConditions.isXTSCurrentMin && - mConditions.isXTDSignalVale && - mConditions.isXTDBullishVale && - mConditions.isXCHLHSCMCLLSame && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXCHMASCUnderMin && - mConditions.isXLHLowAttachedLL && - mConditions.isXTDBullUnderBear && - mConditions.isXTDSignalUnderBear) + ((mConditions.isXTSCurrentMin && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) && + ( + // + mConditions.isXCHLHSameLLs + // + || + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXLHLowAttachedLL) + // + ) + // + ) // ) // @@ -6288,6 +6349,22 @@ bool XUSCHF5XTAMHasShortSignal() mConditions.isXCHMAMCTrendsDown && mConditions.isXCHMAMCFastUnderSlow) // + || + // + (mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXRSICrossedOverLongExit) + // + || + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 65810125..2b843801 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -21,7 +21,7 @@ XTAM ----- Resolve XUSCHF5 XTAM All Stopouts in All Markets ... Resolve XUSCHF5 XTAM Longs All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XTAM Shorts All Critical Guard Attacks in HFMarkets ... +Resolve XUSCHF5 XTAM Shorts All Critical Guard Attacks in AMarkets-Demo ... 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 d79b90c1..974fd265 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -5709,7 +5709,25 @@ bool XUSCHF5XTAMHasShortSignal() !mConditions.isXLHHHSameInLength) && // ( - false) + // + // Check if MC Fast Over Slow ... + ((mConditions.isXCHMAMCFastOverSlow || + mConditions.isXCHMAMCFastCrossedOverSlow) && + ( + // + (mConditions.isXAMABullish && + mConditions.isXCHMALCVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXTSCurrentOverFarest && + mConditions.isXCHMASCCrossedOverMin) + // + ) + // + ) + // + ) // ) // @@ -5841,6 +5859,39 @@ bool XUSCHF5XTAMHasShortSignal() // ) // + || + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + ((mConditions.isXTMStartBearish && + mConditions.isXAMAStartBearish) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXTDBullOverBear && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXLHLowAttachedLL) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -6106,15 +6157,25 @@ bool XUSCHF5XTAMHasShortSignal() // || // - (mConditions.isXTSCurrentMin && - mConditions.isXTDSignalVale && - mConditions.isXTDBullishVale && - mConditions.isXCHLHSCMCLLSame && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXCHMASCUnderMin && - mConditions.isXLHLowAttachedLL && - mConditions.isXTDBullUnderBear && - mConditions.isXTDSignalUnderBear) + ((mConditions.isXTSCurrentMin && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) && + ( + // + mConditions.isXCHLHSameLLs + // + || + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXLHLowAttachedLL) + // + ) + // + ) // ) // @@ -6288,6 +6349,22 @@ bool XUSCHF5XTAMHasShortSignal() mConditions.isXCHMAMCTrendsDown && mConditions.isXCHMAMCFastUnderSlow) // + || + // + (mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXRSICrossedOverLongExit) + // + || + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) + // ) // ) diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index d79b90c1..974fd265 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -5709,7 +5709,25 @@ bool XUSCHF5XTAMHasShortSignal() !mConditions.isXLHHHSameInLength) && // ( - false) + // + // Check if MC Fast Over Slow ... + ((mConditions.isXCHMAMCFastOverSlow || + mConditions.isXCHMAMCFastCrossedOverSlow) && + ( + // + (mConditions.isXAMABullish && + mConditions.isXCHMALCVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXTSCurrentOverFarest && + mConditions.isXCHMASCCrossedOverMin) + // + ) + // + ) + // + ) // ) // @@ -5841,6 +5859,39 @@ bool XUSCHF5XTAMHasShortSignal() // ) // + || + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + ((mConditions.isXTMStartBearish && + mConditions.isXAMAStartBearish) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXTDBullOverBear && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXLHLowAttachedLL) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -6106,15 +6157,25 @@ bool XUSCHF5XTAMHasShortSignal() // || // - (mConditions.isXTSCurrentMin && - mConditions.isXTDSignalVale && - mConditions.isXTDBullishVale && - mConditions.isXCHLHSCMCLLSame && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXCHMASCUnderMin && - mConditions.isXLHLowAttachedLL && - mConditions.isXTDBullUnderBear && - mConditions.isXTDSignalUnderBear) + ((mConditions.isXTSCurrentMin && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) && + ( + // + mConditions.isXCHLHSameLLs + // + || + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXLHLowAttachedLL) + // + ) + // + ) // ) // @@ -6288,6 +6349,22 @@ bool XUSCHF5XTAMHasShortSignal() mConditions.isXCHMAMCTrendsDown && mConditions.isXCHMAMCFastUnderSlow) // + || + // + (mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXRSICrossedOverLongExit) + // + || + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) + // ) // )