@@ -2661,22 +2661,32 @@ def sell_under_main(self, current_profit: float, last_candle) -> tuple:
26612661 if current_profit >= 0.20 :
26622662 if last_candle ['rsi_14' ] < 30.0 and (last_candle ['cmf' ] < 0.0 ):
26632663 return True , 'signal_profit_u_bull_12_1'
2664+ elif (last_candle ['rsi_14' ] < 28.0 ):
2665+ return True , 'signal_profit_u_bull_12_9'
26642666 elif 0.20 > current_profit >= 0.12 :
26652667 if last_candle ['rsi_14' ] < 42.0 and (last_candle ['cmf' ] < 0.0 ):
26662668 return True , 'signal_profit_u_bull_11_1'
2669+ elif (last_candle ['rsi_14' ] < 43.0 ):
2670+ return True , 'signal_profit_u_bull_11_9'
26672671 elif 0.12 > current_profit >= 0.10 :
26682672 if last_candle ['rsi_14' ] < 46.0 and (last_candle ['cmf' ] < 0.0 ):
26692673 return True , 'signal_profit_u_bull_10_1'
2674+ elif (last_candle ['rsi_14' ] < 49.0 ):
2675+ return True , 'signal_profit_u_bull_10_9'
26702676 elif 0.10 > current_profit >= 0.09 :
26712677 if last_candle ['rsi_14' ] < 50.0 and (last_candle ['cmf' ] < 0.0 ):
26722678 return True , 'signal_profit_u_bull_9_1'
2679+ elif (last_candle ['rsi_14' ] < 50.0 ):
2680+ return True , 'signal_profit_u_bull_9_9'
26732681 elif 0.09 > current_profit >= 0.08 :
26742682 if last_candle ['rsi_14' ] < 57.0 and (last_candle ['cmf' ] < 0.0 ):
26752683 return True , 'signal_profit_u_bull_8_1'
26762684 elif (last_candle ['rsi_14' ] < 58.0 ) and (last_candle ['cmf' ] < - 0.4 ):
26772685 return True , 'signal_profit_u_bull_8_3'
26782686 elif (last_candle ['rsi_14' ] < 58.0 ) and (last_candle ['r_14' ] == 0.0 ):
26792687 return True , 'signal_profit_u_bull_8_4'
2688+ elif (last_candle ['rsi_14' ] < 49.0 ):
2689+ return True , 'signal_profit_u_bull_8_9'
26802690 elif 0.08 > current_profit >= 0.07 :
26812691 if last_candle ['rsi_14' ] < 52.0 and (last_candle ['cmf' ] < 0.0 ):
26822692 return True , 'signal_profit_u_bull_7_1'
@@ -2686,6 +2696,8 @@ def sell_under_main(self, current_profit: float, last_candle) -> tuple:
26862696 return True , 'signal_profit_u_bull_7_3'
26872697 elif (last_candle ['rsi_14' ] < 55.0 ) and (last_candle ['r_14' ] == 0.0 ):
26882698 return True , 'signal_profit_u_bull_7_4'
2699+ elif (last_candle ['rsi_14' ] < 46.0 ):
2700+ return True , 'signal_profit_u_bull_7_9'
26892701 elif 0.07 > current_profit >= 0.06 :
26902702 if last_candle ['rsi_14' ] < 50.0 and (last_candle ['cmf' ] < 0.0 ):
26912703 return True , 'signal_profit_u_bull_6_1'
@@ -2697,6 +2709,8 @@ def sell_under_main(self, current_profit: float, last_candle) -> tuple:
26972709 return True , 'signal_profit_u_bull_6_4'
26982710 elif (last_candle ['cti' ] > 0.95 ):
26992711 return True , 'signal_profit_u_bull_6_5'
2712+ elif (last_candle ['rsi_14' ] < 43.0 ):
2713+ return True , 'signal_profit_u_bull_6_9'
27002714 elif 0.06 > current_profit >= 0.05 :
27012715 if last_candle ['rsi_14' ] < 48.0 and (last_candle ['cmf' ] < 0.0 ):
27022716 return True , 'signal_profit_u_bull_5_1'
@@ -2710,6 +2724,8 @@ def sell_under_main(self, current_profit: float, last_candle) -> tuple:
27102724 return True , 'signal_profit_u_bull_5_5'
27112725 elif (last_candle ['rsi_14' ] < 51.0 ) and (last_candle ['sma_200_dec_20_1h' ]) and (last_candle ['cmf' ] < 0.0 ):
27122726 return True , 'signal_profit_u_bull_5_6'
2727+ elif (last_candle ['rsi_14' ] < 42.0 ):
2728+ return True , 'signal_profit_u_bull_5_9'
27132729 elif 0.05 > current_profit >= 0.04 :
27142730 if last_candle ['rsi_14' ] < 47.0 and (last_candle ['cmf' ] < 0.0 ):
27152731 return True , 'signal_profit_u_bull_4_1'
@@ -2721,6 +2737,8 @@ def sell_under_main(self, current_profit: float, last_candle) -> tuple:
27212737 return True , 'signal_profit_u_bull_4_5'
27222738 elif (last_candle ['rsi_14' ] < 50.0 ) and (last_candle ['sma_200_dec_20_1h' ]) and (last_candle ['cmf' ] < 0.0 ):
27232739 return True , 'signal_profit_u_bull_4_6'
2740+ elif (last_candle ['rsi_14' ] < 41.0 ):
2741+ return True , 'signal_profit_u_bull_4_9'
27242742 elif 0.04 > current_profit >= 0.03 :
27252743 if last_candle ['rsi_14' ] < 46.0 and (last_candle ['cmf' ] < 0.0 ):
27262744 return True , 'signal_profit_u_bull_3_1'
@@ -2732,6 +2750,8 @@ def sell_under_main(self, current_profit: float, last_candle) -> tuple:
27322750 return True , 'signal_profit_u_bull_3_5'
27332751 elif (last_candle ['rsi_14' ] < 49.0 ) and (last_candle ['sma_200_dec_20_1h' ]) and (last_candle ['cmf' ] < 0.0 ):
27342752 return True , 'signal_profit_u_bull_3_6'
2753+ elif (last_candle ['rsi_14' ] < 36.0 ):
2754+ return True , 'signal_profit_u_bull_3_9'
27352755 elif 0.03 > current_profit >= 0.02 :
27362756 if last_candle ['rsi_14' ] < 45.0 and (last_candle ['cmf' ] < 0.0 ):
27372757 return True , 'signal_profit_u_bull_2_1'
@@ -2747,6 +2767,8 @@ def sell_under_main(self, current_profit: float, last_candle) -> tuple:
27472767 return True , 'signal_profit_u_bull_2_7'
27482768 elif last_candle ['rsi_14' ] < 41.0 and (last_candle ['cmf' ] < - 0.25 ):
27492769 return True , 'signal_profit_u_bull_2_8'
2770+ elif (last_candle ['rsi_14' ] < 35.0 ):
2771+ return True , 'signal_profit_u_bull_2_9'
27502772 elif 0.02 > current_profit >= 0.01 :
27512773 if (last_candle ['rsi_14' ] < 37.0 ) and (last_candle ['cmf' ] < 0.0 ):
27522774 return True , 'signal_profit_u_bull_1_1'
@@ -2762,6 +2784,8 @@ def sell_under_main(self, current_profit: float, last_candle) -> tuple:
27622784 return True , 'signal_profit_u_bull_1_7'
27632785 elif last_candle ['rsi_14' ] < 40.0 and (last_candle ['cmf' ] < - 0.25 ):
27642786 return True , 'signal_profit_u_bull_1_8'
2787+ elif (last_candle ['rsi_14' ] < 33.0 ):
2788+ return True , 'signal_profit_u_bull_1_9'
27652789 else :
27662790 if current_profit >= 0.20 :
27672791 if last_candle ['rsi_14' ] < 30.0 :
@@ -2855,6 +2879,9 @@ def sell_under_main(self, current_profit: float, last_candle) -> tuple:
28552879 return True , 'signal_profit_u_bull_1_6'
28562880 elif (last_candle ['rsi_14' ] < 44.0 ) and (last_candle ['cmf_1h' ] < - 0.05 ) and (last_candle ['cti_1h' ] > 0.85 ):
28572881 return True , 'signal_profit_u_bear_1_7'
2882+ elif (last_candle ['rsi_14' ] < 34.0 ):
2883+ return True , 'signal_profit_u_bear_1_9'
2884+
28582885 return False , None
28592886
28602887 def sell_pump_main (self , current_profit : float , last_candle ) -> tuple :
0 commit comments