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 2315f41d..50b5dc27 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -35191,6 +35191,32 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMASCUnderMin && mConditions.isXFICrossedUnderZero) // + || + // + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + ((mConditions.isXCHMAMCVale && + mConditions.isXTDBearishVale && + mConditions.isXCHMASCUnderMin) && + ( + // + mConditions.isXTMBullish + // + || + // + mConditions.isXTMStartBullish + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -35311,6 +35337,16 @@ bool XUSPY5XTSFIHasShortSignal() // || // + (mConditions.isXTMBullish && + mConditions.isXAMABullish) + // + || + // + (mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) + // + || + // ((mConditions.isXTMNeutural && mConditions.isXAMANeutural) && ( @@ -35447,14 +35483,75 @@ bool XUSPY5XTSFIHasShortSignal() // || // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMAMCVale && + ( + // + (mConditions.isXAMAEndBearish && + mConditions.isXFICrossedUnderZero) + // + ) + // + ) + // + ) + // + ) + // + || + // ((mConditions.isXTMBearish && mConditions.isXAMABearish) && ( // - (mConditions.isXTDBullUnderBear && - mConditions.isXTDSignalUnderBear && - mConditions.isXTSCurrentUnderFarest && - mConditions.isXTSCurrentUnderNearest) + ((mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) && + ( + // + (mConditions.isXTSCurrentUnderFarest && + mConditions.isXTSCurrentUnderNearest) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXFIUnderZero && + mConditions.isXTSCurrentUnderFarest) + // + || + // + (mConditions.isXCHMAMCVale && + ( + // + (mConditions.isXFIUnderZero && + mConditions.isXTSCurrentUnderFarest) + // + || + // + (mConditions.isXCHMALCPeak && + ( + // + mConditions.isXCHLHSameLLs + // + || + // + (mConditions.isXTMVale && + mConditions.isXAMAVale && + mConditions.isXCHLHMCLCLLSame) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // || // @@ -35724,6 +35821,19 @@ bool XUSPY5XTSFIHasShortSignal() ((mConditions.isXCHMALCTrendsDown && mConditions.isXCHMALCFastUnderSlow) && ( + // + (mConditions.isXFIOverZero && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXAMABullish && + mConditions.isXTMNeutural) + // + ) + // + ) + // + || // (mConditions.isXTDBullCrossedOverBear && ( @@ -35759,6 +35869,52 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + (mConditions.isXCHMAMCPeak && + ( + // + (mConditions.isXCHMASCOverMax && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + mConditions.isXCHMALCVale + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -36822,7 +36978,41 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMASCFastUnderSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXTSCurrentCrossedOverMediest && + ( + // + ((mConditions.isXFIOverZero && + mConditions.isXFICrossedOverZero) && + ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXTMVale && + mConditions.isXTMEndBearish && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXLHLowAttachedLL) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 831f65be..8bdeebb0 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 MetaQuotes ... +Resolve XUSPY5 XTSFI All Short Guard Attacks in AMarkets-Demo ... 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 2315f41d..50b5dc27 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -35191,6 +35191,32 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMASCUnderMin && mConditions.isXFICrossedUnderZero) // + || + // + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + ((mConditions.isXCHMAMCVale && + mConditions.isXTDBearishVale && + mConditions.isXCHMASCUnderMin) && + ( + // + mConditions.isXTMBullish + // + || + // + mConditions.isXTMStartBullish + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -35311,6 +35337,16 @@ bool XUSPY5XTSFIHasShortSignal() // || // + (mConditions.isXTMBullish && + mConditions.isXAMABullish) + // + || + // + (mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) + // + || + // ((mConditions.isXTMNeutural && mConditions.isXAMANeutural) && ( @@ -35447,14 +35483,75 @@ bool XUSPY5XTSFIHasShortSignal() // || // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMAMCVale && + ( + // + (mConditions.isXAMAEndBearish && + mConditions.isXFICrossedUnderZero) + // + ) + // + ) + // + ) + // + ) + // + || + // ((mConditions.isXTMBearish && mConditions.isXAMABearish) && ( // - (mConditions.isXTDBullUnderBear && - mConditions.isXTDSignalUnderBear && - mConditions.isXTSCurrentUnderFarest && - mConditions.isXTSCurrentUnderNearest) + ((mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) && + ( + // + (mConditions.isXTSCurrentUnderFarest && + mConditions.isXTSCurrentUnderNearest) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXFIUnderZero && + mConditions.isXTSCurrentUnderFarest) + // + || + // + (mConditions.isXCHMAMCVale && + ( + // + (mConditions.isXFIUnderZero && + mConditions.isXTSCurrentUnderFarest) + // + || + // + (mConditions.isXCHMALCPeak && + ( + // + mConditions.isXCHLHSameLLs + // + || + // + (mConditions.isXTMVale && + mConditions.isXAMAVale && + mConditions.isXCHLHMCLCLLSame) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // || // @@ -35724,6 +35821,19 @@ bool XUSPY5XTSFIHasShortSignal() ((mConditions.isXCHMALCTrendsDown && mConditions.isXCHMALCFastUnderSlow) && ( + // + (mConditions.isXFIOverZero && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXAMABullish && + mConditions.isXTMNeutural) + // + ) + // + ) + // + || // (mConditions.isXTDBullCrossedOverBear && ( @@ -35759,6 +35869,52 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + (mConditions.isXCHMAMCPeak && + ( + // + (mConditions.isXCHMASCOverMax && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + mConditions.isXCHMALCVale + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -36822,7 +36978,41 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMASCFastUnderSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXTSCurrentCrossedOverMediest && + ( + // + ((mConditions.isXFIOverZero && + mConditions.isXFICrossedOverZero) && + ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXTMVale && + mConditions.isXTMEndBearish && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXLHLowAttachedLL) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 2315f41d..50b5dc27 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -35191,6 +35191,32 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMASCUnderMin && mConditions.isXFICrossedUnderZero) // + || + // + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + ((mConditions.isXCHMAMCVale && + mConditions.isXTDBearishVale && + mConditions.isXCHMASCUnderMin) && + ( + // + mConditions.isXTMBullish + // + || + // + mConditions.isXTMStartBullish + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -35311,6 +35337,16 @@ bool XUSPY5XTSFIHasShortSignal() // || // + (mConditions.isXTMBullish && + mConditions.isXAMABullish) + // + || + // + (mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish) + // + || + // ((mConditions.isXTMNeutural && mConditions.isXAMANeutural) && ( @@ -35447,14 +35483,75 @@ bool XUSPY5XTSFIHasShortSignal() // || // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMAMCVale && + ( + // + (mConditions.isXAMAEndBearish && + mConditions.isXFICrossedUnderZero) + // + ) + // + ) + // + ) + // + ) + // + || + // ((mConditions.isXTMBearish && mConditions.isXAMABearish) && ( // - (mConditions.isXTDBullUnderBear && - mConditions.isXTDSignalUnderBear && - mConditions.isXTSCurrentUnderFarest && - mConditions.isXTSCurrentUnderNearest) + ((mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) && + ( + // + (mConditions.isXTSCurrentUnderFarest && + mConditions.isXTSCurrentUnderNearest) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXFIUnderZero && + mConditions.isXTSCurrentUnderFarest) + // + || + // + (mConditions.isXCHMAMCVale && + ( + // + (mConditions.isXFIUnderZero && + mConditions.isXTSCurrentUnderFarest) + // + || + // + (mConditions.isXCHMALCPeak && + ( + // + mConditions.isXCHLHSameLLs + // + || + // + (mConditions.isXTMVale && + mConditions.isXAMAVale && + mConditions.isXCHLHMCLCLLSame) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // || // @@ -35724,6 +35821,19 @@ bool XUSPY5XTSFIHasShortSignal() ((mConditions.isXCHMALCTrendsDown && mConditions.isXCHMALCFastUnderSlow) && ( + // + (mConditions.isXFIOverZero && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXAMABullish && + mConditions.isXTMNeutural) + // + ) + // + ) + // + || // (mConditions.isXTDBullCrossedOverBear && ( @@ -35759,6 +35869,52 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + (mConditions.isXCHMAMCPeak && + ( + // + (mConditions.isXCHMASCOverMax && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + mConditions.isXCHMALCVale + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -36822,7 +36978,41 @@ bool XUSPY5XTSFIHasShortSignal() mConditions.isXCHMASCFastUnderSlow) && ( // - false + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXTSCurrentCrossedOverMediest && + ( + // + ((mConditions.isXFIOverZero && + mConditions.isXFICrossedOverZero) && + ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXTMVale && + mConditions.isXTMEndBearish && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXLHLowAttachedLL) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) //