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 fabd2f0d..b5f6ac0c 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -39446,11 +39446,22 @@ bool XUSPY5XCHMACCHasLongSignal() (mConditions.isXTDBullCrossedOverBear && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXAMANeutural && - mConditions.isXTSCurrentMax && - mConditions.isXTMStartBullish && - mConditions.isXCHLHMCLCHHSame) + ((mConditions.isXCHMALCPeak && + mConditions.isXAMANeutural && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame) && + ( + // + mConditions.isXTMStartBullish + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXTSCurrentCrossedOverFarest) + // + ) + // + ) // ) // @@ -39622,7 +39633,16 @@ bool XUSPY5XCHMACCHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - false + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) // ) // @@ -39641,6 +39661,36 @@ bool XUSPY5XCHMACCHasLongSignal() // mConditions.isXRSICrossedOverLongExit // + || + // + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + || + // + ((mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXLHPriceCrossedOverSignal && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // ) // ) @@ -40481,6 +40531,25 @@ bool XUSPY5XCHMACCHasLongSignal() // ) // + || + // + ((mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish && + mConditions.isXLHHighAttachedHH && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // ) // ) @@ -40865,13 +40934,33 @@ bool XUSPY5XCHMACCHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXTDBullOverBear && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXTMBullish && + mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXTDBullOverBear) && + ( + // + (mConditions.isXAMABullish && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTDSignalCrossedOverBear) + // + || + // + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXAMANeutural && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 2384e983..d5201c43 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -37,14 +37,14 @@ XTSFI ------ 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 ... +Resolve XUSPY5 XTSFI All Short Guard Attacks in AMarkets-Real ... 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 Alpari ... +Resolve XUSPY5 XCHMACC 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 fabd2f0d..b5f6ac0c 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -39446,11 +39446,22 @@ bool XUSPY5XCHMACCHasLongSignal() (mConditions.isXTDBullCrossedOverBear && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXAMANeutural && - mConditions.isXTSCurrentMax && - mConditions.isXTMStartBullish && - mConditions.isXCHLHMCLCHHSame) + ((mConditions.isXCHMALCPeak && + mConditions.isXAMANeutural && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame) && + ( + // + mConditions.isXTMStartBullish + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXTSCurrentCrossedOverFarest) + // + ) + // + ) // ) // @@ -39622,7 +39633,16 @@ bool XUSPY5XCHMACCHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - false + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) // ) // @@ -39641,6 +39661,36 @@ bool XUSPY5XCHMACCHasLongSignal() // mConditions.isXRSICrossedOverLongExit // + || + // + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + || + // + ((mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXLHPriceCrossedOverSignal && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // ) // ) @@ -40481,6 +40531,25 @@ bool XUSPY5XCHMACCHasLongSignal() // ) // + || + // + ((mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish && + mConditions.isXLHHighAttachedHH && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // ) // ) @@ -40865,13 +40934,33 @@ bool XUSPY5XCHMACCHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXTDBullOverBear && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXTMBullish && + mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXTDBullOverBear) && + ( + // + (mConditions.isXAMABullish && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTDSignalCrossedOverBear) + // + || + // + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXAMANeutural && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index fabd2f0d..b5f6ac0c 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -39446,11 +39446,22 @@ bool XUSPY5XCHMACCHasLongSignal() (mConditions.isXTDBullCrossedOverBear && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXAMANeutural && - mConditions.isXTSCurrentMax && - mConditions.isXTMStartBullish && - mConditions.isXCHLHMCLCHHSame) + ((mConditions.isXCHMALCPeak && + mConditions.isXAMANeutural && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame) && + ( + // + mConditions.isXTMStartBullish + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXTSCurrentCrossedOverFarest) + // + ) + // + ) // ) // @@ -39622,7 +39633,16 @@ bool XUSPY5XCHMACCHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - false + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) // ) // @@ -39641,6 +39661,36 @@ bool XUSPY5XCHMACCHasLongSignal() // mConditions.isXRSICrossedOverLongExit // + || + // + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + || + // + ((mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXLHPriceCrossedOverSignal && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // ) // ) @@ -40481,6 +40531,25 @@ bool XUSPY5XCHMACCHasLongSignal() // ) // + || + // + ((mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish && + mConditions.isXLHHighAttachedHH && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // ) // ) @@ -40865,13 +40934,33 @@ bool XUSPY5XCHMACCHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXTDBullOverBear && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXTMBullish && + mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXTDBullOverBear) && + ( + // + (mConditions.isXAMABullish && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTDSignalCrossedOverBear) + // + || + // + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXAMANeutural && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) + // + ) + // + ) // ) //