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 20ffeb55..9d2ef8c5 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -2418,6 +2418,13 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXTDBullOverBear && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTSCurrentOverFarest) + // + || + // (mConditions.isXCHMASCOverMin && mConditions.isXCHMASCUnderMax && mConditions.isXCHMALCTrendsDown && @@ -4209,17 +4216,39 @@ bool XUSCHF5XTDHasShortSignal() mConditions.isXCHMASCFastCrossedOverSlow) && ( // - (mConditions.isXTDBullOverBear && - mConditions.isXCHMASCTrendsUp && + (mConditions.isXCHMASCTrendsUp && mConditions.isXTSCurrentOverFarest) // || // - (mConditions.isXAMABullish && - mConditions.isXTDBullOverBear && - mConditions.isXCHLHMCLCLLSame && - mConditions.isXCHMAMCTrendsDown && - mConditions.isXCHMAMCFastUnderSlow) + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXCHMASCTrendsUp && + mConditions.isXTSCurrentOverFarest) + // + || + // + ((mConditions.isXAMABullish && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + mConditions.isXCHLHMCLCLLSame + // + || + // + (mConditions.isXTSCurrentCrossedUnderFarest && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 65e624be..7400384a 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 HFMarkets ... +Resolve XUSCHF5 XTD All Guard Attacks in AMarkets-Demo ... 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 20ffeb55..9d2ef8c5 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -2418,6 +2418,13 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXTDBullOverBear && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTSCurrentOverFarest) + // + || + // (mConditions.isXCHMASCOverMin && mConditions.isXCHMASCUnderMax && mConditions.isXCHMALCTrendsDown && @@ -4209,17 +4216,39 @@ bool XUSCHF5XTDHasShortSignal() mConditions.isXCHMASCFastCrossedOverSlow) && ( // - (mConditions.isXTDBullOverBear && - mConditions.isXCHMASCTrendsUp && + (mConditions.isXCHMASCTrendsUp && mConditions.isXTSCurrentOverFarest) // || // - (mConditions.isXAMABullish && - mConditions.isXTDBullOverBear && - mConditions.isXCHLHMCLCLLSame && - mConditions.isXCHMAMCTrendsDown && - mConditions.isXCHMAMCFastUnderSlow) + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXCHMASCTrendsUp && + mConditions.isXTSCurrentOverFarest) + // + || + // + ((mConditions.isXAMABullish && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + mConditions.isXCHLHMCLCLLSame + // + || + // + (mConditions.isXTSCurrentCrossedUnderFarest && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 20ffeb55..9d2ef8c5 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -2418,6 +2418,13 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXTDBullOverBear && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTSCurrentOverFarest) + // + || + // (mConditions.isXCHMASCOverMin && mConditions.isXCHMASCUnderMax && mConditions.isXCHMALCTrendsDown && @@ -4209,17 +4216,39 @@ bool XUSCHF5XTDHasShortSignal() mConditions.isXCHMASCFastCrossedOverSlow) && ( // - (mConditions.isXTDBullOverBear && - mConditions.isXCHMASCTrendsUp && + (mConditions.isXCHMASCTrendsUp && mConditions.isXTSCurrentOverFarest) // || // - (mConditions.isXAMABullish && - mConditions.isXTDBullOverBear && - mConditions.isXCHLHMCLCLLSame && - mConditions.isXCHMAMCTrendsDown && - mConditions.isXCHMAMCFastUnderSlow) + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXCHMASCTrendsUp && + mConditions.isXTSCurrentOverFarest) + // + || + // + ((mConditions.isXAMABullish && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + mConditions.isXCHLHMCLCLLSame + // + || + // + (mConditions.isXTSCurrentCrossedUnderFarest && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // + ) + // + ) // ) //