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 aad5ce55..8a3b86a6 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -26663,6 +26663,35 @@ bool XUSPY5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXCHMASCTrendsUp && + ( + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) && + ( + // + ((!mConditions.isXCHMALCTrendsUp && + !mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCLLSame) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -26819,11 +26848,32 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMALCFastOverSlow) && ( // - (mConditions.isXCHMAMCVale && - mConditions.isXCHMALCPeak && + (mConditions.isXCHMALCPeak && + mConditions.isXFIUnderZero && mConditions.isXTMStartBullish && mConditions.isXAMAStartBullish) // + || + // + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak) && + ( + // + (mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) + // + || + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXTDBearishVale && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) + // + ) + // + ) + // ) // ) @@ -26927,7 +26977,26 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - false + (mConditions.isXTSCurrentUnderMediest && + ( + // + ((!mConditions.isXCHMALCTrendsUp && + !mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTDBearishVale && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // + ) + // + ) // ) // @@ -27150,11 +27219,24 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMALCFastOverSlow) && ( // - (mConditions.isXTMBearish && - mConditions.isXCHMALCPeak && - mConditions.isXAMANeutural && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXLHPriceCrossedUnderSignal) + (mConditions.isXCHMALCPeak && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXTMNeutural && + mConditions.isXTMEndBullish && + mConditions.isXTDBearishVale) + // + || + // + (mConditions.isXTMBearish && + mConditions.isXAMANeutural && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXLHPriceCrossedUnderSignal) + // + ) + // + ) // || // @@ -27353,6 +27435,13 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMASCOverMax && mConditions.isXCHLHSCMCHHSame) // + || + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXTDBullUnderBear && + mConditions.isXLHPriceCrossedUnderSignal) + // ) // ) @@ -27597,12 +27686,40 @@ bool XUSPY5XTSFIHasLongSignal() (mConditions.isXTSCurrentUnderMediest && ( // - (mConditions.isXCHMAMCPeak && - mConditions.isXTMNeutural && - mConditions.isXAMANeutural && - mConditions.isXCHMASCOverMax && - mConditions.isXCHLHSCMCHHSame && - mConditions.isXCHLHMCLCLLSame) + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastOverSlow) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXTMStartBullish && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + || + // + ((mConditions.isXCHMAMCPeak && + mConditions.isXTMNeutural) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHMASCOverMin && + mConditions.isXCHMASCUnderMax) + // + || + // + (mConditions.isXAMANeutural && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame) + // + ) + // + ) // ) // @@ -28823,7 +28940,6 @@ bool XUSPY5XTSFIHasLongSignal() // (mConditions.isXCHMALCPeak && mConditions.isXTMNeutural && - mConditions.isXTMEndBullish && mConditions.isXCHMASCOverMax && mConditions.isXCHLHSCMCLLSame) // @@ -28898,13 +29014,21 @@ bool XUSPY5XTSFIHasLongSignal() (mConditions.isXTSCurrentUnderMediest && ( // - (mConditions.isXCHMAMCPeak && - mConditions.isXCHMALCVale && - mConditions.isXLHLLIncreased && - mConditions.isXTMNeutural && - mConditions.isXAMANeutural && - mConditions.isXTMEndBullish && - mConditions.isXAMAEndBullish) + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale) && + ( + // + mConditions.isXAMANeutural + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXAMABearish && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) // ) // @@ -29072,7 +29196,24 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMALCFastCrossedUnderSlow) && ( // - false + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXTMNeutural && + mConditions.isXAMABearish) + // + ) + // + ) + // + ) + // + ) // ) // @@ -29190,6 +29331,20 @@ bool XUSPY5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXTDBullUnderBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTMNeutural && + mConditions.isXAMANeutural && + mConditions.isXCHMASCOverMax) + // + ) + // + ) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 604f330b..37ef921b 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 OANDA ... +Resolve XUSPY5 XTSFI All Longs Guard Attacks in MetaQuotes ... 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 aad5ce55..8a3b86a6 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -26663,6 +26663,35 @@ bool XUSPY5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXCHMASCTrendsUp && + ( + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) && + ( + // + ((!mConditions.isXCHMALCTrendsUp && + !mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCLLSame) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -26819,11 +26848,32 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMALCFastOverSlow) && ( // - (mConditions.isXCHMAMCVale && - mConditions.isXCHMALCPeak && + (mConditions.isXCHMALCPeak && + mConditions.isXFIUnderZero && mConditions.isXTMStartBullish && mConditions.isXAMAStartBullish) // + || + // + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak) && + ( + // + (mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) + // + || + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXTDBearishVale && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) + // + ) + // + ) + // ) // ) @@ -26927,7 +26977,26 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - false + (mConditions.isXTSCurrentUnderMediest && + ( + // + ((!mConditions.isXCHMALCTrendsUp && + !mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTDBearishVale && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // + ) + // + ) // ) // @@ -27150,11 +27219,24 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMALCFastOverSlow) && ( // - (mConditions.isXTMBearish && - mConditions.isXCHMALCPeak && - mConditions.isXAMANeutural && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXLHPriceCrossedUnderSignal) + (mConditions.isXCHMALCPeak && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXTMNeutural && + mConditions.isXTMEndBullish && + mConditions.isXTDBearishVale) + // + || + // + (mConditions.isXTMBearish && + mConditions.isXAMANeutural && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXLHPriceCrossedUnderSignal) + // + ) + // + ) // || // @@ -27353,6 +27435,13 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMASCOverMax && mConditions.isXCHLHSCMCHHSame) // + || + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXTDBullUnderBear && + mConditions.isXLHPriceCrossedUnderSignal) + // ) // ) @@ -27597,12 +27686,40 @@ bool XUSPY5XTSFIHasLongSignal() (mConditions.isXTSCurrentUnderMediest && ( // - (mConditions.isXCHMAMCPeak && - mConditions.isXTMNeutural && - mConditions.isXAMANeutural && - mConditions.isXCHMASCOverMax && - mConditions.isXCHLHSCMCHHSame && - mConditions.isXCHLHMCLCLLSame) + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastOverSlow) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXTMStartBullish && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + || + // + ((mConditions.isXCHMAMCPeak && + mConditions.isXTMNeutural) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHMASCOverMin && + mConditions.isXCHMASCUnderMax) + // + || + // + (mConditions.isXAMANeutural && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame) + // + ) + // + ) // ) // @@ -28823,7 +28940,6 @@ bool XUSPY5XTSFIHasLongSignal() // (mConditions.isXCHMALCPeak && mConditions.isXTMNeutural && - mConditions.isXTMEndBullish && mConditions.isXCHMASCOverMax && mConditions.isXCHLHSCMCLLSame) // @@ -28898,13 +29014,21 @@ bool XUSPY5XTSFIHasLongSignal() (mConditions.isXTSCurrentUnderMediest && ( // - (mConditions.isXCHMAMCPeak && - mConditions.isXCHMALCVale && - mConditions.isXLHLLIncreased && - mConditions.isXTMNeutural && - mConditions.isXAMANeutural && - mConditions.isXTMEndBullish && - mConditions.isXAMAEndBullish) + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale) && + ( + // + mConditions.isXAMANeutural + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXAMABearish && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) // ) // @@ -29072,7 +29196,24 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMALCFastCrossedUnderSlow) && ( // - false + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXTMNeutural && + mConditions.isXAMABearish) + // + ) + // + ) + // + ) + // + ) // ) // @@ -29190,6 +29331,20 @@ bool XUSPY5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXTDBullUnderBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTMNeutural && + mConditions.isXAMANeutural && + mConditions.isXCHMASCOverMax) + // + ) + // + ) + // ) // ) diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index aad5ce55..8a3b86a6 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -26663,6 +26663,35 @@ bool XUSPY5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXCHMASCTrendsUp && + ( + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) && + ( + // + ((!mConditions.isXCHMALCTrendsUp && + !mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCLLSame) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -26819,11 +26848,32 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMALCFastOverSlow) && ( // - (mConditions.isXCHMAMCVale && - mConditions.isXCHMALCPeak && + (mConditions.isXCHMALCPeak && + mConditions.isXFIUnderZero && mConditions.isXTMStartBullish && mConditions.isXAMAStartBullish) // + || + // + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak) && + ( + // + (mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) + // + || + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXTDBearishVale && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) + // + ) + // + ) + // ) // ) @@ -26927,7 +26977,26 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - false + (mConditions.isXTSCurrentUnderMediest && + ( + // + ((!mConditions.isXCHMALCTrendsUp && + !mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTDBearishVale && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // + ) + // + ) // ) // @@ -27150,11 +27219,24 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMALCFastOverSlow) && ( // - (mConditions.isXTMBearish && - mConditions.isXCHMALCPeak && - mConditions.isXAMANeutural && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXLHPriceCrossedUnderSignal) + (mConditions.isXCHMALCPeak && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXTMNeutural && + mConditions.isXTMEndBullish && + mConditions.isXTDBearishVale) + // + || + // + (mConditions.isXTMBearish && + mConditions.isXAMANeutural && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXLHPriceCrossedUnderSignal) + // + ) + // + ) // || // @@ -27353,6 +27435,13 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMASCOverMax && mConditions.isXCHLHSCMCHHSame) // + || + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXTDBullUnderBear && + mConditions.isXLHPriceCrossedUnderSignal) + // ) // ) @@ -27597,12 +27686,40 @@ bool XUSPY5XTSFIHasLongSignal() (mConditions.isXTSCurrentUnderMediest && ( // - (mConditions.isXCHMAMCPeak && - mConditions.isXTMNeutural && - mConditions.isXAMANeutural && - mConditions.isXCHMASCOverMax && - mConditions.isXCHLHSCMCHHSame && - mConditions.isXCHLHMCLCLLSame) + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastOverSlow) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXTMStartBullish && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + || + // + ((mConditions.isXCHMAMCPeak && + mConditions.isXTMNeutural) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHMASCOverMin && + mConditions.isXCHMASCUnderMax) + // + || + // + (mConditions.isXAMANeutural && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame) + // + ) + // + ) // ) // @@ -28823,7 +28940,6 @@ bool XUSPY5XTSFIHasLongSignal() // (mConditions.isXCHMALCPeak && mConditions.isXTMNeutural && - mConditions.isXTMEndBullish && mConditions.isXCHMASCOverMax && mConditions.isXCHLHSCMCLLSame) // @@ -28898,13 +29014,21 @@ bool XUSPY5XTSFIHasLongSignal() (mConditions.isXTSCurrentUnderMediest && ( // - (mConditions.isXCHMAMCPeak && - mConditions.isXCHMALCVale && - mConditions.isXLHLLIncreased && - mConditions.isXTMNeutural && - mConditions.isXAMANeutural && - mConditions.isXTMEndBullish && - mConditions.isXAMAEndBullish) + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale) && + ( + // + mConditions.isXAMANeutural + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXAMABearish && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) // ) // @@ -29072,7 +29196,24 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMALCFastCrossedUnderSlow) && ( // - false + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXTMNeutural && + mConditions.isXAMABearish) + // + ) + // + ) + // + ) + // + ) // ) // @@ -29190,6 +29331,20 @@ bool XUSPY5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXTDBullUnderBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTMNeutural && + mConditions.isXAMANeutural && + mConditions.isXCHMASCOverMax) + // + ) + // + ) + // ) // )