From cfbaf50fa0ee27f38728aefece569addcadbac58 Mon Sep 17 00:00:00 2001
From: Hadi Khazaee Asl <hadi_khazaee_asl@yahoo.com>
Date: Thu, 7 Mar 2024 23:16:38 +0330
Subject: [PATCH] Resolve XUSPY5 XTAM All Guard Attacks in AMarkets-Demo ...

---
 ...aherelm.xuspy5.provider.indicators.lib.mq5 | 140 +++++++++++++-----
 Documents/Templates/Brokers List.txt          |   2 +-
 ...aherelm.xuspy5.provider.indicators.lib.mq5 | 140 +++++++++++++-----
 ...aherelm.xuspy5.provider.indicators.lib.mq5 | 140 +++++++++++++-----
 4 files changed, 304 insertions(+), 118 deletions(-)

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 4f22a301..0980aabe 100644
--- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -5727,39 +5727,39 @@ bool XUSPY5XTDHasLongSignal()
                      ((mConditions.isXCHMALCPeak &&
                        mConditions.isXTSCurrentMax &&
                        mConditions.isXTDSignalCrossedOverBear) &&
-                          (
-                              //
-                              mConditions.isXCHMASCOverMax
-                              //
-                              ||
-                              //
-                              (mConditions.isXTSAllSame &&
-                               mConditions.isXAMANeutural &&
-                               mConditions.isXTDBearishVale &&
-                               mConditions.isXTMStartBearish &&
-                               mConditions.isXCHLHMCLCHHSame)
-                              //
-                              )
+                      (
+                          //
+                          mConditions.isXCHMASCOverMax
+                          //
+                          ||
+                          //
+                          (mConditions.isXTSAllSame &&
+                           mConditions.isXAMANeutural &&
+                           mConditions.isXTDBearishVale &&
+                           mConditions.isXTMStartBearish &&
+                           mConditions.isXCHLHMCLCHHSame)
+                          //
+                          )
                       //
-                      ||
-                      //
-                      ((mConditions.isXLHHHSameInLength &&
-                        mConditions.isXLHLLSameInLength) &&
-                       (
-                           //
-                           (mConditions.isXLHPriceInSignalRange &&
-                            (
-                                //
-                                (mConditions.isXTSAllSame &&
-                                 mConditions.isXLHLLIncreased)
-                                //
-                                )
-                            //
-                            )
+                      )
+                     //
+                     ||
+                     //
+                     ((mConditions.isXLHHHSameInLength &&
+                       mConditions.isXLHLLSameInLength) &&
+                      (
+                          //
+                          (mConditions.isXLHPriceInSignalRange &&
+                           (
+                               //
+                               (mConditions.isXTSAllSame &&
+                                mConditions.isXLHLLIncreased)
+                               //
+                               )
                            //
                            )
-                       //
-                       )
+                          //
+                          )
                       //
                       )
                      //
@@ -7923,6 +7923,28 @@ bool XUSPY5XTAMHasLongSignal()
                                    ((mConditions.isXTDBullUnderBear &&
                                      mConditions.isXTDSignalUnderBear) &&
                                     (
+                                        //
+                                        (mConditions.isXCHMASCTrendsUp &&
+                                         (
+                                             //
+                                             ((mConditions.isXCHMALCPeak &&
+                                               mConditions.isXTSCurrentMax &&
+                                               mConditions.isXCHMASCOverMax &&
+                                               mConditions.isXCHLHMCLCHHSame) &&
+                                              (
+                                                  //
+                                                  (mConditions.isXTMBearish &&
+                                                   mConditions.isXAMABearish)
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        ||
                                         //
                                         ((mConditions.isXTSAllSame &&
                                           mConditions.isXCHMALCPeak &&
@@ -9751,15 +9773,33 @@ bool XUSPY5XTAMHasLongSignal()
                                      mConditions.isXCHMAMCFastOverSlow) &&
                                     (
                                         //
-                                        (mConditions.isXTMVale &&
-                                         mConditions.isXCHMASCVale &&
-                                         mConditions.isXCHMALCPeak &&
-                                         mConditions.isXLHLLDecreased &&
-                                         mConditions.isXCHLHSCMCLLSame &&
-                                         mConditions.isXCHMASCTrendsUp &&
-                                         mConditions.isXTDBullUnderBear &&
-                                         mConditions.isXTDSignalUnderBear &&
-                                         mConditions.isXTSCurrentUnderFarest)
+                                        (mConditions.isXCHMASCTrendsUp &&
+                                         (
+                                             //
+                                             ((mConditions.isXCHMALCPeak &&
+                                               mConditions.isXCHLHSCMCLLSame &&
+                                               mConditions.isXTDBullUnderBear &&
+                                               mConditions.isXTDSignalUnderBear &&
+                                               mConditions.isXTSCurrentUnderFarest) &&
+                                              (
+                                                  //
+                                                  (mConditions.isXTMBearish &&
+                                                   mConditions.isXAMABearish &&
+                                                   mConditions.isXTSCurrentUnderMediest)
+                                                  //
+                                                  ||
+                                                  //
+                                                  (mConditions.isXTMVale &&
+                                                   mConditions.isXCHMASCVale &&
+                                                   mConditions.isXLHLLDecreased)
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         )
                                     //
@@ -11215,6 +11255,13 @@ bool XUSPY5XTAMHasShortSignal()
                                    ((mConditions.isXTMBullish &&
                                      mConditions.isXAMABullish) &&
                                     (
+                                        //
+                                        (mConditions.isXCHMALCVale &&
+                                         mConditions.isXCHMASCUnderMin &&
+                                         mConditions.isXTSCurrentOverFarest &&
+                                         mConditions.isXTSCurrentOverMediest)
+                                        //
+                                        ||
                                         //
                                         (mConditions.isXTDBullCrossedOverBear &&
                                          (
@@ -12447,6 +12494,21 @@ bool XUSPY5XTAMHasShortSignal()
                               ((mConditions.isXCHMAMCFastOverSlow ||
                                 mConditions.isXCHMAMCFastCrossedOverSlow) &&
                                (
+                                   //
+                                   (mConditions.isXCHMASCVale &&
+                                    mConditions.isXTSCurrentMin &&
+                                    mConditions.isXCHLHSCMCLLSame &&
+                                    mConditions.isXCHMASCUnderMin &&
+                                    mConditions.isXTMStartBearish &&
+                                    mConditions.isXTDBullUnderBear &&
+                                    mConditions.isXAMAStartBearish &&
+                                    mConditions.isXTDSignalUnderBear &&
+                                    mConditions.isXCHMASCCrossedUnderMin &&
+                                    mConditions.isXLHPriceCrossedUnderSignal &&
+                                    mConditions.isXTSCurrentCrossedUnderNearest &&
+                                    mConditions.isXTSCurrentCrossedUnderMediest)
+                                   //
+                                   ||
                                    //
                                    ((mConditions.isXCHMALCVale &&
                                      mConditions.isXTSCurrentMin &&
diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt
index 18c3025a..b3d8cb8b 100644
--- a/Documents/Templates/Brokers List.txt	
+++ b/Documents/Templates/Brokers List.txt	
@@ -23,7 +23,7 @@ XTAM
 -----
 Resolve XUSPY5 XTAM All Stopouts in All Markets ...
 Resolve XUSPY5 XTAM All Critical Guard Attacks in All Markets ...
-Resolve XUSPY5 XTAM All Guard Attacks in AMarkets-Demo ...
+Resolve XUSPY5 XTAM All Guard Attacks in IFCMarkets ...
 
 
 XSI
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 4f22a301..0980aabe 100644
--- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -5727,39 +5727,39 @@ bool XUSPY5XTDHasLongSignal()
                      ((mConditions.isXCHMALCPeak &&
                        mConditions.isXTSCurrentMax &&
                        mConditions.isXTDSignalCrossedOverBear) &&
-                          (
-                              //
-                              mConditions.isXCHMASCOverMax
-                              //
-                              ||
-                              //
-                              (mConditions.isXTSAllSame &&
-                               mConditions.isXAMANeutural &&
-                               mConditions.isXTDBearishVale &&
-                               mConditions.isXTMStartBearish &&
-                               mConditions.isXCHLHMCLCHHSame)
-                              //
-                              )
+                      (
+                          //
+                          mConditions.isXCHMASCOverMax
+                          //
+                          ||
+                          //
+                          (mConditions.isXTSAllSame &&
+                           mConditions.isXAMANeutural &&
+                           mConditions.isXTDBearishVale &&
+                           mConditions.isXTMStartBearish &&
+                           mConditions.isXCHLHMCLCHHSame)
+                          //
+                          )
                       //
-                      ||
-                      //
-                      ((mConditions.isXLHHHSameInLength &&
-                        mConditions.isXLHLLSameInLength) &&
-                       (
-                           //
-                           (mConditions.isXLHPriceInSignalRange &&
-                            (
-                                //
-                                (mConditions.isXTSAllSame &&
-                                 mConditions.isXLHLLIncreased)
-                                //
-                                )
-                            //
-                            )
+                      )
+                     //
+                     ||
+                     //
+                     ((mConditions.isXLHHHSameInLength &&
+                       mConditions.isXLHLLSameInLength) &&
+                      (
+                          //
+                          (mConditions.isXLHPriceInSignalRange &&
+                           (
+                               //
+                               (mConditions.isXTSAllSame &&
+                                mConditions.isXLHLLIncreased)
+                               //
+                               )
                            //
                            )
-                       //
-                       )
+                          //
+                          )
                       //
                       )
                      //
@@ -7923,6 +7923,28 @@ bool XUSPY5XTAMHasLongSignal()
                                    ((mConditions.isXTDBullUnderBear &&
                                      mConditions.isXTDSignalUnderBear) &&
                                     (
+                                        //
+                                        (mConditions.isXCHMASCTrendsUp &&
+                                         (
+                                             //
+                                             ((mConditions.isXCHMALCPeak &&
+                                               mConditions.isXTSCurrentMax &&
+                                               mConditions.isXCHMASCOverMax &&
+                                               mConditions.isXCHLHMCLCHHSame) &&
+                                              (
+                                                  //
+                                                  (mConditions.isXTMBearish &&
+                                                   mConditions.isXAMABearish)
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        ||
                                         //
                                         ((mConditions.isXTSAllSame &&
                                           mConditions.isXCHMALCPeak &&
@@ -9751,15 +9773,33 @@ bool XUSPY5XTAMHasLongSignal()
                                      mConditions.isXCHMAMCFastOverSlow) &&
                                     (
                                         //
-                                        (mConditions.isXTMVale &&
-                                         mConditions.isXCHMASCVale &&
-                                         mConditions.isXCHMALCPeak &&
-                                         mConditions.isXLHLLDecreased &&
-                                         mConditions.isXCHLHSCMCLLSame &&
-                                         mConditions.isXCHMASCTrendsUp &&
-                                         mConditions.isXTDBullUnderBear &&
-                                         mConditions.isXTDSignalUnderBear &&
-                                         mConditions.isXTSCurrentUnderFarest)
+                                        (mConditions.isXCHMASCTrendsUp &&
+                                         (
+                                             //
+                                             ((mConditions.isXCHMALCPeak &&
+                                               mConditions.isXCHLHSCMCLLSame &&
+                                               mConditions.isXTDBullUnderBear &&
+                                               mConditions.isXTDSignalUnderBear &&
+                                               mConditions.isXTSCurrentUnderFarest) &&
+                                              (
+                                                  //
+                                                  (mConditions.isXTMBearish &&
+                                                   mConditions.isXAMABearish &&
+                                                   mConditions.isXTSCurrentUnderMediest)
+                                                  //
+                                                  ||
+                                                  //
+                                                  (mConditions.isXTMVale &&
+                                                   mConditions.isXCHMASCVale &&
+                                                   mConditions.isXLHLLDecreased)
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         )
                                     //
@@ -11215,6 +11255,13 @@ bool XUSPY5XTAMHasShortSignal()
                                    ((mConditions.isXTMBullish &&
                                      mConditions.isXAMABullish) &&
                                     (
+                                        //
+                                        (mConditions.isXCHMALCVale &&
+                                         mConditions.isXCHMASCUnderMin &&
+                                         mConditions.isXTSCurrentOverFarest &&
+                                         mConditions.isXTSCurrentOverMediest)
+                                        //
+                                        ||
                                         //
                                         (mConditions.isXTDBullCrossedOverBear &&
                                          (
@@ -12447,6 +12494,21 @@ bool XUSPY5XTAMHasShortSignal()
                               ((mConditions.isXCHMAMCFastOverSlow ||
                                 mConditions.isXCHMAMCFastCrossedOverSlow) &&
                                (
+                                   //
+                                   (mConditions.isXCHMASCVale &&
+                                    mConditions.isXTSCurrentMin &&
+                                    mConditions.isXCHLHSCMCLLSame &&
+                                    mConditions.isXCHMASCUnderMin &&
+                                    mConditions.isXTMStartBearish &&
+                                    mConditions.isXTDBullUnderBear &&
+                                    mConditions.isXAMAStartBearish &&
+                                    mConditions.isXTDSignalUnderBear &&
+                                    mConditions.isXCHMASCCrossedUnderMin &&
+                                    mConditions.isXLHPriceCrossedUnderSignal &&
+                                    mConditions.isXTSCurrentCrossedUnderNearest &&
+                                    mConditions.isXTSCurrentCrossedUnderMediest)
+                                   //
+                                   ||
                                    //
                                    ((mConditions.isXCHMALCVale &&
                                      mConditions.isXTSCurrentMin &&
diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
index 4f22a301..0980aabe 100644
--- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -5727,39 +5727,39 @@ bool XUSPY5XTDHasLongSignal()
                      ((mConditions.isXCHMALCPeak &&
                        mConditions.isXTSCurrentMax &&
                        mConditions.isXTDSignalCrossedOverBear) &&
-                          (
-                              //
-                              mConditions.isXCHMASCOverMax
-                              //
-                              ||
-                              //
-                              (mConditions.isXTSAllSame &&
-                               mConditions.isXAMANeutural &&
-                               mConditions.isXTDBearishVale &&
-                               mConditions.isXTMStartBearish &&
-                               mConditions.isXCHLHMCLCHHSame)
-                              //
-                              )
+                      (
+                          //
+                          mConditions.isXCHMASCOverMax
+                          //
+                          ||
+                          //
+                          (mConditions.isXTSAllSame &&
+                           mConditions.isXAMANeutural &&
+                           mConditions.isXTDBearishVale &&
+                           mConditions.isXTMStartBearish &&
+                           mConditions.isXCHLHMCLCHHSame)
+                          //
+                          )
                       //
-                      ||
-                      //
-                      ((mConditions.isXLHHHSameInLength &&
-                        mConditions.isXLHLLSameInLength) &&
-                       (
-                           //
-                           (mConditions.isXLHPriceInSignalRange &&
-                            (
-                                //
-                                (mConditions.isXTSAllSame &&
-                                 mConditions.isXLHLLIncreased)
-                                //
-                                )
-                            //
-                            )
+                      )
+                     //
+                     ||
+                     //
+                     ((mConditions.isXLHHHSameInLength &&
+                       mConditions.isXLHLLSameInLength) &&
+                      (
+                          //
+                          (mConditions.isXLHPriceInSignalRange &&
+                           (
+                               //
+                               (mConditions.isXTSAllSame &&
+                                mConditions.isXLHLLIncreased)
+                               //
+                               )
                            //
                            )
-                       //
-                       )
+                          //
+                          )
                       //
                       )
                      //
@@ -7923,6 +7923,28 @@ bool XUSPY5XTAMHasLongSignal()
                                    ((mConditions.isXTDBullUnderBear &&
                                      mConditions.isXTDSignalUnderBear) &&
                                     (
+                                        //
+                                        (mConditions.isXCHMASCTrendsUp &&
+                                         (
+                                             //
+                                             ((mConditions.isXCHMALCPeak &&
+                                               mConditions.isXTSCurrentMax &&
+                                               mConditions.isXCHMASCOverMax &&
+                                               mConditions.isXCHLHMCLCHHSame) &&
+                                              (
+                                                  //
+                                                  (mConditions.isXTMBearish &&
+                                                   mConditions.isXAMABearish)
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        ||
                                         //
                                         ((mConditions.isXTSAllSame &&
                                           mConditions.isXCHMALCPeak &&
@@ -9751,15 +9773,33 @@ bool XUSPY5XTAMHasLongSignal()
                                      mConditions.isXCHMAMCFastOverSlow) &&
                                     (
                                         //
-                                        (mConditions.isXTMVale &&
-                                         mConditions.isXCHMASCVale &&
-                                         mConditions.isXCHMALCPeak &&
-                                         mConditions.isXLHLLDecreased &&
-                                         mConditions.isXCHLHSCMCLLSame &&
-                                         mConditions.isXCHMASCTrendsUp &&
-                                         mConditions.isXTDBullUnderBear &&
-                                         mConditions.isXTDSignalUnderBear &&
-                                         mConditions.isXTSCurrentUnderFarest)
+                                        (mConditions.isXCHMASCTrendsUp &&
+                                         (
+                                             //
+                                             ((mConditions.isXCHMALCPeak &&
+                                               mConditions.isXCHLHSCMCLLSame &&
+                                               mConditions.isXTDBullUnderBear &&
+                                               mConditions.isXTDSignalUnderBear &&
+                                               mConditions.isXTSCurrentUnderFarest) &&
+                                              (
+                                                  //
+                                                  (mConditions.isXTMBearish &&
+                                                   mConditions.isXAMABearish &&
+                                                   mConditions.isXTSCurrentUnderMediest)
+                                                  //
+                                                  ||
+                                                  //
+                                                  (mConditions.isXTMVale &&
+                                                   mConditions.isXCHMASCVale &&
+                                                   mConditions.isXLHLLDecreased)
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         )
                                     //
@@ -11215,6 +11255,13 @@ bool XUSPY5XTAMHasShortSignal()
                                    ((mConditions.isXTMBullish &&
                                      mConditions.isXAMABullish) &&
                                     (
+                                        //
+                                        (mConditions.isXCHMALCVale &&
+                                         mConditions.isXCHMASCUnderMin &&
+                                         mConditions.isXTSCurrentOverFarest &&
+                                         mConditions.isXTSCurrentOverMediest)
+                                        //
+                                        ||
                                         //
                                         (mConditions.isXTDBullCrossedOverBear &&
                                          (
@@ -12447,6 +12494,21 @@ bool XUSPY5XTAMHasShortSignal()
                               ((mConditions.isXCHMAMCFastOverSlow ||
                                 mConditions.isXCHMAMCFastCrossedOverSlow) &&
                                (
+                                   //
+                                   (mConditions.isXCHMASCVale &&
+                                    mConditions.isXTSCurrentMin &&
+                                    mConditions.isXCHLHSCMCLLSame &&
+                                    mConditions.isXCHMASCUnderMin &&
+                                    mConditions.isXTMStartBearish &&
+                                    mConditions.isXTDBullUnderBear &&
+                                    mConditions.isXAMAStartBearish &&
+                                    mConditions.isXTDSignalUnderBear &&
+                                    mConditions.isXCHMASCCrossedUnderMin &&
+                                    mConditions.isXLHPriceCrossedUnderSignal &&
+                                    mConditions.isXTSCurrentCrossedUnderNearest &&
+                                    mConditions.isXTSCurrentCrossedUnderMediest)
+                                   //
+                                   ||
                                    //
                                    ((mConditions.isXCHMALCVale &&
                                      mConditions.isXTSCurrentMin &&