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 ab013e50..39d8a98b 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -13344,6 +13344,7 @@ bool XUSCHF5XCHMACCHasLongSignal() // ) // + // XCHMACC Longs ... // Guard Attacks Resolves ... || // @@ -13389,14 +13390,42 @@ bool XUSCHF5XCHMACCHasLongSignal() // || // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXTDSignalUnderBear && + ( + // + ((mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastOverSlow) && + ( + // + mConditions.isXTMNeutural + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // (mConditions.isXTDBullUnderBear && ( // (mConditions.isXTDSignalUnderBear && ( // - (mConditions.isXCHMASCTrendsDown && - mConditions.isXCHMASCFastOverSlow) + (mConditions.isXCHMASCFastOverSlow && + (mConditions.isXCHMASCTrendsDown || + (!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown))) // ) // @@ -13423,11 +13452,20 @@ bool XUSCHF5XCHMACCHasLongSignal() // || // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXTDSignalVale && - mConditions.isXTDBullishVale && - mConditions.isXTMStartBullish) + ((mConditions.isXTSCurrentMax && + mConditions.isXCHMALCPeak) && + ( + // + mConditions.isXTMStartBullish + // + || + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) + // + ) + // + ) // ) // @@ -13456,6 +13494,15 @@ bool XUSCHF5XCHMACCHasLongSignal() // ) // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXLHHighAttachedHH && + mConditions.isXTSCurrentCrossedOverNearest) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 86dafc0a..8fb19718 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -41,7 +41,7 @@ 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 OANDA ... +Resolve XUSCHF5 XCHMACC Longs All Critical Guard Attacks in MetaQuotes ... Resolve XUSCHF5 XCHMACC Shorts All Critical Guard Attacks in All Markets ... 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 ab013e50..39d8a98b 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -13344,6 +13344,7 @@ bool XUSCHF5XCHMACCHasLongSignal() // ) // + // XCHMACC Longs ... // Guard Attacks Resolves ... || // @@ -13389,14 +13390,42 @@ bool XUSCHF5XCHMACCHasLongSignal() // || // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXTDSignalUnderBear && + ( + // + ((mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastOverSlow) && + ( + // + mConditions.isXTMNeutural + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // (mConditions.isXTDBullUnderBear && ( // (mConditions.isXTDSignalUnderBear && ( // - (mConditions.isXCHMASCTrendsDown && - mConditions.isXCHMASCFastOverSlow) + (mConditions.isXCHMASCFastOverSlow && + (mConditions.isXCHMASCTrendsDown || + (!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown))) // ) // @@ -13423,11 +13452,20 @@ bool XUSCHF5XCHMACCHasLongSignal() // || // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXTDSignalVale && - mConditions.isXTDBullishVale && - mConditions.isXTMStartBullish) + ((mConditions.isXTSCurrentMax && + mConditions.isXCHMALCPeak) && + ( + // + mConditions.isXTMStartBullish + // + || + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) + // + ) + // + ) // ) // @@ -13456,6 +13494,15 @@ bool XUSCHF5XCHMACCHasLongSignal() // ) // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXLHHighAttachedHH && + mConditions.isXTSCurrentCrossedOverNearest) + // ) // ) diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index ab013e50..39d8a98b 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -13344,6 +13344,7 @@ bool XUSCHF5XCHMACCHasLongSignal() // ) // + // XCHMACC Longs ... // Guard Attacks Resolves ... || // @@ -13389,14 +13390,42 @@ bool XUSCHF5XCHMACCHasLongSignal() // || // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXTDSignalUnderBear && + ( + // + ((mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastOverSlow) && + ( + // + mConditions.isXTMNeutural + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // (mConditions.isXTDBullUnderBear && ( // (mConditions.isXTDSignalUnderBear && ( // - (mConditions.isXCHMASCTrendsDown && - mConditions.isXCHMASCFastOverSlow) + (mConditions.isXCHMASCFastOverSlow && + (mConditions.isXCHMASCTrendsDown || + (!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown))) // ) // @@ -13423,11 +13452,20 @@ bool XUSCHF5XCHMACCHasLongSignal() // || // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXTDSignalVale && - mConditions.isXTDBullishVale && - mConditions.isXTMStartBullish) + ((mConditions.isXTSCurrentMax && + mConditions.isXCHMALCPeak) && + ( + // + mConditions.isXTMStartBullish + // + || + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) + // + ) + // + ) // ) // @@ -13456,6 +13494,15 @@ bool XUSCHF5XCHMACCHasLongSignal() // ) // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXLHHighAttachedHH && + mConditions.isXTSCurrentCrossedOverNearest) + // ) // )