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 67b6da22..4f7d7163 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -3490,10 +3490,24 @@ bool XUSPY5XTDHasLongSignal() (mConditions.isXTSCurrentUnderMediest && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXCHMASCOverMax && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + mConditions.isXCHLHMCLCHHSame + // + || + // + (mConditions.isXLHHHSameInLength && + mConditions.isXLHLLSameInLength && + mConditions.isXLHPriceOverSignal && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) // || // @@ -11639,6 +11653,35 @@ bool XUSPY5XTAMHasShortSignal() ((mConditions.isXCHMASCFastOverSlow || mConditions.isXCHMASCFastCrossedOverSlow) && ( + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXTDBullOverBear && + ( + // + ((mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || // (mConditions.isXCHMASCTrendsUp && ( 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 67b6da22..4f7d7163 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -3490,10 +3490,24 @@ bool XUSPY5XTDHasLongSignal() (mConditions.isXTSCurrentUnderMediest && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXCHMASCOverMax && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + mConditions.isXCHLHMCLCHHSame + // + || + // + (mConditions.isXLHHHSameInLength && + mConditions.isXLHLLSameInLength && + mConditions.isXLHPriceOverSignal && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) // || // @@ -11639,6 +11653,35 @@ bool XUSPY5XTAMHasShortSignal() ((mConditions.isXCHMASCFastOverSlow || mConditions.isXCHMASCFastCrossedOverSlow) && ( + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXTDBullOverBear && + ( + // + ((mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || // (mConditions.isXCHMASCTrendsUp && ( diff --git a/Projects/XUSPY5/Settings/XSI.set b/Projects/XUSPY5/Settings/XSI.set new file mode 100644 index 00000000..35fb9983 Binary files /dev/null and b/Projects/XUSPY5/Settings/XSI.set differ diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 67b6da22..4f7d7163 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -3490,10 +3490,24 @@ bool XUSPY5XTDHasLongSignal() (mConditions.isXTSCurrentUnderMediest && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXCHMASCOverMax && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + mConditions.isXCHLHMCLCHHSame + // + || + // + (mConditions.isXLHHHSameInLength && + mConditions.isXLHLLSameInLength && + mConditions.isXLHPriceOverSignal && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) // || // @@ -11639,6 +11653,35 @@ bool XUSPY5XTAMHasShortSignal() ((mConditions.isXCHMASCFastOverSlow || mConditions.isXCHMASCFastCrossedOverSlow) && ( + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXTDBullOverBear && + ( + // + ((mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || // (mConditions.isXCHMASCTrendsUp && (