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 d776a3ee..ed4495ef 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -14243,6 +14243,12 @@ bool XUSCHF5XCHMACCHasShortSignal() // || // + (mConditions.isXTMBearish && + mConditions.isXAMABullish && + mConditions.isXCHMALCVale) + // + || + // (mConditions.isXTMNeutural && mConditions.isXCHMASCPeak && mConditions.isXCHMALCVale && @@ -14264,6 +14270,25 @@ bool XUSCHF5XCHMACCHasShortSignal() // ) // + || + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXTDSignalCrossedOverBear && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMABullish) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -14379,6 +14404,12 @@ bool XUSCHF5XCHMACCHasShortSignal() // mConditions.isXLHHHIncreased // + || + // + (mConditions.isXLHLowAttachedLL && + mConditions.isXTDSignalCrossedUnderBear && + mConditions.isXLHPriceCrossedUnderSignal) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 54838305..4ff8b4b0 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 Shorts All Critical Guard Attacks in Alpari ... -Resolve XUSCHF5 XCHMACC All Guard Attacks in All Markets ... +Resolve XUSCHF5 XCHMACC All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XCHMACC All Guard Attacks in AMarkets-Real ... 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 d776a3ee..ed4495ef 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -14243,6 +14243,12 @@ bool XUSCHF5XCHMACCHasShortSignal() // || // + (mConditions.isXTMBearish && + mConditions.isXAMABullish && + mConditions.isXCHMALCVale) + // + || + // (mConditions.isXTMNeutural && mConditions.isXCHMASCPeak && mConditions.isXCHMALCVale && @@ -14264,6 +14270,25 @@ bool XUSCHF5XCHMACCHasShortSignal() // ) // + || + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXTDSignalCrossedOverBear && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMABullish) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -14379,6 +14404,12 @@ bool XUSCHF5XCHMACCHasShortSignal() // mConditions.isXLHHHIncreased // + || + // + (mConditions.isXLHLowAttachedLL && + mConditions.isXTDSignalCrossedUnderBear && + mConditions.isXLHPriceCrossedUnderSignal) + // ) // ) diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index d776a3ee..ed4495ef 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -14243,6 +14243,12 @@ bool XUSCHF5XCHMACCHasShortSignal() // || // + (mConditions.isXTMBearish && + mConditions.isXAMABullish && + mConditions.isXCHMALCVale) + // + || + // (mConditions.isXTMNeutural && mConditions.isXCHMASCPeak && mConditions.isXCHMALCVale && @@ -14264,6 +14270,25 @@ bool XUSCHF5XCHMACCHasShortSignal() // ) // + || + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXTDSignalCrossedOverBear && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMABullish) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -14379,6 +14404,12 @@ bool XUSCHF5XCHMACCHasShortSignal() // mConditions.isXLHHHIncreased // + || + // + (mConditions.isXLHLowAttachedLL && + mConditions.isXTDSignalCrossedUnderBear && + mConditions.isXLHPriceCrossedUnderSignal) + // ) // )