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 b47b331b..ba8ddf2c 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -35639,6 +35639,25 @@ bool XUSPY5XTSFIHasShortSignal() // || // + (mConditions.isXTDBullOverBear && + ( + // + ((mConditions.isXFIOverZero && + mConditions.isXFICrossedOverZero) && + ( + // + mConditions.isXCHLHSCMCLLSame + // + ) + // + ) + // + ) + // + ) + // + || + // ((mConditions.isXTMNeutural && mConditions.isXAMANeutural) && ( @@ -35946,6 +35965,42 @@ bool XUSPY5XTSFIHasShortSignal() // || // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXCHMASCTrendsUp && + ( + // + ((mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame) && + ( + // + ((mConditions.isXFIOverZero && + mConditions.isXFICrossedOverZero) && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMANeutural) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // ((mConditions.isXCHMALCTrendsDown && mConditions.isXCHMALCFastUnderSlow) && ( @@ -36181,6 +36236,29 @@ bool XUSPY5XTSFIHasShortSignal() // (mConditions.isXCHMALCPeak && ( + // + ((!mConditions.isXCHMAMCTrendsUp && + !mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + ((mConditions.isXAMAVale && + mConditions.isXCHMAMCVale && + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish) + // + ) + // + ) + // + ) + // + ) + // + || // (mConditions.isXAMANeutural && ( @@ -36346,7 +36424,30 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMALCFastUnderSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXFIOverZero && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -37597,6 +37698,19 @@ bool XUSPY5XTSFIHasShortSignal() ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( + // + (mConditions.isXTDSignalCrossedOverBear && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTDBearishVale && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + || // ((mConditions.isXFIOverZero && mConditions.isXFICrossedOverZero) && diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 8cfcd48f..c355f7b8 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -37,13 +37,13 @@ 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 Alpari ... +Resolve XUSPY5 XTSFI All Guard Attacks in All Markets ... XCHMACC -------- Resolve XUSPY5 XCHMACC All Stopouts in All Markets ... Resolve XUSPY5 XCHMACC All Critical Guard Attacks in All Markets ... -Resolve XUSPY5 XCHMACC All Guard Attacks in All Markets ... +Resolve XUSPY5 XCHMACC All Shorts Guard Attacks in AMarkets-Real ... 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 b47b331b..ba8ddf2c 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -35639,6 +35639,25 @@ bool XUSPY5XTSFIHasShortSignal() // || // + (mConditions.isXTDBullOverBear && + ( + // + ((mConditions.isXFIOverZero && + mConditions.isXFICrossedOverZero) && + ( + // + mConditions.isXCHLHSCMCLLSame + // + ) + // + ) + // + ) + // + ) + // + || + // ((mConditions.isXTMNeutural && mConditions.isXAMANeutural) && ( @@ -35946,6 +35965,42 @@ bool XUSPY5XTSFIHasShortSignal() // || // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXCHMASCTrendsUp && + ( + // + ((mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame) && + ( + // + ((mConditions.isXFIOverZero && + mConditions.isXFICrossedOverZero) && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMANeutural) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // ((mConditions.isXCHMALCTrendsDown && mConditions.isXCHMALCFastUnderSlow) && ( @@ -36181,6 +36236,29 @@ bool XUSPY5XTSFIHasShortSignal() // (mConditions.isXCHMALCPeak && ( + // + ((!mConditions.isXCHMAMCTrendsUp && + !mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + ((mConditions.isXAMAVale && + mConditions.isXCHMAMCVale && + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish) + // + ) + // + ) + // + ) + // + ) + // + || // (mConditions.isXAMANeutural && ( @@ -36346,7 +36424,30 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMALCFastUnderSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXFIOverZero && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -37597,6 +37698,19 @@ bool XUSPY5XTSFIHasShortSignal() ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( + // + (mConditions.isXTDSignalCrossedOverBear && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTDBearishVale && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + || // ((mConditions.isXFIOverZero && mConditions.isXFICrossedOverZero) && diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index b47b331b..ba8ddf2c 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -35639,6 +35639,25 @@ bool XUSPY5XTSFIHasShortSignal() // || // + (mConditions.isXTDBullOverBear && + ( + // + ((mConditions.isXFIOverZero && + mConditions.isXFICrossedOverZero) && + ( + // + mConditions.isXCHLHSCMCLLSame + // + ) + // + ) + // + ) + // + ) + // + || + // ((mConditions.isXTMNeutural && mConditions.isXAMANeutural) && ( @@ -35946,6 +35965,42 @@ bool XUSPY5XTSFIHasShortSignal() // || // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXCHMASCTrendsUp && + ( + // + ((mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame) && + ( + // + ((mConditions.isXFIOverZero && + mConditions.isXFICrossedOverZero) && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMANeutural) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // ((mConditions.isXCHMALCTrendsDown && mConditions.isXCHMALCFastUnderSlow) && ( @@ -36181,6 +36236,29 @@ bool XUSPY5XTSFIHasShortSignal() // (mConditions.isXCHMALCPeak && ( + // + ((!mConditions.isXCHMAMCTrendsUp && + !mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + ((mConditions.isXAMAVale && + mConditions.isXCHMAMCVale && + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish) + // + ) + // + ) + // + ) + // + ) + // + || // (mConditions.isXAMANeutural && ( @@ -36346,7 +36424,30 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMALCFastUnderSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXFIOverZero && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -37597,6 +37698,19 @@ bool XUSPY5XTSFIHasShortSignal() ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( + // + (mConditions.isXTDSignalCrossedOverBear && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTDBearishVale && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + || // ((mConditions.isXFIOverZero && mConditions.isXFICrossedOverZero) &&