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 1bfb0937..a6bcf830 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -1642,6 +1642,12 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXCHMALCVale && + mConditions.isXFICrossedOverZero && + mConditions.isXTSCurrentCrossedOverNearest) + // + || + // (mConditions.isXCHMALCVale && mConditions.isXLHLLIncreased && mConditions.isXTSCurrentCrossedOverFarest && @@ -1674,12 +1680,24 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXAMAEndBullish) && ( // - (mConditions.isXCHMAMCPeak && - mConditions.isXCHMALCVale && - mConditions.isXTDBearishVale && - mConditions.isXTSCurrentUnderFarest && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXTSCurrentCrossedUnderFarest) + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale) && + ( + // + (mConditions.isXLHLLIncreased && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // + (mConditions.isXTDBearishVale && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedUnderFarest) + // + ) + // + ) // ) // @@ -2204,6 +2222,17 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXTMNeutural && + mConditions.isXCHMAMCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXTDSignalCrossedOverBear) + // + || + // ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( @@ -2850,12 +2879,23 @@ bool XUSCHF5XTDHasLongSignal() // || // - (mConditions.isXCHMAMCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXTDBearishVale && - mConditions.isXCHMALCTrendsDown && - mConditions.isXTSCurrentOverFarest && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + mConditions.isXTDBearishVale + // + || + // + (mConditions.isXCHMASCOverMin && + mConditions.isXCHMASCUnderMax) + // + ) + // + ) // || // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 553f5150..51296bce 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -10,8 +10,8 @@ Alpari All Markets -Resolve XUSCHF5 XTD Longs All Critical Guard Attacks in Alpari ... -Resolve XUSCHF5 XTAM Longs All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XTD Longs All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XTAM Longs All Critical Guard Attacks in AMarkets-Real ... Resolve XUSCHF5 XSI Longs All Critical Guard Attacks in All Markets ... Resolve XUSCHF5 XTSFI Longs All Critical Guard Attacks in All Markets ... Resolve XUSCHF5 XOBDLH Longs All Critical 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 1bfb0937..a6bcf830 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -1642,6 +1642,12 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXCHMALCVale && + mConditions.isXFICrossedOverZero && + mConditions.isXTSCurrentCrossedOverNearest) + // + || + // (mConditions.isXCHMALCVale && mConditions.isXLHLLIncreased && mConditions.isXTSCurrentCrossedOverFarest && @@ -1674,12 +1680,24 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXAMAEndBullish) && ( // - (mConditions.isXCHMAMCPeak && - mConditions.isXCHMALCVale && - mConditions.isXTDBearishVale && - mConditions.isXTSCurrentUnderFarest && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXTSCurrentCrossedUnderFarest) + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale) && + ( + // + (mConditions.isXLHLLIncreased && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // + (mConditions.isXTDBearishVale && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedUnderFarest) + // + ) + // + ) // ) // @@ -2204,6 +2222,17 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXTMNeutural && + mConditions.isXCHMAMCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXTDSignalCrossedOverBear) + // + || + // ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( @@ -2850,12 +2879,23 @@ bool XUSCHF5XTDHasLongSignal() // || // - (mConditions.isXCHMAMCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXTDBearishVale && - mConditions.isXCHMALCTrendsDown && - mConditions.isXTSCurrentOverFarest && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + mConditions.isXTDBearishVale + // + || + // + (mConditions.isXCHMASCOverMin && + mConditions.isXCHMASCUnderMax) + // + ) + // + ) // || // diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 1bfb0937..a6bcf830 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -1642,6 +1642,12 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXCHMALCVale && + mConditions.isXFICrossedOverZero && + mConditions.isXTSCurrentCrossedOverNearest) + // + || + // (mConditions.isXCHMALCVale && mConditions.isXLHLLIncreased && mConditions.isXTSCurrentCrossedOverFarest && @@ -1674,12 +1680,24 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXAMAEndBullish) && ( // - (mConditions.isXCHMAMCPeak && - mConditions.isXCHMALCVale && - mConditions.isXTDBearishVale && - mConditions.isXTSCurrentUnderFarest && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXTSCurrentCrossedUnderFarest) + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale) && + ( + // + (mConditions.isXLHLLIncreased && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // + (mConditions.isXTDBearishVale && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedUnderFarest) + // + ) + // + ) // ) // @@ -2204,6 +2222,17 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXTMNeutural && + mConditions.isXCHMAMCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXTDSignalCrossedOverBear) + // + || + // ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( @@ -2850,12 +2879,23 @@ bool XUSCHF5XTDHasLongSignal() // || // - (mConditions.isXCHMAMCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXTDBearishVale && - mConditions.isXCHMALCTrendsDown && - mConditions.isXTSCurrentOverFarest && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + mConditions.isXTDBearishVale + // + || + // + (mConditions.isXCHMASCOverMin && + mConditions.isXCHMASCUnderMax) + // + ) + // + ) // || //