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 72093224..51cb2468 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -13583,10 +13583,43 @@ bool XUSCHF5XCHMACCHasLongSignal() !mConditions.isXCHMAMCTrendsDown))) && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXCHMASCOverMax && - mConditions.isXLHPriceCrossedOverSignal) + ((mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax) && + ( + // + mConditions.isXLHPriceCrossedOverSignal + // + || + // + ((mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) && + ( + // + (mConditions.isXLHHHDecreased && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + ) + // + ) + // + || + // + ((mConditions.isXLHHHSameInLength && + mConditions.isXLHLLSameInLength && + mConditions.isXLHPriceInSignalRange) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) // || // @@ -14922,6 +14955,17 @@ bool XUSCHF5XCHMACCHasShortSignal() // ) // + || + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin && + mConditions.isXLHHHSameInLength && + mConditions.isXLHLLSameInLength && + mConditions.isXLHPriceInSignalRange) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index c4a014c5..3a8d6322 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 IFCMarkets ... +Resolve XUSCHF5 XCHMACC All Guard Attacks in ErranteSC ... 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 72093224..51cb2468 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -13583,10 +13583,43 @@ bool XUSCHF5XCHMACCHasLongSignal() !mConditions.isXCHMAMCTrendsDown))) && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXCHMASCOverMax && - mConditions.isXLHPriceCrossedOverSignal) + ((mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax) && + ( + // + mConditions.isXLHPriceCrossedOverSignal + // + || + // + ((mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) && + ( + // + (mConditions.isXLHHHDecreased && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + ) + // + ) + // + || + // + ((mConditions.isXLHHHSameInLength && + mConditions.isXLHLLSameInLength && + mConditions.isXLHPriceInSignalRange) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) // || // @@ -14922,6 +14955,17 @@ bool XUSCHF5XCHMACCHasShortSignal() // ) // + || + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin && + mConditions.isXLHHHSameInLength && + mConditions.isXLHLLSameInLength && + mConditions.isXLHPriceInSignalRange) + // ) // ) diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 72093224..51cb2468 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -13583,10 +13583,43 @@ bool XUSCHF5XCHMACCHasLongSignal() !mConditions.isXCHMAMCTrendsDown))) && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXCHMASCOverMax && - mConditions.isXLHPriceCrossedOverSignal) + ((mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax) && + ( + // + mConditions.isXLHPriceCrossedOverSignal + // + || + // + ((mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) && + ( + // + (mConditions.isXLHHHDecreased && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + ) + // + ) + // + || + // + ((mConditions.isXLHHHSameInLength && + mConditions.isXLHLLSameInLength && + mConditions.isXLHPriceInSignalRange) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) // || // @@ -14922,6 +14955,17 @@ bool XUSCHF5XCHMACCHasShortSignal() // ) // + || + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin && + mConditions.isXLHHHSameInLength && + mConditions.isXLHLLSameInLength && + mConditions.isXLHPriceInSignalRange) + // ) // )