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 547c7578..80d0fd5a 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -4642,6 +4642,12 @@ bool XUSCHF5XTSFIHasLongSignal() ((mConditions.isXCHMASCFastUnderSlow || mConditions.isXCHMASCFastCrossedUnderSlow) && ( + // + (mConditions.isXCHMASCOverMax && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderMediest) + // + || // (mConditions.isXAMAVale && mConditions.isXTDSignalVale && @@ -4746,9 +4752,19 @@ bool XUSCHF5XTSFIHasLongSignal() // || // - (mConditions.isXCHMALCVale && - mConditions.isXCHMALCTrendsDown && - mConditions.isXCHMALCFastOverSlow) + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + mConditions.isXCHMALCVale + // + || + // + mConditions.isXTSCurrentUnderMediest + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index ff056fc3..0d921e4e 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 AMarkets-Real ... +Resolve XUSCHF5 XTSFI Longs All Stopouts in MetaQuotes ... 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 547c7578..80d0fd5a 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -4642,6 +4642,12 @@ bool XUSCHF5XTSFIHasLongSignal() ((mConditions.isXCHMASCFastUnderSlow || mConditions.isXCHMASCFastCrossedUnderSlow) && ( + // + (mConditions.isXCHMASCOverMax && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderMediest) + // + || // (mConditions.isXAMAVale && mConditions.isXTDSignalVale && @@ -4746,9 +4752,19 @@ bool XUSCHF5XTSFIHasLongSignal() // || // - (mConditions.isXCHMALCVale && - mConditions.isXCHMALCTrendsDown && - mConditions.isXCHMALCFastOverSlow) + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + mConditions.isXCHMALCVale + // + || + // + mConditions.isXTSCurrentUnderMediest + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 547c7578..80d0fd5a 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -4642,6 +4642,12 @@ bool XUSCHF5XTSFIHasLongSignal() ((mConditions.isXCHMASCFastUnderSlow || mConditions.isXCHMASCFastCrossedUnderSlow) && ( + // + (mConditions.isXCHMASCOverMax && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderMediest) + // + || // (mConditions.isXAMAVale && mConditions.isXTDSignalVale && @@ -4746,9 +4752,19 @@ bool XUSCHF5XTSFIHasLongSignal() // || // - (mConditions.isXCHMALCVale && - mConditions.isXCHMALCTrendsDown && - mConditions.isXCHMALCFastOverSlow) + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + mConditions.isXCHMALCVale + // + || + // + mConditions.isXTSCurrentUnderMediest + // + ) + // + ) // ) //