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 6ba71e75..cee28432 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -14436,6 +14436,12 @@ bool XUSCHF5XCHMACCHasShortSignal() // || // + (mConditions.isXTMNeutural && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) + // + || + // (mConditions.isXTMStartBearish && mConditions.isXLHHHIncreased && mConditions.isXTSCurrentCrossedUnderFarest && @@ -14535,13 +14541,25 @@ bool XUSCHF5XCHMACCHasShortSignal() mConditions.isXAMABearish) && ( // - (mConditions.isXCHMALCVale && - mConditions.isXCHLHSameLLs && - mConditions.isXTSCurrentMin && - mConditions.isXLHHHDecreased && - mConditions.isXCHMASCUnderMin && - mConditions.isXTSCurrentCrossedUnderNearest && - mConditions.isXTSCurrentCrossedUnderMediest) + ((mConditions.isXCHMALCVale && + mConditions.isXCHLHSameLLs && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderNearest) && + ( + // + (mConditions.isXLHLLDecreased && + mConditions.isXAMAStartBearish && + mConditions.isXLHLowAttachedLL) + // + || + // + (mConditions.isXLHHHDecreased && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index cdd019ef..67808662 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 Longs All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XCHMACC Shorts All Critical Guard Attacks in AMarkets-Demo ... +Resolve XUSCHF5 XCHMACC Shorts All Critical Guard Attacks in IFCMarkets ... 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 6ba71e75..cee28432 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -14436,6 +14436,12 @@ bool XUSCHF5XCHMACCHasShortSignal() // || // + (mConditions.isXTMNeutural && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) + // + || + // (mConditions.isXTMStartBearish && mConditions.isXLHHHIncreased && mConditions.isXTSCurrentCrossedUnderFarest && @@ -14535,13 +14541,25 @@ bool XUSCHF5XCHMACCHasShortSignal() mConditions.isXAMABearish) && ( // - (mConditions.isXCHMALCVale && - mConditions.isXCHLHSameLLs && - mConditions.isXTSCurrentMin && - mConditions.isXLHHHDecreased && - mConditions.isXCHMASCUnderMin && - mConditions.isXTSCurrentCrossedUnderNearest && - mConditions.isXTSCurrentCrossedUnderMediest) + ((mConditions.isXCHMALCVale && + mConditions.isXCHLHSameLLs && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderNearest) && + ( + // + (mConditions.isXLHLLDecreased && + mConditions.isXAMAStartBearish && + mConditions.isXLHLowAttachedLL) + // + || + // + (mConditions.isXLHHHDecreased && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 6ba71e75..cee28432 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -14436,6 +14436,12 @@ bool XUSCHF5XCHMACCHasShortSignal() // || // + (mConditions.isXTMNeutural && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) + // + || + // (mConditions.isXTMStartBearish && mConditions.isXLHHHIncreased && mConditions.isXTSCurrentCrossedUnderFarest && @@ -14535,13 +14541,25 @@ bool XUSCHF5XCHMACCHasShortSignal() mConditions.isXAMABearish) && ( // - (mConditions.isXCHMALCVale && - mConditions.isXCHLHSameLLs && - mConditions.isXTSCurrentMin && - mConditions.isXLHHHDecreased && - mConditions.isXCHMASCUnderMin && - mConditions.isXTSCurrentCrossedUnderNearest && - mConditions.isXTSCurrentCrossedUnderMediest) + ((mConditions.isXCHMALCVale && + mConditions.isXCHLHSameLLs && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderNearest) && + ( + // + (mConditions.isXLHLLDecreased && + mConditions.isXAMAStartBearish && + mConditions.isXLHLowAttachedLL) + // + || + // + (mConditions.isXLHHHDecreased && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) // ) //