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 1af17210..6f3edee2 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -1969,9 +1969,20 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - (mConditions.isXAMANeutural && - mConditions.isXTSCurrentUnderFarest && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXAMANeutural && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + mConditions.isXTSCurrentUnderFarest + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentUnderNearest) + // + ) + // + ) // ) // @@ -2031,6 +2042,15 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXLHLLDecreased && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // ) // ) @@ -2792,6 +2812,13 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXTSCurrentOverFarest && mConditions.isXTDSignalCrossedOverBear) // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXLHHighAttachedHH && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) @@ -3179,6 +3206,14 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // + || + // (mConditions.isXTSAllSame && mConditions.isXCHMALCPeak && mConditions.isXTDBearishVale && @@ -3280,6 +3315,14 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + (mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXLHHighAttachedHH && + mConditions.isXRSICrossedOverLongExit && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) @@ -3353,6 +3396,15 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXTSCurrentCrossedOverNearest && mConditions.isXTSCurrentCrossedOverMediest) // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXCHMAMCFastCrossedOverSlow && + mConditions.isXTSCurrentCrossedOverNearest) + // ) // ) @@ -3408,6 +3460,23 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXTDSignalCrossedOverBear && mConditions.isXTSCurrentCrossedOverNearest) // + || + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastUnderSlow) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 239c86b3..e23acbf7 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 IFCMarkets ... +Resolve XUSCHF5 XTD Longs All Critical Guard Attacks in ErranteSC ... 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 1af17210..6f3edee2 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -1969,9 +1969,20 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - (mConditions.isXAMANeutural && - mConditions.isXTSCurrentUnderFarest && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXAMANeutural && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + mConditions.isXTSCurrentUnderFarest + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentUnderNearest) + // + ) + // + ) // ) // @@ -2031,6 +2042,15 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXLHLLDecreased && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // ) // ) @@ -2792,6 +2812,13 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXTSCurrentOverFarest && mConditions.isXTDSignalCrossedOverBear) // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXLHHighAttachedHH && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) @@ -3179,6 +3206,14 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // + || + // (mConditions.isXTSAllSame && mConditions.isXCHMALCPeak && mConditions.isXTDBearishVale && @@ -3280,6 +3315,14 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + (mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXLHHighAttachedHH && + mConditions.isXRSICrossedOverLongExit && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) @@ -3353,6 +3396,15 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXTSCurrentCrossedOverNearest && mConditions.isXTSCurrentCrossedOverMediest) // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXCHMAMCFastCrossedOverSlow && + mConditions.isXTSCurrentCrossedOverNearest) + // ) // ) @@ -3408,6 +3460,23 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXTDSignalCrossedOverBear && mConditions.isXTSCurrentCrossedOverNearest) // + || + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastUnderSlow) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // ) // ) diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 1af17210..6f3edee2 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -1969,9 +1969,20 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - (mConditions.isXAMANeutural && - mConditions.isXTSCurrentUnderFarest && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXAMANeutural && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + mConditions.isXTSCurrentUnderFarest + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentUnderNearest) + // + ) + // + ) // ) // @@ -2031,6 +2042,15 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXLHLLDecreased && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // ) // ) @@ -2792,6 +2812,13 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXTSCurrentOverFarest && mConditions.isXTDSignalCrossedOverBear) // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXLHHighAttachedHH && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) @@ -3179,6 +3206,14 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // + || + // (mConditions.isXTSAllSame && mConditions.isXCHMALCPeak && mConditions.isXTDBearishVale && @@ -3280,6 +3315,14 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + (mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXLHHighAttachedHH && + mConditions.isXRSICrossedOverLongExit && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) @@ -3353,6 +3396,15 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXTSCurrentCrossedOverNearest && mConditions.isXTSCurrentCrossedOverMediest) // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXCHMAMCFastCrossedOverSlow && + mConditions.isXTSCurrentCrossedOverNearest) + // ) // ) @@ -3408,6 +3460,23 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXTDSignalCrossedOverBear && mConditions.isXTSCurrentCrossedOverNearest) // + || + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastUnderSlow) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // ) // )