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 c899f529..62944dff 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -8420,6 +8420,32 @@ bool XUSCHF5XTSFIHasLongSignal() mConditions.isXCHMASCOverMax && mConditions.isXTDSignalCrossedUnderBear) // + || + // + (mConditions.isXTDSignalUnderBear && + ( + // + ((mConditions.isXTMEndBullish && + mConditions.isXAMAEndBullish) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax) + // + ) + // + ) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // ) // ) @@ -8947,19 +8973,35 @@ bool XUSCHF5XTSFIHasLongSignal() // || // - (mConditions.isXTMBearish && - mConditions.isXCHMALCVale && - mConditions.isXTMStartBearish && - mConditions.isXTDSignalUnderBear) - // - || - // - (mConditions.isXAMAVale && - mConditions.isXAMABearish && - mConditions.isXCHMALCVale && - mConditions.isXCHMASCUnderMin && - mConditions.isXCHMAMCTrendsUp && - mConditions.isXTDSignalUnderBear) + (mConditions.isXCHMALCVale && + ( + // + (mConditions.isXTMBearish && + mConditions.isXTMStartBearish && + mConditions.isXTDSignalUnderBear) + // + || + // + (mConditions.isXAMAVale && + ( + // + (mConditions.isXAMANeutural && + mConditions.isXTDSignalCrossedUnderBear) + // + || + // + (mConditions.isXAMABearish && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + ) + // + ) // || // @@ -8971,6 +9013,13 @@ bool XUSCHF5XTSFIHasLongSignal() mConditions.isXLHHHDecreased && mConditions.isXCHMASCUnderMin) // + || + // + (mConditions.isXAMAVale && + mConditions.isXAMANeutural && + mConditions.isXTMStartBullish && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) @@ -9204,6 +9253,22 @@ bool XUSCHF5XTSFIHasLongSignal() // || // + (mConditions.isXTDBullUnderBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTMStartBullish && + mConditions.isXCHMALCTrendsDown && + mConditions.isXFICrossedUnderZero && + mConditions.isXCHMALCFastOverSlow) + // + ) + // + ) + // + || + // ((mConditions.isXCHMASCOverMax && mConditions.isXCHMASCTrendsUp && mConditions.isXLHPriceCrossedOverSignal) && @@ -9361,6 +9426,40 @@ bool XUSCHF5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale) + // + || + // + (mConditions.isXTDSignalUnderBear && + ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -9521,9 +9620,21 @@ bool XUSCHF5XTSFIHasLongSignal() // || // - (mConditions.isXTDBullOverBear && - mConditions.isXTDSignalUnderBear && - mConditions.isXFICrossedUnderZero) + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXTDBullOverBear && + mConditions.isXFICrossedUnderZero) + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame) + // + ) + // + ) // || // @@ -9887,6 +9998,21 @@ bool XUSCHF5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXLHLLIncreased && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 5912715a..aadc51c9 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -34,7 +34,7 @@ Resolve XUSCHF5 XSI All Guard Attacks in All Markets ... XTSFI ------ Resolve XUSCHF5 XTSFI All Stopouts in All Markets ... -Resolve XUSCHF5 XTSFI Longs All Critical Guard Attacks in IFCMarkets ... +Resolve XUSCHF5 XTSFI Longs All Critical Guard Attacks in ErranteSC ... Resolve XUSCHF5 XTSFI Shorts All Critical Guard Attacks in All Markets ... Resolve XUSCHF5 XTSFI All Guard Attacks in All Markets ... 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 c899f529..62944dff 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -8420,6 +8420,32 @@ bool XUSCHF5XTSFIHasLongSignal() mConditions.isXCHMASCOverMax && mConditions.isXTDSignalCrossedUnderBear) // + || + // + (mConditions.isXTDSignalUnderBear && + ( + // + ((mConditions.isXTMEndBullish && + mConditions.isXAMAEndBullish) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax) + // + ) + // + ) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // ) // ) @@ -8947,19 +8973,35 @@ bool XUSCHF5XTSFIHasLongSignal() // || // - (mConditions.isXTMBearish && - mConditions.isXCHMALCVale && - mConditions.isXTMStartBearish && - mConditions.isXTDSignalUnderBear) - // - || - // - (mConditions.isXAMAVale && - mConditions.isXAMABearish && - mConditions.isXCHMALCVale && - mConditions.isXCHMASCUnderMin && - mConditions.isXCHMAMCTrendsUp && - mConditions.isXTDSignalUnderBear) + (mConditions.isXCHMALCVale && + ( + // + (mConditions.isXTMBearish && + mConditions.isXTMStartBearish && + mConditions.isXTDSignalUnderBear) + // + || + // + (mConditions.isXAMAVale && + ( + // + (mConditions.isXAMANeutural && + mConditions.isXTDSignalCrossedUnderBear) + // + || + // + (mConditions.isXAMABearish && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + ) + // + ) // || // @@ -8971,6 +9013,13 @@ bool XUSCHF5XTSFIHasLongSignal() mConditions.isXLHHHDecreased && mConditions.isXCHMASCUnderMin) // + || + // + (mConditions.isXAMAVale && + mConditions.isXAMANeutural && + mConditions.isXTMStartBullish && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) @@ -9204,6 +9253,22 @@ bool XUSCHF5XTSFIHasLongSignal() // || // + (mConditions.isXTDBullUnderBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTMStartBullish && + mConditions.isXCHMALCTrendsDown && + mConditions.isXFICrossedUnderZero && + mConditions.isXCHMALCFastOverSlow) + // + ) + // + ) + // + || + // ((mConditions.isXCHMASCOverMax && mConditions.isXCHMASCTrendsUp && mConditions.isXLHPriceCrossedOverSignal) && @@ -9361,6 +9426,40 @@ bool XUSCHF5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale) + // + || + // + (mConditions.isXTDSignalUnderBear && + ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -9521,9 +9620,21 @@ bool XUSCHF5XTSFIHasLongSignal() // || // - (mConditions.isXTDBullOverBear && - mConditions.isXTDSignalUnderBear && - mConditions.isXFICrossedUnderZero) + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXTDBullOverBear && + mConditions.isXFICrossedUnderZero) + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame) + // + ) + // + ) // || // @@ -9887,6 +9998,21 @@ bool XUSCHF5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXLHLLIncreased && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // ) // ) diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index c899f529..62944dff 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -8420,6 +8420,32 @@ bool XUSCHF5XTSFIHasLongSignal() mConditions.isXCHMASCOverMax && mConditions.isXTDSignalCrossedUnderBear) // + || + // + (mConditions.isXTDSignalUnderBear && + ( + // + ((mConditions.isXTMEndBullish && + mConditions.isXAMAEndBullish) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax) + // + ) + // + ) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) + // ) // ) @@ -8947,19 +8973,35 @@ bool XUSCHF5XTSFIHasLongSignal() // || // - (mConditions.isXTMBearish && - mConditions.isXCHMALCVale && - mConditions.isXTMStartBearish && - mConditions.isXTDSignalUnderBear) - // - || - // - (mConditions.isXAMAVale && - mConditions.isXAMABearish && - mConditions.isXCHMALCVale && - mConditions.isXCHMASCUnderMin && - mConditions.isXCHMAMCTrendsUp && - mConditions.isXTDSignalUnderBear) + (mConditions.isXCHMALCVale && + ( + // + (mConditions.isXTMBearish && + mConditions.isXTMStartBearish && + mConditions.isXTDSignalUnderBear) + // + || + // + (mConditions.isXAMAVale && + ( + // + (mConditions.isXAMANeutural && + mConditions.isXTDSignalCrossedUnderBear) + // + || + // + (mConditions.isXAMABearish && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + ) + // + ) // || // @@ -8971,6 +9013,13 @@ bool XUSCHF5XTSFIHasLongSignal() mConditions.isXLHHHDecreased && mConditions.isXCHMASCUnderMin) // + || + // + (mConditions.isXAMAVale && + mConditions.isXAMANeutural && + mConditions.isXTMStartBullish && + mConditions.isXTDSignalCrossedOverBear) + // ) // ) @@ -9204,6 +9253,22 @@ bool XUSCHF5XTSFIHasLongSignal() // || // + (mConditions.isXTDBullUnderBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTMStartBullish && + mConditions.isXCHMALCTrendsDown && + mConditions.isXFICrossedUnderZero && + mConditions.isXCHMALCFastOverSlow) + // + ) + // + ) + // + || + // ((mConditions.isXCHMASCOverMax && mConditions.isXCHMASCTrendsUp && mConditions.isXLHPriceCrossedOverSignal) && @@ -9361,6 +9426,40 @@ bool XUSCHF5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale) + // + || + // + (mConditions.isXTDSignalUnderBear && + ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -9521,9 +9620,21 @@ bool XUSCHF5XTSFIHasLongSignal() // || // - (mConditions.isXTDBullOverBear && - mConditions.isXTDSignalUnderBear && - mConditions.isXFICrossedUnderZero) + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXTDBullOverBear && + mConditions.isXFICrossedUnderZero) + // + || + // + (mConditions.isXTMNeutural && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame) + // + ) + // + ) // || // @@ -9887,6 +9998,21 @@ bool XUSCHF5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXLHLLIncreased && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // ) // )