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 4247696e..1f2a845a 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -5518,7 +5518,7 @@ bool XUSCHF5XTAMHasLongSignal() // ( // - // Check LC Fast Over Slow ... + // Check LC Fast Under Slow ... ((mConditions.isXCHMALCFastUnderSlow || mConditions.isXCHMALCFastCrossedUnderSlow) && ( @@ -5550,9 +5550,7 @@ bool XUSCHF5XTAMHasLongSignal() (mConditions.isXCHMALCPeak && mConditions.isXCHLHSameHHs && mConditions.isXTSCurrentMax && - mConditions.isXTDBearishVale && mConditions.isXCHMASCOverMax && - mConditions.isXCHMALCTrendsUp && mConditions.isXLHHighAttachedHH) // ) @@ -6325,6 +6323,14 @@ bool XUSCHF5XTAMHasShortSignal() // ) // + || + // + (mConditions.isXCHLHSameLLs && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastCrossedUnderSlow) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 55a79253..87300147 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -14,7 +14,7 @@ XTD ---- Resolve XUSCHF5 XTD All Stopouts in All Markets ... Resolve XUSCHF5 XTD All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XTD All Guard Attacks in All Markets ... +Resolve XUSCHF5 XTD All Guard Attacks in AMarkets-Real ... XTAM 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 4247696e..1f2a845a 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -5518,7 +5518,7 @@ bool XUSCHF5XTAMHasLongSignal() // ( // - // Check LC Fast Over Slow ... + // Check LC Fast Under Slow ... ((mConditions.isXCHMALCFastUnderSlow || mConditions.isXCHMALCFastCrossedUnderSlow) && ( @@ -5550,9 +5550,7 @@ bool XUSCHF5XTAMHasLongSignal() (mConditions.isXCHMALCPeak && mConditions.isXCHLHSameHHs && mConditions.isXTSCurrentMax && - mConditions.isXTDBearishVale && mConditions.isXCHMASCOverMax && - mConditions.isXCHMALCTrendsUp && mConditions.isXLHHighAttachedHH) // ) @@ -6325,6 +6323,14 @@ bool XUSCHF5XTAMHasShortSignal() // ) // + || + // + (mConditions.isXCHLHSameLLs && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastCrossedUnderSlow) + // ) // ) diff --git a/Projects/XUSCHF5/Settings/XTAM.set b/Projects/XUSCHF5/Settings/XTAM.set index 5a747db7..4afe23be 100644 Binary files a/Projects/XUSCHF5/Settings/XTAM.set and b/Projects/XUSCHF5/Settings/XTAM.set differ diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 4247696e..1f2a845a 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -5518,7 +5518,7 @@ bool XUSCHF5XTAMHasLongSignal() // ( // - // Check LC Fast Over Slow ... + // Check LC Fast Under Slow ... ((mConditions.isXCHMALCFastUnderSlow || mConditions.isXCHMALCFastCrossedUnderSlow) && ( @@ -5550,9 +5550,7 @@ bool XUSCHF5XTAMHasLongSignal() (mConditions.isXCHMALCPeak && mConditions.isXCHLHSameHHs && mConditions.isXTSCurrentMax && - mConditions.isXTDBearishVale && mConditions.isXCHMASCOverMax && - mConditions.isXCHMALCTrendsUp && mConditions.isXLHHighAttachedHH) // ) @@ -6325,6 +6323,14 @@ bool XUSCHF5XTAMHasShortSignal() // ) // + || + // + (mConditions.isXCHLHSameLLs && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastCrossedUnderSlow) + // ) // )