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 d44a6e54..3c148c37 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -2859,7 +2859,6 @@ bool XUSCHF5XTDHasShortSignal() ( // (mConditions.isXTSCurrentMin && - mConditions.isXLHHHDecreased && mConditions.isXTDBullOverBear && mConditions.isXTDSignalCrossedUnderBear && mConditions.isXLHPriceCrossedUnderSignal) @@ -2976,7 +2975,20 @@ bool XUSCHF5XTDHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXCHMASCPeak && + mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMASCFastOverSlow) + // + ) + // + ) + // + ) // ) // @@ -2989,7 +3001,21 @@ bool XUSCHF5XTDHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index b0eaa4b9..36c055db 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -8,7 +8,7 @@ IFCMarkets ErranteSC Alpari -Resolve XUSCHF5 XTD Shorts All Stopouts in OANDA ... +Resolve XUSCHF5 XTD Shorts All Stopouts in MetaQuotes ... Resolve XUSCHF5 XTAM Shorts All Stopouts in ... Resolve XUSCHF5 XSI Shorts All Stopouts in ... Resolve XUSCHF5 XTSFI Shorts All Stopouts in ... 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 d44a6e54..3c148c37 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -2859,7 +2859,6 @@ bool XUSCHF5XTDHasShortSignal() ( // (mConditions.isXTSCurrentMin && - mConditions.isXLHHHDecreased && mConditions.isXTDBullOverBear && mConditions.isXTDSignalCrossedUnderBear && mConditions.isXLHPriceCrossedUnderSignal) @@ -2976,7 +2975,20 @@ bool XUSCHF5XTDHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXCHMASCPeak && + mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMASCFastOverSlow) + // + ) + // + ) + // + ) // ) // @@ -2989,7 +3001,21 @@ bool XUSCHF5XTDHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index d44a6e54..3c148c37 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -2859,7 +2859,6 @@ bool XUSCHF5XTDHasShortSignal() ( // (mConditions.isXTSCurrentMin && - mConditions.isXLHHHDecreased && mConditions.isXTDBullOverBear && mConditions.isXTDSignalCrossedUnderBear && mConditions.isXLHPriceCrossedUnderSignal) @@ -2976,7 +2975,20 @@ bool XUSCHF5XTDHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXCHMASCPeak && + mConditions.isXCHMASCTrendsUp && + mConditions.isXCHMASCFastOverSlow) + // + ) + // + ) + // + ) // ) // @@ -2989,7 +3001,21 @@ bool XUSCHF5XTDHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) // ) //