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 50b5dc27..5110ab15 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -35295,7 +35295,38 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMALCFastUnderSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + ((mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish) + // + || + // + (mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -35699,10 +35730,31 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMAMCFastUnderSlow) && ( // - (mConditions.isXCHMALCVale && - mConditions.isXCHLHMCLCLLSame && - mConditions.isXTMStartBearish && - mConditions.isXAMAStartBearish) + ((mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMABullish) + // + || + // + (mConditions.isXTMStartBearish && + ( + // + mConditions.isXAMANeutural + // + || + // + mConditions.isXAMAStartBearish + // + ) + // + ) + // + ) + // + ) // || // @@ -35829,6 +35881,23 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXAMABullish && mConditions.isXTMNeutural) // + || + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish) + // + || + // + (mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) + // + ) + // + ) + // ) // ) @@ -35873,6 +35942,30 @@ bool XUSPY5XTSFIHasShortSignal() // (mConditions.isXCHMAMCTrendsUp && ( + // + ((mConditions.isXCHMASCOverMax && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXLHPriceCrossedOverSignal) && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish) + // + || + // + (mConditions.isXFIOverZero && + mConditions.isXFICrossedOverZero) + // + || + // + (mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) + // + ) + // + ) + // + || // (mConditions.isXCHMAMCPeak && ( @@ -36591,7 +36684,58 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMASCFastCrossedOverSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXCHMASCTrendsUp && + ( + // + ((mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXTDSignalOverBear && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -37123,6 +37267,30 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + (mConditions.isXFIOverZero && + ( + // + ((mConditions.isXCHMALCVale && + mConditions.isXTDBearishVale && + mConditions.isXCHMASCUnderMin) && + ( + // + mConditions.isXTDSignalOverBear + // + || + // + mConditions.isXTDSignalCrossedOverBear + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -37330,10 +37498,28 @@ bool XUSPY5XTSFIHasShortSignal() (mConditions.isXTSCurrentOverMediest && ( // - (mConditions.isXAMAVale && - mConditions.isXCHMALCVale && - mConditions.isXCHLHSCMCLLSame && - mConditions.isXCHMASCUnderMin) + ((mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCUnderMin) && + ( + // + (mConditions.isXAMAVale && + mConditions.isXCHMALCVale) + // + || + // + (mConditions.isXTSCurrentCrossedOverMediest && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXTMEndBearish) + // + ) + // + ) + // + ) + // + ) // ) // @@ -37435,6 +37621,21 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTMEndBearish && + mConditions.isXAMAEndBearish && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 8bdeebb0..82f43bc3 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 Short Guard Attacks in AMarkets-Demo ... +Resolve XUSPY5 XTSFI All Short 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 50b5dc27..5110ab15 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -35295,7 +35295,38 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMALCFastUnderSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + ((mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish) + // + || + // + (mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -35699,10 +35730,31 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMAMCFastUnderSlow) && ( // - (mConditions.isXCHMALCVale && - mConditions.isXCHLHMCLCLLSame && - mConditions.isXTMStartBearish && - mConditions.isXAMAStartBearish) + ((mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMABullish) + // + || + // + (mConditions.isXTMStartBearish && + ( + // + mConditions.isXAMANeutural + // + || + // + mConditions.isXAMAStartBearish + // + ) + // + ) + // + ) + // + ) // || // @@ -35829,6 +35881,23 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXAMABullish && mConditions.isXTMNeutural) // + || + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish) + // + || + // + (mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) + // + ) + // + ) + // ) // ) @@ -35873,6 +35942,30 @@ bool XUSPY5XTSFIHasShortSignal() // (mConditions.isXCHMAMCTrendsUp && ( + // + ((mConditions.isXCHMASCOverMax && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXLHPriceCrossedOverSignal) && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish) + // + || + // + (mConditions.isXFIOverZero && + mConditions.isXFICrossedOverZero) + // + || + // + (mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) + // + ) + // + ) + // + || // (mConditions.isXCHMAMCPeak && ( @@ -36591,7 +36684,58 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMASCFastCrossedOverSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXCHMASCTrendsUp && + ( + // + ((mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXTDSignalOverBear && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -37123,6 +37267,30 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + (mConditions.isXFIOverZero && + ( + // + ((mConditions.isXCHMALCVale && + mConditions.isXTDBearishVale && + mConditions.isXCHMASCUnderMin) && + ( + // + mConditions.isXTDSignalOverBear + // + || + // + mConditions.isXTDSignalCrossedOverBear + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -37330,10 +37498,28 @@ bool XUSPY5XTSFIHasShortSignal() (mConditions.isXTSCurrentOverMediest && ( // - (mConditions.isXAMAVale && - mConditions.isXCHMALCVale && - mConditions.isXCHLHSCMCLLSame && - mConditions.isXCHMASCUnderMin) + ((mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCUnderMin) && + ( + // + (mConditions.isXAMAVale && + mConditions.isXCHMALCVale) + // + || + // + (mConditions.isXTSCurrentCrossedOverMediest && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXTMEndBearish) + // + ) + // + ) + // + ) + // + ) // ) // @@ -37435,6 +37621,21 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTMEndBearish && + mConditions.isXAMAEndBearish && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // ) // ) diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 50b5dc27..5110ab15 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -35295,7 +35295,38 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMALCFastUnderSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + ((mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish) + // + || + // + (mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -35699,10 +35730,31 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMAMCFastUnderSlow) && ( // - (mConditions.isXCHMALCVale && - mConditions.isXCHLHMCLCLLSame && - mConditions.isXTMStartBearish && - mConditions.isXAMAStartBearish) + ((mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMABullish) + // + || + // + (mConditions.isXTMStartBearish && + ( + // + mConditions.isXAMANeutural + // + || + // + mConditions.isXAMAStartBearish + // + ) + // + ) + // + ) + // + ) // || // @@ -35829,6 +35881,23 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXAMABullish && mConditions.isXTMNeutural) // + || + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish) + // + || + // + (mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) + // + ) + // + ) + // ) // ) @@ -35873,6 +35942,30 @@ bool XUSPY5XTSFIHasShortSignal() // (mConditions.isXCHMAMCTrendsUp && ( + // + ((mConditions.isXCHMASCOverMax && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXLHPriceCrossedOverSignal) && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish) + // + || + // + (mConditions.isXFIOverZero && + mConditions.isXFICrossedOverZero) + // + || + // + (mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) + // + ) + // + ) + // + || // (mConditions.isXCHMAMCPeak && ( @@ -36591,7 +36684,58 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMASCFastCrossedOverSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXCHMASCTrendsUp && + ( + // + ((mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXTDSignalOverBear && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -37123,6 +37267,30 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + (mConditions.isXFIOverZero && + ( + // + ((mConditions.isXCHMALCVale && + mConditions.isXTDBearishVale && + mConditions.isXCHMASCUnderMin) && + ( + // + mConditions.isXTDSignalOverBear + // + || + // + mConditions.isXTDSignalCrossedOverBear + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -37330,10 +37498,28 @@ bool XUSPY5XTSFIHasShortSignal() (mConditions.isXTSCurrentOverMediest && ( // - (mConditions.isXAMAVale && - mConditions.isXCHMALCVale && - mConditions.isXCHLHSCMCLLSame && - mConditions.isXCHMASCUnderMin) + ((mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCUnderMin) && + ( + // + (mConditions.isXAMAVale && + mConditions.isXCHMALCVale) + // + || + // + (mConditions.isXTSCurrentCrossedOverMediest && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXTMEndBearish) + // + ) + // + ) + // + ) + // + ) // ) // @@ -37435,6 +37621,21 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTMEndBearish && + mConditions.isXAMAEndBearish && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // ) // )