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 3eb6288f..b378115b 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -29087,6 +29087,28 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXCHLHSameLLs && + mConditions.isXCHMASCUnderMin && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -29193,7 +29215,26 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMALCFastCrossedOverSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak && + mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 9930cfac..4ae806b6 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 ErranteSC ... +Resolve XUSPY5 XTSFI All Shorts Stopouts in Alpari ... 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 3eb6288f..b378115b 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -29087,6 +29087,28 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXCHLHSameLLs && + mConditions.isXCHMASCUnderMin && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -29193,7 +29215,26 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMALCFastCrossedOverSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak && + mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 3eb6288f..b378115b 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -29087,6 +29087,28 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXCHLHSameLLs && + mConditions.isXCHMASCUnderMin && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -29193,7 +29215,26 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMALCFastCrossedOverSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak && + mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + ) + // + ) + // + ) + // + ) // ) //