last ...

XCAEA/Signals/xcaea.signaller.class.mq5

@@ -139,8 +139,8 @@ class XCXCAEASignaller : XCBase
         inputs.caInputs.showPeaksAndVales = true;
 
         //
-        inputs.caInputs.showKI = false;
-        inputs.caInputs.showTKI = false;
+        inputs.caInputs.showKI = true;
+        inputs.caInputs.showTKI = true;
         inputs.caInputs.showVidya = true;
         inputs.caInputs.showTrend = true;
         inputs.caInputs.showPeakAndValeGolden = false;
@@ -159,7 +159,7 @@ class XCXCAEASignaller : XCBase
 
         //
         // Oscillators Views ...
-        inputs.showRSI = false;
+        inputs.showRSI = true;
         inputs.showCCI = false;
         inputs.showMFI = false;
         inputs.showRVI = false;
@@ -602,29 +602,42 @@ class XCXCAEASignaller : XCBase
         // Checking Trigger Conditions ...
         double sl = 0;
         double tp = 0;
-        ENUM_X_DIRECTION triggerDir;
+        ENUM_X_DIRECTION triggerDir = X_DIRECTION_NONE;
+
+        //
+        // Checking Trigger Cond 0 ...
+        bool canTriggerCond0 = CanTriggerCond0(
+            helper,
+            conditions.decisionZone,
+            triggerDir,
+            sl,
+            tp,
+            barIndex //
+        );
 
         //
         // Checking Trigger Cond 1 ...
-        bool canTriggerCond1 = CanTriggerCond1(
-            helper,
-            conditions.decisionZone,
-            triggerDir,
-            sl,
-            tp,
-            barIndex //
-        );
+        bool canTriggerCond1 = false;
+        // CanTriggerCond1(
+        //     helper,
+        //     conditions.decisionZone,
+        //     triggerDir,
+        //     sl,
+        //     tp,
+        //     barIndex //
+        // );
 
         //
         // Checking Trigger Cond 2 ...
-        bool canTriggerCond2 = CanTriggerCond2(
-            helper,
-            conditions.decisionZone,
-            triggerDir,
-            sl,
-            tp,
-            barIndex //
-        );
+        bool canTriggerCond2 = false; 
+        // CanTriggerCond2(
+        //     helper,
+        //     conditions.decisionZone,
+        //     triggerDir,
+        //     sl,
+        //     tp,
+        //     barIndex //
+        // );
 
         //
         // Update Signal Box To ...
@@ -645,6 +658,7 @@ class XCXCAEASignaller : XCBase
         //
         // Summarizing Result ...
         result =
+            canTriggerCond0 ||
             canTriggerCond1 ||
             canTriggerCond2;
 
@@ -655,6 +669,7 @@ class XCXCAEASignaller : XCBase
                     IsBearish(triggerDir);
 
         //
+        // Configure Conditions for Preparing Signal ...
         if (result)
         {
             //
@@ -697,6 +712,22 @@ class XCXCAEASignaller : XCBase
                 conditions.targets //
             );
 
+            //
+            rfReward = risk * 2.85;
+            rfPrice =
+                isBullish
+                    ? entry + rfReward
+                    : entry - rfReward;
+            Add(
+                rfPrice,
+                conditions.targets //
+            );
+
+            //
+            // Handling Partial Close ...
+            conditions.partialCloseOnTPLevel = 1;
+            conditions.partialCloseMultiplier = 0.5;
+
             //
             conditions.sl = sl;
             conditions.tp = tp;