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 b378115b..49016137 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -28620,6 +28620,22 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + (mConditions.isXTMVale && + mConditions.isXTMNeutural && + mConditions.isXAMANeutural && + mConditions.isXCHMAMCVale) + // + ) + // + ) + // ) // ) @@ -28828,12 +28844,39 @@ bool XUSPY5XTSFIHasShortSignal() (mConditions.isXCHMASCTrendsUp && ( // - (mConditions.isXCHMALCVale && - mConditions.isXTMNeutural && - mConditions.isXAMANeutural && - mConditions.isXLHLLDecreased && - mConditions.isXCHMASCUnderMin && - mConditions.isXTSCurrentCrossedUnderNearest) + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXLHLLDecreased && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // + (mConditions.isXTDBullCrossedOverBear && + ( + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastUnderSlow) && + ( + // + (mConditions.isXFIOverZero && + mConditions.isXFICrossedOverZero && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // || // @@ -28974,6 +29017,12 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMASCUnderMax && mConditions.isXTSCurrentCrossedUnderNearest) // + || + // + (!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) + // ) // ) @@ -29185,8 +29234,20 @@ bool XUSPY5XTSFIHasShortSignal() ( // (mConditions.isXCHMAMCPeak && - mConditions.isXCHMASCOverMax && - mConditions.isXTSCurrentCrossedOverMediest) + ( + // + (mConditions.isXCHMASCOverMax && + mConditions.isXTSCurrentCrossedOverMediest) + // + || + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXCHMALCVale) + // + ) + // + ) // ) // @@ -29305,7 +29366,23 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMALCFastUnderSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXLHPriceCrossedOverSignal && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + ) + + ) // ) // @@ -29651,6 +29728,31 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + (mConditions.isXCHMAMCVale && + ( + // + (mConditions.isXAMABearish && + mConditions.isXTMStartBearish && + mConditions.isXCHMALCTrendsDown) + // + || + // + (mConditions.isXTSCurrentCrossedUnderNearest && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMAStartBearish) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -29734,7 +29836,20 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMASCFastCrossedOverSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXCHMASCTrendsUp && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 4ae806b6..008db358 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 Alpari ... +Resolve XUSPY5 XTSFI All Stopouts in All Markets ... 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 b378115b..49016137 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -28620,6 +28620,22 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + (mConditions.isXTMVale && + mConditions.isXTMNeutural && + mConditions.isXAMANeutural && + mConditions.isXCHMAMCVale) + // + ) + // + ) + // ) // ) @@ -28828,12 +28844,39 @@ bool XUSPY5XTSFIHasShortSignal() (mConditions.isXCHMASCTrendsUp && ( // - (mConditions.isXCHMALCVale && - mConditions.isXTMNeutural && - mConditions.isXAMANeutural && - mConditions.isXLHLLDecreased && - mConditions.isXCHMASCUnderMin && - mConditions.isXTSCurrentCrossedUnderNearest) + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXLHLLDecreased && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // + (mConditions.isXTDBullCrossedOverBear && + ( + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastUnderSlow) && + ( + // + (mConditions.isXFIOverZero && + mConditions.isXFICrossedOverZero && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // || // @@ -28974,6 +29017,12 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMASCUnderMax && mConditions.isXTSCurrentCrossedUnderNearest) // + || + // + (!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) + // ) // ) @@ -29185,8 +29234,20 @@ bool XUSPY5XTSFIHasShortSignal() ( // (mConditions.isXCHMAMCPeak && - mConditions.isXCHMASCOverMax && - mConditions.isXTSCurrentCrossedOverMediest) + ( + // + (mConditions.isXCHMASCOverMax && + mConditions.isXTSCurrentCrossedOverMediest) + // + || + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXCHMALCVale) + // + ) + // + ) // ) // @@ -29305,7 +29366,23 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMALCFastUnderSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXLHPriceCrossedOverSignal && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + ) + + ) // ) // @@ -29651,6 +29728,31 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + (mConditions.isXCHMAMCVale && + ( + // + (mConditions.isXAMABearish && + mConditions.isXTMStartBearish && + mConditions.isXCHMALCTrendsDown) + // + || + // + (mConditions.isXTSCurrentCrossedUnderNearest && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMAStartBearish) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -29734,7 +29836,20 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMASCFastCrossedOverSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXCHMASCTrendsUp && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index b378115b..49016137 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -28620,6 +28620,22 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + (mConditions.isXTMVale && + mConditions.isXTMNeutural && + mConditions.isXAMANeutural && + mConditions.isXCHMAMCVale) + // + ) + // + ) + // ) // ) @@ -28828,12 +28844,39 @@ bool XUSPY5XTSFIHasShortSignal() (mConditions.isXCHMASCTrendsUp && ( // - (mConditions.isXCHMALCVale && - mConditions.isXTMNeutural && - mConditions.isXAMANeutural && - mConditions.isXLHLLDecreased && - mConditions.isXCHMASCUnderMin && - mConditions.isXTSCurrentCrossedUnderNearest) + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXLHLLDecreased && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // + (mConditions.isXTDBullCrossedOverBear && + ( + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastUnderSlow) && + ( + // + (mConditions.isXFIOverZero && + mConditions.isXFICrossedOverZero && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // || // @@ -28974,6 +29017,12 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMASCUnderMax && mConditions.isXTSCurrentCrossedUnderNearest) // + || + // + (!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) + // ) // ) @@ -29185,8 +29234,20 @@ bool XUSPY5XTSFIHasShortSignal() ( // (mConditions.isXCHMAMCPeak && - mConditions.isXCHMASCOverMax && - mConditions.isXTSCurrentCrossedOverMediest) + ( + // + (mConditions.isXCHMASCOverMax && + mConditions.isXTSCurrentCrossedOverMediest) + // + || + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXCHMALCVale) + // + ) + // + ) // ) // @@ -29305,7 +29366,23 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMALCFastUnderSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXLHPriceCrossedOverSignal && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + ) + + ) // ) // @@ -29651,6 +29728,31 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + (mConditions.isXCHMAMCVale && + ( + // + (mConditions.isXAMABearish && + mConditions.isXTMStartBearish && + mConditions.isXCHMALCTrendsDown) + // + || + // + (mConditions.isXTSCurrentCrossedUnderNearest && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMAStartBearish) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -29734,7 +29836,20 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMASCFastCrossedOverSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXCHMASCTrendsUp && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) + // + ) + // + ) // ) //