diff --git a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 99115d9a..b6cdb387 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -9245,14 +9245,6 @@ bool XUSCHF5XTSFIHasLongSignal() mConditions.isXLHHHSameInLength) && // ( - // - (mConditions.isXCHMALCPeak && - mConditions.isXCHLHSameHHs && - mConditions.isXCHMASCOverMax && - mConditions.isXTDSignalUnderBear && - mConditions.isXTSCurrentUnderMediest) - // - || // // Check if SC Fast Under Slow ... ((mConditions.isXCHMASCFastUnderSlow || @@ -9546,6 +9538,12 @@ bool XUSCHF5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXTSCurrentCrossedOverNearest) + // ) // ) @@ -9569,6 +9567,13 @@ bool XUSCHF5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXCHMASCOverMax && + mConditions.isXTDSignalUnderBear) + // ) // ) @@ -10036,6 +10041,26 @@ bool XUSCHF5XTSFIHasLongSignal() mConditions.isXTSCurrentUnderMediest && mConditions.isXTDSignalCrossedOverBear) // + || + // + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -10720,8 +10745,28 @@ bool XUSCHF5XTSFIHasShortSignal() // (mConditions.isXCHMALCVale && mConditions.isXCHLHMCLCLLSame && - mConditions.isXCHMASCUnderMin && - mConditions.isXLHPriceUnderSignal) + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + || + // + (mConditions.isXCHMALCFastOverSlow && + ( + // + ((mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) && + ( + // + (mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMASCCrossedUnderMin) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 6b0b59db..c2c6ddd5 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -35,7 +35,7 @@ XTSFI ------ Resolve XUSCHF5 XTSFI All Stopouts in All Markets ... Resolve XUSCHF5 XTSFI All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XTSFI All Guard Attacks in AMarkets-Real ... +Resolve XUSCHF5 XTSFI All Guard Attacks in GrowthNext ... XOBDLH diff --git a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 99115d9a..b6cdb387 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -9245,14 +9245,6 @@ bool XUSCHF5XTSFIHasLongSignal() mConditions.isXLHHHSameInLength) && // ( - // - (mConditions.isXCHMALCPeak && - mConditions.isXCHLHSameHHs && - mConditions.isXCHMASCOverMax && - mConditions.isXTDSignalUnderBear && - mConditions.isXTSCurrentUnderMediest) - // - || // // Check if SC Fast Under Slow ... ((mConditions.isXCHMASCFastUnderSlow || @@ -9546,6 +9538,12 @@ bool XUSCHF5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXTSCurrentCrossedOverNearest) + // ) // ) @@ -9569,6 +9567,13 @@ bool XUSCHF5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXCHMASCOverMax && + mConditions.isXTDSignalUnderBear) + // ) // ) @@ -10036,6 +10041,26 @@ bool XUSCHF5XTSFIHasLongSignal() mConditions.isXTSCurrentUnderMediest && mConditions.isXTDSignalCrossedOverBear) // + || + // + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -10720,8 +10745,28 @@ bool XUSCHF5XTSFIHasShortSignal() // (mConditions.isXCHMALCVale && mConditions.isXCHLHMCLCLLSame && - mConditions.isXCHMASCUnderMin && - mConditions.isXLHPriceUnderSignal) + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + || + // + (mConditions.isXCHMALCFastOverSlow && + ( + // + ((mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) && + ( + // + (mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMASCCrossedUnderMin) + // + ) + // + ) // ) // diff --git a/Projects/XUSCHF5/Settings/XTSFI.set b/Projects/XUSCHF5/Settings/XTSFI.set index 5d4f86f4..0b52aaea 100644 Binary files a/Projects/XUSCHF5/Settings/XTSFI.set and b/Projects/XUSCHF5/Settings/XTSFI.set differ diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 99115d9a..b6cdb387 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -9245,14 +9245,6 @@ bool XUSCHF5XTSFIHasLongSignal() mConditions.isXLHHHSameInLength) && // ( - // - (mConditions.isXCHMALCPeak && - mConditions.isXCHLHSameHHs && - mConditions.isXCHMASCOverMax && - mConditions.isXTDSignalUnderBear && - mConditions.isXTSCurrentUnderMediest) - // - || // // Check if SC Fast Under Slow ... ((mConditions.isXCHMASCFastUnderSlow || @@ -9546,6 +9538,12 @@ bool XUSCHF5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXTSCurrentCrossedOverNearest) + // ) // ) @@ -9569,6 +9567,13 @@ bool XUSCHF5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXCHMASCOverMax && + mConditions.isXTDSignalUnderBear) + // ) // ) @@ -10036,6 +10041,26 @@ bool XUSCHF5XTSFIHasLongSignal() mConditions.isXTSCurrentUnderMediest && mConditions.isXTDSignalCrossedOverBear) // + || + // + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -10720,8 +10745,28 @@ bool XUSCHF5XTSFIHasShortSignal() // (mConditions.isXCHMALCVale && mConditions.isXCHLHMCLCLLSame && - mConditions.isXCHMASCUnderMin && - mConditions.isXLHPriceUnderSignal) + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + || + // + (mConditions.isXCHMALCFastOverSlow && + ( + // + ((mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) && + ( + // + (mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMASCCrossedUnderMin) + // + ) + // + ) // ) //