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 87059787..f98a1852 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -7939,6 +7939,26 @@ bool XUSCHF5XCHMACCHasShortSignal() // ) // + || + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXTSCurrentMin && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -8031,6 +8051,23 @@ bool XUSCHF5XCHMACCHasShortSignal() // ) // + || + // + ((mConditions.isXTMStartBearish && + mConditions.isXAMAStartBearish) && + ( + // + (mConditions.isXFIOverZero && + mConditions.isXTSCurrentMin && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXLHPriceCrossedUnderSignal) + // + ) + // + ) + // ) // ) @@ -8075,6 +8112,15 @@ bool XUSCHF5XCHMACCHasShortSignal() (mConditions.isXTDSignalCrossedUnderBear && mConditions.isXLHPriceCrossedUnderSignal) // + || + // + (mConditions.isXLHHHDecreased && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentUnderMediest && + mConditions.isXTSCurrentCrossedUnderNearest) + // ) // ) @@ -8096,6 +8142,12 @@ bool XUSCHF5XCHMACCHasShortSignal() ((mConditions.isXTMBearish && mConditions.isXAMABearish) && ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentOverNearest && + mConditions.isXTSCurrentCrossedOverNearest) + // + || // (mConditions.isXCHMALCVale && mConditions.isXTSCurrentOverFarest && diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 17460597..f3ddf7d6 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -15,6 +15,6 @@ Resolve XUSCHF5 XTAM Shorts All Stopouts in All Markets ... Resolve XUSCHF5 XSI Shorts All Stopouts in All Markets ... Resolve XUSCHF5 XTSFI Shorts All Stopouts in All Markets ... Resolve XUSCHF5 XOBDLH Shorts All Stopouts in All Markets ... -Resolve XUSCHF5 XCHMACC Shorts All Stopouts in IFCMarkets ... +Resolve XUSCHF5 XCHMACC Shorts All Stopouts in ErranteSC ... Resolve XUSCHF5 XCHMAMX Shorts All Stopouts in ... Resolve XUSCHF5 XCHMAMN 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 87059787..f98a1852 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -7939,6 +7939,26 @@ bool XUSCHF5XCHMACCHasShortSignal() // ) // + || + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXTSCurrentMin && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -8031,6 +8051,23 @@ bool XUSCHF5XCHMACCHasShortSignal() // ) // + || + // + ((mConditions.isXTMStartBearish && + mConditions.isXAMAStartBearish) && + ( + // + (mConditions.isXFIOverZero && + mConditions.isXTSCurrentMin && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXLHPriceCrossedUnderSignal) + // + ) + // + ) + // ) // ) @@ -8075,6 +8112,15 @@ bool XUSCHF5XCHMACCHasShortSignal() (mConditions.isXTDSignalCrossedUnderBear && mConditions.isXLHPriceCrossedUnderSignal) // + || + // + (mConditions.isXLHHHDecreased && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentUnderMediest && + mConditions.isXTSCurrentCrossedUnderNearest) + // ) // ) @@ -8096,6 +8142,12 @@ bool XUSCHF5XCHMACCHasShortSignal() ((mConditions.isXTMBearish && mConditions.isXAMABearish) && ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentOverNearest && + mConditions.isXTSCurrentCrossedOverNearest) + // + || // (mConditions.isXCHMALCVale && mConditions.isXTSCurrentOverFarest && diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 87059787..f98a1852 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -7939,6 +7939,26 @@ bool XUSCHF5XCHMACCHasShortSignal() // ) // + || + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXTSCurrentMin && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) + // + ) + // ) // ) @@ -8031,6 +8051,23 @@ bool XUSCHF5XCHMACCHasShortSignal() // ) // + || + // + ((mConditions.isXTMStartBearish && + mConditions.isXAMAStartBearish) && + ( + // + (mConditions.isXFIOverZero && + mConditions.isXTSCurrentMin && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXLHPriceCrossedUnderSignal) + // + ) + // + ) + // ) // ) @@ -8075,6 +8112,15 @@ bool XUSCHF5XCHMACCHasShortSignal() (mConditions.isXTDSignalCrossedUnderBear && mConditions.isXLHPriceCrossedUnderSignal) // + || + // + (mConditions.isXLHHHDecreased && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentUnderFarest && + mConditions.isXTSCurrentUnderNearest && + mConditions.isXTSCurrentUnderMediest && + mConditions.isXTSCurrentCrossedUnderNearest) + // ) // ) @@ -8096,6 +8142,12 @@ bool XUSCHF5XCHMACCHasShortSignal() ((mConditions.isXTMBearish && mConditions.isXAMABearish) && ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentOverNearest && + mConditions.isXTSCurrentCrossedOverNearest) + // + || // (mConditions.isXCHMALCVale && mConditions.isXTSCurrentOverFarest &&