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 8df82b85..f394567b 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -26645,6 +26645,11 @@ bool XUSPY5XTSFIHasLongSignal() ((mConditions.isXCHMALCTrendsDown && mConditions.isXCHMALCFastOverSlow) && ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish) + // + || // (mConditions.isXTMBearish && mConditions.isXCHMALCPeak && @@ -26863,6 +26868,19 @@ bool XUSPY5XTSFIHasLongSignal() // || // + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale) && + ( + // + (mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + || + // ((mConditions.isXCHMAMCVale && mConditions.isXCHMALCPeak) && ( @@ -26872,11 +26890,24 @@ bool XUSPY5XTSFIHasLongSignal() // || // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXTDBearishVale && - mConditions.isXTDBullOverBear && - mConditions.isXTDSignalOverBear) + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTDBearishVale && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) + // + || + // + (mConditions.isXFIUnderZero && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) // ) // @@ -27064,6 +27095,20 @@ bool XUSPY5XTSFIHasLongSignal() ((mConditions.isXCHMALCTrendsDown && mConditions.isXCHMALCFastOverSlow) && ( + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXFIUnderZero && + mConditions.isXFICrossedUnderZero && + mConditions.isXTDSignalCrossedUnderBear && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // + || // (mConditions.isXTDSignalUnderBear && ( @@ -27634,7 +27679,6 @@ bool XUSPY5XTSFIHasLongSignal() ( // (mConditions.isXCHMALCPeak && - mConditions.isXAMANeutural && mConditions.isXCHMASCOverMax && mConditions.isXTMStartBullish && mConditions.isXCHLHMCLCHHSame && @@ -27931,6 +27975,12 @@ bool XUSPY5XTSFIHasLongSignal() // || // + (mConditions.isXFIUnderZero && + mConditions.isXCHMASCOverMax && + mConditions.isXFICrossedUnderZero) + // + || + // (mConditions.isXAMANeutural && mConditions.isXCHMASCOverMax && mConditions.isXCHLHSCMCHHSame && @@ -28753,11 +28803,22 @@ bool XUSPY5XTSFIHasLongSignal() (mConditions.isXTSCurrentUnderMediest && ( // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXCHMALCPeak && - mConditions.isXLHHHDecreased && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXCHMALCPeak && + mConditions.isXLHHHDecreased && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish) + // + || + // + (mConditions.isXAMANeutural && + mConditions.isXAMAEndBullish) + // + ) + // + ) // ) // @@ -28829,23 +28890,34 @@ bool XUSPY5XTSFIHasLongSignal() ( // ((mConditions.isXCHMASCPeak && - mConditions.isXCHMASCOverMax && - mConditions.isXCHLHSCMCHHSame && - mConditions.isXCHLHMCLCLLSame) && + mConditions.isXCHMASCOverMax) && ( // - (mConditions.isXTMNeutural && - mConditions.isXAMANeutural) + (mConditions.isXLHHHDecreased && + mConditions.isXTSCurrentCrossedUnderMediest) // || // - (mConditions.isXTMEndBullish && - mConditions.isXAMAEndBullish) - // - || - // - (mConditions.isXTMNeutural && - mConditions.isXTMEndBullish) + ((mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + || + // + (mConditions.isXTMEndBullish && + mConditions.isXAMAEndBullish) + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXTMEndBullish) + // + ) + // + ) // ) // @@ -28926,6 +28998,19 @@ bool XUSPY5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXTDSignalCrossedUnderBear && + ( + // + (mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXRSICrossedOverLongExit) + // + ) + // + ) + // ) // ) @@ -29044,6 +29129,11 @@ bool XUSPY5XTSFIHasLongSignal() ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( + // + (mConditions.isXTDSignalCrossedUnderBear && + mConditions.isXTSCurrentCrossedUnderMediest) + // + || // ((mConditions.isXTDBullOverBear && mConditions.isXTDSignalOverBear) && @@ -29112,6 +29202,11 @@ bool XUSPY5XTSFIHasLongSignal() // || // + (mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDSignalCrossedOverBear) + // + || + // (mConditions.isXCHLHSameHHs && mConditions.isXTDBullOverBear && mConditions.isXTDSignalOverBear && @@ -29119,6 +29214,13 @@ bool XUSPY5XTSFIHasLongSignal() // || // + (mConditions.isXTDBullOverBear && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverNearest) + // + || + // (mConditions.isXAMAStartBullish && mConditions.isXCHMASCCrossedOverMax && mConditions.isXLHPriceCrossedOverSignal && @@ -30415,7 +30517,24 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - false + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + (mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXLHPriceCrossedUnderSignal && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 9a295706..c1acc99d 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 AMarkets-Demo ... +Resolve XUSPY5 XTSFI All Longs Guard Attacks in IFCMarkets ... 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 8df82b85..f394567b 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -26645,6 +26645,11 @@ bool XUSPY5XTSFIHasLongSignal() ((mConditions.isXCHMALCTrendsDown && mConditions.isXCHMALCFastOverSlow) && ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish) + // + || // (mConditions.isXTMBearish && mConditions.isXCHMALCPeak && @@ -26863,6 +26868,19 @@ bool XUSPY5XTSFIHasLongSignal() // || // + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale) && + ( + // + (mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + || + // ((mConditions.isXCHMAMCVale && mConditions.isXCHMALCPeak) && ( @@ -26872,11 +26890,24 @@ bool XUSPY5XTSFIHasLongSignal() // || // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXTDBearishVale && - mConditions.isXTDBullOverBear && - mConditions.isXTDSignalOverBear) + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTDBearishVale && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) + // + || + // + (mConditions.isXFIUnderZero && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) // ) // @@ -27064,6 +27095,20 @@ bool XUSPY5XTSFIHasLongSignal() ((mConditions.isXCHMALCTrendsDown && mConditions.isXCHMALCFastOverSlow) && ( + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXFIUnderZero && + mConditions.isXFICrossedUnderZero && + mConditions.isXTDSignalCrossedUnderBear && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // + || // (mConditions.isXTDSignalUnderBear && ( @@ -27634,7 +27679,6 @@ bool XUSPY5XTSFIHasLongSignal() ( // (mConditions.isXCHMALCPeak && - mConditions.isXAMANeutural && mConditions.isXCHMASCOverMax && mConditions.isXTMStartBullish && mConditions.isXCHLHMCLCHHSame && @@ -27931,6 +27975,12 @@ bool XUSPY5XTSFIHasLongSignal() // || // + (mConditions.isXFIUnderZero && + mConditions.isXCHMASCOverMax && + mConditions.isXFICrossedUnderZero) + // + || + // (mConditions.isXAMANeutural && mConditions.isXCHMASCOverMax && mConditions.isXCHLHSCMCHHSame && @@ -28753,11 +28803,22 @@ bool XUSPY5XTSFIHasLongSignal() (mConditions.isXTSCurrentUnderMediest && ( // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXCHMALCPeak && - mConditions.isXLHHHDecreased && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXCHMALCPeak && + mConditions.isXLHHHDecreased && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish) + // + || + // + (mConditions.isXAMANeutural && + mConditions.isXAMAEndBullish) + // + ) + // + ) // ) // @@ -28829,23 +28890,34 @@ bool XUSPY5XTSFIHasLongSignal() ( // ((mConditions.isXCHMASCPeak && - mConditions.isXCHMASCOverMax && - mConditions.isXCHLHSCMCHHSame && - mConditions.isXCHLHMCLCLLSame) && + mConditions.isXCHMASCOverMax) && ( // - (mConditions.isXTMNeutural && - mConditions.isXAMANeutural) + (mConditions.isXLHHHDecreased && + mConditions.isXTSCurrentCrossedUnderMediest) // || // - (mConditions.isXTMEndBullish && - mConditions.isXAMAEndBullish) - // - || - // - (mConditions.isXTMNeutural && - mConditions.isXTMEndBullish) + ((mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + || + // + (mConditions.isXTMEndBullish && + mConditions.isXAMAEndBullish) + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXTMEndBullish) + // + ) + // + ) // ) // @@ -28926,6 +28998,19 @@ bool XUSPY5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXTDSignalCrossedUnderBear && + ( + // + (mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXRSICrossedOverLongExit) + // + ) + // + ) + // ) // ) @@ -29044,6 +29129,11 @@ bool XUSPY5XTSFIHasLongSignal() ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( + // + (mConditions.isXTDSignalCrossedUnderBear && + mConditions.isXTSCurrentCrossedUnderMediest) + // + || // ((mConditions.isXTDBullOverBear && mConditions.isXTDSignalOverBear) && @@ -29112,6 +29202,11 @@ bool XUSPY5XTSFIHasLongSignal() // || // + (mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDSignalCrossedOverBear) + // + || + // (mConditions.isXCHLHSameHHs && mConditions.isXTDBullOverBear && mConditions.isXTDSignalOverBear && @@ -29119,6 +29214,13 @@ bool XUSPY5XTSFIHasLongSignal() // || // + (mConditions.isXTDBullOverBear && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverNearest) + // + || + // (mConditions.isXAMAStartBullish && mConditions.isXCHMASCCrossedOverMax && mConditions.isXLHPriceCrossedOverSignal && @@ -30415,7 +30517,24 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - false + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + (mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXLHPriceCrossedUnderSignal && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 8df82b85..f394567b 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -26645,6 +26645,11 @@ bool XUSPY5XTSFIHasLongSignal() ((mConditions.isXCHMALCTrendsDown && mConditions.isXCHMALCFastOverSlow) && ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish) + // + || // (mConditions.isXTMBearish && mConditions.isXCHMALCPeak && @@ -26863,6 +26868,19 @@ bool XUSPY5XTSFIHasLongSignal() // || // + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale) && + ( + // + (mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + || + // ((mConditions.isXCHMAMCVale && mConditions.isXCHMALCPeak) && ( @@ -26872,11 +26890,24 @@ bool XUSPY5XTSFIHasLongSignal() // || // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXTDBearishVale && - mConditions.isXTDBullOverBear && - mConditions.isXTDSignalOverBear) + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTDBearishVale && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) + // + || + // + (mConditions.isXFIUnderZero && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) // ) // @@ -27064,6 +27095,20 @@ bool XUSPY5XTSFIHasLongSignal() ((mConditions.isXCHMALCTrendsDown && mConditions.isXCHMALCFastOverSlow) && ( + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXFIUnderZero && + mConditions.isXFICrossedUnderZero && + mConditions.isXTDSignalCrossedUnderBear && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // + || // (mConditions.isXTDSignalUnderBear && ( @@ -27634,7 +27679,6 @@ bool XUSPY5XTSFIHasLongSignal() ( // (mConditions.isXCHMALCPeak && - mConditions.isXAMANeutural && mConditions.isXCHMASCOverMax && mConditions.isXTMStartBullish && mConditions.isXCHLHMCLCHHSame && @@ -27931,6 +27975,12 @@ bool XUSPY5XTSFIHasLongSignal() // || // + (mConditions.isXFIUnderZero && + mConditions.isXCHMASCOverMax && + mConditions.isXFICrossedUnderZero) + // + || + // (mConditions.isXAMANeutural && mConditions.isXCHMASCOverMax && mConditions.isXCHLHSCMCHHSame && @@ -28753,11 +28803,22 @@ bool XUSPY5XTSFIHasLongSignal() (mConditions.isXTSCurrentUnderMediest && ( // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXCHMALCPeak && - mConditions.isXLHHHDecreased && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXCHMALCPeak && + mConditions.isXLHHHDecreased && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish) + // + || + // + (mConditions.isXAMANeutural && + mConditions.isXAMAEndBullish) + // + ) + // + ) // ) // @@ -28829,23 +28890,34 @@ bool XUSPY5XTSFIHasLongSignal() ( // ((mConditions.isXCHMASCPeak && - mConditions.isXCHMASCOverMax && - mConditions.isXCHLHSCMCHHSame && - mConditions.isXCHLHMCLCLLSame) && + mConditions.isXCHMASCOverMax) && ( // - (mConditions.isXTMNeutural && - mConditions.isXAMANeutural) + (mConditions.isXLHHHDecreased && + mConditions.isXTSCurrentCrossedUnderMediest) // || // - (mConditions.isXTMEndBullish && - mConditions.isXAMAEndBullish) - // - || - // - (mConditions.isXTMNeutural && - mConditions.isXTMEndBullish) + ((mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + || + // + (mConditions.isXTMEndBullish && + mConditions.isXAMAEndBullish) + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXTMEndBullish) + // + ) + // + ) // ) // @@ -28926,6 +28998,19 @@ bool XUSPY5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXTDSignalCrossedUnderBear && + ( + // + (mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXRSICrossedOverLongExit) + // + ) + // + ) + // ) // ) @@ -29044,6 +29129,11 @@ bool XUSPY5XTSFIHasLongSignal() ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( + // + (mConditions.isXTDSignalCrossedUnderBear && + mConditions.isXTSCurrentCrossedUnderMediest) + // + || // ((mConditions.isXTDBullOverBear && mConditions.isXTDSignalOverBear) && @@ -29112,6 +29202,11 @@ bool XUSPY5XTSFIHasLongSignal() // || // + (mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDSignalCrossedOverBear) + // + || + // (mConditions.isXCHLHSameHHs && mConditions.isXTDBullOverBear && mConditions.isXTDSignalOverBear && @@ -29119,6 +29214,13 @@ bool XUSPY5XTSFIHasLongSignal() // || // + (mConditions.isXTDBullOverBear && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverNearest) + // + || + // (mConditions.isXAMAStartBullish && mConditions.isXCHMASCCrossedOverMax && mConditions.isXLHPriceCrossedOverSignal && @@ -30415,7 +30517,24 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - false + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + (mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXLHPriceCrossedUnderSignal && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // + ) + // + ) // ) //