diff --git a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 6a25fbea..f1370176 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -3256,9 +3256,19 @@ bool XUSPY5XTDHasLongSignal() // || // - (mConditions.isXCHMAMCPeak && - mConditions.isXLHHHSameInLength && - mConditions.isXFICrossedOverZero) + ((mConditions.isXCHMAMCPeak && + mConditions.isXLHHHSameInLength) && + ( + // + mConditions.isXCHLHMCLCHHSame + // + || + // + mConditions.isXFICrossedOverZero + // + ) + // + ) // || // @@ -4130,6 +4140,149 @@ bool XUSPY5XTDHasShortSignal() // ) // + // XTD Shorts ... + // Resolve Guard Attacks ... + || + ( + // + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXTSCurrentOverFarest && + ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTDBullOverBear && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXTDBullOverBear && + ( + // + ((mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin) && + ( + // + (mConditions.isXCHLHSameLLs && + mConditions.isXCHMASCUnderMin && + mConditions.isXAMAStartBearish && + mConditions.isXLHLowAttachedLL) + // + || + // + (mConditions.isXCHMASCTrendsDown && + mConditions.isXTDSignalCrossedUnderBear && + mConditions.isXCHMASCFastCrossedUnderSlow && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) + // + ) + // + || + // + // Check if SC Fast Over Slow ... + ((mConditions.isXCHMASCFastOverSlow || + mConditions.isXCHMASCFastCrossedOverSlow) && + ( + // + (mConditions.isXCHMASCTrendsUp && + ( + // + ((mConditions.isXLHHHSameInLength && + mConditions.isXLHLLSameInLength) && + ( + // + (mConditions.isXLHPriceUnderSignal && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderFarest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + ((mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXLHHHSameInLength && + ( + // + (mConditions.isXLHPriceUnderSignal && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHSameLLs && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + )) + // + ) + // + ) + // + ) + // ) // ; diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 2bf44f0b..f904f65f 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -16,7 +16,7 @@ XTD ---- Resolve XUSPY5 XTD All Stopouts in All Markets ... Resolve XUSPY5 XTD All Longs Critical Guard Attacks in AMarkets-Real ... -Resolve XUSPY5 XTD All Guard Attacks in All Markets ... +Resolve XUSPY5 XTD All Guard Attacks in AMarkets-Real ... XTAM diff --git a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 6a25fbea..f1370176 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -3256,9 +3256,19 @@ bool XUSPY5XTDHasLongSignal() // || // - (mConditions.isXCHMAMCPeak && - mConditions.isXLHHHSameInLength && - mConditions.isXFICrossedOverZero) + ((mConditions.isXCHMAMCPeak && + mConditions.isXLHHHSameInLength) && + ( + // + mConditions.isXCHLHMCLCHHSame + // + || + // + mConditions.isXFICrossedOverZero + // + ) + // + ) // || // @@ -4130,6 +4140,149 @@ bool XUSPY5XTDHasShortSignal() // ) // + // XTD Shorts ... + // Resolve Guard Attacks ... + || + ( + // + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXTSCurrentOverFarest && + ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTDBullOverBear && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXTDBullOverBear && + ( + // + ((mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin) && + ( + // + (mConditions.isXCHLHSameLLs && + mConditions.isXCHMASCUnderMin && + mConditions.isXAMAStartBearish && + mConditions.isXLHLowAttachedLL) + // + || + // + (mConditions.isXCHMASCTrendsDown && + mConditions.isXTDSignalCrossedUnderBear && + mConditions.isXCHMASCFastCrossedUnderSlow && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) + // + ) + // + || + // + // Check if SC Fast Over Slow ... + ((mConditions.isXCHMASCFastOverSlow || + mConditions.isXCHMASCFastCrossedOverSlow) && + ( + // + (mConditions.isXCHMASCTrendsUp && + ( + // + ((mConditions.isXLHHHSameInLength && + mConditions.isXLHLLSameInLength) && + ( + // + (mConditions.isXLHPriceUnderSignal && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderFarest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + ((mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXLHHHSameInLength && + ( + // + (mConditions.isXLHPriceUnderSignal && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHSameLLs && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + )) + // + ) + // + ) + // + ) + // ) // ; diff --git a/Projects/XUSPY5/Settings/XTD.set b/Projects/XUSPY5/Settings/XTD.set index 7e97698c..f9215cd8 100644 Binary files a/Projects/XUSPY5/Settings/XTD.set and b/Projects/XUSPY5/Settings/XTD.set differ diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 6a25fbea..f1370176 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -3256,9 +3256,19 @@ bool XUSPY5XTDHasLongSignal() // || // - (mConditions.isXCHMAMCPeak && - mConditions.isXLHHHSameInLength && - mConditions.isXFICrossedOverZero) + ((mConditions.isXCHMAMCPeak && + mConditions.isXLHHHSameInLength) && + ( + // + mConditions.isXCHLHMCLCHHSame + // + || + // + mConditions.isXFICrossedOverZero + // + ) + // + ) // || // @@ -4130,6 +4140,149 @@ bool XUSPY5XTDHasShortSignal() // ) // + // XTD Shorts ... + // Resolve Guard Attacks ... + || + ( + // + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXTSCurrentOverFarest && + ( + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTDBullOverBear && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXTDBullOverBear && + ( + // + ((mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin) && + ( + // + (mConditions.isXCHLHSameLLs && + mConditions.isXCHMASCUnderMin && + mConditions.isXAMAStartBearish && + mConditions.isXLHLowAttachedLL) + // + || + // + (mConditions.isXCHMASCTrendsDown && + mConditions.isXTDSignalCrossedUnderBear && + mConditions.isXCHMASCFastCrossedUnderSlow && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) + // + ) + // + || + // + // Check if SC Fast Over Slow ... + ((mConditions.isXCHMASCFastOverSlow || + mConditions.isXCHMASCFastCrossedOverSlow) && + ( + // + (mConditions.isXCHMASCTrendsUp && + ( + // + ((mConditions.isXLHHHSameInLength && + mConditions.isXLHLLSameInLength) && + ( + // + (mConditions.isXLHPriceUnderSignal && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderFarest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + ((mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXLHHHSameInLength && + ( + // + (mConditions.isXLHPriceUnderSignal && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHSameLLs && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + )) + // + ) + // + ) + // + ) + // ) // ;