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 f91ce877..acfc6f1d 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -1557,6 +1557,22 @@ bool XUSCHF5XTDHasLongSignal() ((mConditions.isXCHMAMCFastUnderSlow || mConditions.isXCHMAMCFastCrossedUnderSlow) && ( + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + || // (mConditions.isXCHMAMCTrendsUp && ( @@ -1693,6 +1709,31 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) && + ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -2038,11 +2079,39 @@ bool XUSCHF5XTDHasLongSignal() // || // - (mConditions.isXTSCurrentMax && - mConditions.isXTDBearishVale && - mConditions.isXAMAStartBullish && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXLHPriceCrossedOverSignal) + ((mConditions.isXTSCurrentMax && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + (mConditions.isXTDBearishVale && + mConditions.isXAMAStartBullish && + mConditions.isXLHPriceCrossedOverSignal) + // + || + // + (mConditions.isXTMEndBullish && + mConditions.isXLHLLDecreased && + mConditions.isXCHMASCOverMax && + mConditions.isXCHMASCCrossedOverMax) + // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXLHPriceCrossedOverSignal) + // + ) + // + ) + // + ) + // + ) // ) // @@ -2069,8 +2138,19 @@ bool XUSCHF5XTDHasLongSignal() || // (mConditions.isXTSCurrentMax && - (mConditions.isXAMANeutural || - mConditions.isXAMAEndBullish)) + ( + // + (mConditions.isXAMANeutural || + mConditions.isXAMAEndBullish) + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXAMABullish) + // + ) + // + ) // ) // @@ -2100,6 +2180,15 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXTDBullOverBear && mConditions.isXCHMASCCrossedOverMin) // + || + // + (mConditions.isXCHMASCOverMin && + mConditions.isXCHMASCUnderMax && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverNearest && + mConditions.isXTSCurrentOverMediest) + // ) // ) @@ -2240,6 +2329,22 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXAMANeutural && + mConditions.isXTMStartBullish) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverFarest) + // + ) + // + ) + // ) // ) @@ -2364,6 +2469,14 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTDSignalCrossedOverBear) + // + || + // (mConditions.isXCHLHSCMCHHSame && ( // @@ -2488,7 +2601,17 @@ bool XUSCHF5XTDHasLongSignal() || // (mConditions.isXCHMALCVale && - mConditions.isXLHHighAttachedHH) + ( + // + mConditions.isXLHHighAttachedHH + // + || + // + mConditions.isXTDSignalCrossedOverBear + // + ) + // + ) // ) // @@ -2580,6 +2703,12 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXCHMASCCrossedOverMax) + // + || + // (mConditions.isXCHMALCPeak && mConditions.isXCHLHSameHHs && mConditions.isXLHLLDecreased && @@ -2636,6 +2765,15 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + (mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentOverFarest && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXTSCurrentUnderMediest && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) @@ -2691,6 +2829,20 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXTMNeutural && + mConditions.isXAMABullish && + mConditions.isXTSCurrentMax && + mConditions.isXTDBullOverBear && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverNearest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest) + // + || + // ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( @@ -2797,6 +2949,14 @@ bool XUSCHF5XTDHasLongSignal() ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( + // + (mConditions.isXTSAllSame && + mConditions.isXCHMALCPeak && + mConditions.isXTDBearishVale && + mConditions.isXCHMASCOverMax && + mConditions.isXTDSignalCrossedOverBear) + // + || // (mConditions.isXTSCurrentMax && mConditions.isXCHMASCOverMax && @@ -2900,6 +3060,25 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXRSICrossedUnderShortEntry && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index bfaab21d..52d57b76 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -10,7 +10,7 @@ Alpari All Markets -Resolve XUSCHF5 XTD Longs All Critical Guard Attacks in GrowthNext ... +Resolve XUSCHF5 XTD Longs All Critical Guard Attacks in OANDA ... Resolve XUSCHF5 XTAM Longs All Critical Guard Attacks in All Markets ... Resolve XUSCHF5 XSI Longs All Critical Guard Attacks in All Markets ... Resolve XUSCHF5 XTSFI 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 f91ce877..acfc6f1d 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -1557,6 +1557,22 @@ bool XUSCHF5XTDHasLongSignal() ((mConditions.isXCHMAMCFastUnderSlow || mConditions.isXCHMAMCFastCrossedUnderSlow) && ( + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + || // (mConditions.isXCHMAMCTrendsUp && ( @@ -1693,6 +1709,31 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) && + ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -2038,11 +2079,39 @@ bool XUSCHF5XTDHasLongSignal() // || // - (mConditions.isXTSCurrentMax && - mConditions.isXTDBearishVale && - mConditions.isXAMAStartBullish && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXLHPriceCrossedOverSignal) + ((mConditions.isXTSCurrentMax && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + (mConditions.isXTDBearishVale && + mConditions.isXAMAStartBullish && + mConditions.isXLHPriceCrossedOverSignal) + // + || + // + (mConditions.isXTMEndBullish && + mConditions.isXLHLLDecreased && + mConditions.isXCHMASCOverMax && + mConditions.isXCHMASCCrossedOverMax) + // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXLHPriceCrossedOverSignal) + // + ) + // + ) + // + ) + // + ) // ) // @@ -2069,8 +2138,19 @@ bool XUSCHF5XTDHasLongSignal() || // (mConditions.isXTSCurrentMax && - (mConditions.isXAMANeutural || - mConditions.isXAMAEndBullish)) + ( + // + (mConditions.isXAMANeutural || + mConditions.isXAMAEndBullish) + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXAMABullish) + // + ) + // + ) // ) // @@ -2100,6 +2180,15 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXTDBullOverBear && mConditions.isXCHMASCCrossedOverMin) // + || + // + (mConditions.isXCHMASCOverMin && + mConditions.isXCHMASCUnderMax && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverNearest && + mConditions.isXTSCurrentOverMediest) + // ) // ) @@ -2240,6 +2329,22 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXAMANeutural && + mConditions.isXTMStartBullish) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverFarest) + // + ) + // + ) + // ) // ) @@ -2364,6 +2469,14 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTDSignalCrossedOverBear) + // + || + // (mConditions.isXCHLHSCMCHHSame && ( // @@ -2488,7 +2601,17 @@ bool XUSCHF5XTDHasLongSignal() || // (mConditions.isXCHMALCVale && - mConditions.isXLHHighAttachedHH) + ( + // + mConditions.isXLHHighAttachedHH + // + || + // + mConditions.isXTDSignalCrossedOverBear + // + ) + // + ) // ) // @@ -2580,6 +2703,12 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXCHMASCCrossedOverMax) + // + || + // (mConditions.isXCHMALCPeak && mConditions.isXCHLHSameHHs && mConditions.isXLHLLDecreased && @@ -2636,6 +2765,15 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + (mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentOverFarest && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXTSCurrentUnderMediest && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) @@ -2691,6 +2829,20 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXTMNeutural && + mConditions.isXAMABullish && + mConditions.isXTSCurrentMax && + mConditions.isXTDBullOverBear && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverNearest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest) + // + || + // ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( @@ -2797,6 +2949,14 @@ bool XUSCHF5XTDHasLongSignal() ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( + // + (mConditions.isXTSAllSame && + mConditions.isXCHMALCPeak && + mConditions.isXTDBearishVale && + mConditions.isXCHMASCOverMax && + mConditions.isXTDSignalCrossedOverBear) + // + || // (mConditions.isXTSCurrentMax && mConditions.isXCHMASCOverMax && @@ -2900,6 +3060,25 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXRSICrossedUnderShortEntry && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) + // ) // ) diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index f91ce877..acfc6f1d 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -1557,6 +1557,22 @@ bool XUSCHF5XTDHasLongSignal() ((mConditions.isXCHMAMCFastUnderSlow || mConditions.isXCHMAMCFastCrossedUnderSlow) && ( + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + || // (mConditions.isXCHMAMCTrendsUp && ( @@ -1693,6 +1709,31 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) && + ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -2038,11 +2079,39 @@ bool XUSCHF5XTDHasLongSignal() // || // - (mConditions.isXTSCurrentMax && - mConditions.isXTDBearishVale && - mConditions.isXAMAStartBullish && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXLHPriceCrossedOverSignal) + ((mConditions.isXTSCurrentMax && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + (mConditions.isXTDBearishVale && + mConditions.isXAMAStartBullish && + mConditions.isXLHPriceCrossedOverSignal) + // + || + // + (mConditions.isXTMEndBullish && + mConditions.isXLHLLDecreased && + mConditions.isXCHMASCOverMax && + mConditions.isXCHMASCCrossedOverMax) + // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXLHPriceCrossedOverSignal) + // + ) + // + ) + // + ) + // + ) // ) // @@ -2069,8 +2138,19 @@ bool XUSCHF5XTDHasLongSignal() || // (mConditions.isXTSCurrentMax && - (mConditions.isXAMANeutural || - mConditions.isXAMAEndBullish)) + ( + // + (mConditions.isXAMANeutural || + mConditions.isXAMAEndBullish) + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXAMABullish) + // + ) + // + ) // ) // @@ -2100,6 +2180,15 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXTDBullOverBear && mConditions.isXCHMASCCrossedOverMin) // + || + // + (mConditions.isXCHMASCOverMin && + mConditions.isXCHMASCUnderMax && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverNearest && + mConditions.isXTSCurrentOverMediest) + // ) // ) @@ -2240,6 +2329,22 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXAMANeutural && + mConditions.isXTMStartBullish) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverFarest) + // + ) + // + ) + // ) // ) @@ -2364,6 +2469,14 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTDSignalCrossedOverBear) + // + || + // (mConditions.isXCHLHSCMCHHSame && ( // @@ -2488,7 +2601,17 @@ bool XUSCHF5XTDHasLongSignal() || // (mConditions.isXCHMALCVale && - mConditions.isXLHHighAttachedHH) + ( + // + mConditions.isXLHHighAttachedHH + // + || + // + mConditions.isXTDSignalCrossedOverBear + // + ) + // + ) // ) // @@ -2580,6 +2703,12 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXCHMASCCrossedOverMax) + // + || + // (mConditions.isXCHMALCPeak && mConditions.isXCHLHSameHHs && mConditions.isXLHLLDecreased && @@ -2636,6 +2765,15 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + (mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentOverFarest && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXTSCurrentUnderMediest && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) @@ -2691,6 +2829,20 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXTMNeutural && + mConditions.isXAMABullish && + mConditions.isXTSCurrentMax && + mConditions.isXTDBullOverBear && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverNearest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest) + // + || + // ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( @@ -2797,6 +2949,14 @@ bool XUSCHF5XTDHasLongSignal() ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( + // + (mConditions.isXTSAllSame && + mConditions.isXCHMALCPeak && + mConditions.isXTDBearishVale && + mConditions.isXCHMASCOverMax && + mConditions.isXTDSignalCrossedOverBear) + // + || // (mConditions.isXTSCurrentMax && mConditions.isXCHMASCOverMax && @@ -2900,6 +3060,25 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXRSICrossedUnderShortEntry && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) + // ) // )