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 6f3edee2..1bfb0937 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -1716,6 +1716,18 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + (mConditions.isXAMAVale && + mConditions.isXTMNeutural && + mConditions.isXAMABearish && + mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMax && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest) + // ) // ) @@ -1984,6 +1996,12 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + (mConditions.isXTDBearishVale && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) @@ -2051,6 +2069,16 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXTDSignalCrossedOverBear && mConditions.isXTSCurrentCrossedOverNearest) // + || + // + (mConditions.isXAMAVale && + mConditions.isXAMABearish && + mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) @@ -2179,6 +2207,13 @@ bool XUSCHF5XTDHasLongSignal() ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXLHHHDecreased && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTDSignalCrossedOverBear) + // + || // (mConditions.isXCHMALCTrendsDown && mConditions.isXCHMALCFastOverSlow && @@ -2305,9 +2340,7 @@ bool XUSCHF5XTDHasLongSignal() (mConditions.isXCHMASCOverMin && mConditions.isXCHMASCUnderMax && mConditions.isXCHMALCTrendsDown && - mConditions.isXTSCurrentOverFarest && - mConditions.isXTSCurrentOverNearest && - mConditions.isXTSCurrentOverMediest) + mConditions.isXTSCurrentOverFarest) // ) // @@ -2570,13 +2603,25 @@ bool XUSCHF5XTDHasLongSignal() // || // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXTDBearishVale && - mConditions.isXCHMASCOverMax && - mConditions.isXTDBullOverBear && - mConditions.isXTSCurrentOverFarest && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + (mConditions.isXLHHHDecreased && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentUnderMediest) + // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXTDBearishVale && + mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentOverFarest) + // + ) + // + ) // ) // @@ -2827,7 +2872,6 @@ bool XUSCHF5XTDHasLongSignal() // (mConditions.isXTSCurrentMax && mConditions.isXCHMALCTrendsDown && - mConditions.isXCHMASCCrossedOverMax && mConditions.isXTDSignalCrossedOverBear && mConditions.isXTSCurrentCrossedOverNearest) // @@ -3355,6 +3399,12 @@ bool XUSCHF5XTDHasLongSignal() // mConditions.isXLHHighAttachedHH // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index e23acbf7..553f5150 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 ErranteSC ... +Resolve XUSCHF5 XTD Longs All Critical Guard Attacks in Alpari ... 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 ... @@ -19,6 +19,17 @@ Resolve XUSCHF5 XCHMACC Longs All Critical Guard Attacks in All Markets ... Resolve XUSCHF5 XCHMAMX Longs All Critical Guard Attacks in All Markets ... Resolve XUSCHF5 XCHMAMN Longs All Critical Guard Attacks in All Markets ... + +Resolve XUSCHF5 XTD Shorts All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XTAM Shorts All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XSI Shorts All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XTSFI Shorts All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XOBDLH Shorts All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XCHMACC Shorts All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XCHMAMX Shorts All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XCHMAMN Shorts All Critical Guard Attacks in All Markets ... + + Resolve XUSCHF5 XTD Shorts All Stopouts in All Markets ... Resolve XUSCHF5 XTAM Shorts All Stopouts in All Markets ... Resolve XUSCHF5 XSI Shorts All Stopouts 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 6f3edee2..1bfb0937 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -1716,6 +1716,18 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + (mConditions.isXAMAVale && + mConditions.isXTMNeutural && + mConditions.isXAMABearish && + mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMax && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest) + // ) // ) @@ -1984,6 +1996,12 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + (mConditions.isXTDBearishVale && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) @@ -2051,6 +2069,16 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXTDSignalCrossedOverBear && mConditions.isXTSCurrentCrossedOverNearest) // + || + // + (mConditions.isXAMAVale && + mConditions.isXAMABearish && + mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) @@ -2179,6 +2207,13 @@ bool XUSCHF5XTDHasLongSignal() ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXLHHHDecreased && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTDSignalCrossedOverBear) + // + || // (mConditions.isXCHMALCTrendsDown && mConditions.isXCHMALCFastOverSlow && @@ -2305,9 +2340,7 @@ bool XUSCHF5XTDHasLongSignal() (mConditions.isXCHMASCOverMin && mConditions.isXCHMASCUnderMax && mConditions.isXCHMALCTrendsDown && - mConditions.isXTSCurrentOverFarest && - mConditions.isXTSCurrentOverNearest && - mConditions.isXTSCurrentOverMediest) + mConditions.isXTSCurrentOverFarest) // ) // @@ -2570,13 +2603,25 @@ bool XUSCHF5XTDHasLongSignal() // || // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXTDBearishVale && - mConditions.isXCHMASCOverMax && - mConditions.isXTDBullOverBear && - mConditions.isXTSCurrentOverFarest && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + (mConditions.isXLHHHDecreased && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentUnderMediest) + // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXTDBearishVale && + mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentOverFarest) + // + ) + // + ) // ) // @@ -2827,7 +2872,6 @@ bool XUSCHF5XTDHasLongSignal() // (mConditions.isXTSCurrentMax && mConditions.isXCHMALCTrendsDown && - mConditions.isXCHMASCCrossedOverMax && mConditions.isXTDSignalCrossedOverBear && mConditions.isXTSCurrentCrossedOverNearest) // @@ -3355,6 +3399,12 @@ bool XUSCHF5XTDHasLongSignal() // mConditions.isXLHHighAttachedHH // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 6f3edee2..1bfb0937 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -1716,6 +1716,18 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + (mConditions.isXAMAVale && + mConditions.isXTMNeutural && + mConditions.isXAMABearish && + mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMax && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest) + // ) // ) @@ -1984,6 +1996,12 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + (mConditions.isXTDBearishVale && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) @@ -2051,6 +2069,16 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXTDSignalCrossedOverBear && mConditions.isXTSCurrentCrossedOverNearest) // + || + // + (mConditions.isXAMAVale && + mConditions.isXAMABearish && + mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) @@ -2179,6 +2207,13 @@ bool XUSCHF5XTDHasLongSignal() ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXLHHHDecreased && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTDSignalCrossedOverBear) + // + || // (mConditions.isXCHMALCTrendsDown && mConditions.isXCHMALCFastOverSlow && @@ -2305,9 +2340,7 @@ bool XUSCHF5XTDHasLongSignal() (mConditions.isXCHMASCOverMin && mConditions.isXCHMASCUnderMax && mConditions.isXCHMALCTrendsDown && - mConditions.isXTSCurrentOverFarest && - mConditions.isXTSCurrentOverNearest && - mConditions.isXTSCurrentOverMediest) + mConditions.isXTSCurrentOverFarest) // ) // @@ -2570,13 +2603,25 @@ bool XUSCHF5XTDHasLongSignal() // || // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXTDBearishVale && - mConditions.isXCHMASCOverMax && - mConditions.isXTDBullOverBear && - mConditions.isXTSCurrentOverFarest && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + (mConditions.isXLHHHDecreased && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentUnderMediest) + // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXTDBearishVale && + mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentOverFarest) + // + ) + // + ) // ) // @@ -2827,7 +2872,6 @@ bool XUSCHF5XTDHasLongSignal() // (mConditions.isXTSCurrentMax && mConditions.isXCHMALCTrendsDown && - mConditions.isXCHMASCCrossedOverMax && mConditions.isXTDSignalCrossedOverBear && mConditions.isXTSCurrentCrossedOverNearest) // @@ -3355,6 +3399,12 @@ bool XUSCHF5XTDHasLongSignal() // mConditions.isXLHHighAttachedHH // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalCrossedOverBear) + // ) // )