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 7ec61757..98f1b762 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -1562,11 +1562,22 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXAMABullish) && ( // - (mConditions.isXCHLHMCLCHHSame && - mConditions.isXCHLHMCLCLLSame && - mConditions.isXTSCurrentUnderFarest && - mConditions.isXTSCurrentUnderNearest && - mConditions.isXTSCurrentCrossedUnderNearest) + ((mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // + (mConditions.isXTSCurrentUnderFarest && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) // ) // @@ -2489,6 +2500,22 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) && + ( + // + (mConditions.isXTDBearishVale && + mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // ) // ) @@ -3017,6 +3044,12 @@ bool XUSCHF5XTDHasLongSignal() ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( + // + (mConditions.isXTDBearishVale && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXTDSignalCrossedOverBear) + // + || // (mConditions.isXTSAllSame && mConditions.isXCHMALCPeak && @@ -3196,6 +3229,22 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXTDSignalCrossedOverBear && mConditions.isXTSCurrentCrossedOverMediest) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMALCFastUnderSlow && + mConditions.isXCHMASCCrossedOverMin && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 2f4707e9..9ae6489d 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 MetaQuotes ... +Resolve XUSCHF5 XTD Longs All Critical Guard Attacks in HFMarkets ... 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 7ec61757..98f1b762 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -1562,11 +1562,22 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXAMABullish) && ( // - (mConditions.isXCHLHMCLCHHSame && - mConditions.isXCHLHMCLCLLSame && - mConditions.isXTSCurrentUnderFarest && - mConditions.isXTSCurrentUnderNearest && - mConditions.isXTSCurrentCrossedUnderNearest) + ((mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // + (mConditions.isXTSCurrentUnderFarest && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) // ) // @@ -2489,6 +2500,22 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) && + ( + // + (mConditions.isXTDBearishVale && + mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // ) // ) @@ -3017,6 +3044,12 @@ bool XUSCHF5XTDHasLongSignal() ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( + // + (mConditions.isXTDBearishVale && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXTDSignalCrossedOverBear) + // + || // (mConditions.isXTSAllSame && mConditions.isXCHMALCPeak && @@ -3196,6 +3229,22 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXTDSignalCrossedOverBear && mConditions.isXTSCurrentCrossedOverMediest) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMALCFastUnderSlow && + mConditions.isXCHMASCCrossedOverMin && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // ) // ) diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 7ec61757..98f1b762 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -1562,11 +1562,22 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXAMABullish) && ( // - (mConditions.isXCHLHMCLCHHSame && - mConditions.isXCHLHMCLCLLSame && - mConditions.isXTSCurrentUnderFarest && - mConditions.isXTSCurrentUnderNearest && - mConditions.isXTSCurrentCrossedUnderNearest) + ((mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // + (mConditions.isXTSCurrentUnderFarest && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) // ) // @@ -2489,6 +2500,22 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) && + ( + // + (mConditions.isXTDBearishVale && + mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // ) // ) @@ -3017,6 +3044,12 @@ bool XUSCHF5XTDHasLongSignal() ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( + // + (mConditions.isXTDBearishVale && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXTDSignalCrossedOverBear) + // + || // (mConditions.isXTSAllSame && mConditions.isXCHMALCPeak && @@ -3196,6 +3229,22 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXTDSignalCrossedOverBear && mConditions.isXTSCurrentCrossedOverMediest) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHMALCFastUnderSlow && + mConditions.isXCHMASCCrossedOverMin && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // ) // )