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 0c4b2e17..fabd2f0d 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -39406,6 +39406,19 @@ bool XUSPY5XCHMACCHasLongSignal() // || // + (mConditions.isXTDSignalOverBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) + // + || + // ((mConditions.isXAMANeutural && mConditions.isXLHLLDecreased && mConditions.isXCHMASCOverMin && @@ -39447,6 +39460,28 @@ bool XUSPY5XCHMACCHasLongSignal() // ) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + ((mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -39549,10 +39584,20 @@ bool XUSPY5XCHMACCHasLongSignal() (mConditions.isXTDSignalUnderBear && ( // - (mConditions.isXTMNeutural && - mConditions.isXTSCurrentMax && - mConditions.isXCHMASCOverMax && - mConditions.isXCHLHMCLCLLSame) + ((mConditions.isXTMNeutural && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHMCLCLLSame) && + ( + // + mConditions.isXTSCurrentMax + // + || + // + mConditions.isXTSCurrentUnderFarest + // + ) + // + ) // ) // @@ -40052,7 +40097,23 @@ bool XUSPY5XCHMACCHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - false + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXTSCurrentUnderFarest && + ( + // + (mConditions.isXTSCurrentMin && + mConditions.isXTDBearishVale && + mConditions.isXLHPriceCrossedUnderSignal) + // + ) + // + ) + // + ) + // + ) // ) // @@ -40213,6 +40274,21 @@ bool XUSPY5XCHMACCHasLongSignal() // ) // + || + // + (mConditions.isXTSCurrentUnderFarest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXLHHHDecreased && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXLHPriceCrossedOverSignal) + // + ) + // + ) + // ) // ) @@ -40311,8 +40387,18 @@ bool XUSPY5XCHMACCHasLongSignal() || // (mConditions.isXCHLHSCMCHHSame && - mConditions.isXCHLHSCMCLLSame && - mConditions.isXCHMASCCrossedOverMax) + ( + // + mConditions.isXTDBullCrossedOverBear + // + || + // + (mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCCrossedOverMax) + // + ) + // + ) // ) // @@ -40920,14 +41006,22 @@ bool XUSPY5XCHMACCHasLongSignal() (mConditions.isXTDSignalUnderBear && ( // - (mConditions.isXTDSignalUnderBear && + (mConditions.isXTDBearishVale && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentUnderMediest && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + || + // + (mConditions.isXTDBullOverBear && ( // - (mConditions.isXTDBearishVale && - mConditions.isXTSCurrentUnderNearest && - mConditions.isXTSCurrentUnderMediest && - mConditions.isXTSCurrentCrossedUnderNearest && - mConditions.isXTSCurrentCrossedUnderMediest) + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXTMStartBullish && + mConditions.isXTSCurrentCrossedOverNearest) // ) // @@ -41419,6 +41513,22 @@ bool XUSPY5XCHMACCHasLongSignal() ((mConditions.isXCHMAMCTrendsDown && mConditions.isXCHMAMCFastOverSlow) && ( + // + ((mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) && + ( + // + (mConditions.isXTSAllSame && + mConditions.isXTDBearishVale && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXLHHighAttachedHH) + // + ) + // + ) + // + || // ((mConditions.isXCHMALCPeak && mConditions.isXTSCurrentMax && @@ -41481,7 +41591,17 @@ bool XUSPY5XCHMACCHasLongSignal() ( // (mConditions.isXTSCurrentUnderNearest && - mConditions.isXTSCurrentCrossedUnderNearest) + ( + // + mConditions.isXTSCurrentUnderMediest + // + || + // + mConditions.isXTSCurrentCrossedUnderNearest + // + ) + // + ) // || // @@ -41984,6 +42104,21 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + (mConditions.isXTDSignalOverBear && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 0438e72d..2384e983 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -44,7 +44,7 @@ XCHMACC -------- Resolve XUSPY5 XCHMACC All Stopouts in All Markets ... Resolve XUSPY5 XCHMACC All Critical Guard Attacks in All Markets ... -Resolve XUSPY5 XCHMACC All Longs Guard Attacks in ErranteSC ... +Resolve XUSPY5 XCHMACC All Longs 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 0c4b2e17..fabd2f0d 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -39406,6 +39406,19 @@ bool XUSPY5XCHMACCHasLongSignal() // || // + (mConditions.isXTDSignalOverBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) + // + || + // ((mConditions.isXAMANeutural && mConditions.isXLHLLDecreased && mConditions.isXCHMASCOverMin && @@ -39447,6 +39460,28 @@ bool XUSPY5XCHMACCHasLongSignal() // ) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + ((mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -39549,10 +39584,20 @@ bool XUSPY5XCHMACCHasLongSignal() (mConditions.isXTDSignalUnderBear && ( // - (mConditions.isXTMNeutural && - mConditions.isXTSCurrentMax && - mConditions.isXCHMASCOverMax && - mConditions.isXCHLHMCLCLLSame) + ((mConditions.isXTMNeutural && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHMCLCLLSame) && + ( + // + mConditions.isXTSCurrentMax + // + || + // + mConditions.isXTSCurrentUnderFarest + // + ) + // + ) // ) // @@ -40052,7 +40097,23 @@ bool XUSPY5XCHMACCHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - false + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXTSCurrentUnderFarest && + ( + // + (mConditions.isXTSCurrentMin && + mConditions.isXTDBearishVale && + mConditions.isXLHPriceCrossedUnderSignal) + // + ) + // + ) + // + ) + // + ) // ) // @@ -40213,6 +40274,21 @@ bool XUSPY5XCHMACCHasLongSignal() // ) // + || + // + (mConditions.isXTSCurrentUnderFarest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXLHHHDecreased && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXLHPriceCrossedOverSignal) + // + ) + // + ) + // ) // ) @@ -40311,8 +40387,18 @@ bool XUSPY5XCHMACCHasLongSignal() || // (mConditions.isXCHLHSCMCHHSame && - mConditions.isXCHLHSCMCLLSame && - mConditions.isXCHMASCCrossedOverMax) + ( + // + mConditions.isXTDBullCrossedOverBear + // + || + // + (mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCCrossedOverMax) + // + ) + // + ) // ) // @@ -40920,14 +41006,22 @@ bool XUSPY5XCHMACCHasLongSignal() (mConditions.isXTDSignalUnderBear && ( // - (mConditions.isXTDSignalUnderBear && + (mConditions.isXTDBearishVale && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentUnderMediest && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + || + // + (mConditions.isXTDBullOverBear && ( // - (mConditions.isXTDBearishVale && - mConditions.isXTSCurrentUnderNearest && - mConditions.isXTSCurrentUnderMediest && - mConditions.isXTSCurrentCrossedUnderNearest && - mConditions.isXTSCurrentCrossedUnderMediest) + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXTMStartBullish && + mConditions.isXTSCurrentCrossedOverNearest) // ) // @@ -41419,6 +41513,22 @@ bool XUSPY5XCHMACCHasLongSignal() ((mConditions.isXCHMAMCTrendsDown && mConditions.isXCHMAMCFastOverSlow) && ( + // + ((mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) && + ( + // + (mConditions.isXTSAllSame && + mConditions.isXTDBearishVale && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXLHHighAttachedHH) + // + ) + // + ) + // + || // ((mConditions.isXCHMALCPeak && mConditions.isXTSCurrentMax && @@ -41481,7 +41591,17 @@ bool XUSPY5XCHMACCHasLongSignal() ( // (mConditions.isXTSCurrentUnderNearest && - mConditions.isXTSCurrentCrossedUnderNearest) + ( + // + mConditions.isXTSCurrentUnderMediest + // + || + // + mConditions.isXTSCurrentCrossedUnderNearest + // + ) + // + ) // || // @@ -41984,6 +42104,21 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + (mConditions.isXTDSignalOverBear && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) + // ) // ) diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 0c4b2e17..fabd2f0d 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -39406,6 +39406,19 @@ bool XUSPY5XCHMACCHasLongSignal() // || // + (mConditions.isXTDSignalOverBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) + // + || + // ((mConditions.isXAMANeutural && mConditions.isXLHLLDecreased && mConditions.isXCHMASCOverMin && @@ -39447,6 +39460,28 @@ bool XUSPY5XCHMACCHasLongSignal() // ) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + ((mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -39549,10 +39584,20 @@ bool XUSPY5XCHMACCHasLongSignal() (mConditions.isXTDSignalUnderBear && ( // - (mConditions.isXTMNeutural && - mConditions.isXTSCurrentMax && - mConditions.isXCHMASCOverMax && - mConditions.isXCHLHMCLCLLSame) + ((mConditions.isXTMNeutural && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHMCLCLLSame) && + ( + // + mConditions.isXTSCurrentMax + // + || + // + mConditions.isXTSCurrentUnderFarest + // + ) + // + ) // ) // @@ -40052,7 +40097,23 @@ bool XUSPY5XCHMACCHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - false + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXTSCurrentUnderFarest && + ( + // + (mConditions.isXTSCurrentMin && + mConditions.isXTDBearishVale && + mConditions.isXLHPriceCrossedUnderSignal) + // + ) + // + ) + // + ) + // + ) // ) // @@ -40213,6 +40274,21 @@ bool XUSPY5XCHMACCHasLongSignal() // ) // + || + // + (mConditions.isXTSCurrentUnderFarest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXLHHHDecreased && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXLHPriceCrossedOverSignal) + // + ) + // + ) + // ) // ) @@ -40311,8 +40387,18 @@ bool XUSPY5XCHMACCHasLongSignal() || // (mConditions.isXCHLHSCMCHHSame && - mConditions.isXCHLHSCMCLLSame && - mConditions.isXCHMASCCrossedOverMax) + ( + // + mConditions.isXTDBullCrossedOverBear + // + || + // + (mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCCrossedOverMax) + // + ) + // + ) // ) // @@ -40920,14 +41006,22 @@ bool XUSPY5XCHMACCHasLongSignal() (mConditions.isXTDSignalUnderBear && ( // - (mConditions.isXTDSignalUnderBear && + (mConditions.isXTDBearishVale && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentUnderMediest && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + || + // + (mConditions.isXTDBullOverBear && ( // - (mConditions.isXTDBearishVale && - mConditions.isXTSCurrentUnderNearest && - mConditions.isXTSCurrentUnderMediest && - mConditions.isXTSCurrentCrossedUnderNearest && - mConditions.isXTSCurrentCrossedUnderMediest) + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXTMStartBullish && + mConditions.isXTSCurrentCrossedOverNearest) // ) // @@ -41419,6 +41513,22 @@ bool XUSPY5XCHMACCHasLongSignal() ((mConditions.isXCHMAMCTrendsDown && mConditions.isXCHMAMCFastOverSlow) && ( + // + ((mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) && + ( + // + (mConditions.isXTSAllSame && + mConditions.isXTDBearishVale && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXLHHighAttachedHH) + // + ) + // + ) + // + || // ((mConditions.isXCHMALCPeak && mConditions.isXTSCurrentMax && @@ -41481,7 +41591,17 @@ bool XUSPY5XCHMACCHasLongSignal() ( // (mConditions.isXTSCurrentUnderNearest && - mConditions.isXTSCurrentCrossedUnderNearest) + ( + // + mConditions.isXTSCurrentUnderMediest + // + || + // + mConditions.isXTSCurrentCrossedUnderNearest + // + ) + // + ) // || // @@ -41984,6 +42104,21 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + (mConditions.isXTDSignalOverBear && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) + // ) // )