diff --git a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 2438d856..4ea6359e 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -27686,9 +27686,28 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMALCVale) && ( // - (mConditions.isXTMBearish && - mConditions.isXAMABearish && - mConditions.isXTDSignalCrossedUnderBear) + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + mConditions.isXTDBullOverBear + // + || + // + mConditions.isXTDSignalUnderBear + // + || + // + mConditions.isXTDSignalCrossedUnderBear + // + || + // + (mConditions.isXFIUnderZero && + mConditions.isXFICrossedUnderZero) + // + ) + // + ) // || // @@ -27700,8 +27719,18 @@ bool XUSPY5XTSFIHasLongSignal() || // (mConditions.isXAMANeutural && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXTSCurrentCrossedOverNearest) + ( + // + mConditions.isXTDSignalUnderBear + // + || + // + (mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) // ) // @@ -29351,22 +29380,52 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXAMABullish) && ( // - ((mConditions.isXTDBullOverBear && - mConditions.isXTDSignalOverBear) && + (mConditions.isXTDBullOverBear && ( // - (mConditions.isXCHMASCOverMax && + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXTDSignalCrossedOverBear) + // + || + // + (mConditions.isXTDSignalOverBear && ( // - ((mConditions.isXCHMAMCPeak && - mConditions.isXCHLHSCMCHHSame) && + (mConditions.isXCHMASCOverMax && ( // - mConditions.isXCHLHMCLCLLSame + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHLHSCMCHHSame) && + ( + // + mConditions.isXCHLHMCLCLLSame + // + || + // + mConditions.isXCHMALCTrendsDown + // + ) + // + ) // || // - mConditions.isXCHMALCTrendsDown + ((mConditions.isXCHLHSameHHs && + mConditions.isXTDBearishVale) && + ( + // + mConditions.isXLHHHIncreased + // + || + // + mConditions.isXTSCurrentCrossedOverNearest + // + ) + // + ) // ) // @@ -29374,15 +29433,14 @@ bool XUSPY5XTSFIHasLongSignal() // || // - ((mConditions.isXCHLHSameHHs && - mConditions.isXTDBearishVale) && + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale) && ( // - mConditions.isXLHHHIncreased - // - || - // - mConditions.isXTSCurrentCrossedOverNearest + (mConditions.isXCHMASCOverMin && + mConditions.isXCHMASCUnderMax && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMALCTrendsDown) // ) // @@ -30147,6 +30205,18 @@ bool XUSPY5XTSFIHasLongSignal() (mConditions.isXTMEndBullish && mConditions.isXAMAEndBullish) // + || + // + (mConditions.isXTDBearishVale && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMABearish) + // + ) + // + ) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 9541087a..171e179f 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -37,7 +37,7 @@ XTSFI ------ Resolve XUSPY5 XTSFI All Stopouts in All Markets ... Resolve XUSPY5 XTSFI All Critical Guard Attacks in All Markets ... -Resolve XUSPY5 XTSFI All Longs Guard Attacks in ErranteSC ... +Resolve XUSPY5 XTSFI All Longs Guard Attacks in Alpari ... XCHMACC diff --git a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 2438d856..4ea6359e 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -27686,9 +27686,28 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMALCVale) && ( // - (mConditions.isXTMBearish && - mConditions.isXAMABearish && - mConditions.isXTDSignalCrossedUnderBear) + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + mConditions.isXTDBullOverBear + // + || + // + mConditions.isXTDSignalUnderBear + // + || + // + mConditions.isXTDSignalCrossedUnderBear + // + || + // + (mConditions.isXFIUnderZero && + mConditions.isXFICrossedUnderZero) + // + ) + // + ) // || // @@ -27700,8 +27719,18 @@ bool XUSPY5XTSFIHasLongSignal() || // (mConditions.isXAMANeutural && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXTSCurrentCrossedOverNearest) + ( + // + mConditions.isXTDSignalUnderBear + // + || + // + (mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) // ) // @@ -29351,22 +29380,52 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXAMABullish) && ( // - ((mConditions.isXTDBullOverBear && - mConditions.isXTDSignalOverBear) && + (mConditions.isXTDBullOverBear && ( // - (mConditions.isXCHMASCOverMax && + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXTDSignalCrossedOverBear) + // + || + // + (mConditions.isXTDSignalOverBear && ( // - ((mConditions.isXCHMAMCPeak && - mConditions.isXCHLHSCMCHHSame) && + (mConditions.isXCHMASCOverMax && ( // - mConditions.isXCHLHMCLCLLSame + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHLHSCMCHHSame) && + ( + // + mConditions.isXCHLHMCLCLLSame + // + || + // + mConditions.isXCHMALCTrendsDown + // + ) + // + ) // || // - mConditions.isXCHMALCTrendsDown + ((mConditions.isXCHLHSameHHs && + mConditions.isXTDBearishVale) && + ( + // + mConditions.isXLHHHIncreased + // + || + // + mConditions.isXTSCurrentCrossedOverNearest + // + ) + // + ) // ) // @@ -29374,15 +29433,14 @@ bool XUSPY5XTSFIHasLongSignal() // || // - ((mConditions.isXCHLHSameHHs && - mConditions.isXTDBearishVale) && + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale) && ( // - mConditions.isXLHHHIncreased - // - || - // - mConditions.isXTSCurrentCrossedOverNearest + (mConditions.isXCHMASCOverMin && + mConditions.isXCHMASCUnderMax && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMALCTrendsDown) // ) // @@ -30147,6 +30205,18 @@ bool XUSPY5XTSFIHasLongSignal() (mConditions.isXTMEndBullish && mConditions.isXAMAEndBullish) // + || + // + (mConditions.isXTDBearishVale && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMABearish) + // + ) + // + ) + // ) // ) diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 2438d856..4ea6359e 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -27686,9 +27686,28 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMALCVale) && ( // - (mConditions.isXTMBearish && - mConditions.isXAMABearish && - mConditions.isXTDSignalCrossedUnderBear) + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + mConditions.isXTDBullOverBear + // + || + // + mConditions.isXTDSignalUnderBear + // + || + // + mConditions.isXTDSignalCrossedUnderBear + // + || + // + (mConditions.isXFIUnderZero && + mConditions.isXFICrossedUnderZero) + // + ) + // + ) // || // @@ -27700,8 +27719,18 @@ bool XUSPY5XTSFIHasLongSignal() || // (mConditions.isXAMANeutural && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXTSCurrentCrossedOverNearest) + ( + // + mConditions.isXTDSignalUnderBear + // + || + // + (mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) // ) // @@ -29351,22 +29380,52 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXAMABullish) && ( // - ((mConditions.isXTDBullOverBear && - mConditions.isXTDSignalOverBear) && + (mConditions.isXTDBullOverBear && ( // - (mConditions.isXCHMASCOverMax && + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXTDSignalCrossedOverBear) + // + || + // + (mConditions.isXTDSignalOverBear && ( // - ((mConditions.isXCHMAMCPeak && - mConditions.isXCHLHSCMCHHSame) && + (mConditions.isXCHMASCOverMax && ( // - mConditions.isXCHLHMCLCLLSame + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHLHSCMCHHSame) && + ( + // + mConditions.isXCHLHMCLCLLSame + // + || + // + mConditions.isXCHMALCTrendsDown + // + ) + // + ) // || // - mConditions.isXCHMALCTrendsDown + ((mConditions.isXCHLHSameHHs && + mConditions.isXTDBearishVale) && + ( + // + mConditions.isXLHHHIncreased + // + || + // + mConditions.isXTSCurrentCrossedOverNearest + // + ) + // + ) // ) // @@ -29374,15 +29433,14 @@ bool XUSPY5XTSFIHasLongSignal() // || // - ((mConditions.isXCHLHSameHHs && - mConditions.isXTDBearishVale) && + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale) && ( // - mConditions.isXLHHHIncreased - // - || - // - mConditions.isXTSCurrentCrossedOverNearest + (mConditions.isXCHMASCOverMin && + mConditions.isXCHMASCUnderMax && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMALCTrendsDown) // ) // @@ -30147,6 +30205,18 @@ bool XUSPY5XTSFIHasLongSignal() (mConditions.isXTMEndBullish && mConditions.isXAMAEndBullish) // + || + // + (mConditions.isXTDBearishVale && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMABearish) + // + ) + // + ) + // ) // )