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 a09daa41..056b3471 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -1567,6 +1567,19 @@ bool XUSPY5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // ) // ) @@ -1613,6 +1626,21 @@ bool XUSPY5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // ) // ) @@ -1726,27 +1754,41 @@ bool XUSPY5XTDHasLongSignal() (mConditions.isXTSCurrentUnderFarest && ( // - ( - (mConditions.isXTDBearishVale && - mConditions.isXTDSignalCrossedOverBear) && - ( - // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMin && - mConditions.isXCHLHMCLCHHSame) - // - || - // - (mConditions.isXCHMAMCVale && - mConditions.isXCHMALCVale && - mConditions.isXCHLHMCLCLLSame && - mConditions.isXCHMASCUnderMin && - mConditions.isXAMAStartBullish && - mConditions.isXCHMASCFastCrossedOverSlow) - // - ) - // - ) + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale) && + ( + // + (mConditions.isXAMAVale && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + || + // + ((mConditions.isXTDBearishVale && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXCHLHMCLCHHSame) + // + || + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXAMAStartBullish && + mConditions.isXCHMASCFastCrossedOverSlow) + // + ) + // + ) // ) // @@ -1796,6 +1838,29 @@ bool XUSPY5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) && + ( + // + (mConditions.isXTDBearishVale && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) + // + ) + // + ) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 10eb3c55..0b3dde51 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 OANDA ... +Resolve XUSPY5 XTD All Longs Stopouts in MetaQuotes ... 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 a09daa41..056b3471 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -1567,6 +1567,19 @@ bool XUSPY5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // ) // ) @@ -1613,6 +1626,21 @@ bool XUSPY5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // ) // ) @@ -1726,27 +1754,41 @@ bool XUSPY5XTDHasLongSignal() (mConditions.isXTSCurrentUnderFarest && ( // - ( - (mConditions.isXTDBearishVale && - mConditions.isXTDSignalCrossedOverBear) && - ( - // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMin && - mConditions.isXCHLHMCLCHHSame) - // - || - // - (mConditions.isXCHMAMCVale && - mConditions.isXCHMALCVale && - mConditions.isXCHLHMCLCLLSame && - mConditions.isXCHMASCUnderMin && - mConditions.isXAMAStartBullish && - mConditions.isXCHMASCFastCrossedOverSlow) - // - ) - // - ) + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale) && + ( + // + (mConditions.isXAMAVale && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + || + // + ((mConditions.isXTDBearishVale && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXCHLHMCLCHHSame) + // + || + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXAMAStartBullish && + mConditions.isXCHMASCFastCrossedOverSlow) + // + ) + // + ) // ) // @@ -1796,6 +1838,29 @@ bool XUSPY5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) && + ( + // + (mConditions.isXTDBearishVale && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) + // + ) + // + ) + // ) // ) diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index a09daa41..056b3471 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -1567,6 +1567,19 @@ bool XUSPY5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // ) // ) @@ -1613,6 +1626,21 @@ bool XUSPY5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // ) // ) @@ -1726,27 +1754,41 @@ bool XUSPY5XTDHasLongSignal() (mConditions.isXTSCurrentUnderFarest && ( // - ( - (mConditions.isXTDBearishVale && - mConditions.isXTDSignalCrossedOverBear) && - ( - // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMin && - mConditions.isXCHLHMCLCHHSame) - // - || - // - (mConditions.isXCHMAMCVale && - mConditions.isXCHMALCVale && - mConditions.isXCHLHMCLCLLSame && - mConditions.isXCHMASCUnderMin && - mConditions.isXAMAStartBullish && - mConditions.isXCHMASCFastCrossedOverSlow) - // - ) - // - ) + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale) && + ( + // + (mConditions.isXAMAVale && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + || + // + ((mConditions.isXTDBearishVale && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXCHLHMCLCHHSame) + // + || + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXAMAStartBullish && + mConditions.isXCHMASCFastCrossedOverSlow) + // + ) + // + ) // ) // @@ -1796,6 +1838,29 @@ bool XUSPY5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) && + ( + // + (mConditions.isXTDBearishVale && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverMediest) + // + ) + // + ) + // + ) + // + ) + // ) // )