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 f2f83a2d..7c3322cc 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -5094,7 +5094,6 @@ bool XUSCHF5XTAMHasLongSignal() mConditions.isXCHMAMCTrendsUp && mConditions.isXCHMALCTrendsDown && mConditions.isXCHMALCFastOverSlow && - mConditions.isXTSCurrentCrossedOverFarest && mConditions.isXTSCurrentCrossedOverNearest) // ) @@ -5179,16 +5178,35 @@ bool XUSCHF5XTAMHasLongSignal() // ( // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXCHMALCPeak && - mConditions.isXCHLHSameHHs && - mConditions.isXTSCurrentMax && - mConditions.isXLHLLIncreased && - mConditions.isXCHMALCTrendsUp && - mConditions.isXLHHighAttachedHH && - mConditions.isXTDSignalUnderBear && - mConditions.isXCHMALCFastOverSlow) + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + ((mConditions.isXCHLHSameHHs && + mConditions.isXTSCurrentMax && + mConditions.isXLHHighAttachedHH && + mConditions.isXTDSignalUnderBear) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXLHLLIncreased && + mConditions.isXCHMALCTrendsUp && + mConditions.isXCHMALCFastOverSlow) + // + || + // + (mConditions.isXCHMASCOverMax && + mConditions.isXTDBullUnderBear && + mConditions.isXLHPriceCrossedOverSignal && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 51476664..2cc6a786 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -20,7 +20,7 @@ Resolve XUSCHF5 XTD All Guard Attacks in All Markets ... XTAM ----- Resolve XUSCHF5 XTAM All Stopouts in All Markets ... -Resolve XUSCHF5 XTAM Longs All Critical Guard Attacks in OANDA ... +Resolve XUSCHF5 XTAM Longs All Critical Guard Attacks in MetaQuotes ... Resolve XUSCHF5 XTAM Shorts All Critical Guard Attacks in All Markets ... Resolve XUSCHF5 XTAM 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 f2f83a2d..7c3322cc 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -5094,7 +5094,6 @@ bool XUSCHF5XTAMHasLongSignal() mConditions.isXCHMAMCTrendsUp && mConditions.isXCHMALCTrendsDown && mConditions.isXCHMALCFastOverSlow && - mConditions.isXTSCurrentCrossedOverFarest && mConditions.isXTSCurrentCrossedOverNearest) // ) @@ -5179,16 +5178,35 @@ bool XUSCHF5XTAMHasLongSignal() // ( // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXCHMALCPeak && - mConditions.isXCHLHSameHHs && - mConditions.isXTSCurrentMax && - mConditions.isXLHLLIncreased && - mConditions.isXCHMALCTrendsUp && - mConditions.isXLHHighAttachedHH && - mConditions.isXTDSignalUnderBear && - mConditions.isXCHMALCFastOverSlow) + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + ((mConditions.isXCHLHSameHHs && + mConditions.isXTSCurrentMax && + mConditions.isXLHHighAttachedHH && + mConditions.isXTDSignalUnderBear) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXLHLLIncreased && + mConditions.isXCHMALCTrendsUp && + mConditions.isXCHMALCFastOverSlow) + // + || + // + (mConditions.isXCHMASCOverMax && + mConditions.isXTDBullUnderBear && + mConditions.isXLHPriceCrossedOverSignal && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index f2f83a2d..7c3322cc 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -5094,7 +5094,6 @@ bool XUSCHF5XTAMHasLongSignal() mConditions.isXCHMAMCTrendsUp && mConditions.isXCHMALCTrendsDown && mConditions.isXCHMALCFastOverSlow && - mConditions.isXTSCurrentCrossedOverFarest && mConditions.isXTSCurrentCrossedOverNearest) // ) @@ -5179,16 +5178,35 @@ bool XUSCHF5XTAMHasLongSignal() // ( // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXCHMALCPeak && - mConditions.isXCHLHSameHHs && - mConditions.isXTSCurrentMax && - mConditions.isXLHLLIncreased && - mConditions.isXCHMALCTrendsUp && - mConditions.isXLHHighAttachedHH && - mConditions.isXTDSignalUnderBear && - mConditions.isXCHMALCFastOverSlow) + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + ((mConditions.isXCHLHSameHHs && + mConditions.isXTSCurrentMax && + mConditions.isXLHHighAttachedHH && + mConditions.isXTDSignalUnderBear) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXLHLLIncreased && + mConditions.isXCHMALCTrendsUp && + mConditions.isXCHMALCFastOverSlow) + // + || + // + (mConditions.isXCHMASCOverMax && + mConditions.isXTDBullUnderBear && + mConditions.isXLHPriceCrossedOverSignal && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + ) + // + ) // ) //