last ...

Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5

@@ -7165,6 +7165,13 @@ bool XAU5XTSFIHasShortSignal()
                             mConditions.isXAMABearish &&
                             mConditions.isXTSCurrentOverMediest) &&
                            (
+                               //
+                               (mConditions.isXTDBullUnderBear &&
+                                mConditions.isXCHMAMCTrendsDown &&
+                                mConditions.isXTDSignalUnderBear &&
+                                mConditions.isXCHMAMCFastUnderSlow)
+                               //
+                               ||
                                //
                                (mConditions.isXCHMALCVale &&
                                 mConditions.isXCHLHMCLCLLSame &&
@@ -7173,6 +7180,14 @@ bool XAU5XTSFIHasShortSignal()
                                //
                                ||
                                //
+                               (mConditions.isXCHMAMCVale &&
+                                !mConditions.isXCHMAMCTrendsUp &&
+                                !mConditions.isXCHMAMCTrendsDown &&
+                                mConditions.isXTDBullUnderBear &&
+                                mConditions.isXTDSignalUnderBear)
+                               //
+                               ||
+                               //
                                ((mConditions.isXCHMALCVale &&
                                  mConditions.isXTDBullishVale &&
                                  mConditions.isXTDSignalUnderBear) &&
@@ -7391,6 +7406,13 @@ bool XAU5XTSFIHasShortSignal()
                           ((mConditions.isXCHMALCFastOverSlow ||
                             mConditions.isXCHMALCFastCrossedOverSlow) &&
                            (
+                               //
+                               (mConditions.isXAMAVale &&
+                                mConditions.isXCHMAMCVale &&
+                                mConditions.isXCHLHSCMCLLSame &&
+                                mConditions.isXTSCurrentOverMediest)
+                               //
+                               ||
                                //
                                (mConditions.isXTMNeutural &&
                                 mConditions.isXAMANeutural &&
@@ -7629,7 +7651,32 @@ bool XAU5XTSFIHasShortSignal()
                        !mConditions.isXLHHHSameInLength) &&
                       //
                       (
-                          false)
+                          //
+                          // Check if SC Fast Over Slow ...
+                          ((mConditions.isXCHMASCFastOverSlow ||
+                            mConditions.isXCHMASCFastCrossedOverSlow) &&
+                           (
+                               //
+                               ((mConditions.isXTMNeutural &&
+                                 mConditions.isXAMANeutural) &&
+                                (
+                                    //
+                                    (mConditions.isXCHMALCVale &&
+                                     mConditions.isXCHLHSCMCHHSame &&
+                                     mConditions.isXCHLHMCLCLLSame &&
+                                     mConditions.isXTDBullUnderBear &&
+                                     mConditions.isXTDSignalUnderBear &&
+                                     mConditions.isXTSCurrentOverMediest)
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               )
+                           //
+                           )
+                          //
+                          )
                       //
                       )
                      //
@@ -9554,6 +9601,23 @@ bool XAU5XCHMACCHasShortSignal()
                                //
                                ||
                                //
+                               ((mConditions.isXCHMAMCVale &&
+                                 !mConditions.isXCHMAMCTrendsUp &&
+                                 !mConditions.isXCHMAMCTrendsDown) &&
+                                (
+                                    //
+                                    (mConditions.isXTMBearish &&
+                                     mConditions.isXAMABearish &&
+                                     mConditions.isXTDBullUnderBear &&
+                                     mConditions.isXTDSignalUnderBear &&
+                                     mConditions.isXTSCurrentOverMediest)
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               ||
+                               //
                                (mConditions.isXTSCurrentMin &&
                                 mConditions.isXTMStartBearish &&
                                 mConditions.isXCHLHSCMCLLSame &&
@@ -10555,6 +10619,16 @@ bool XAU5XCHMAMNHasLongSignal()
                                 mConditions.isXTSCurrentCrossedOverNearest &&
                                 mConditions.isXTSCurrentCrossedOverMediest)
                                //
+                               ||
+                               //
+                               (mConditions.isXTSCurrentMax &&
+                                mConditions.isXLHLLIncreased &&
+                                mConditions.isXTMStartBullish &&
+                                mConditions.isXAMAStartBullish &&
+                                mConditions.isXTDBullUnderBear &&
+                                mConditions.isXTDSignalUnderBear &&
+                                mConditions.isXTSCurrentCrossedOverFarest)
+                               //
                                )
                            //
                            )