last ...

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

@@ -1147,6 +1147,7 @@ bool DetectX121SMCXTWPVSiganlSetup(
         // false &&
         hasBullishTrend &&
         isBullishFiboPassed &&
+        hasConsolidationZone &&
         analyseCBar.IsBullish() &&
         isNewAnalysePeakOverLast &&
         conditions.pivot.upper < analysePeak &&
@@ -1168,6 +1169,7 @@ bool DetectX121SMCXTWPVSiganlSetup(
         // false &&
         hasBearishTrend &&
         isBearishFiboPassed &&
+        hasConsolidationZone &&
         analyseCBar.IsBearish() &&
         isNewAnalyseValeUnderLast &&
         conditions.pivot.lower > analyseVale &&

X121SMCEA/Strategy/x-121.smc.strategy.class.mq5

@@ -123,6 +123,9 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
         string symbol = GetSymbol();
         ENUM_TIMEFRAMES period = GetPeriod();
 
+        //
+        datetime cTime = TimeCurrent();
+
         //
         // Required Value For SL/TP Calculations ...
         double points = GetPoints(symbol);
@@ -130,14 +133,9 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
         double pip2 = 2 * pip;
 
         //
-        // Retrieve and Fill Cycle Conditions ...
-        result = GetCyclesConditions(conditions);
-        if (!result)
-        {
-            //
-            conditions.Clean();
-            return result;
-        }
+        conditions.time = cTime;
+        conditions.symbol = symbol;
+        conditions.period = period;
 
         //
         // Check Spread for Signalling Conditions ...
@@ -327,42 +325,6 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
     //
     // Actions ...
 
-    /**
-     * Retrieve Cycles Conditions ...
-     *
-     * @param  conditions: X121SMCStrategyConditions instance Reference ...
-     *
-     * @return ( bool )
-     */
-    bool GetCyclesConditions(
-        X121SMCStrategyConditions &conditions //
-    )
-    {
-        //
-        bool result = false;
-
-        //
-        string symbol = GetSymbol();
-        ENUM_TIMEFRAMES period = GetPeriod();
-
-        //
-        int zIndex = 0;
-        int cIndex = zIndex + 1;
-        int pIndex = cIndex + 1;
-        int ppIndex = pIndex + 1;
-
-        //
-        datetime cTime = TimeCurrent();
-
-        //
-        conditions.time = cTime;
-        conditions.symbol = symbol;
-        conditions.period = period;
-
-        //
-        return result;
-    }
-
     //
     // Signalling Functions ...