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 3b249dda..61051a14 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -1691,6 +1691,32 @@ bool XUSPY5XTDHasLongSignal() !mConditions.isXLHHHSameInLength) && // ( + // + (mConditions.isXTSCurrentUnderNearest && + ( + // + (mConditions.isXRSICrossedOverLongExit && + ( + // + (mConditions.isXTSCurrentCrossedUnderNearest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXLHHHDecreased) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || // // Check if MC Fast Under Slow ... ((mConditions.isXCHMAMCFastUnderSlow || @@ -1740,7 +1766,20 @@ bool XUSPY5XTDHasLongSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + (mConditions.isXTSCurrentUnderNearest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTMNeutural && + mConditions.isXAMANeutural && + mConditions.isXTDBearishVale) + // + ) + // + ) + // + ) // ) // @@ -1998,7 +2037,20 @@ bool XUSPY5XTDHasLongSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + (mConditions.isXTSCurrentUnderNearest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTMNeutural && + mConditions.isXAMANeutural && + mConditions.isXTDBearishVale) + // + ) + // + ) + // + ) // ) // @@ -2166,7 +2218,6 @@ bool XUSPY5XTDHasLongSignal() (mConditions.isXCHMALCPeak && mConditions.isXTSCurrentMax && mConditions.isXCHMASCOverMax && - mConditions.isXFICrossedOverZero && mConditions.isXTDSignalCrossedOverBear) // ) @@ -2219,23 +2270,63 @@ bool XUSPY5XTDHasLongSignal() // || // + (mConditions.isXTSCurrentUnderMediest && + ( + // + // Check LC Fast Under Slow ... + ((mConditions.isXCHMALCFastUnderSlow || + mConditions.isXCHMALCFastCrossedUnderSlow) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXTDBearishVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) + // + || + // // Check LC Fast Under Slow ... ((mConditions.isXCHMALCFastUnderSlow || mConditions.isXCHMALCFastCrossedUnderSlow) && ( // ((mConditions.isXCHMAMCPeak && - mConditions.isXCHLHSameHHs && mConditions.isXTSCurrentMax && mConditions.isXTDSignalCrossedOverBear) && ( // - mConditions.isXLHHighAttachedHH + (mConditions.isXCHMALCVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXLHHighAttachedHH && + mConditions.isXTSCurrentCrossedOverNearest) // || // - (mConditions.isXLHLLSameInLength && - mConditions.isXRSICrossedOverLongExit) + (mConditions.isXCHLHSameHHs && + ( + // + ( + // + mConditions.isXLHHighAttachedHH + // + || + // + (mConditions.isXLHLLSameInLength && + mConditions.isXRSICrossedOverLongExit) + // + ) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index ff9b53d5..ddbd1b85 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -12,7 +12,7 @@ All Markets XTD ---- -Resolve XUSPY5 XTD All Longs Stopouts in IFCMarkets ... +Resolve XUSPY5 XTD All Longs Stopouts in ErranteSC ... Resolve XUSPY5 XTD All Critical Guard Attacks in All Markets ... Resolve XUSPY5 XTD All Guard Attacks in All Markets ... diff --git a/Projects/XUSCHF5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Projects/XUSCHF5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 3b249dda..61051a14 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -1691,6 +1691,32 @@ bool XUSPY5XTDHasLongSignal() !mConditions.isXLHHHSameInLength) && // ( + // + (mConditions.isXTSCurrentUnderNearest && + ( + // + (mConditions.isXRSICrossedOverLongExit && + ( + // + (mConditions.isXTSCurrentCrossedUnderNearest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXLHHHDecreased) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || // // Check if MC Fast Under Slow ... ((mConditions.isXCHMAMCFastUnderSlow || @@ -1740,7 +1766,20 @@ bool XUSPY5XTDHasLongSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + (mConditions.isXTSCurrentUnderNearest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTMNeutural && + mConditions.isXAMANeutural && + mConditions.isXTDBearishVale) + // + ) + // + ) + // + ) // ) // @@ -1998,7 +2037,20 @@ bool XUSPY5XTDHasLongSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + (mConditions.isXTSCurrentUnderNearest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTMNeutural && + mConditions.isXAMANeutural && + mConditions.isXTDBearishVale) + // + ) + // + ) + // + ) // ) // @@ -2166,7 +2218,6 @@ bool XUSPY5XTDHasLongSignal() (mConditions.isXCHMALCPeak && mConditions.isXTSCurrentMax && mConditions.isXCHMASCOverMax && - mConditions.isXFICrossedOverZero && mConditions.isXTDSignalCrossedOverBear) // ) @@ -2219,23 +2270,63 @@ bool XUSPY5XTDHasLongSignal() // || // + (mConditions.isXTSCurrentUnderMediest && + ( + // + // Check LC Fast Under Slow ... + ((mConditions.isXCHMALCFastUnderSlow || + mConditions.isXCHMALCFastCrossedUnderSlow) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXTDBearishVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) + // + || + // // Check LC Fast Under Slow ... ((mConditions.isXCHMALCFastUnderSlow || mConditions.isXCHMALCFastCrossedUnderSlow) && ( // ((mConditions.isXCHMAMCPeak && - mConditions.isXCHLHSameHHs && mConditions.isXTSCurrentMax && mConditions.isXTDSignalCrossedOverBear) && ( // - mConditions.isXLHHighAttachedHH + (mConditions.isXCHMALCVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXLHHighAttachedHH && + mConditions.isXTSCurrentCrossedOverNearest) // || // - (mConditions.isXLHLLSameInLength && - mConditions.isXRSICrossedOverLongExit) + (mConditions.isXCHLHSameHHs && + ( + // + ( + // + mConditions.isXLHHighAttachedHH + // + || + // + (mConditions.isXLHLLSameInLength && + mConditions.isXRSICrossedOverLongExit) + // + ) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 3b249dda..990d3b9a 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -1691,6 +1691,32 @@ bool XUSPY5XTDHasLongSignal() !mConditions.isXLHHHSameInLength) && // ( + // + (mConditions.isXTSCurrentUnderNearest && + ( + // + (mConditions.isXRSICrossedOverLongExit && + ( + // + (mConditions.isXTSCurrentCrossedUnderNearest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXLHHHDecreased) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || // // Check if MC Fast Under Slow ... ((mConditions.isXCHMAMCFastUnderSlow || @@ -1740,7 +1766,20 @@ bool XUSPY5XTDHasLongSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + (mConditions.isXTSCurrentUnderNearest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTMNeutural && + mConditions.isXAMANeutural && + mConditions.isXTDBearishVale) + // + ) + // + ) + // + ) // ) // @@ -1966,12 +2005,23 @@ bool XUSPY5XTDHasLongSignal() mConditions.isXCHMALCVale) && ( // - (mConditions.isXTMEndBullish && - mConditions.isXTMNeutural && - mConditions.isXTSCurrentMax && - mConditions.isXCHMASCUnderMin && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXTSCurrentCrossedOverNearest) + ((mConditions.isXTSCurrentMax && + mConditions.isXCHMASCUnderMin && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + || + // + (mConditions.isXTMEndBullish && + mConditions.isXTMNeutural && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) // ) // @@ -1998,7 +2048,20 @@ bool XUSPY5XTDHasLongSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + (mConditions.isXTSCurrentUnderNearest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTMNeutural && + mConditions.isXAMANeutural && + mConditions.isXTDBearishVale) + // + ) + // + ) + // + ) // ) // @@ -2166,7 +2229,6 @@ bool XUSPY5XTDHasLongSignal() (mConditions.isXCHMALCPeak && mConditions.isXTSCurrentMax && mConditions.isXCHMASCOverMax && - mConditions.isXFICrossedOverZero && mConditions.isXTDSignalCrossedOverBear) // ) @@ -2219,23 +2281,63 @@ bool XUSPY5XTDHasLongSignal() // || // + (mConditions.isXTSCurrentUnderMediest && + ( + // + // Check LC Fast Under Slow ... + ((mConditions.isXCHMALCFastUnderSlow || + mConditions.isXCHMALCFastCrossedUnderSlow) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXTDBearishVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) + // + || + // // Check LC Fast Under Slow ... ((mConditions.isXCHMALCFastUnderSlow || mConditions.isXCHMALCFastCrossedUnderSlow) && ( // ((mConditions.isXCHMAMCPeak && - mConditions.isXCHLHSameHHs && mConditions.isXTSCurrentMax && mConditions.isXTDSignalCrossedOverBear) && ( // - mConditions.isXLHHighAttachedHH + (mConditions.isXCHMALCVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXLHHighAttachedHH && + mConditions.isXTSCurrentCrossedOverNearest) // || // - (mConditions.isXLHLLSameInLength && - mConditions.isXRSICrossedOverLongExit) + (mConditions.isXCHLHSameHHs && + ( + // + ( + // + mConditions.isXLHHighAttachedHH + // + || + // + (mConditions.isXLHLLSameInLength && + mConditions.isXRSICrossedOverLongExit) + // + ) + // + ) + // + ) // ) //