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 5d47c45e..521594e5 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -5722,7 +5722,40 @@ bool XUSCHF5XTAMHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + // Check if MC Fast Over Slow ... + ((mConditions.isXCHMAMCFastOverSlow || + mConditions.isXCHMAMCFastCrossedOverSlow) && + ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXTDBullOverBear && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHMAMCTrendsUp) + // + ) + // + ) + // + || + // + (mConditions.isXCHMASCPeak && + mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCPeak && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastUnderSlow) + // + ) + // + ) + // + ) // ) // @@ -5752,9 +5785,20 @@ bool XUSCHF5XTAMHasShortSignal() mConditions.isXAMAStartBearish) && ( // - (mConditions.isXCHLHSameLLs && - mConditions.isXLHLowAttachedLL && - mConditions.isXTSCurrentOverFarest) + ((mConditions.isXCHLHSameLLs && + mConditions.isXLHLowAttachedLL) && + ( + // + mConditions.isXTSCurrentOverFarest + // + || + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin) + // + ) + // + ) // ) // @@ -5876,6 +5920,13 @@ bool XUSCHF5XTAMHasShortSignal() ((mConditions.isXTMBearish && mConditions.isXAMABearish) && ( + // + (mConditions.isXTSCurrentOverNearest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTSCurrentCrossedOverNearest && + mConditions.isXTSCurrentCrossedOverMediest) + // + || // (mConditions.isXCHLHSameLLs && mConditions.isXTSCurrentMin && @@ -5957,6 +6008,26 @@ bool XUSCHF5XTAMHasShortSignal() // ) // + || + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXCHMASCUnderMin && + mConditions.isXLHLowAttachedLL && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXCHMASCCrossedUnderMin) + // + ) + // + ) + // ) // ) @@ -5984,7 +6055,6 @@ bool XUSCHF5XTAMHasShortSignal() mConditions.isXCHMALCPeak && mConditions.isXTDSignalVale && mConditions.isXTSCurrentMin && - mConditions.isXTDBullishVale && mConditions.isXCHLHSCMCLLSame && mConditions.isXLHLowAttachedLL && mConditions.isXTSCurrentCrossedUnderNearest) @@ -6035,13 +6105,23 @@ bool XUSCHF5XTAMHasShortSignal() mConditions.isXAMANeutural) && ( // - (mConditions.isXCHMALCVale && - mConditions.isXTSCurrentMin && - mConditions.isXCHLHMCLCLLSame && - mConditions.isXCHMAMCTrendsDown && - mConditions.isXTSCurrentCrossedUnderFarest && - mConditions.isXTSCurrentCrossedUnderNearest && - mConditions.isXTSCurrentCrossedUnderMediest) + ((mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMAMCTrendsDown) && + ( + // + mConditions.isXTSCurrentOverFarest + // + || + // + (mConditions.isXTSCurrentMin && + mConditions.isXTSCurrentCrossedUnderFarest && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) // ) // @@ -6095,6 +6175,31 @@ bool XUSCHF5XTAMHasShortSignal() // ) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear && + mConditions.isXTSCurrentOverFarest && + (mConditions.isXTSCurrentOverMediest || + mConditions.isXTSCurrentOverNearest)) + // + || + // + (mConditions.isXCHMASCPeak && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) + // + ) + // + ) + // ) // ) @@ -6169,7 +6274,29 @@ bool XUSCHF5XTAMHasShortSignal() !mConditions.isXLHHHSameInLength) && // ( - false) + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 71042156..6aae9175 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 GrowthNext ... +Resolve XUSCHF5 XTAM Shorts All Critical Guard Attacks in OANDA ... 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 5d47c45e..521594e5 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -5722,7 +5722,40 @@ bool XUSCHF5XTAMHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + // Check if MC Fast Over Slow ... + ((mConditions.isXCHMAMCFastOverSlow || + mConditions.isXCHMAMCFastCrossedOverSlow) && + ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXTDBullOverBear && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHMAMCTrendsUp) + // + ) + // + ) + // + || + // + (mConditions.isXCHMASCPeak && + mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCPeak && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastUnderSlow) + // + ) + // + ) + // + ) // ) // @@ -5752,9 +5785,20 @@ bool XUSCHF5XTAMHasShortSignal() mConditions.isXAMAStartBearish) && ( // - (mConditions.isXCHLHSameLLs && - mConditions.isXLHLowAttachedLL && - mConditions.isXTSCurrentOverFarest) + ((mConditions.isXCHLHSameLLs && + mConditions.isXLHLowAttachedLL) && + ( + // + mConditions.isXTSCurrentOverFarest + // + || + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin) + // + ) + // + ) // ) // @@ -5876,6 +5920,13 @@ bool XUSCHF5XTAMHasShortSignal() ((mConditions.isXTMBearish && mConditions.isXAMABearish) && ( + // + (mConditions.isXTSCurrentOverNearest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTSCurrentCrossedOverNearest && + mConditions.isXTSCurrentCrossedOverMediest) + // + || // (mConditions.isXCHLHSameLLs && mConditions.isXTSCurrentMin && @@ -5957,6 +6008,26 @@ bool XUSCHF5XTAMHasShortSignal() // ) // + || + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXCHMASCUnderMin && + mConditions.isXLHLowAttachedLL && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXCHMASCCrossedUnderMin) + // + ) + // + ) + // ) // ) @@ -5984,7 +6055,6 @@ bool XUSCHF5XTAMHasShortSignal() mConditions.isXCHMALCPeak && mConditions.isXTDSignalVale && mConditions.isXTSCurrentMin && - mConditions.isXTDBullishVale && mConditions.isXCHLHSCMCLLSame && mConditions.isXLHLowAttachedLL && mConditions.isXTSCurrentCrossedUnderNearest) @@ -6035,13 +6105,23 @@ bool XUSCHF5XTAMHasShortSignal() mConditions.isXAMANeutural) && ( // - (mConditions.isXCHMALCVale && - mConditions.isXTSCurrentMin && - mConditions.isXCHLHMCLCLLSame && - mConditions.isXCHMAMCTrendsDown && - mConditions.isXTSCurrentCrossedUnderFarest && - mConditions.isXTSCurrentCrossedUnderNearest && - mConditions.isXTSCurrentCrossedUnderMediest) + ((mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMAMCTrendsDown) && + ( + // + mConditions.isXTSCurrentOverFarest + // + || + // + (mConditions.isXTSCurrentMin && + mConditions.isXTSCurrentCrossedUnderFarest && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) // ) // @@ -6095,6 +6175,31 @@ bool XUSCHF5XTAMHasShortSignal() // ) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear && + mConditions.isXTSCurrentOverFarest && + (mConditions.isXTSCurrentOverMediest || + mConditions.isXTSCurrentOverNearest)) + // + || + // + (mConditions.isXCHMASCPeak && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) + // + ) + // + ) + // ) // ) @@ -6169,7 +6274,29 @@ bool XUSCHF5XTAMHasShortSignal() !mConditions.isXLHHHSameInLength) && // ( - false) + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 5d47c45e..521594e5 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -5722,7 +5722,40 @@ bool XUSCHF5XTAMHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + // Check if MC Fast Over Slow ... + ((mConditions.isXCHMAMCFastOverSlow || + mConditions.isXCHMAMCFastCrossedOverSlow) && + ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXTDBullOverBear && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHMAMCTrendsUp) + // + ) + // + ) + // + || + // + (mConditions.isXCHMASCPeak && + mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCPeak && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastUnderSlow) + // + ) + // + ) + // + ) // ) // @@ -5752,9 +5785,20 @@ bool XUSCHF5XTAMHasShortSignal() mConditions.isXAMAStartBearish) && ( // - (mConditions.isXCHLHSameLLs && - mConditions.isXLHLowAttachedLL && - mConditions.isXTSCurrentOverFarest) + ((mConditions.isXCHLHSameLLs && + mConditions.isXLHLowAttachedLL) && + ( + // + mConditions.isXTSCurrentOverFarest + // + || + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin) + // + ) + // + ) // ) // @@ -5876,6 +5920,13 @@ bool XUSCHF5XTAMHasShortSignal() ((mConditions.isXTMBearish && mConditions.isXAMABearish) && ( + // + (mConditions.isXTSCurrentOverNearest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTSCurrentCrossedOverNearest && + mConditions.isXTSCurrentCrossedOverMediest) + // + || // (mConditions.isXCHLHSameLLs && mConditions.isXTSCurrentMin && @@ -5957,6 +6008,26 @@ bool XUSCHF5XTAMHasShortSignal() // ) // + || + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXCHMASCUnderMin && + mConditions.isXLHLowAttachedLL && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXCHMASCCrossedUnderMin) + // + ) + // + ) + // ) // ) @@ -5984,7 +6055,6 @@ bool XUSCHF5XTAMHasShortSignal() mConditions.isXCHMALCPeak && mConditions.isXTDSignalVale && mConditions.isXTSCurrentMin && - mConditions.isXTDBullishVale && mConditions.isXCHLHSCMCLLSame && mConditions.isXLHLowAttachedLL && mConditions.isXTSCurrentCrossedUnderNearest) @@ -6035,13 +6105,23 @@ bool XUSCHF5XTAMHasShortSignal() mConditions.isXAMANeutural) && ( // - (mConditions.isXCHMALCVale && - mConditions.isXTSCurrentMin && - mConditions.isXCHLHMCLCLLSame && - mConditions.isXCHMAMCTrendsDown && - mConditions.isXTSCurrentCrossedUnderFarest && - mConditions.isXTSCurrentCrossedUnderNearest && - mConditions.isXTSCurrentCrossedUnderMediest) + ((mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMAMCTrendsDown) && + ( + // + mConditions.isXTSCurrentOverFarest + // + || + // + (mConditions.isXTSCurrentMin && + mConditions.isXTSCurrentCrossedUnderFarest && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) // ) // @@ -6095,6 +6175,31 @@ bool XUSCHF5XTAMHasShortSignal() // ) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear && + mConditions.isXTSCurrentOverFarest && + (mConditions.isXTSCurrentOverMediest || + mConditions.isXTSCurrentOverNearest)) + // + || + // + (mConditions.isXCHMASCPeak && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) + // + ) + // + ) + // ) // ) @@ -6169,7 +6274,29 @@ bool XUSCHF5XTAMHasShortSignal() !mConditions.isXLHHHSameInLength) && // ( - false) + // + // Check LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin) + // + ) + // + ) + // + ) + // + ) + // + ) // ) //