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 bdbfbe5d..54210e57 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -14464,6 +14464,14 @@ bool XUSCHF5XCHMACCHasShortSignal() ((mConditions.isXCHMAMCTrendsDown && mConditions.isXCHMAMCFastUnderSlow) && ( + // + (mConditions.isXCHMALCVale && + mConditions.isXAMAStartBearish && + mConditions.isXLHHHSameInLength && + mConditions.isXLHLLSameInLength && + mConditions.isXLHPriceOverSignal) + // + || // (mConditions.isXTMNeutural && mConditions.isXCHMAMCPeak && @@ -14526,9 +14534,20 @@ bool XUSCHF5XCHMACCHasShortSignal() mConditions.isXAMABearish) && ( // - (mConditions.isXTSAllSame && - mConditions.isXCHMASCUnderMin && - mConditions.isXLHPriceInSignalRange) + ((mConditions.isXCHMASCUnderMin && + mConditions.isXLHPriceInSignalRange) && + ( + // + mConditions.isXTSAllSame + // + || + // + (mConditions.isXLHHHSameInLength && + mConditions.isXLHLLSameInLength) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 5d9ff3e1..80d18ebb 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -42,7 +42,7 @@ XCHMACC -------- Resolve XUSCHF5 XCHMACC All Stopouts in All Markets ... Resolve XUSCHF5 XCHMACC All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XCHMACC All Guard Attacks in OANDA ... +Resolve XUSCHF5 XCHMACC All Guard Attacks in MetaQuotes ... XOBDLH 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 bdbfbe5d..54210e57 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -14464,6 +14464,14 @@ bool XUSCHF5XCHMACCHasShortSignal() ((mConditions.isXCHMAMCTrendsDown && mConditions.isXCHMAMCFastUnderSlow) && ( + // + (mConditions.isXCHMALCVale && + mConditions.isXAMAStartBearish && + mConditions.isXLHHHSameInLength && + mConditions.isXLHLLSameInLength && + mConditions.isXLHPriceOverSignal) + // + || // (mConditions.isXTMNeutural && mConditions.isXCHMAMCPeak && @@ -14526,9 +14534,20 @@ bool XUSCHF5XCHMACCHasShortSignal() mConditions.isXAMABearish) && ( // - (mConditions.isXTSAllSame && - mConditions.isXCHMASCUnderMin && - mConditions.isXLHPriceInSignalRange) + ((mConditions.isXCHMASCUnderMin && + mConditions.isXLHPriceInSignalRange) && + ( + // + mConditions.isXTSAllSame + // + || + // + (mConditions.isXLHHHSameInLength && + mConditions.isXLHLLSameInLength) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index bdbfbe5d..54210e57 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -14464,6 +14464,14 @@ bool XUSCHF5XCHMACCHasShortSignal() ((mConditions.isXCHMAMCTrendsDown && mConditions.isXCHMAMCFastUnderSlow) && ( + // + (mConditions.isXCHMALCVale && + mConditions.isXAMAStartBearish && + mConditions.isXLHHHSameInLength && + mConditions.isXLHLLSameInLength && + mConditions.isXLHPriceOverSignal) + // + || // (mConditions.isXTMNeutural && mConditions.isXCHMAMCPeak && @@ -14526,9 +14534,20 @@ bool XUSCHF5XCHMACCHasShortSignal() mConditions.isXAMABearish) && ( // - (mConditions.isXTSAllSame && - mConditions.isXCHMASCUnderMin && - mConditions.isXLHPriceInSignalRange) + ((mConditions.isXCHMASCUnderMin && + mConditions.isXLHPriceInSignalRange) && + ( + // + mConditions.isXTSAllSame + // + || + // + (mConditions.isXLHHHSameInLength && + mConditions.isXLHLLSameInLength) + // + ) + // + ) // ) //