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 6ea15925..ddf5fb32 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -7133,7 +7133,6 @@ bool XUSCHF5XSIHasLongSignal() ((mConditions.isXCHMASCFastUnderSlow || mConditions.isXCHMASCFastCrossedUnderSlow) && ( - // (mConditions.isXCHMASCVale && mConditions.isXCHMASCTrendsUp) @@ -7189,6 +7188,29 @@ bool XUSCHF5XSIHasLongSignal() // ) // + || + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTMVale && + mConditions.isXAMAVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + || + // + (mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMAMCFastOverSlow && + mConditions.isXCHMALCFastOverSlow) + // + ) + // + ) + // ) // ) @@ -7318,7 +7340,30 @@ bool XUSCHF5XSIHasLongSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + // Check if SC Fast Under Slow ... + ((mConditions.isXCHMASCFastUnderSlow || + mConditions.isXCHMASCFastCrossedUnderSlow) && + ( + // + (mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXTSCurrentUnderMediest) + // + || + // + (mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow && + mConditions.isXLHPriceCrossedOverSignal) + // + ) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index cc34591c..0af409b9 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -27,7 +27,7 @@ Resolve XUSCHF5 XTAM All Guard Attacks in All Markets ... XSI ---- Resolve XUSCHF5 XSI All Stopouts in All Markets ... -Resolve XUSCHF5 XSI Longs All Critical Guard Attacks in GrowthNext ... +Resolve XUSCHF5 XSI Longs All Critical Guard Attacks in OANDA ... Resolve XUSCHF5 XSI Shorts All Critical Guard Attacks in All Markets ... Resolve XUSCHF5 XSI 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 6ea15925..ddf5fb32 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -7133,7 +7133,6 @@ bool XUSCHF5XSIHasLongSignal() ((mConditions.isXCHMASCFastUnderSlow || mConditions.isXCHMASCFastCrossedUnderSlow) && ( - // (mConditions.isXCHMASCVale && mConditions.isXCHMASCTrendsUp) @@ -7189,6 +7188,29 @@ bool XUSCHF5XSIHasLongSignal() // ) // + || + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTMVale && + mConditions.isXAMAVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + || + // + (mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMAMCFastOverSlow && + mConditions.isXCHMALCFastOverSlow) + // + ) + // + ) + // ) // ) @@ -7318,7 +7340,30 @@ bool XUSCHF5XSIHasLongSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + // Check if SC Fast Under Slow ... + ((mConditions.isXCHMASCFastUnderSlow || + mConditions.isXCHMASCFastCrossedUnderSlow) && + ( + // + (mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXTSCurrentUnderMediest) + // + || + // + (mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow && + mConditions.isXLHPriceCrossedOverSignal) + // + ) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 6ea15925..ddf5fb32 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -7133,7 +7133,6 @@ bool XUSCHF5XSIHasLongSignal() ((mConditions.isXCHMASCFastUnderSlow || mConditions.isXCHMASCFastCrossedUnderSlow) && ( - // (mConditions.isXCHMASCVale && mConditions.isXCHMASCTrendsUp) @@ -7189,6 +7188,29 @@ bool XUSCHF5XSIHasLongSignal() // ) // + || + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTMVale && + mConditions.isXAMAVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + || + // + (mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMAMCFastOverSlow && + mConditions.isXCHMALCFastOverSlow) + // + ) + // + ) + // ) // ) @@ -7318,7 +7340,30 @@ bool XUSCHF5XSIHasLongSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + // Check if SC Fast Under Slow ... + ((mConditions.isXCHMASCFastUnderSlow || + mConditions.isXCHMASCFastCrossedUnderSlow) && + ( + // + (mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXTSCurrentUnderMediest) + // + || + // + (mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow && + mConditions.isXLHPriceCrossedOverSignal) + // + ) + // + ) + // + ) // ) //