From 292e946afb8be27d74693bc1ff609998c8e5375a Mon Sep 17 00:00:00 2001
From: Hadi Khazaee Asl <hadi_khazaee_asl@yahoo.com>
Date: Mon, 5 May 2025 00:08:03 +0330
Subject: [PATCH] last ...

---
 XCAEA/Libraries/xcaea.signaller.lib.mq5 | 38 +++++++++++--------------
 XCAEA/Signals/xcaea.signaller.class.mq5 | 10 +++----
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/XCAEA/Libraries/xcaea.signaller.lib.mq5 b/XCAEA/Libraries/xcaea.signaller.lib.mq5
index ba51c5ce..9800e048 100644
--- a/XCAEA/Libraries/xcaea.signaller.lib.mq5
+++ b/XCAEA/Libraries/xcaea.signaller.lib.mq5
@@ -421,6 +421,13 @@ int AddGuard(
     return result;
 }
 
+//
+// Cond 2 ...
+// - a PV Box is Sweep Liquidity;
+// - a Directional FVg Occures Exactly after Liquidity Sweep;
+// - Price Action Go Inside FVG;
+// - SL behind FVG;
+
 //
 bool DetectXCAEAConditions(
     XCXCAEAPOIDrawer *drawer,
@@ -1144,11 +1151,6 @@ bool DetectXCAEAConditions(
             p2Bar //
         );
         Clean(allowedFakeBreakedPivots);
-        if (has)
-        {
-            //
-            Print("Faked Breaked Box Detected ...");
-        }
 
         //
         // Select Boundary Boxes ...
@@ -1168,11 +1170,6 @@ bool DetectXCAEAConditions(
             p2Bar //
         );
         Clean(allowedBoundarydPivots);
-        if (has)
-        {
-            //
-            Print("Boundary Pivots Detected ...");
-        }
     }
 
     //
@@ -1214,17 +1211,7 @@ bool DetectXCAEAConditions(
                    isCond1Bearish;
     if (isCond1)
     {
-        //
         pivotBox = rejectedPivot;
-
-        // //
-        // drawer.DrawBox(
-        //     rejectedPivot,
-        //     TimeCurrent() //
-        // );
-
-        //
-        // Print("Cond1");
     }
 
     //
@@ -1233,14 +1220,20 @@ bool DetectXCAEAConditions(
     //
     bool isCond2Bullish =
         //
-        false
+        upperPivot.IsValid() &&
+        lowerPivot.IsValid() &&
+        fakeBreakedPivot.IsValid() &&
+        fakeBreakedPivot.IsBullish()
         //
         ;
 
     //
     bool isCond2Bearish =
         //
-        false
+        upperPivot.IsValid() &&
+        lowerPivot.IsValid() &&
+        fakeBreakedPivot.IsValid() &&
+        fakeBreakedPivot.IsBearish()
         //
         ;
 
@@ -1249,6 +1242,7 @@ bool DetectXCAEAConditions(
                    isCond2Bearish;
     if (isCond2)
     {
+        Print("Cond2 ...");
     }
 
     //
diff --git a/XCAEA/Signals/xcaea.signaller.class.mq5 b/XCAEA/Signals/xcaea.signaller.class.mq5
index 24876cb5..b90d5886 100644
--- a/XCAEA/Signals/xcaea.signaller.class.mq5
+++ b/XCAEA/Signals/xcaea.signaller.class.mq5
@@ -209,8 +209,8 @@ class XCXCAEASignaller : XCBase
         //
         drawer.DrawPeakPivots(cTime);
         drawer.DrawValePivots(cTime);
-        // drawer.DrawFVGBullishPivots(cTime);
-        // drawer.DrawFVGBearishPivots(cTime);
+        drawer.DrawFVGBullishPivots(cTime);
+        drawer.DrawFVGBearishPivots(cTime);
         // drawer.DrawTrendBullishPivots(cTime);
         // drawer.DrawTrendBearishPivots(cTime);
 
@@ -902,12 +902,12 @@ class XCXCAEASignaller : XCBase
         // FVG ...
 
         //
-        detector.selectSameBarFVGs = true;
+        detector.selectSameBarFVGs = false;
         detector.maxAllowedFVGLifetime = 0;
         detector.validateFVGUsingPV = false;
         detector.applyPVToFVGBoundary = false;
-        detector.selectRejectedFVGPivots = true;
-        detector.selectEngulfedFVGPivots = true;
+        detector.selectRejectedFVGPivots = false;
+        detector.selectEngulfedFVGPivots = false;
         detector.validateFVGUsingManalyser = true;
         detector.applyLastBarToFVGBoundary = false;
         detector.selectOnlyFVGWhichHasIndirectionalLastBar = true;