From 3eedf27c3bf5e15eff941998bf350f3c87c5d239 Mon Sep 17 00:00:00 2001 From: Hadi Khazaee Asl Date: Wed, 21 Feb 2024 15:53:38 +0330 Subject: [PATCH] Resolve XUSCHF5 XTAM All Guard Attacks in AMarkets-Demo ... --- ...herelm.xuschf5.provider.indicators.lib.mq5 | 22 ++++++++++++++----- Documents/Templates/Brokers List.txt | 2 +- ...herelm.xuschf5.provider.indicators.lib.mq5 | 22 ++++++++++++++----- ...herelm.xuschf5.provider.indicators.lib.mq5 | 22 ++++++++++++++----- 4 files changed, 49 insertions(+), 19 deletions(-) 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 ebeafb6b..c879f878 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -4736,12 +4736,22 @@ bool XUSCHF5XTAMHasLongSignal() mConditions.isXAMABearish) && ( // - (mConditions.isXCHLHMCLCHHSame && - mConditions.isXCHMASCTrendsUp && - mConditions.isXCHMAMCTrendsDown && - mConditions.isXTDSignalUnderBear && - mConditions.isXCHMAMCFastOverSlow && - mConditions.isXTDBullCrossedUnderBear) + ((mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) && + ( + // + mConditions.isXTSAllSame + // + || + // + (mConditions.isXCHLHMCLCHHSame && + mConditions.isXTDSignalUnderBear && + mConditions.isXTDBullCrossedUnderBear) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index b550ee0b..5269aab1 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -21,7 +21,7 @@ XTAM ----- Resolve XUSCHF5 XTAM All Stopouts in All Markets ... Resolve XUSCHF5 XTAM All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XTAM All Guard Attacks in AMarkets-Demo ... +Resolve XUSCHF5 XTAM All Guard Attacks in IFCMarkets ... XSI 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 ebeafb6b..c879f878 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -4736,12 +4736,22 @@ bool XUSCHF5XTAMHasLongSignal() mConditions.isXAMABearish) && ( // - (mConditions.isXCHLHMCLCHHSame && - mConditions.isXCHMASCTrendsUp && - mConditions.isXCHMAMCTrendsDown && - mConditions.isXTDSignalUnderBear && - mConditions.isXCHMAMCFastOverSlow && - mConditions.isXTDBullCrossedUnderBear) + ((mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) && + ( + // + mConditions.isXTSAllSame + // + || + // + (mConditions.isXCHLHMCLCHHSame && + mConditions.isXTDSignalUnderBear && + mConditions.isXTDBullCrossedUnderBear) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index ebeafb6b..c879f878 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -4736,12 +4736,22 @@ bool XUSCHF5XTAMHasLongSignal() mConditions.isXAMABearish) && ( // - (mConditions.isXCHLHMCLCHHSame && - mConditions.isXCHMASCTrendsUp && - mConditions.isXCHMAMCTrendsDown && - mConditions.isXTDSignalUnderBear && - mConditions.isXCHMAMCFastOverSlow && - mConditions.isXTDBullCrossedUnderBear) + ((mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) && + ( + // + mConditions.isXTSAllSame + // + || + // + (mConditions.isXCHLHMCLCHHSame && + mConditions.isXTDSignalUnderBear && + mConditions.isXTDBullCrossedUnderBear) + // + ) + // + ) // ) //