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 bf48fa2b..d24e82a2 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -4777,9 +4777,19 @@ bool XUSCHF5XTSFIHasLongSignal() mConditions.isXAMABearish) && ( // - (mConditions.isXTDSignalUnderBear && - mConditions.isXTSCurrentUnderMediest && - mConditions.isXTDBullCrossedUnderBear) + ((mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderMediest) && + ( + // + mConditions.isXTDBullUnderBear + // + || + // + mConditions.isXTDBullCrossedUnderBear + // + ) + // + ) // ) // @@ -4823,6 +4833,20 @@ bool XUSCHF5XTSFIHasLongSignal() // || // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow && + mConditions.isXTSCurrentUnderMediest) + // + ) + // + ) + // + || + // // Check if SC Fast Under Slow ... ((mConditions.isXCHMASCFastUnderSlow || mConditions.isXCHMASCFastCrossedUnderSlow) && @@ -5127,6 +5151,23 @@ bool XUSCHF5XTSFIHasLongSignal() // || // + // Check if SC Fast Under Slow ... + ((mConditions.isXCHMASCFastUnderSlow || + mConditions.isXCHMASCFastCrossedUnderSlow) && + ( + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderMediest) + // + ) + // + ) + // + || + // // Check LC Fast Under Slow ... ((mConditions.isXCHMALCFastUnderSlow || mConditions.isXCHMALCFastCrossedUnderSlow) && diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index c6b155f8..93ca73de 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -18,4 +18,4 @@ Alpari Resolve XUSCHF5 XTD Longs All Stopouts in MetaQuotes, HFMarkets ... Resolve XUSCHF5 XTAM Longs All Stopouts in MetaQuotes ... -Resolve XUSCHF5 XTSFI Longs All Stopouts in ErranteSC ... +Resolve XUSCHF5 XTSFI Longs All Stopouts in Alpari ... 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 bf48fa2b..d24e82a2 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -4777,9 +4777,19 @@ bool XUSCHF5XTSFIHasLongSignal() mConditions.isXAMABearish) && ( // - (mConditions.isXTDSignalUnderBear && - mConditions.isXTSCurrentUnderMediest && - mConditions.isXTDBullCrossedUnderBear) + ((mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderMediest) && + ( + // + mConditions.isXTDBullUnderBear + // + || + // + mConditions.isXTDBullCrossedUnderBear + // + ) + // + ) // ) // @@ -4823,6 +4833,20 @@ bool XUSCHF5XTSFIHasLongSignal() // || // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow && + mConditions.isXTSCurrentUnderMediest) + // + ) + // + ) + // + || + // // Check if SC Fast Under Slow ... ((mConditions.isXCHMASCFastUnderSlow || mConditions.isXCHMASCFastCrossedUnderSlow) && @@ -5127,6 +5151,23 @@ bool XUSCHF5XTSFIHasLongSignal() // || // + // Check if SC Fast Under Slow ... + ((mConditions.isXCHMASCFastUnderSlow || + mConditions.isXCHMASCFastCrossedUnderSlow) && + ( + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderMediest) + // + ) + // + ) + // + || + // // Check LC Fast Under Slow ... ((mConditions.isXCHMALCFastUnderSlow || mConditions.isXCHMALCFastCrossedUnderSlow) && diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index bf48fa2b..d24e82a2 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -4777,9 +4777,19 @@ bool XUSCHF5XTSFIHasLongSignal() mConditions.isXAMABearish) && ( // - (mConditions.isXTDSignalUnderBear && - mConditions.isXTSCurrentUnderMediest && - mConditions.isXTDBullCrossedUnderBear) + ((mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderMediest) && + ( + // + mConditions.isXTDBullUnderBear + // + || + // + mConditions.isXTDBullCrossedUnderBear + // + ) + // + ) // ) // @@ -4823,6 +4833,20 @@ bool XUSCHF5XTSFIHasLongSignal() // || // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow && + mConditions.isXTSCurrentUnderMediest) + // + ) + // + ) + // + || + // // Check if SC Fast Under Slow ... ((mConditions.isXCHMASCFastUnderSlow || mConditions.isXCHMASCFastCrossedUnderSlow) && @@ -5127,6 +5151,23 @@ bool XUSCHF5XTSFIHasLongSignal() // || // + // Check if SC Fast Under Slow ... + ((mConditions.isXCHMASCFastUnderSlow || + mConditions.isXCHMASCFastCrossedUnderSlow) && + ( + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderMediest) + // + ) + // + ) + // + || + // // Check LC Fast Under Slow ... ((mConditions.isXCHMALCFastUnderSlow || mConditions.isXCHMALCFastCrossedUnderSlow) &&