Skip to content

Commit e5ef3f0

Browse files
committed
sell_over_main: rework.
1 parent 7310347 commit e5ef3f0

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

NostalgiaForInfinityNext.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2146,6 +2146,8 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
21462146
return True, 'signal_profit_o_bull_2_5'
21472147
elif (last_candle['rsi_14'] < 42.0) and (last_candle['sma_200_dec_20_1h']) and (last_candle['cmf'] < 0.0):
21482148
return True, 'signal_profit_o_bull_2_6'
2149+
elif (last_candle['rsi_14'] < 42.0) and (last_candle['cmf_1h'] < -0.05) and (last_candle['cti_1h'] > 0.85):
2150+
return True, 'signal_profit_o_bull_2_7'
21492151
elif 0.02 > current_profit >= 0.012:
21502152
if (last_candle['rsi_14'] < 34.0) and (last_candle['cmf'] < 0.0):
21512153
return True, 'signal_profit_o_bull_1_1'
@@ -2157,6 +2159,8 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
21572159
return True, 'signal_profit_o_bull_1_5'
21582160
elif (last_candle['rsi_14'] < 41.0) and (last_candle['sma_200_dec_20_1h']) and (last_candle['cmf'] < 0.0):
21592161
return True, 'signal_profit_o_bull_1_6'
2162+
elif (last_candle['rsi_14'] < 41.0) and (last_candle['cmf_1h'] < -0.05) and (last_candle['cti_1h'] > 0.85):
2163+
return True, 'signal_profit_o_bull_1_7'
21602164
else:
21612165
if current_profit >= 0.20:
21622166
if last_candle['rsi_14'] < 30.0 and (last_candle['cmf'] < 0.0):
@@ -2245,6 +2249,8 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
22452249
return True, 'signal_profit_o_bear_2_5'
22462250
elif (last_candle['rsi_14'] < 43.0) and (last_candle['sma_200_dec_20_1h']) and (last_candle['cmf'] < 0.0):
22472251
return True, 'signal_profit_o_bear_2_6'
2252+
elif (last_candle['rsi_14'] < 43.0) and (last_candle['cmf_1h'] < -0.05) and (last_candle['cti_1h'] > 0.85):
2253+
return True, 'signal_profit_o_bear_2_7'
22482254
elif 0.02 > current_profit >= 0.012:
22492255
if (last_candle['rsi_14'] < 35.0) and (last_candle['cmf'] < 0.0):
22502256
return True, 'signal_profit_o_bear_1_1'
@@ -2256,6 +2262,8 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
22562262
return True, 'signal_profit_o_bear_1_5'
22572263
elif (last_candle['rsi_14'] < 43.0) and (last_candle['sma_200_dec_20_1h']) and (last_candle['cmf'] < 0.0):
22582264
return True, 'signal_profit_o_bear_1_6'
2265+
elif (last_candle['rsi_14'] < 43.0) and (last_candle['cmf_1h'] < -0.05) and (last_candle['cti_1h'] > 0.85):
2266+
return True, 'signal_profit_o_bear_1_7'
22592267

22602268
return False, None
22612269

0 commit comments

Comments
 (0)