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 59179087..0b6f2e9e 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -28588,6 +28588,38 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + (mConditions.isXCHMALCPeak && + ( + // + (mConditions.isXTMVale && + mConditions.isXAMAVale && + mConditions.isXCHMAMCVale && + mConditions.isXTMNeutural && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXTSCurrentCrossedUnderFarest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHSameLLs && + mConditions.isXLHHHIncreased && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // ) // ) @@ -28717,6 +28749,12 @@ bool XUSPY5XTSFIHasShortSignal() // || // + (mConditions.isXCHMASCOverMin && + mConditions.isXCHMASCUnderMax && + mConditions.isXCHMALCTrendsDown) + // + || + // (mConditions.isXTSCurrentCrossedOverMediest && mConditions.isXAMAVale && mConditions.isXCHMALCPeak) @@ -28725,6 +28763,21 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTSCurrentCrossedUnderFarest) + // + ) + // + ) + // ) // ) @@ -29734,6 +29787,32 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + (mConditions.isXCHMALCPeak && + ( + // + ((mConditions.isXTMVale && + mConditions.isXAMAVale && + mConditions.isXCHMAMCVale && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHLHMCLCHHSame) && + ( + // + mConditions.isXLHLowAttachedLL + // + || + // + mConditions.isXTSCurrentCrossedUnderNearest + // + ) + // + ) + // + ) + // + ) + // ) // ) diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index f894b80e..c1e691aa 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 Shorts Stopouts in AMarkets-Real ... +Resolve XUSPY5 XTSFI All Shorts Stopouts in GrowthNext ... Resolve XUSPY5 XTSFI All Critical Guard Attacks in All Markets ... Resolve XUSPY5 XTSFI All Guard Attacks in All Markets ... diff --git a/Documents/XAU5-Guards/Guards.yml b/Documents/XAU5-Guards/Guards.yml index 68491e24..e69de29b 100644 --- a/Documents/XAU5-Guards/Guards.yml +++ b/Documents/XAU5-Guards/Guards.yml @@ -1,115 +0,0 @@ -2021.12.24 06:30:01 XUSPY5EA > Short Signal Provided by: -2021.12.24 06:30:01 XTSFI -2021.12.24 06:30:01 Pusher: 1 -2021.12.24 06:30:01 Market Conditions: -2021.12.24 06:30:01 | XOBD | -2021.12.24 06:30:01 -2021.12.24 06:30:01 | XTM | -2021.12.24 06:30:01 isXTMVale: true -2021.12.24 06:30:01 isXTMBearish: true -2021.12.24 06:30:01 -2021.12.24 06:30:01 | XAMA | -2021.12.24 06:30:01 isXAMAVale: true -2021.12.24 06:30:01 isXAMABearish: true -2021.12.24 06:30:01 -2021.12.24 06:30:01 | XTD | -2021.12.24 06:30:01 isXTDBullUnderBear: true -2021.12.24 06:30:01 isXTDSignalUnderBear: true -2021.12.24 06:30:01 -2021.12.24 06:30:01 | XFI | -2021.12.24 06:30:01 isXFIUnderZero: true -2021.12.24 06:30:01 -2021.12.24 06:30:01 | XTS | -2021.12.24 06:30:01 isXTSCurrentOverMediest: true -2021.12.24 06:30:01 isXTSCurrentUnderFarest: true -2021.12.24 06:30:01 isXTSCurrentUnderNearest: true -2021.12.24 06:30:01 -2021.12.24 06:30:01 | XLH | -2021.12.24 06:30:01 isXLHLowAttachedLL: true -2021.12.24 06:30:01 isXLHHHSameInLength: true -2021.12.24 06:30:01 isXLHPriceUnderSignal: true -2021.12.24 06:30:01 -2021.12.24 06:30:01 | XRSI | -2021.12.24 06:30:01 -2021.12.24 06:30:01 | XCHLH | -2021.12.24 06:30:01 isXCHLHSCMCLLSame: true -2021.12.24 06:30:01 isXCHLHMCLCHHSame: true -2021.12.24 06:30:01 isXCHLHMCOnTopOfLC: true -2021.12.24 06:30:01 -2021.12.24 06:30:01 | XCHMA | -2021.12.24 06:30:01 isXCHMASCOverMin: true -2021.12.24 06:30:01 isXCHMASCUnderMax: true -2021.12.24 06:30:01 isXCHMASCTrendsUp: true -2021.12.24 06:30:01 isXCHMASCFastUnderSlow: true -2021.12.24 06:30:01 isXCHMAMCVale: true -2021.12.24 06:30:01 isXCHMAMCTrendsUp: true -2021.12.24 06:30:01 isXCHMAMCFastUnderSlow: true -2021.12.24 06:30:01 isXCHMALCPeak: true -2021.12.24 06:30:01 isXCHMALCTrendsDown: true -2021.12.24 06:30:01 isXCHMALCFastOverSlow: true -2021.12.24 06:30:01 -2021.12.24 06:30:01 -2021.12.24 06:30:01 market sell 0.28 USDJPYb tp: 114.282 (114.312 / 114.322) -2021.12.24 06:30:01 deal #416 sell 0.28 USDJPYb at 114.312 done (based on order #416) -2021.12.24 06:30:01 deal performed [#416 sell 0.28 USDJPYb at 114.312] -2021.12.24 06:30:01 order performed sell 0.28 at 114.312 [#416 sell 0.28 USDJPYb at 114.312] -2021.12.24 06:30:01 XUSPY5EA > T(416)_TY(Short)_TP(114.282)_SL(0.0)_RFS(0.0)_RFR(0.0), Providers: XTSFI - - - -2021.12.23 05:25:11 XUSPY5EA > Short Signal Provided by: -2021.12.23 05:25:11 XTSFI -2021.12.23 05:25:11 Pusher: 1 -2021.12.23 05:25:11 Market Conditions: -2021.12.23 05:25:11 | XOBD | -2021.12.23 05:25:11 isXOBDSwingLow: true -2021.12.23 05:25:11 -2021.12.23 05:25:11 | XTM | -2021.12.23 05:25:11 isXTMVale: true -2021.12.23 05:25:11 isXTMNeutural: true -2021.12.23 05:25:11 -2021.12.23 05:25:11 | XAMA | -2021.12.23 05:25:11 isXAMAVale: true -2021.12.23 05:25:11 isXAMABearish: true -2021.12.23 05:25:11 -2021.12.23 05:25:11 | XTD | -2021.12.23 05:25:11 isXTDBullUnderBear: true -2021.12.23 05:25:11 isXTDSignalUnderBear: true -2021.12.23 05:25:11 -2021.12.23 05:25:11 | XFI | -2021.12.23 05:25:11 isXFIUnderZero: true -2021.12.23 05:25:11 -2021.12.23 05:25:11 | XTS | -2021.12.23 05:25:11 isXTSCurrentOverMediest: true -2021.12.23 05:25:11 isXTSCurrentUnderFarest: true -2021.12.23 05:25:11 isXTSCurrentUnderNearest: true -2021.12.23 05:25:11 isXTSCurrentCrossedUnderFarest: true -2021.12.23 05:25:11 isXTSCurrentCrossedUnderNearest: true -2021.12.23 05:25:11 -2021.12.23 05:25:11 | XLH | -2021.12.23 05:25:11 isXLHHHSameInLength: true -2021.12.23 05:25:11 isXLHLLSameInLength: true -2021.12.23 05:25:11 isXLHPriceInSignalRange: true -2021.12.23 05:25:11 -2021.12.23 05:25:11 | XRSI | -2021.12.23 05:25:11 -2021.12.23 05:25:11 | XCHLH | -2021.12.23 05:25:11 isXCHLHMCLCLLSame: true -2021.12.23 05:25:11 isXCHLHMCOnTopOfLC: true -2021.12.23 05:25:11 -2021.12.23 05:25:11 | XCHMA | -2021.12.23 05:25:11 isXCHMASCOverMin: true -2021.12.23 05:25:11 isXCHMASCUnderMax: true -2021.12.23 05:25:11 isXCHMASCFastUnderSlow: true -2021.12.23 05:25:11 isXCHMAMCVale: true -2021.12.23 05:25:11 isXCHMAMCFastUnderSlow: true -2021.12.23 05:25:11 isXCHMALCPeak: true -2021.12.23 05:25:11 isXCHMALCTrendsDown: true -2021.12.23 05:25:11 isXCHMALCFastOverSlow: true -2021.12.23 05:25:11 -2021.12.23 05:25:11 -2021.12.23 05:25:11 market sell 0.85 USDJPYb tp: 114.100 (114.130 / 114.133) -2021.12.23 05:25:11 deal #414 sell 0.85 USDJPYb at 114.130 done (based on order #414) -2021.12.23 05:25:11 deal performed [#414 sell 0.85 USDJPYb at 114.130] -2021.12.23 05:25:11 order performed sell 0.85 at 114.130 [#414 sell 0.85 USDJPYb at 114.130] -2021.12.23 05:25:11 XUSPY5EA > T(414)_TY(Short)_TP(114.1)_SL(0.0)_RFS(0.0)_RFR(0.0), Providers: XTSFI 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 59179087..0b6f2e9e 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -28588,6 +28588,38 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + (mConditions.isXCHMALCPeak && + ( + // + (mConditions.isXTMVale && + mConditions.isXAMAVale && + mConditions.isXCHMAMCVale && + mConditions.isXTMNeutural && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXTSCurrentCrossedUnderFarest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHSameLLs && + mConditions.isXLHHHIncreased && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // ) // ) @@ -28717,6 +28749,12 @@ bool XUSPY5XTSFIHasShortSignal() // || // + (mConditions.isXCHMASCOverMin && + mConditions.isXCHMASCUnderMax && + mConditions.isXCHMALCTrendsDown) + // + || + // (mConditions.isXTSCurrentCrossedOverMediest && mConditions.isXAMAVale && mConditions.isXCHMALCPeak) @@ -28725,6 +28763,21 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTSCurrentCrossedUnderFarest) + // + ) + // + ) + // ) // ) @@ -29734,6 +29787,32 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + (mConditions.isXCHMALCPeak && + ( + // + ((mConditions.isXTMVale && + mConditions.isXAMAVale && + mConditions.isXCHMAMCVale && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHLHMCLCHHSame) && + ( + // + mConditions.isXLHLowAttachedLL + // + || + // + mConditions.isXTSCurrentCrossedUnderNearest + // + ) + // + ) + // + ) + // + ) + // ) // ) diff --git a/Projects/XUSPY5/Settings/XTSFI.set b/Projects/XUSPY5/Settings/XTSFI.set index f5630bce..d7d29a0d 100644 Binary files a/Projects/XUSPY5/Settings/XTSFI.set and b/Projects/XUSPY5/Settings/XTSFI.set differ diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 59179087..0b6f2e9e 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -28588,6 +28588,38 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + (mConditions.isXCHMALCPeak && + ( + // + (mConditions.isXTMVale && + mConditions.isXAMAVale && + mConditions.isXCHMAMCVale && + mConditions.isXTMNeutural && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXTSCurrentCrossedUnderFarest && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHSameLLs && + mConditions.isXLHHHIncreased && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // ) // ) @@ -28717,6 +28749,12 @@ bool XUSPY5XTSFIHasShortSignal() // || // + (mConditions.isXCHMASCOverMin && + mConditions.isXCHMASCUnderMax && + mConditions.isXCHMALCTrendsDown) + // + || + // (mConditions.isXTSCurrentCrossedOverMediest && mConditions.isXAMAVale && mConditions.isXCHMALCPeak) @@ -28725,6 +28763,21 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTSCurrentCrossedUnderFarest) + // + ) + // + ) + // ) // ) @@ -29734,6 +29787,32 @@ bool XUSPY5XTSFIHasShortSignal() // ) // + || + // + (mConditions.isXCHMALCPeak && + ( + // + ((mConditions.isXTMVale && + mConditions.isXAMAVale && + mConditions.isXCHMAMCVale && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHLHMCLCHHSame) && + ( + // + mConditions.isXLHLowAttachedLL + // + || + // + mConditions.isXTSCurrentCrossedUnderNearest + // + ) + // + ) + // + ) + // + ) + // ) // )