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 67f33ed4..264eed0a 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -24461,6 +24461,14 @@ bool XUSPY5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale && + mConditions.isXTMNeutural && + mConditions.isXAMANeutural && + mConditions.isXCHMASCUnderMin) + // ) // ) @@ -24509,7 +24517,18 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMASCFastOverSlow) && ( // - false + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) // ) // @@ -24564,7 +24583,6 @@ bool XUSPY5XTSFIHasLongSignal() ( // (mConditions.isXCHMALCPeak && - mConditions.isXLHLLIncreased && mConditions.isXCHMASCOverMax && mConditions.isXCHLHMCLCHHSame && mConditions.isXCHMASCCrossedOverMax) @@ -24763,7 +24781,17 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMALCFastOverSlow) && ( // - false + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) + // + ) + // + ) // ) // @@ -25234,7 +25262,24 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMALCFastCrossedUnderSlow) && ( // - false + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXTDBearishVale && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMASCOverMin && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHMASCUnderMax) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 7b5c4a5a..c8460841 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -35,7 +35,7 @@ Resolve XUSPY5 XSI All Guard Attacks in All Markets ... XTSFI ------ -Resolve XUSPY5 XTSFI All Long Stopouts in IFCMarkets ... +Resolve XUSPY5 XTSFI All Long Stopouts in ErranteSC ... Resolve XUSPY5 XTSFI All Critical Guard Attacks in All Markets ... Resolve XUSPY5 XTSFI All Guard Attacks in All Markets ... 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 67f33ed4..264eed0a 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -24461,6 +24461,14 @@ bool XUSPY5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale && + mConditions.isXTMNeutural && + mConditions.isXAMANeutural && + mConditions.isXCHMASCUnderMin) + // ) // ) @@ -24509,7 +24517,18 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMASCFastOverSlow) && ( // - false + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) // ) // @@ -24564,7 +24583,6 @@ bool XUSPY5XTSFIHasLongSignal() ( // (mConditions.isXCHMALCPeak && - mConditions.isXLHLLIncreased && mConditions.isXCHMASCOverMax && mConditions.isXCHLHMCLCHHSame && mConditions.isXCHMASCCrossedOverMax) @@ -24763,7 +24781,17 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMALCFastOverSlow) && ( // - false + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) + // + ) + // + ) // ) // @@ -25234,7 +25262,24 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMALCFastCrossedUnderSlow) && ( // - false + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXTDBearishVale && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMASCOverMin && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHMASCUnderMax) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 67f33ed4..264eed0a 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -24461,6 +24461,14 @@ bool XUSPY5XTSFIHasLongSignal() // ) // + || + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale && + mConditions.isXTMNeutural && + mConditions.isXAMANeutural && + mConditions.isXCHMASCUnderMin) + // ) // ) @@ -24509,7 +24517,18 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMASCFastOverSlow) && ( // - false + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) // ) // @@ -24564,7 +24583,6 @@ bool XUSPY5XTSFIHasLongSignal() ( // (mConditions.isXCHMALCPeak && - mConditions.isXLHLLIncreased && mConditions.isXCHMASCOverMax && mConditions.isXCHLHMCLCHHSame && mConditions.isXCHMASCCrossedOverMax) @@ -24763,7 +24781,17 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMALCFastOverSlow) && ( // - false + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) + // + ) + // + ) // ) // @@ -25234,7 +25262,24 @@ bool XUSPY5XTSFIHasLongSignal() mConditions.isXCHMALCFastCrossedUnderSlow) && ( // - false + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXTDBearishVale && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMASCOverMin && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHMASCUnderMax) + // + ) + // + ) + // + ) + // + ) // ) //