last ...

X121SMCEA/Signals/x-121.smc.xtwpv.signal.lib.mq5

@@ -398,13 +398,12 @@ bool DetectX121SMCXTWPVSiganlSetup(
     ENUM_X_DIRECTION forDir;
     XFVGOrderBlock bullishOrderBlocks[];
     XFVGOrderBlock bearishOrderBlocks[];
-    bool isTested = TestPOIState(
+    bool isTested = DetectFVGOB(
         forDir,
         bullishOrderBlocks,
         bearishOrderBlocks,
         consolidationState,
-        analyseState,
-        decisionState //
+        analyseState //
     );
 
     //
@@ -671,6 +670,10 @@ bool DetectX121SMCXTWPVSiganlTrigger(
     double decisionVale = decisionConditions.x121Conditions.valesBuffer[1];
     double isNewDecisionVale = decisionConditions.x121Conditions.isNewVale;
 
+    //
+    bool isTriggerRSICrossedOverOverSold = triggerConditions.x121Conditions.isRSICrossedOverOverSold;
+    bool isTriggerRSICrossedUnderOverBought = triggerConditions.x121Conditions.isRSICrossedUnderOverBought;
+
     //
     bool isDecisionRSICrossedOverOverSold = decisionConditions.x121Conditions.isRSICrossedOverOverSold;
     bool isDecisionRSICrossedUnderOverBought = decisionConditions.x121Conditions.isRSICrossedUnderOverBought;
@@ -716,8 +719,10 @@ bool DetectX121SMCXTWPVSiganlTrigger(
         isBullish &&
         cBar.IsBullish() &&
         decisionVale < fvgOBUpper &&
-        decisionVale > fvgOBLower &&
-        isDecisionRSICrossedOverOverSold;
+        decisionVale > fvgOBLower
+        //  &&
+        // isTriggerRSICrossedOverOverSold
+        ;
 
     //
     // Detect Bearish Conditions ...
@@ -725,8 +730,10 @@ bool DetectX121SMCXTWPVSiganlTrigger(
         isBearish &&
         cBar.IsBearish() &&
         decisionPeak < fvgOBUpper &&
-        decisionPeak > fvgOBLower &&
-        isDecisionRSICrossedUnderOverBought;
+        decisionPeak > fvgOBLower
+        // &&
+        // isTriggerRSICrossedUnderOverBought
+        ;
 
     //
     result = isBullish ||
@@ -893,7 +900,8 @@ bool DetectX121SMCXTWPVSiganlTrigger(
 //
 int AddX121SMCXTWPVConditionsIfNotExists(
     X121SMCStrategyXTWPVSignalConditions &item,
-    X121SMCStrategyXTWPVSignalConditions &items[] //
+    X121SMCStrategyXTWPVSignalConditions &items[],
+    int maxAllowed = 10 //
 )
 {
     //
@@ -946,6 +954,10 @@ int AddX121SMCXTWPVConditionsIfNotExists(
 
         //
         // Remove Olds ...
+        CleanupArray(
+            items,
+            maxAllowed //
+        );
 
         //
         result = ArraySize(items);