last ...

X121SMCEA/Signals/x-121.smc.xwz.signal.class.mq5

@@ -35,6 +35,7 @@ class XCX121SMCXWZSignalDetector : public XCBase
     //
     // Props ...
     bool useGuards;
+    double rfRewar;
     bool useQuarterTargets;
     X121SMCStrategyXWZWorkingZone workingZone;
     X121SMCStrategyXWZSignalConditions mConditions;
@@ -213,6 +214,22 @@ class XCX121SMCXWZSignalDetector : public XCBase
             hasWorkingZoneOveralDirection = workingZone
                                                 .DetectOveralDirection(wzOveralDir);
 
+            //
+            // Detectiong Signal Boxes ...
+            hasWaitingBoxes = workingZone
+                                  .DetectSignalBoxes(
+                                      X_CYCLE_ANALYSE,
+                                      provider,
+                                      zIndex //
+                                  );
+            if (hasWaitingBoxes)
+            {
+                //
+                workingZone
+                    .ValidateWaitingBoxes(zIndex);
+                hasWaitingBoxes = workingZone.HasWaitingBoxes();
+            }
+
             //
             // Checking Working Zone Destory or not ...
             bool isWorkingZoneDestroyed = workingZone.IsDestroyed(
@@ -517,20 +534,21 @@ class XCX121SMCXWZSignalDetector : public XCBase
             }
 
             //
-            double reward2 = 2 * risk;
-            double reward3 = 3 * risk;
-            double iTP2 = isBullish
-                              ? entry + reward2
-                              : entry - reward2;
-            double iTP3 = isBullish
-                              ? entry + reward3
-                              : entry - reward3;
+            // Reward to RF ...
+            if (rfRewar > 0)
+            {
+                //
+                double iRFReward = rfRewar * risk;
+                double iRFTP = isBullish
+                                   ? entry + iRFReward
+                                   : entry - iRFReward;
 
-            //
-            Add(
-                iTP3,
-                targets //
-            );
+                //
+                Add(
+                    iRFTP,
+                    targets //
+                );
+            }
 
             //
             // Based On Priority ...
@@ -1667,8 +1685,9 @@ class XCX121SMCXWZSignalDetector : public XCBase
     void Init()
     {
         //
-        useGuards = true;
-        useQuarterTargets = true;
+        rfRewar = 2;
+        useGuards = false;
+        useQuarterTargets = false;
     }
 
     /**