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 445631dd..fd697415 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -3682,11 +3682,30 @@ bool XUSCHF5XTDHasShortSignal() mConditions.isXCHMAMCFastUnderSlow) && ( // - (mConditions.isXTSCurrentMin && - mConditions.isXTDBullOverBear && - mConditions.isXTDSignalCrossedUnderBear && - mConditions.isXTSCurrentCrossedUnderFarest && - mConditions.isXTSCurrentCrossedUnderMediest) + (mConditions.isXTDBullOverBear && + ( + // + ((mConditions.isXTSCurrentMin && + mConditions.isXTSCurrentCrossedUnderFarest) && + ( + // + (mConditions.isXTDSignalCrossedUnderBear && + mConditions.isXTSCurrentCrossedUnderMediest) + // + || + // + (mConditions.isXAMANeutural && + mConditions.isXTMStartBearish && + mConditions.isXCHMASCFastCrossedUnderSlow && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) + // + ) // ) // @@ -3718,7 +3737,43 @@ bool XUSCHF5XTDHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + // Check if MC Fast Over Slow ... + ((mConditions.isXCHMAMCFastOverSlow || + mConditions.isXCHMAMCFastCrossedOverSlow) && + ( + // + (mConditions.isXTDBullOverBear && + ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXLHLowAttachedLL && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastUnderSlow && + mConditions.isXCHMASCFastCrossedUnderSlow && + mConditions.isXTSCurrentCrossedUnderFarest && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -3908,7 +3963,6 @@ bool XUSCHF5XTDHasShortSignal() ( // (mConditions.isXTSCurrentMin && - mConditions.isXLHHHIncreased && mConditions.isXTDBullOverBear && mConditions.isXCHLHSCMCLLSame && mConditions.isXLHLowAttachedLL && @@ -4007,6 +4061,14 @@ bool XUSCHF5XTDHasShortSignal() mConditions.isXCHMASCTrendsUp && mConditions.isXTSCurrentOverFarest) // + || + // + (mConditions.isXAMABullish && + mConditions.isXTDBullOverBear && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index d18b5e74..1a86a5e1 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -20,7 +20,7 @@ Resolve XUSCHF5 XCHMAMX Longs All Critical Guard Attacks in All Markets ... Resolve XUSCHF5 XCHMAMN Longs All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XTD Shorts All Critical Guard Attacks in OANDA ... +Resolve XUSCHF5 XTD Shorts All Critical Guard Attacks in MetaQuotes ... Resolve XUSCHF5 XTAM Shorts All Critical Guard Attacks in All Markets ... Resolve XUSCHF5 XSI Shorts All Critical Guard Attacks in All Markets ... Resolve XUSCHF5 XTSFI Shorts All Critical 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 445631dd..fd697415 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -3682,11 +3682,30 @@ bool XUSCHF5XTDHasShortSignal() mConditions.isXCHMAMCFastUnderSlow) && ( // - (mConditions.isXTSCurrentMin && - mConditions.isXTDBullOverBear && - mConditions.isXTDSignalCrossedUnderBear && - mConditions.isXTSCurrentCrossedUnderFarest && - mConditions.isXTSCurrentCrossedUnderMediest) + (mConditions.isXTDBullOverBear && + ( + // + ((mConditions.isXTSCurrentMin && + mConditions.isXTSCurrentCrossedUnderFarest) && + ( + // + (mConditions.isXTDSignalCrossedUnderBear && + mConditions.isXTSCurrentCrossedUnderMediest) + // + || + // + (mConditions.isXAMANeutural && + mConditions.isXTMStartBearish && + mConditions.isXCHMASCFastCrossedUnderSlow && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) + // + ) // ) // @@ -3718,7 +3737,43 @@ bool XUSCHF5XTDHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + // Check if MC Fast Over Slow ... + ((mConditions.isXCHMAMCFastOverSlow || + mConditions.isXCHMAMCFastCrossedOverSlow) && + ( + // + (mConditions.isXTDBullOverBear && + ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXLHLowAttachedLL && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastUnderSlow && + mConditions.isXCHMASCFastCrossedUnderSlow && + mConditions.isXTSCurrentCrossedUnderFarest && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -3908,7 +3963,6 @@ bool XUSCHF5XTDHasShortSignal() ( // (mConditions.isXTSCurrentMin && - mConditions.isXLHHHIncreased && mConditions.isXTDBullOverBear && mConditions.isXCHLHSCMCLLSame && mConditions.isXLHLowAttachedLL && @@ -4007,6 +4061,14 @@ bool XUSCHF5XTDHasShortSignal() mConditions.isXCHMASCTrendsUp && mConditions.isXTSCurrentOverFarest) // + || + // + (mConditions.isXAMABullish && + mConditions.isXTDBullOverBear && + mConditions.isXCHLHMCLCLLSame && + 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 445631dd..fd697415 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -3682,11 +3682,30 @@ bool XUSCHF5XTDHasShortSignal() mConditions.isXCHMAMCFastUnderSlow) && ( // - (mConditions.isXTSCurrentMin && - mConditions.isXTDBullOverBear && - mConditions.isXTDSignalCrossedUnderBear && - mConditions.isXTSCurrentCrossedUnderFarest && - mConditions.isXTSCurrentCrossedUnderMediest) + (mConditions.isXTDBullOverBear && + ( + // + ((mConditions.isXTSCurrentMin && + mConditions.isXTSCurrentCrossedUnderFarest) && + ( + // + (mConditions.isXTDSignalCrossedUnderBear && + mConditions.isXTSCurrentCrossedUnderMediest) + // + || + // + (mConditions.isXAMANeutural && + mConditions.isXTMStartBearish && + mConditions.isXCHMASCFastCrossedUnderSlow && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) + // + ) // ) // @@ -3718,7 +3737,43 @@ bool XUSCHF5XTDHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + // Check if MC Fast Over Slow ... + ((mConditions.isXCHMAMCFastOverSlow || + mConditions.isXCHMAMCFastCrossedOverSlow) && + ( + // + (mConditions.isXTDBullOverBear && + ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXLHLowAttachedLL && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastUnderSlow && + mConditions.isXCHMASCFastCrossedUnderSlow && + mConditions.isXTSCurrentCrossedUnderFarest && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -3908,7 +3963,6 @@ bool XUSCHF5XTDHasShortSignal() ( // (mConditions.isXTSCurrentMin && - mConditions.isXLHHHIncreased && mConditions.isXTDBullOverBear && mConditions.isXCHLHSCMCLLSame && mConditions.isXLHLowAttachedLL && @@ -4007,6 +4061,14 @@ bool XUSCHF5XTDHasShortSignal() mConditions.isXCHMASCTrendsUp && mConditions.isXTSCurrentOverFarest) // + || + // + (mConditions.isXAMABullish && + mConditions.isXTDBullOverBear && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) + // ) // )