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 9a9930f4..61247eda 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -49088,6 +49088,20 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + (mConditions.isXTSCurrentOverFarest && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // ) // ) @@ -49157,6 +49171,23 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXTSCurrentMin && + mConditions.isXLHLLIncreased && + mConditions.isXLHPriceCrossedUnderSignal && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // ) // ) @@ -49200,6 +49231,25 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + ((!mConditions.isXCHMAMCTrendsUp && + !mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXLHHHDecreased && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderFarest && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // ) // ) @@ -49658,6 +49708,22 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + (mConditions.isXTSAllSame && + mConditions.isXCHMALCVale && + mConditions.isXTMStartBearish && + mConditions.isXAMAStartBearish) + // + ) + // + ) + // ) // ) @@ -49854,9 +49920,29 @@ bool XUSPY5XCHMACCHasShortSignal() (mConditions.isXTSCurrentOverNearest && ( // - (mConditions.isXCHLHSameLLs && - mConditions.isXLHHHIncreased && - mConditions.isXCHMASCUnderMin) + (mConditions.isXCHMASCUnderMin && + ( + // + (mConditions.isXCHLHSameLLs && + mConditions.isXLHHHIncreased) + // + || + // + ((mConditions.isXCHMALCVale && + mConditions.isXCHLHSCMCLLSame) && + ( + // + (mConditions.isXTSCurrentOverMediest && + mConditions.isXTSCurrentCrossedOverNearest && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) + // + ) + // + ) // ) // @@ -50059,14 +50145,59 @@ bool XUSPY5XCHMACCHasShortSignal() (mConditions.isXTDBullOverBear && ( // - (mConditions.isXCHMALCVale && - mConditions.isXCHLHSameLLs && - mConditions.isXTSCurrentMin && - mConditions.isXCHMASCUnderMin && - mConditions.isXLHLowAttachedLL && - mConditions.isXAMAStartBearish && - mConditions.isXTDSignalCrossedUnderBear && - mConditions.isXLHPriceCrossedUnderSignal) + ((mConditions.isXCHMALCVale && + mConditions.isXCHMASCUnderMin) && + ( + // + (mConditions.isXCHLHSameLLs && + mConditions.isXTSCurrentMin && + mConditions.isXLHLowAttachedLL && + mConditions.isXAMAStartBearish && + mConditions.isXTDSignalCrossedUnderBear && + mConditions.isXLHPriceCrossedUnderSignal) + // + || + // + (mConditions.isXTSCurrentOverNearest && + ( + // + (mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCCrossedUnderMin) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXTDSignalOverBear && + ( + // + (mConditions.isXTSCurrentOverNearest && + ( + // + (mConditions.isXTSCurrentCrossedOverNearest && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHSameLLs && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -50098,6 +50229,23 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + ((mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXLHLowAttachedLL && + mConditions.isXCHMASCCrossedUnderMin) + // + ) + // + ) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 945968cf..95eda17a 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 ErranteSC ... +Resolve XUSPY5 XCHMACC All Shorts Guard Attacks in Alpari ... 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 9a9930f4..61247eda 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -49088,6 +49088,20 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + (mConditions.isXTSCurrentOverFarest && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // ) // ) @@ -49157,6 +49171,23 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXTSCurrentMin && + mConditions.isXLHLLIncreased && + mConditions.isXLHPriceCrossedUnderSignal && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // ) // ) @@ -49200,6 +49231,25 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + ((!mConditions.isXCHMAMCTrendsUp && + !mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXLHHHDecreased && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderFarest && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // ) // ) @@ -49658,6 +49708,22 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + (mConditions.isXTSAllSame && + mConditions.isXCHMALCVale && + mConditions.isXTMStartBearish && + mConditions.isXAMAStartBearish) + // + ) + // + ) + // ) // ) @@ -49854,9 +49920,29 @@ bool XUSPY5XCHMACCHasShortSignal() (mConditions.isXTSCurrentOverNearest && ( // - (mConditions.isXCHLHSameLLs && - mConditions.isXLHHHIncreased && - mConditions.isXCHMASCUnderMin) + (mConditions.isXCHMASCUnderMin && + ( + // + (mConditions.isXCHLHSameLLs && + mConditions.isXLHHHIncreased) + // + || + // + ((mConditions.isXCHMALCVale && + mConditions.isXCHLHSCMCLLSame) && + ( + // + (mConditions.isXTSCurrentOverMediest && + mConditions.isXTSCurrentCrossedOverNearest && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) + // + ) + // + ) // ) // @@ -50059,14 +50145,59 @@ bool XUSPY5XCHMACCHasShortSignal() (mConditions.isXTDBullOverBear && ( // - (mConditions.isXCHMALCVale && - mConditions.isXCHLHSameLLs && - mConditions.isXTSCurrentMin && - mConditions.isXCHMASCUnderMin && - mConditions.isXLHLowAttachedLL && - mConditions.isXAMAStartBearish && - mConditions.isXTDSignalCrossedUnderBear && - mConditions.isXLHPriceCrossedUnderSignal) + ((mConditions.isXCHMALCVale && + mConditions.isXCHMASCUnderMin) && + ( + // + (mConditions.isXCHLHSameLLs && + mConditions.isXTSCurrentMin && + mConditions.isXLHLowAttachedLL && + mConditions.isXAMAStartBearish && + mConditions.isXTDSignalCrossedUnderBear && + mConditions.isXLHPriceCrossedUnderSignal) + // + || + // + (mConditions.isXTSCurrentOverNearest && + ( + // + (mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCCrossedUnderMin) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXTDSignalOverBear && + ( + // + (mConditions.isXTSCurrentOverNearest && + ( + // + (mConditions.isXTSCurrentCrossedOverNearest && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHSameLLs && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -50098,6 +50229,23 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + ((mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXLHLowAttachedLL && + mConditions.isXCHMASCCrossedUnderMin) + // + ) + // + ) + // ) // ) diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 9a9930f4..61247eda 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -49088,6 +49088,20 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + (mConditions.isXTSCurrentOverFarest && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // ) // ) @@ -49157,6 +49171,23 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXTSCurrentMin && + mConditions.isXLHLLIncreased && + mConditions.isXLHPriceCrossedUnderSignal && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // ) // ) @@ -49200,6 +49231,25 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + ((!mConditions.isXCHMAMCTrendsUp && + !mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXLHHHDecreased && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderFarest && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // ) // ) @@ -49658,6 +49708,22 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + (mConditions.isXTSAllSame && + mConditions.isXCHMALCVale && + mConditions.isXTMStartBearish && + mConditions.isXAMAStartBearish) + // + ) + // + ) + // ) // ) @@ -49854,9 +49920,29 @@ bool XUSPY5XCHMACCHasShortSignal() (mConditions.isXTSCurrentOverNearest && ( // - (mConditions.isXCHLHSameLLs && - mConditions.isXLHHHIncreased && - mConditions.isXCHMASCUnderMin) + (mConditions.isXCHMASCUnderMin && + ( + // + (mConditions.isXCHLHSameLLs && + mConditions.isXLHHHIncreased) + // + || + // + ((mConditions.isXCHMALCVale && + mConditions.isXCHLHSCMCLLSame) && + ( + // + (mConditions.isXTSCurrentOverMediest && + mConditions.isXTSCurrentCrossedOverNearest && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) + // + ) + // + ) // ) // @@ -50059,14 +50145,59 @@ bool XUSPY5XCHMACCHasShortSignal() (mConditions.isXTDBullOverBear && ( // - (mConditions.isXCHMALCVale && - mConditions.isXCHLHSameLLs && - mConditions.isXTSCurrentMin && - mConditions.isXCHMASCUnderMin && - mConditions.isXLHLowAttachedLL && - mConditions.isXAMAStartBearish && - mConditions.isXTDSignalCrossedUnderBear && - mConditions.isXLHPriceCrossedUnderSignal) + ((mConditions.isXCHMALCVale && + mConditions.isXCHMASCUnderMin) && + ( + // + (mConditions.isXCHLHSameLLs && + mConditions.isXTSCurrentMin && + mConditions.isXLHLowAttachedLL && + mConditions.isXAMAStartBearish && + mConditions.isXTDSignalCrossedUnderBear && + mConditions.isXLHPriceCrossedUnderSignal) + // + || + // + (mConditions.isXTSCurrentOverNearest && + ( + // + (mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCCrossedUnderMin) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXTDSignalOverBear && + ( + // + (mConditions.isXTSCurrentOverNearest && + ( + // + (mConditions.isXTSCurrentCrossedOverNearest && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHSameLLs && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -50098,6 +50229,23 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + ((mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXLHLowAttachedLL && + mConditions.isXCHMASCCrossedUnderMin) + // + ) + // + ) + // ) // )