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 64395fc9..9a9930f4 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -48277,6 +48277,32 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + (mConditions.isXTSCurrentOverNearest && + ( + // + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + (mConditions.isXTMVale && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMASCCrossedUnderMin && + mConditions.isXLHPriceCrossedUnderSignal && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -48515,7 +48541,18 @@ bool XUSPY5XCHMACCHasShortSignal() ( // (mConditions.isXTMBearish && - mConditions.isXAMANeutural) + ( + // + mConditions.isXAMANeutural + // + || + // + (mConditions.isXAMABearish && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) // ) // @@ -49035,10 +49072,21 @@ bool XUSPY5XCHMACCHasShortSignal() (mConditions.isXFIOverZero && ( // - (mConditions.isXCHMALCVale && - mConditions.isXTSCurrentMin && - mConditions.isXCHMASCUnderMin && - mConditions.isXTSCurrentCrossedUnderNearest) + ((mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHLHMCLCLLSame) + // + || + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) // ) // @@ -49865,12 +49913,21 @@ bool XUSPY5XCHMACCHasShortSignal() mConditions.isXLHHHIncreased) && ( // - ((mConditions.isXTDBullCrossedUnderBear && - mConditions.isXLHPriceCrossedUnderSignal) && + ((mConditions.isXTMStartBearish && + mConditions.isXAMAStartBearish) && ( // - (mConditions.isXTMStartBearish && - mConditions.isXAMAStartBearish) + mConditions.isXTDBullCrossedUnderBear + // + || + // + mConditions.isXLHPriceCrossedUnderSignal + // + || + // + (!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) // ) // @@ -49894,6 +49951,33 @@ bool XUSPY5XCHMACCHasShortSignal() // || // + (mConditions.isXTSCurrentOverMediest && + ( + // + ((mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCUnderMin) && + ( + // + (mConditions.isXTSCurrentCrossedOverMediest && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXTMEndBearish) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // ((mConditions.isXCHMALCVale && mConditions.isXTSCurrentMin && mConditions.isXCHLHSCMCLLSame && diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 69a5ca3d..945968cf 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -43,7 +43,7 @@ XCHMACC -------- Resolve XUSPY5 XCHMACC All Stopouts in All Markets ... Resolve XUSPY5 XCHMACC All Critical Guard Attacks in All Markets ... -Resolve XUSPY5 XCHMACC All Shorts Guard Attacks in IFCMarkets ... +Resolve XUSPY5 XCHMACC All Shorts Guard Attacks in ErranteSC ... 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 64395fc9..9a9930f4 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -48277,6 +48277,32 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + (mConditions.isXTSCurrentOverNearest && + ( + // + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + (mConditions.isXTMVale && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMASCCrossedUnderMin && + mConditions.isXLHPriceCrossedUnderSignal && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -48515,7 +48541,18 @@ bool XUSPY5XCHMACCHasShortSignal() ( // (mConditions.isXTMBearish && - mConditions.isXAMANeutural) + ( + // + mConditions.isXAMANeutural + // + || + // + (mConditions.isXAMABearish && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) // ) // @@ -49035,10 +49072,21 @@ bool XUSPY5XCHMACCHasShortSignal() (mConditions.isXFIOverZero && ( // - (mConditions.isXCHMALCVale && - mConditions.isXTSCurrentMin && - mConditions.isXCHMASCUnderMin && - mConditions.isXTSCurrentCrossedUnderNearest) + ((mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHLHMCLCLLSame) + // + || + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) // ) // @@ -49865,12 +49913,21 @@ bool XUSPY5XCHMACCHasShortSignal() mConditions.isXLHHHIncreased) && ( // - ((mConditions.isXTDBullCrossedUnderBear && - mConditions.isXLHPriceCrossedUnderSignal) && + ((mConditions.isXTMStartBearish && + mConditions.isXAMAStartBearish) && ( // - (mConditions.isXTMStartBearish && - mConditions.isXAMAStartBearish) + mConditions.isXTDBullCrossedUnderBear + // + || + // + mConditions.isXLHPriceCrossedUnderSignal + // + || + // + (!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) // ) // @@ -49894,6 +49951,33 @@ bool XUSPY5XCHMACCHasShortSignal() // || // + (mConditions.isXTSCurrentOverMediest && + ( + // + ((mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCUnderMin) && + ( + // + (mConditions.isXTSCurrentCrossedOverMediest && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXTMEndBearish) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // ((mConditions.isXCHMALCVale && mConditions.isXTSCurrentMin && mConditions.isXCHLHSCMCLLSame && diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 64395fc9..9a9930f4 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -48277,6 +48277,32 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + (mConditions.isXTSCurrentOverNearest && + ( + // + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + (mConditions.isXTMVale && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMASCCrossedUnderMin && + mConditions.isXLHPriceCrossedUnderSignal && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -48515,7 +48541,18 @@ bool XUSPY5XCHMACCHasShortSignal() ( // (mConditions.isXTMBearish && - mConditions.isXAMANeutural) + ( + // + mConditions.isXAMANeutural + // + || + // + (mConditions.isXAMABearish && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) // ) // @@ -49035,10 +49072,21 @@ bool XUSPY5XCHMACCHasShortSignal() (mConditions.isXFIOverZero && ( // - (mConditions.isXCHMALCVale && - mConditions.isXTSCurrentMin && - mConditions.isXCHMASCUnderMin && - mConditions.isXTSCurrentCrossedUnderNearest) + ((mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHLHMCLCLLSame) + // + || + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) // ) // @@ -49865,12 +49913,21 @@ bool XUSPY5XCHMACCHasShortSignal() mConditions.isXLHHHIncreased) && ( // - ((mConditions.isXTDBullCrossedUnderBear && - mConditions.isXLHPriceCrossedUnderSignal) && + ((mConditions.isXTMStartBearish && + mConditions.isXAMAStartBearish) && ( // - (mConditions.isXTMStartBearish && - mConditions.isXAMAStartBearish) + mConditions.isXTDBullCrossedUnderBear + // + || + // + mConditions.isXLHPriceCrossedUnderSignal + // + || + // + (!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) // ) // @@ -49894,6 +49951,33 @@ bool XUSPY5XCHMACCHasShortSignal() // || // + (mConditions.isXTSCurrentOverMediest && + ( + // + ((mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCUnderMin) && + ( + // + (mConditions.isXTSCurrentCrossedOverMediest && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXTMEndBearish) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // ((mConditions.isXCHMALCVale && mConditions.isXTSCurrentMin && mConditions.isXCHLHSCMCLLSame &&