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 3c4bcbc0..f6a5e140 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -13555,11 +13555,23 @@ bool XUSCHF5XCHMACCHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - (mConditions.isXTSCurrentMax && - mConditions.isXTDBearishVale && - mConditions.isXCHMASCOverMax && - mConditions.isXCHLHSCMCHHSame && - mConditions.isXLHHighAttachedHH) + ((mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax) && + ( + // + (mConditions.isXTDBearishVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXLHHighAttachedHH) + // + || + // + (mConditions.isXCHMASCPeak && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 79915a1c..a5ab8ee2 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -41,8 +41,8 @@ Resolve XUSCHF5 XTSFI All Guard Attacks in All Markets ... XCHMACC -------- Resolve XUSCHF5 XCHMACC All Stopouts in All Markets ... -Resolve XUSCHF5 XCHMACC Longs All Critical Guard Attacks in IFCMarkets ... -Resolve XUSCHF5 XCHMACC Shorts All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XCHMACC Longs All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XCHMACC Shorts All Critical Guard Attacks in AMarkets-Real ... Resolve XUSCHF5 XCHMACC 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 3c4bcbc0..f6a5e140 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -13555,11 +13555,23 @@ bool XUSCHF5XCHMACCHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - (mConditions.isXTSCurrentMax && - mConditions.isXTDBearishVale && - mConditions.isXCHMASCOverMax && - mConditions.isXCHLHSCMCHHSame && - mConditions.isXLHHighAttachedHH) + ((mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax) && + ( + // + (mConditions.isXTDBearishVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXLHHighAttachedHH) + // + || + // + (mConditions.isXCHMASCPeak && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 3c4bcbc0..f6a5e140 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -13555,11 +13555,23 @@ bool XUSCHF5XCHMACCHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - (mConditions.isXTSCurrentMax && - mConditions.isXTDBearishVale && - mConditions.isXCHMASCOverMax && - mConditions.isXCHLHSCMCHHSame && - mConditions.isXLHHighAttachedHH) + ((mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax) && + ( + // + (mConditions.isXTDBearishVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXLHHighAttachedHH) + // + || + // + (mConditions.isXCHMASCPeak && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) // ) //