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 8a3b86a6..418c0bde 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -27083,11 +27083,14 @@ bool XUSPY5XTSFIHasLongSignal() // || // - (mConditions.isXTMVale && - mConditions.isXAMAVale && - mConditions.isXTMBearish && + (mConditions.isXTMBearish && mConditions.isXAMABearish) // + || + // + (mConditions.isXTMVale && + mConditions.isXAMAVale) + // ) // ) @@ -27119,19 +27122,29 @@ bool XUSPY5XTSFIHasLongSignal() // (mConditions.isXCHMALCPeak && ( - // - (mConditions.isXTMNeutural && - mConditions.isXAMABearish && - mConditions.isXCHMAMCVale && - mConditions.isXCHLHSCMCLLSame) - // - || // (mConditions.isXTMBearish && mConditions.isXAMANeutural && mConditions.isXAMAEndBearish && mConditions.isXCHMASCOverMax) // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMABearish) && + ( + // + mConditions.isXTMEndBearish + // + || + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHLHSCMCLLSame) + // + ) + // + ) + // ) // ) @@ -27229,10 +27242,33 @@ bool XUSPY5XTSFIHasLongSignal() // || // - (mConditions.isXTMBearish && - mConditions.isXAMANeutural && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXLHPriceCrossedUnderSignal) + ((mConditions.isXAMANeutural && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXLHPriceCrossedUnderSignal) && + ( + // + mConditions.isXTMBearish + // + || + // + mConditions.isXTMNeutural + // + ) + // + ) + // + || + // + (mConditions.isXTDSignalCrossedUnderBear && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) // ) // @@ -27854,6 +27890,10 @@ bool XUSPY5XTSFIHasLongSignal() (mConditions.isXCHLHMCLCHHSame && mConditions.isXTDSignalCrossedOverBear) // + || + (mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentCrossedUnderMediest) + // ) // ) @@ -28288,6 +28328,36 @@ bool XUSPY5XTSFIHasLongSignal() // (mConditions.isXCHMAMCTrendsUp && ( + // + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXFIUnderZero && + mConditions.isXCHMASCUnderMin && + mConditions.isXFICrossedUnderZero && + mConditions.isXLHPriceCrossedUnderSignal) + // + ) + // + ) + // + || + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXLHHHDecreased && + mConditions.isXCHMASCUnderMin && + mConditions.isXLHPriceCrossedUnderSignal) + // + ) + // + ) + // + || // ((mConditions.isXCHMAMCVale && mConditions.isXCHMALCVale && @@ -28725,12 +28795,25 @@ bool XUSPY5XTSFIHasLongSignal() (mConditions.isXTSCurrentUnderMediest && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXCHMASCOverMax && - mConditions.isXAMAStartBullish && - mConditions.isXCHMASCCrossedOverMax && - mConditions.isXLHPriceCrossedOverSignal && - mConditions.isXTSCurrentCrossedOverNearest) + ((mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax) && + ( + // + (mConditions.isXCHLHSameHHs && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear && + mConditions.isXTSCurrentCrossedUnderMediest) + // + || + // + (mConditions.isXAMAStartBullish && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXLHPriceCrossedOverSignal && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) // ) // @@ -29023,8 +29106,19 @@ bool XUSPY5XTSFIHasLongSignal() || // (mConditions.isXTMNeutural && - mConditions.isXAMABearish && - mConditions.isXTDSignalUnderBear) + ( + // + (mConditions.isXAMABearish && + mConditions.isXTDSignalUnderBear) + // + || + // + (mConditions.isXTMEndBullish && + mConditions.isXLHLLIncreased) + // + ) + // + ) // ) // @@ -29144,6 +29238,19 @@ bool XUSPY5XTSFIHasLongSignal() // ) // + || + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXLHLLIncreased && + mConditions.isXCHMASCOverMax) + // + ) + // + ) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 37ef921b..bc81e7f2 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -37,7 +37,7 @@ XTSFI ------ Resolve XUSPY5 XTSFI All Stopouts in All Markets ... Resolve XUSPY5 XTSFI All Critical Guard Attacks in All Markets ... -Resolve XUSPY5 XTSFI All Longs Guard Attacks in MetaQuotes ... +Resolve XUSPY5 XTSFI All Longs Guard Attacks in HFMarkets ... XCHMACC 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 8a3b86a6..418c0bde 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -27083,11 +27083,14 @@ bool XUSPY5XTSFIHasLongSignal() // || // - (mConditions.isXTMVale && - mConditions.isXAMAVale && - mConditions.isXTMBearish && + (mConditions.isXTMBearish && mConditions.isXAMABearish) // + || + // + (mConditions.isXTMVale && + mConditions.isXAMAVale) + // ) // ) @@ -27119,19 +27122,29 @@ bool XUSPY5XTSFIHasLongSignal() // (mConditions.isXCHMALCPeak && ( - // - (mConditions.isXTMNeutural && - mConditions.isXAMABearish && - mConditions.isXCHMAMCVale && - mConditions.isXCHLHSCMCLLSame) - // - || // (mConditions.isXTMBearish && mConditions.isXAMANeutural && mConditions.isXAMAEndBearish && mConditions.isXCHMASCOverMax) // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMABearish) && + ( + // + mConditions.isXTMEndBearish + // + || + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHLHSCMCLLSame) + // + ) + // + ) + // ) // ) @@ -27229,10 +27242,33 @@ bool XUSPY5XTSFIHasLongSignal() // || // - (mConditions.isXTMBearish && - mConditions.isXAMANeutural && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXLHPriceCrossedUnderSignal) + ((mConditions.isXAMANeutural && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXLHPriceCrossedUnderSignal) && + ( + // + mConditions.isXTMBearish + // + || + // + mConditions.isXTMNeutural + // + ) + // + ) + // + || + // + (mConditions.isXTDSignalCrossedUnderBear && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) // ) // @@ -27854,6 +27890,10 @@ bool XUSPY5XTSFIHasLongSignal() (mConditions.isXCHLHMCLCHHSame && mConditions.isXTDSignalCrossedOverBear) // + || + (mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentCrossedUnderMediest) + // ) // ) @@ -28288,6 +28328,36 @@ bool XUSPY5XTSFIHasLongSignal() // (mConditions.isXCHMAMCTrendsUp && ( + // + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXFIUnderZero && + mConditions.isXCHMASCUnderMin && + mConditions.isXFICrossedUnderZero && + mConditions.isXLHPriceCrossedUnderSignal) + // + ) + // + ) + // + || + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXLHHHDecreased && + mConditions.isXCHMASCUnderMin && + mConditions.isXLHPriceCrossedUnderSignal) + // + ) + // + ) + // + || // ((mConditions.isXCHMAMCVale && mConditions.isXCHMALCVale && @@ -28725,12 +28795,25 @@ bool XUSPY5XTSFIHasLongSignal() (mConditions.isXTSCurrentUnderMediest && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXCHMASCOverMax && - mConditions.isXAMAStartBullish && - mConditions.isXCHMASCCrossedOverMax && - mConditions.isXLHPriceCrossedOverSignal && - mConditions.isXTSCurrentCrossedOverNearest) + ((mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax) && + ( + // + (mConditions.isXCHLHSameHHs && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear && + mConditions.isXTSCurrentCrossedUnderMediest) + // + || + // + (mConditions.isXAMAStartBullish && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXLHPriceCrossedOverSignal && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) // ) // @@ -29023,8 +29106,19 @@ bool XUSPY5XTSFIHasLongSignal() || // (mConditions.isXTMNeutural && - mConditions.isXAMABearish && - mConditions.isXTDSignalUnderBear) + ( + // + (mConditions.isXAMABearish && + mConditions.isXTDSignalUnderBear) + // + || + // + (mConditions.isXTMEndBullish && + mConditions.isXLHLLIncreased) + // + ) + // + ) // ) // @@ -29144,6 +29238,19 @@ bool XUSPY5XTSFIHasLongSignal() // ) // + || + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXLHLLIncreased && + mConditions.isXCHMASCOverMax) + // + ) + // + ) + // ) // ) diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 8a3b86a6..418c0bde 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -27083,11 +27083,14 @@ bool XUSPY5XTSFIHasLongSignal() // || // - (mConditions.isXTMVale && - mConditions.isXAMAVale && - mConditions.isXTMBearish && + (mConditions.isXTMBearish && mConditions.isXAMABearish) // + || + // + (mConditions.isXTMVale && + mConditions.isXAMAVale) + // ) // ) @@ -27119,19 +27122,29 @@ bool XUSPY5XTSFIHasLongSignal() // (mConditions.isXCHMALCPeak && ( - // - (mConditions.isXTMNeutural && - mConditions.isXAMABearish && - mConditions.isXCHMAMCVale && - mConditions.isXCHLHSCMCLLSame) - // - || // (mConditions.isXTMBearish && mConditions.isXAMANeutural && mConditions.isXAMAEndBearish && mConditions.isXCHMASCOverMax) // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMABearish) && + ( + // + mConditions.isXTMEndBearish + // + || + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHLHSCMCLLSame) + // + ) + // + ) + // ) // ) @@ -27229,10 +27242,33 @@ bool XUSPY5XTSFIHasLongSignal() // || // - (mConditions.isXTMBearish && - mConditions.isXAMANeutural && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXLHPriceCrossedUnderSignal) + ((mConditions.isXAMANeutural && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXLHPriceCrossedUnderSignal) && + ( + // + mConditions.isXTMBearish + // + || + // + mConditions.isXTMNeutural + // + ) + // + ) + // + || + // + (mConditions.isXTDSignalCrossedUnderBear && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) // ) // @@ -27854,6 +27890,10 @@ bool XUSPY5XTSFIHasLongSignal() (mConditions.isXCHLHMCLCHHSame && mConditions.isXTDSignalCrossedOverBear) // + || + (mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentCrossedUnderMediest) + // ) // ) @@ -28288,6 +28328,36 @@ bool XUSPY5XTSFIHasLongSignal() // (mConditions.isXCHMAMCTrendsUp && ( + // + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXFIUnderZero && + mConditions.isXCHMASCUnderMin && + mConditions.isXFICrossedUnderZero && + mConditions.isXLHPriceCrossedUnderSignal) + // + ) + // + ) + // + || + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXLHHHDecreased && + mConditions.isXCHMASCUnderMin && + mConditions.isXLHPriceCrossedUnderSignal) + // + ) + // + ) + // + || // ((mConditions.isXCHMAMCVale && mConditions.isXCHMALCVale && @@ -28725,12 +28795,25 @@ bool XUSPY5XTSFIHasLongSignal() (mConditions.isXTSCurrentUnderMediest && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXCHMASCOverMax && - mConditions.isXAMAStartBullish && - mConditions.isXCHMASCCrossedOverMax && - mConditions.isXLHPriceCrossedOverSignal && - mConditions.isXTSCurrentCrossedOverNearest) + ((mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax) && + ( + // + (mConditions.isXCHLHSameHHs && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear && + mConditions.isXTSCurrentCrossedUnderMediest) + // + || + // + (mConditions.isXAMAStartBullish && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXLHPriceCrossedOverSignal && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) // ) // @@ -29023,8 +29106,19 @@ bool XUSPY5XTSFIHasLongSignal() || // (mConditions.isXTMNeutural && - mConditions.isXAMABearish && - mConditions.isXTDSignalUnderBear) + ( + // + (mConditions.isXAMABearish && + mConditions.isXTDSignalUnderBear) + // + || + // + (mConditions.isXTMEndBullish && + mConditions.isXLHLLIncreased) + // + ) + // + ) // ) // @@ -29144,6 +29238,19 @@ bool XUSPY5XTSFIHasLongSignal() // ) // + || + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXLHLLIncreased && + mConditions.isXCHMASCOverMax) + // + ) + // + ) + // ) // )