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 866cff83..bc3d5cde 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -3460,6 +3460,13 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCUnderMax && + mConditions.isXCHMALCTrendsDown) + // + || + // ((mConditions.isXCHMAMCPeak && mConditions.isXCHMALCVale) && ( @@ -4295,8 +4302,13 @@ bool XUSCHF5XTDHasShortSignal() mConditions.isXCHMAMCTrendsUp) && ( // - ((mConditions.isXTMBearish && - mConditions.isXAMABearish) && + (((mConditions.isXTMBearish && + mConditions.isXAMABearish) + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural)) && ( // (mConditions.isXTSCurrentMin && diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index e369b1a9..74e2ce02 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -14,12 +14,12 @@ XTD ---- Resolve XUSCHF5 XTD All Stopouts in All Markets ... Resolve XUSCHF5 XTD All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XTD All Guard Attacks in IFCMarkets ... +Resolve XUSCHF5 XTD All Guard Attacks in ErranteSC ... XTAM ----- -Resolve XUSCHF5 XTAM Shorts All Stopouts in All Markets ... +Resolve XUSCHF5 XTAM All Stopouts in All Markets ... Resolve XUSCHF5 XTAM Longs All Critical Guard Attacks in All Markets ... Resolve XUSCHF5 XTAM Shorts All Critical Guard Attacks in All Markets ... Resolve XUSCHF5 XTAM All Guard Attacks in All Markets ... @@ -27,7 +27,7 @@ Resolve XUSCHF5 XTAM All Guard Attacks in All Markets ... XSI ---- -Resolve XUSCHF5 XSI Shorts All Stopouts in All Markets ... +Resolve XUSCHF5 XSI All Stopouts in All Markets ... Resolve XUSCHF5 XSI Longs All Critical Guard Attacks in All Markets ... 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 866cff83..bc3d5cde 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -3460,6 +3460,13 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCUnderMax && + mConditions.isXCHMALCTrendsDown) + // + || + // ((mConditions.isXCHMAMCPeak && mConditions.isXCHMALCVale) && ( @@ -4295,8 +4302,13 @@ bool XUSCHF5XTDHasShortSignal() mConditions.isXCHMAMCTrendsUp) && ( // - ((mConditions.isXTMBearish && - mConditions.isXAMABearish) && + (((mConditions.isXTMBearish && + mConditions.isXAMABearish) + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural)) && ( // (mConditions.isXTSCurrentMin && diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 866cff83..bc3d5cde 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -3460,6 +3460,13 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCUnderMax && + mConditions.isXCHMALCTrendsDown) + // + || + // ((mConditions.isXCHMAMCPeak && mConditions.isXCHMALCVale) && ( @@ -4295,8 +4302,13 @@ bool XUSCHF5XTDHasShortSignal() mConditions.isXCHMAMCTrendsUp) && ( // - ((mConditions.isXTMBearish && - mConditions.isXAMABearish) && + (((mConditions.isXTMBearish && + mConditions.isXAMABearish) + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural)) && ( // (mConditions.isXTSCurrentMin &&