diff --git a/XCAEA/Libraries/xcaea.signaller.lib.mq5 b/XCAEA/Libraries/xcaea.signaller.lib.mq5 index c5ae7a2d..b340b7fa 100644 --- a/XCAEA/Libraries/xcaea.signaller.lib.mq5 +++ b/XCAEA/Libraries/xcaea.signaller.lib.mq5 @@ -1074,9 +1074,14 @@ bool DetectXCAEAConditions( // bool isCond2Bullish = // - false // && + false && // - // conditions.isRSIOS + conditions.isUnderMal && + conditions.isValeIsPivot && + // conditions.swingLowBuffer[cIDX] > conditions.valeBuffer[cIDX] && + conditions.swingLowBuffer[cIDX] < conditions.fiboLevel3Buffer[cIDX] + // + // conditions.isRSIOS // // isVolumeOverAvg && // isVolumeBullish && @@ -1118,7 +1123,7 @@ bool DetectXCAEAConditions( // Print("Cond2"); isCond2Bullish = false; - isCond2Bearish = false; + isCond2Bearish = false; } // @@ -1187,6 +1192,7 @@ bool DetectXCAEAConditions( double sls[]; // + // Preparing SLs ... if (isCond1) { // @@ -1295,6 +1301,27 @@ bool DetectXCAEAConditions( // box.type = "XCASignal"; + // + // Preparing Targets ... + if (isCond1) + { + // + // Add Reward 1 ... + + // + double rewardPrice = 1 * risk; + double rewardTP = + isBullish + ? entry + rewardPrice + : entry - rewardPrice; + + // + Add( + rewardTP, + targets // + ); + } + // Clean(sls); }