@@ -3364,6 +3364,46 @@ def sell_r_5(self, current_profit: float, last_candle) -> tuple:
33643364
33653365 return False , None
33663366
3367+ def sell_r_6 (self , current_profit : float , last_candle ) -> tuple :
3368+ if (0.02 > current_profit >= 0.012 ):
3369+ if (last_candle ['r_14' ] > - 0.1 ) and (last_candle ['rsi_14' ] > 75.0 ) and (last_candle ['cti' ] > 0.8 ) and (last_candle ['cci' ] > 200.0 ):
3370+ return True , 'signal_profit_w_6_1'
3371+ elif (0.03 > current_profit >= 0.02 ):
3372+ if (last_candle ['r_14' ] > - 0.2 ) and (last_candle ['rsi_14' ] > 75.0 ) and (last_candle ['cti' ] > 0.8 ) and (last_candle ['cci' ] > 200.0 ):
3373+ return True , 'signal_profit_w_6_2'
3374+ elif (0.04 > current_profit >= 0.03 ):
3375+ if (last_candle ['r_14' ] > - 0.3 ) and (last_candle ['rsi_14' ] > 75.0 ) and (last_candle ['cti' ] > 0.8 ) and (last_candle ['cci' ] > 200.0 ):
3376+ return True , 'signal_profit_w_6_3'
3377+ elif (0.05 > current_profit >= 0.04 ):
3378+ if (last_candle ['r_14' ] > - 0.4 ) and (last_candle ['rsi_14' ] > 75.0 ) and (last_candle ['cti' ] > 0.8 ) and (last_candle ['cci' ] > 200.0 ):
3379+ return True , 'signal_profit_w_6_4'
3380+ elif (0.06 > current_profit >= 0.05 ):
3381+ if (last_candle ['r_14' ] > - 0.5 ) and (last_candle ['rsi_14' ] > 75.0 ) and (last_candle ['cti' ] > 0.8 ) and (last_candle ['cci' ] > 200.0 ):
3382+ return True , 'signal_profit_w_6_5'
3383+ elif (0.07 > current_profit >= 0.06 ):
3384+ if (last_candle ['r_14' ] > - 0.6 ) and (last_candle ['rsi_14' ] > 75.0 ) and (last_candle ['cti' ] > 0.8 ) and (last_candle ['cci' ] > 200.0 ):
3385+ return True , 'signal_profit_w_6_6'
3386+ elif (0.08 > current_profit >= 0.07 ):
3387+ if (last_candle ['r_14' ] > - 1.0 ) and (last_candle ['rsi_14' ] > 75.0 ) and (last_candle ['cti' ] > 0.8 ) and (last_candle ['cci' ] > 200.0 ):
3388+ return True , 'signal_profit_w_6_7'
3389+ elif (0.09 > current_profit >= 0.08 ):
3390+ if (last_candle ['r_14' ] > - 1.5 ) and (last_candle ['rsi_14' ] > 75.0 ) and (last_candle ['cti' ] > 0.8 ) and (last_candle ['cci' ] > 200.0 ):
3391+ return True , 'signal_profit_w_6_8'
3392+ elif (0.1 > current_profit >= 0.09 ):
3393+ if (last_candle ['r_14' ] > - 1.0 ) and (last_candle ['rsi_14' ] > 75.0 ) and (last_candle ['cti' ] > 0.8 ) and (last_candle ['cci' ] > 200.0 ):
3394+ return True , 'signal_profit_w_6_9'
3395+ elif (0.12 > current_profit >= 0.1 ):
3396+ if (last_candle ['r_14' ] > - 0.75 ) and (last_candle ['rsi_14' ] > 75.0 ) and (last_candle ['cti' ] > 0.8 ) and (last_candle ['cci' ] > 200.0 ):
3397+ return True , 'signal_profit_w_6_10'
3398+ elif (0.2 > current_profit >= 0.12 ):
3399+ if (last_candle ['r_14' ] > - 0.5 ) and (last_candle ['rsi_14' ] > 75.0 ) and (last_candle ['cti' ] > 0.8 ) and (last_candle ['cci' ] > 200.0 ):
3400+ return True , 'signal_profit_w_6_11'
3401+ elif (current_profit >= 0.2 ):
3402+ if (last_candle ['r_14' ] > - 0.1 ) and (last_candle ['rsi_14' ] > 75.0 ) and (last_candle ['cti' ] > 0.8 ) and (last_candle ['cci' ] > 200.0 ):
3403+ return True , 'signal_profit_w_6_12'
3404+
3405+ return False , None
3406+
33673407 def mark_profit_target (self , pair : str , trade : "Trade" , current_time : "datetime" , current_rate : float , current_profit : float , last_candle , previous_candle_1 ) -> tuple :
33683408 # if self.profit_target_1_enable:
33693409 # if (current_profit > 0) and (last_candle['zlema_4_lowKF'] > last_candle['lowKF']) and (previous_candle_1['zlema_4_lowKF'] < previous_candle_1['lowKF']) and (last_candle['cci'] > -100) and (last_candle['hrsi'] > 70):
@@ -3691,6 +3731,11 @@ def custom_sell(self, pair: str, trade: 'Trade', current_time: 'datetime', curre
36913731 if sell and (signal_name is not None ):
36923732 return f"{ signal_name } ( { buy_tag } )"
36933733
3734+ # Williams %R based sell 6, plus RSI, CTI, CCI
3735+ sell , signal_name = self .sell_r_6 (current_profit , last_candle )
3736+ if sell and (signal_name is not None ):
3737+ return f"{ signal_name } ( { buy_tag } )"
3738+
36943739 # Pivot points based sells
36953740 sell , signal_name = self .sell_pivot (current_profit , max_profit , max_loss , last_candle , previous_candle_1 , trade , current_time )
36963741 if sell and (signal_name is not None ):
0 commit comments