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 eda222ed..4247696e 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -5957,7 +5957,6 @@ bool XUSCHF5XTAMHasShortSignal() // (mConditions.isXCHMALCPeak && mConditions.isXTSCurrentMin && - mConditions.isXTDBullOverBear && mConditions.isXCHLHSCMCLLSame && mConditions.isXLHLowAttachedLL) // @@ -6034,6 +6033,20 @@ bool XUSCHF5XTAMHasShortSignal() ((mConditions.isXTMBearish && mConditions.isXAMABearish) && ( + // + ((mConditions.isXTMStartBearish && + mConditions.isXAMAStartBearish) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXTSCurrentMax && + mConditions.isXTSCurrentOverFarest) + // + ) + // + ) + // + || // (mConditions.isXCHMASCVale && mConditions.isXCHMALCPeak && diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index eccbcb1d..55a79253 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -20,8 +20,7 @@ Resolve XUSCHF5 XTD All Guard Attacks in All Markets ... XTAM ----- Resolve XUSCHF5 XTAM All Stopouts in All Markets ... -Resolve XUSCHF5 XTAM Longs All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XTAM Shorts All Critical Guard Attacks in Alpari ... +Resolve XUSCHF5 XTAM All Critical Guard Attacks in All Markets ... Resolve XUSCHF5 XTAM 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 eda222ed..4247696e 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -5957,7 +5957,6 @@ bool XUSCHF5XTAMHasShortSignal() // (mConditions.isXCHMALCPeak && mConditions.isXTSCurrentMin && - mConditions.isXTDBullOverBear && mConditions.isXCHLHSCMCLLSame && mConditions.isXLHLowAttachedLL) // @@ -6034,6 +6033,20 @@ bool XUSCHF5XTAMHasShortSignal() ((mConditions.isXTMBearish && mConditions.isXAMABearish) && ( + // + ((mConditions.isXTMStartBearish && + mConditions.isXAMAStartBearish) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXTSCurrentMax && + mConditions.isXTSCurrentOverFarest) + // + ) + // + ) + // + || // (mConditions.isXCHMASCVale && mConditions.isXCHMALCPeak && diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index eda222ed..4247696e 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -5957,7 +5957,6 @@ bool XUSCHF5XTAMHasShortSignal() // (mConditions.isXCHMALCPeak && mConditions.isXTSCurrentMin && - mConditions.isXTDBullOverBear && mConditions.isXCHLHSCMCLLSame && mConditions.isXLHLowAttachedLL) // @@ -6034,6 +6033,20 @@ bool XUSCHF5XTAMHasShortSignal() ((mConditions.isXTMBearish && mConditions.isXAMABearish) && ( + // + ((mConditions.isXTMStartBearish && + mConditions.isXAMAStartBearish) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXTSCurrentMax && + mConditions.isXTSCurrentOverFarest) + // + ) + // + ) + // + || // (mConditions.isXCHMASCVale && mConditions.isXCHMALCPeak &&