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 becefc6d..3eb6288f 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -29111,7 +29111,31 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMASCFastCrossedOverSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXCHMASCTrendsUp && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXFIOverZero && + mConditions.isXFICrossedOverZero) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -30165,10 +30189,22 @@ bool XUSPY5XTSFIHasShortSignal() (mConditions.isXTSCurrentCrossedOverMediest && ( // - (mConditions.isXAMAVale && - mConditions.isXCHMAMCVale && - mConditions.isXCHLHSCMCLLSame && - mConditions.isXCHMASCUnderMin) + ((mConditions.isXCHMAMCVale && + mConditions.isXCHLHSCMCLLSame) && + ( + // + (mConditions.isXAMAVale && + mConditions.isXCHMASCUnderMin) + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXAMABearish && + mConditions.isXCHMALCPeak) + // + ) + // + ) // ) // @@ -30728,7 +30764,32 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMALCFastCrossedOverSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXTMVale && + mConditions.isXAMAVale && + mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXCHMAMCVale && + mConditions.isXCHLHSameLLs) + // + || + // + (mConditions.isXTSCurrentCrossedOverMediest && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHLHSameLLs && + mConditions.isXLHLowAttachedLL) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 536d53d8..9930cfac 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -35,7 +35,7 @@ Resolve XUSPY5 XSI All Guard Attacks in All Markets ... XTSFI ------ -Resolve XUSPY5 XTSFI All Shorts Stopouts in IFCMarkets ... +Resolve XUSPY5 XTSFI All Shorts Stopouts in ErranteSC ... Resolve XUSPY5 XTSFI All Critical Guard Attacks in All Markets ... Resolve XUSPY5 XTSFI All Guard Attacks in All Markets ... 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 becefc6d..3eb6288f 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -29111,7 +29111,31 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMASCFastCrossedOverSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXCHMASCTrendsUp && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXFIOverZero && + mConditions.isXFICrossedOverZero) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -30165,10 +30189,22 @@ bool XUSPY5XTSFIHasShortSignal() (mConditions.isXTSCurrentCrossedOverMediest && ( // - (mConditions.isXAMAVale && - mConditions.isXCHMAMCVale && - mConditions.isXCHLHSCMCLLSame && - mConditions.isXCHMASCUnderMin) + ((mConditions.isXCHMAMCVale && + mConditions.isXCHLHSCMCLLSame) && + ( + // + (mConditions.isXAMAVale && + mConditions.isXCHMASCUnderMin) + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXAMABearish && + mConditions.isXCHMALCPeak) + // + ) + // + ) // ) // @@ -30728,7 +30764,32 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMALCFastCrossedOverSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXTMVale && + mConditions.isXAMAVale && + mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXCHMAMCVale && + mConditions.isXCHLHSameLLs) + // + || + // + (mConditions.isXTSCurrentCrossedOverMediest && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHLHSameLLs && + mConditions.isXLHLowAttachedLL) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index becefc6d..3eb6288f 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -29111,7 +29111,31 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMASCFastCrossedOverSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXCHMASCTrendsUp && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXFIOverZero && + mConditions.isXFICrossedOverZero) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -30165,10 +30189,22 @@ bool XUSPY5XTSFIHasShortSignal() (mConditions.isXTSCurrentCrossedOverMediest && ( // - (mConditions.isXAMAVale && - mConditions.isXCHMAMCVale && - mConditions.isXCHLHSCMCLLSame && - mConditions.isXCHMASCUnderMin) + ((mConditions.isXCHMAMCVale && + mConditions.isXCHLHSCMCLLSame) && + ( + // + (mConditions.isXAMAVale && + mConditions.isXCHMASCUnderMin) + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXAMABearish && + mConditions.isXCHMALCPeak) + // + ) + // + ) // ) // @@ -30728,7 +30764,32 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMALCFastCrossedOverSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXTMVale && + mConditions.isXAMAVale && + mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXCHMAMCVale && + mConditions.isXCHLHSameLLs) + // + || + // + (mConditions.isXTSCurrentCrossedOverMediest && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHLHSameLLs && + mConditions.isXLHLowAttachedLL) + // + ) + // + ) + // + ) + // + ) // ) //