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 3c148c37..382ea37d 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -2949,10 +2949,32 @@ bool XUSCHF5XTDHasShortSignal() ( // (mConditions.isXCHMALCVale && - mConditions.isXTSCurrentMin && - mConditions.isXTDBullOverBear && - mConditions.isXCHLHSCMCHHSame && - mConditions.isXTDSignalCrossedUnderBear) + ( + // + (mConditions.isXCHMALCTrendsUp && + mConditions.isXCHMALCFastUnderSlow) + // + || + // + ((mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDBullOverBear) && + ( + // + (mConditions.isXCHMASCPeak && + mConditions.isXTSCurrentOverFarest) + // + || + // + (mConditions.isXTSCurrentMin && + mConditions.isXTDSignalCrossedUnderBear) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 36c055db..4b8fa2ae 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -8,7 +8,7 @@ IFCMarkets ErranteSC Alpari -Resolve XUSCHF5 XTD Shorts All Stopouts in MetaQuotes ... +Resolve XUSCHF5 XTD Shorts All Stopouts in HFMarkets ... Resolve XUSCHF5 XTAM Shorts All Stopouts in ... Resolve XUSCHF5 XSI Shorts All Stopouts in ... Resolve XUSCHF5 XTSFI Shorts All Stopouts in ... 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 3c148c37..382ea37d 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -2949,10 +2949,32 @@ bool XUSCHF5XTDHasShortSignal() ( // (mConditions.isXCHMALCVale && - mConditions.isXTSCurrentMin && - mConditions.isXTDBullOverBear && - mConditions.isXCHLHSCMCHHSame && - mConditions.isXTDSignalCrossedUnderBear) + ( + // + (mConditions.isXCHMALCTrendsUp && + mConditions.isXCHMALCFastUnderSlow) + // + || + // + ((mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDBullOverBear) && + ( + // + (mConditions.isXCHMASCPeak && + mConditions.isXTSCurrentOverFarest) + // + || + // + (mConditions.isXTSCurrentMin && + mConditions.isXTDSignalCrossedUnderBear) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 3c148c37..382ea37d 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -2949,10 +2949,32 @@ bool XUSCHF5XTDHasShortSignal() ( // (mConditions.isXCHMALCVale && - mConditions.isXTSCurrentMin && - mConditions.isXTDBullOverBear && - mConditions.isXCHLHSCMCHHSame && - mConditions.isXTDSignalCrossedUnderBear) + ( + // + (mConditions.isXCHMALCTrendsUp && + mConditions.isXCHMALCFastUnderSlow) + // + || + // + ((mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDBullOverBear) && + ( + // + (mConditions.isXCHMASCPeak && + mConditions.isXTSCurrentOverFarest) + // + || + // + (mConditions.isXTSCurrentMin && + mConditions.isXTDSignalCrossedUnderBear) + // + ) + // + ) + // + ) + // + ) // ) //