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 0762089e..67b6da22 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -8591,6 +8591,21 @@ bool XUSPY5XTAMHasLongSignal() // ) // + || + // + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXAMANeutural && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXLHHighAttachedHH && + mConditions.isXCHMASCFastCrossedOverSlow) + // + ) + // + ) + // ) // ) @@ -11296,15 +11311,25 @@ bool XUSPY5XTAMHasShortSignal() mConditions.isXCHMALCFastUnderSlow) && ( // - ((mConditions.isXCHMALCVale && - mConditions.isXTDBearishVale && - mConditions.isXCHMASCUnderMin && - mConditions.isXTDSignalOverBear && - mConditions.isXTSCurrentOverFarest) && + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && ( // - (mConditions.isXTMNeutural && - mConditions.isXAMANeutural) + ((mConditions.isXCHMALCVale && + mConditions.isXTDBearishVale && + mConditions.isXTDSignalOverBear) && + ( + // + mConditions.isXTDBullOverBear + // + || + // + (mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentOverFarest) + // + ) + // + ) // ) // @@ -11486,6 +11511,25 @@ bool XUSPY5XTAMHasShortSignal() // ) // + || + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // ) // ) @@ -11668,6 +11712,26 @@ bool XUSPY5XTAMHasShortSignal() // ) // + || + // + (mConditions.isXLHPriceCrossedOverSignal && + ( + // + ((mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin) && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -13136,6 +13200,15 @@ bool XUSPY5XTAMHasShortSignal() // (mConditions.isXCHMALCPeak && ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXTSCurrentMin && + mConditions.isXTDBullishVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + || // ((!mConditions.isXCHMAMCTrendsUp && !mConditions.isXCHMAMCTrendsDown) && @@ -13239,16 +13312,36 @@ bool XUSPY5XTAMHasShortSignal() (mConditions.isXCHMALCVale && ( // - (mConditions.isXTMVale && - mConditions.isXTSCurrentMin && - mConditions.isXTDSignalVale && - mConditions.isXTDBullishVale && - mConditions.isXCHLHSCMCLLSame && - mConditions.isXCHMASCUnderMin && - mConditions.isXLHLowAttachedLL && - mConditions.isXCHMASCCrossedUnderMin && - mConditions.isXLHPriceCrossedUnderSignal && - mConditions.isXTSCurrentCrossedUnderNearest) + ((mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin && + mConditions.isXLHLowAttachedLL && + mConditions.isXCHMASCCrossedUnderMin) && + ( + // + (mConditions.isXTMVale && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXLHPriceCrossedUnderSignal && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // + (mConditions.isXRSICrossedUnderShortExit && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + ) + // + ) // ) // @@ -13589,7 +13682,32 @@ bool XUSPY5XTAMHasShortSignal() mConditions.isXCHMAMCFastUnderSlow) && ( // - false + (mConditions.isXTSCurrentOverFarest && + ( + // + ((mConditions.isXCHMALCVale && + mConditions.isXTDSignalVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish) + // + || + // + (mConditions.isXTMStartBearish && + mConditions.isXAMAStartBearish) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 2269821f..40eb115e 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -23,7 +23,7 @@ XTAM ----- Resolve XUSPY5 XTAM All Stopouts in All Markets ... Resolve XUSPY5 XTAM All Critical Guard Attacks in All Markets ... -Resolve XUSPY5 XTAM All Guard Attacks in Alpari ... +Resolve XUSPY5 XTAM All Guard Attacks in All Markets ... XSI 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 0762089e..67b6da22 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -8591,6 +8591,21 @@ bool XUSPY5XTAMHasLongSignal() // ) // + || + // + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXAMANeutural && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXLHHighAttachedHH && + mConditions.isXCHMASCFastCrossedOverSlow) + // + ) + // + ) + // ) // ) @@ -11296,15 +11311,25 @@ bool XUSPY5XTAMHasShortSignal() mConditions.isXCHMALCFastUnderSlow) && ( // - ((mConditions.isXCHMALCVale && - mConditions.isXTDBearishVale && - mConditions.isXCHMASCUnderMin && - mConditions.isXTDSignalOverBear && - mConditions.isXTSCurrentOverFarest) && + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && ( // - (mConditions.isXTMNeutural && - mConditions.isXAMANeutural) + ((mConditions.isXCHMALCVale && + mConditions.isXTDBearishVale && + mConditions.isXTDSignalOverBear) && + ( + // + mConditions.isXTDBullOverBear + // + || + // + (mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentOverFarest) + // + ) + // + ) // ) // @@ -11486,6 +11511,25 @@ bool XUSPY5XTAMHasShortSignal() // ) // + || + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // ) // ) @@ -11668,6 +11712,26 @@ bool XUSPY5XTAMHasShortSignal() // ) // + || + // + (mConditions.isXLHPriceCrossedOverSignal && + ( + // + ((mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin) && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -13136,6 +13200,15 @@ bool XUSPY5XTAMHasShortSignal() // (mConditions.isXCHMALCPeak && ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXTSCurrentMin && + mConditions.isXTDBullishVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + || // ((!mConditions.isXCHMAMCTrendsUp && !mConditions.isXCHMAMCTrendsDown) && @@ -13239,16 +13312,36 @@ bool XUSPY5XTAMHasShortSignal() (mConditions.isXCHMALCVale && ( // - (mConditions.isXTMVale && - mConditions.isXTSCurrentMin && - mConditions.isXTDSignalVale && - mConditions.isXTDBullishVale && - mConditions.isXCHLHSCMCLLSame && - mConditions.isXCHMASCUnderMin && - mConditions.isXLHLowAttachedLL && - mConditions.isXCHMASCCrossedUnderMin && - mConditions.isXLHPriceCrossedUnderSignal && - mConditions.isXTSCurrentCrossedUnderNearest) + ((mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin && + mConditions.isXLHLowAttachedLL && + mConditions.isXCHMASCCrossedUnderMin) && + ( + // + (mConditions.isXTMVale && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXLHPriceCrossedUnderSignal && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // + (mConditions.isXRSICrossedUnderShortExit && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + ) + // + ) // ) // @@ -13589,7 +13682,32 @@ bool XUSPY5XTAMHasShortSignal() mConditions.isXCHMAMCFastUnderSlow) && ( // - false + (mConditions.isXTSCurrentOverFarest && + ( + // + ((mConditions.isXCHMALCVale && + mConditions.isXTDSignalVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish) + // + || + // + (mConditions.isXTMStartBearish && + mConditions.isXAMAStartBearish) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 0762089e..67b6da22 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -8591,6 +8591,21 @@ bool XUSPY5XTAMHasLongSignal() // ) // + || + // + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXAMANeutural && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXLHHighAttachedHH && + mConditions.isXCHMASCFastCrossedOverSlow) + // + ) + // + ) + // ) // ) @@ -11296,15 +11311,25 @@ bool XUSPY5XTAMHasShortSignal() mConditions.isXCHMALCFastUnderSlow) && ( // - ((mConditions.isXCHMALCVale && - mConditions.isXTDBearishVale && - mConditions.isXCHMASCUnderMin && - mConditions.isXTDSignalOverBear && - mConditions.isXTSCurrentOverFarest) && + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && ( // - (mConditions.isXTMNeutural && - mConditions.isXAMANeutural) + ((mConditions.isXCHMALCVale && + mConditions.isXTDBearishVale && + mConditions.isXTDSignalOverBear) && + ( + // + mConditions.isXTDBullOverBear + // + || + // + (mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentOverFarest) + // + ) + // + ) // ) // @@ -11486,6 +11511,25 @@ bool XUSPY5XTAMHasShortSignal() // ) // + || + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // ) // ) @@ -11668,6 +11712,26 @@ bool XUSPY5XTAMHasShortSignal() // ) // + || + // + (mConditions.isXLHPriceCrossedOverSignal && + ( + // + ((mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin) && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -13136,6 +13200,15 @@ bool XUSPY5XTAMHasShortSignal() // (mConditions.isXCHMALCPeak && ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXTSCurrentMin && + mConditions.isXTDBullishVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + || // ((!mConditions.isXCHMAMCTrendsUp && !mConditions.isXCHMAMCTrendsDown) && @@ -13239,16 +13312,36 @@ bool XUSPY5XTAMHasShortSignal() (mConditions.isXCHMALCVale && ( // - (mConditions.isXTMVale && - mConditions.isXTSCurrentMin && - mConditions.isXTDSignalVale && - mConditions.isXTDBullishVale && - mConditions.isXCHLHSCMCLLSame && - mConditions.isXCHMASCUnderMin && - mConditions.isXLHLowAttachedLL && - mConditions.isXCHMASCCrossedUnderMin && - mConditions.isXLHPriceCrossedUnderSignal && - mConditions.isXTSCurrentCrossedUnderNearest) + ((mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin && + mConditions.isXLHLowAttachedLL && + mConditions.isXCHMASCCrossedUnderMin) && + ( + // + (mConditions.isXTMVale && + mConditions.isXTDSignalVale && + mConditions.isXTDBullishVale && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXLHPriceCrossedUnderSignal && + mConditions.isXTSCurrentCrossedUnderNearest) + // + || + // + (mConditions.isXRSICrossedUnderShortExit && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + ) + // + ) // ) // @@ -13589,7 +13682,32 @@ bool XUSPY5XTAMHasShortSignal() mConditions.isXCHMAMCFastUnderSlow) && ( // - false + (mConditions.isXTSCurrentOverFarest && + ( + // + ((mConditions.isXCHMALCVale && + mConditions.isXTDSignalVale && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish) + // + || + // + (mConditions.isXTMStartBearish && + mConditions.isXAMAStartBearish) + // + ) + // + ) + // + ) + // + ) // ) //