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 ce5fbcb4..c368f0aa 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -2020,6 +2020,21 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXTSCurrentUnderNearest && mConditions.isXTDSignalCrossedOverBear) // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTMEndBullish && + mConditions.isXTSCurrentMax && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 1539af81..9bc82634 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -12,39 +12,61 @@ All Markets XTD ---- -Resolve XUSCHF5 XTD Shorts All Stopouts in All Markets ... -Resolve XUSCHF5 XTD Longs All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XTD Shorts All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XTD All Guard Attacks in OANDA ... +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 MetaQuotes ... XTAM ----- +Resolve XUSCHF5 XTAM Shorts 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 All Markets ... -Resolve XUSCHF5 XTAM Shorts All Stopouts in All Markets ... Resolve XUSCHF5 XTAM All Guard Attacks in All Markets ... -Resolve XUSCHF5 XSI Longs All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XTSFI Longs All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XOBDLH Longs All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XCHMACC Longs All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XCHMAMX Longs All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XCHMAMN Longs All Critical Guard Attacks in All Markets ... - - -Resolve XUSCHF5 XSI Shorts All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XTSFI Shorts All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XOBDLH Shorts All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XCHMACC Shorts All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XCHMAMX Shorts All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XCHMAMN Shorts All Critical Guard Attacks in All Markets ... - - +XSI +---- 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 All Markets ... -Resolve XUSCHF5 XCHMAMX Shorts All Stopouts in All Markets ... -Resolve XUSCHF5 XCHMAMN Shorts All Stopouts in All Markets ... +Resolve XUSCHF5 XSI Longs All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XSI Shorts All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XSI All Guard Attacks in All Markets ... + + +XTSFI +------ +Resolve XUSCHF5 XTSFI All Stopouts in All Markets ... +Resolve XUSCHF5 XTSFI Longs All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XTSFI Shorts All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XTSFI All Guard Attacks in All Markets ... + + +XOBDLH +-------- +Resolve XUSCHF5 XOBDLH All Stopouts in All Markets ... +Resolve XUSCHF5 XOBDLH Longs All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XOBDLH Shorts All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XOBDLH All Guard Attacks in All Markets ... + + +XCHMACC +-------- +Resolve XUSCHF5 XCHMACC All Stopouts in All Markets ... +Resolve XUSCHF5 XCHMACC Longs All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XCHMACC Shorts All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XCHMACC All Guard Attacks in All Markets ... + + +XCHMAMX +-------- +Resolve XUSCHF5 XCHMAMX All Stopouts in All Markets ... +Resolve XUSCHF5 XCHMAMX Longs All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XCHMAMX Shorts All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XCHMAMX All Guard Attacks in All Markets ... + +XCHMAMN +-------- +Resolve XUSCHF5 XCHMAMN All Stopouts in All Markets ... +Resolve XUSCHF5 XCHMAMN Longs All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XCHMAMN Shorts All Critical Guard Attacks in All Markets ... +Resolve XUSCHF5 XCHMAMN 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 ce5fbcb4..c368f0aa 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -2020,6 +2020,21 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXTSCurrentUnderNearest && mConditions.isXTDSignalCrossedOverBear) // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTMEndBullish && + mConditions.isXTSCurrentMax && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // ) // ) diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index ce5fbcb4..c368f0aa 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -2020,6 +2020,21 @@ bool XUSCHF5XTDHasLongSignal() mConditions.isXTSCurrentUnderNearest && mConditions.isXTDSignalCrossedOverBear) // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTMEndBullish && + mConditions.isXTSCurrentMax && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // ) // )