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 b014576d..90ec00dd 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -6044,8 +6044,24 @@ bool XUSCHF5XTSFIHasShortSignal() ( // (mConditions.isXCHMALCPeak && - mConditions.isXTMNeutural && - mConditions.isXAMANeutural) + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMABullish) + // + || + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish) + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + ) + // + ) // || // @@ -6111,6 +6127,19 @@ bool XUSCHF5XTSFIHasShortSignal() // ) // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHLHSCMCLLSame && + mConditions.isXTSCurrentOverMediest) + // + ) + // + ) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 11329b44..5a7c1c4e 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -11,7 +11,7 @@ Alpari Resolve XUSCHF5 XTD Shorts All Stopouts in All Markets ... Resolve XUSCHF5 XTAM Shorts All Stopouts in All Markets ... Resolve XUSCHF5 XSI Shorts All Stopouts in All Markets ... -Resolve XUSCHF5 XTSFI Shorts All Stopouts in OANDA ... +Resolve XUSCHF5 XTSFI Shorts All Stopouts in HFMarkets ... Resolve XUSCHF5 XOBDLH Shorts All Stopouts in ... Resolve XUSCHF5 XCHMACC Shorts All Stopouts in ... Resolve XUSCHF5 XCHMAMX 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 b014576d..90ec00dd 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -6044,8 +6044,24 @@ bool XUSCHF5XTSFIHasShortSignal() ( // (mConditions.isXCHMALCPeak && - mConditions.isXTMNeutural && - mConditions.isXAMANeutural) + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMABullish) + // + || + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish) + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + ) + // + ) // || // @@ -6111,6 +6127,19 @@ bool XUSCHF5XTSFIHasShortSignal() // ) // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHLHSCMCLLSame && + mConditions.isXTSCurrentOverMediest) + // + ) + // + ) + // ) // ) diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index b014576d..90ec00dd 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -6044,8 +6044,24 @@ bool XUSCHF5XTSFIHasShortSignal() ( // (mConditions.isXCHMALCPeak && - mConditions.isXTMNeutural && - mConditions.isXAMANeutural) + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMABullish) + // + || + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish) + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + ) + // + ) // || // @@ -6111,6 +6127,19 @@ bool XUSCHF5XTSFIHasShortSignal() // ) // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHLHSCMCLLSame && + mConditions.isXTSCurrentOverMediest) + // + ) + // + ) + // ) // )