Skip to content

Commit 670ceb6

Browse files
iterativviterativv
committed
sell_over_main: rework.
1 parent 68ff42c commit 670ceb6

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

‎NostalgiaForInfinityX.py‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2070,123 +2070,123 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
20702070
if last_candle['close'] > last_candle['ema_200']:
20712071
if (last_candle['ema_vwma_osc_96']):
20722072
if current_profit >= 0.20:
2073-
if (last_candle['rsi_14'] < 30.0) and (last_candle['cmf'] < 0.0):
2073+
if (last_candle['rsi_14'] < 31.0) and (last_candle['cmf'] < 0.0):
20742074
return True, 'sell_profit_o_bull_12_1'
20752075
elif (last_candle['rsi_14'] < 34.0) and (last_candle['cmf'] < -0.4):
20762076
return True, 'sell_profit_o_bull_12_2'
20772077
elif 0.20 > current_profit >= 0.12:
2078-
if (last_candle['rsi_14'] < 32.0) and (last_candle['cmf'] < 0.0):
2078+
if (last_candle['rsi_14'] < 33.0) and (last_candle['cmf'] < 0.0):
20792079
return True, 'sell_profit_o_bull_11_1'
20802080
elif (last_candle['rsi_14'] < 36.0) and (last_candle['cmf'] < -0.4):
20812081
return True, 'sell_profit_o_bull_11_2'
20822082
elif 0.12 > current_profit >= 0.1:
2083-
if (last_candle['rsi_14'] < 40.0) and (last_candle['cmf'] < 0.0):
2083+
if (last_candle['rsi_14'] < 41.0) and (last_candle['cmf'] < 0.0):
20842084
return True, 'sell_profit_o_bull_10_1'
20852085
elif (last_candle['rsi_14'] < 44.0) and (last_candle['cmf'] < -0.4):
20862086
return True, 'sell_profit_o_bull_10_2'
20872087
elif 0.1 > current_profit >= 0.09:
2088-
if (last_candle['rsi_14'] < 44.0) and (last_candle['cmf'] < 0.0):
2088+
if (last_candle['rsi_14'] < 45.0) and (last_candle['cmf'] < 0.0):
20892089
return True, 'sell_profit_o_bull_9_1'
20902090
elif (last_candle['rsi_14'] < 48.0) and (last_candle['cmf'] < -0.4):
20912091
return True, 'sell_profit_o_bull_9_2'
20922092
elif 0.09 > current_profit >= 0.08:
2093-
if (last_candle['rsi_14'] < 46.0) and (last_candle['cmf'] < 0.0):
2093+
if (last_candle['rsi_14'] < 47.0) and (last_candle['cmf'] < 0.0):
20942094
return True, 'sell_profit_o_bull_8_1'
20952095
elif (last_candle['rsi_14'] < 49.0) and (last_candle['cmf'] < -0.4):
20962096
return True, 'sell_profit_o_bull_8_2'
20972097
elif 0.08 > current_profit >= 0.07:
2098-
if (last_candle['rsi_14'] < 44.0) and (last_candle['cmf'] < 0.0):
2098+
if (last_candle['rsi_14'] < 45.0) and (last_candle['cmf'] < 0.0):
20992099
return True, 'sell_profit_o_bull_7_1'
21002100
elif (last_candle['rsi_14'] < 50.0) and (last_candle['cmf'] < -0.4):
21012101
return True, 'sell_profit_o_bull_7_2'
21022102
elif 0.07 > current_profit >= 0.06:
2103-
if (last_candle['rsi_14'] < 42.0) and (last_candle['cmf'] < 0.0):
2103+
if (last_candle['rsi_14'] < 43.0) and (last_candle['cmf'] < 0.0):
21042104
return True, 'sell_profit_o_bull_6_1'
21052105
elif (last_candle['rsi_14'] < 54.0) and (last_candle['cmf'] < -0.4):
21062106
return True, 'sell_profit_o_bull_6_2'
21072107
elif 0.06 > current_profit >= 0.05:
2108-
if (last_candle['rsi_14'] < 40.0) and (last_candle['cmf'] < 0.0):
2108+
if (last_candle['rsi_14'] < 41.0) and (last_candle['cmf'] < 0.0):
21092109
return True, 'sell_profit_o_bull_5_1'
21102110
elif (last_candle['rsi_14'] < 58.0) and (last_candle['cmf'] < -0.4):
21112111
return True, 'sell_profit_o_bull_5_2'
21122112
elif 0.05 > current_profit >= 0.04:
2113-
if (last_candle['rsi_14'] < 38.0) and (last_candle['cmf'] < 0.0):
2113+
if (last_candle['rsi_14'] < 39.0) and (last_candle['cmf'] < 0.0):
21142114
return True, 'sell_profit_o_bull_4_1'
21152115
elif (last_candle['rsi_14'] < 62.0) and (last_candle['cmf'] < -0.4):
21162116
return True, 'sell_profit_o_bull_4_2'
21172117
elif 0.04 > current_profit >= 0.03:
2118-
if (last_candle['rsi_14'] < 36.0) and (last_candle['cmf'] < 0.0):
2118+
if (last_candle['rsi_14'] < 37.0) and (last_candle['cmf'] < 0.0):
21192119
return True, 'sell_profit_o_bull_3_1'
21202120
elif (last_candle['rsi_14'] < 56.0) and (last_candle['cmf'] < -0.4):
21212121
return True, 'sell_profit_o_bull_3_2'
21222122
elif 0.03 > current_profit >= 0.02:
2123-
if (last_candle['rsi_14'] < 33.0) and (last_candle['cmf'] < 0.0):
2123+
if (last_candle['rsi_14'] < 34.0) and (last_candle['cmf'] < 0.0):
21242124
return True, 'sell_profit_o_bull_2_1'
21252125
elif (last_candle['rsi_14'] < 50.0) and (last_candle['cmf'] < -0.4):
21262126
return True, 'sell_profit_o_bull_2_2'
21272127
elif 0.02 > current_profit >= 0.012:
2128-
if (last_candle['rsi_14'] < 32.0) and (last_candle['cmf'] < 0.0):
2128+
if (last_candle['rsi_14'] < 33.0) and (last_candle['cmf'] < 0.0):
21292129
return True, 'sell_profit_o_bull_1_1'
21302130
elif (last_candle['rsi_14'] < 44.0) and (last_candle['cmf'] < -0.4):
21312131
return True, 'sell_profit_o_bull_1_2'
21322132
else:
21332133
if current_profit >= 0.20:
2134-
if (last_candle['rsi_14'] < 31.0) and (last_candle['cmf'] < 0.0):
2134+
if (last_candle['rsi_14'] < 32.0) and (last_candle['cmf'] < 0.0):
21352135
return True, 'sell_profit_o_bear_12_1'
21362136
elif (last_candle['rsi_14'] < 34.0) and (last_candle['cmf'] < -0.4):
21372137
return True, 'sell_profit_o_bear_12_2'
21382138
elif 0.20 > current_profit >= 0.12:
2139-
if (last_candle['rsi_14'] < 33.0) and (last_candle['cmf'] < 0.0):
2139+
if (last_candle['rsi_14'] < 34.0) and (last_candle['cmf'] < 0.0):
21402140
return True, 'sell_profit_o_bear_11_1'
21412141
elif (last_candle['rsi_14'] < 36.0) and (last_candle['cmf'] < -0.4):
21422142
return True, 'sell_profit_o_bear_11_2'
21432143
elif 0.12 > current_profit >= 0.10:
2144-
if (last_candle['rsi_14'] < 41.0) and (last_candle['cmf'] < 0.0):
2144+
if (last_candle['rsi_14'] < 42.0) and (last_candle['cmf'] < 0.0):
21452145
return True, 'sell_profit_o_bear_10_1'
21462146
elif (last_candle['rsi_14'] < 44.0) and (last_candle['cmf'] < -0.4):
21472147
return True, 'sell_profit_o_bear_10_2'
21482148
elif 0.10 > current_profit >= 0.09:
2149-
if (last_candle['rsi_14'] < 45.0) and (last_candle['cmf'] < 0.0):
2149+
if (last_candle['rsi_14'] < 46.0) and (last_candle['cmf'] < 0.0):
21502150
return True, 'sell_profit_o_bear_9_1'
21512151
elif (last_candle['rsi_14'] < 49.0) and (last_candle['cmf'] < -0.4):
21522152
return True, 'sell_profit_o_bear_9_2'
21532153
elif 0.09 > current_profit >= 0.08:
2154-
if (last_candle['rsi_14'] < 47.0) and (last_candle['cmf'] < 0.0):
2154+
if (last_candle['rsi_14'] < 48.0) and (last_candle['cmf'] < 0.0):
21552155
return True, 'sell_profit_o_bear_8_1'
21562156
elif (last_candle['rsi_14'] < 49.0) and (last_candle['cmf'] < -0.4):
21572157
return True, 'sell_profit_o_bear_8_2'
21582158
elif 0.08 > current_profit >= 0.07:
2159-
if (last_candle['rsi_14'] < 45.0) and (last_candle['cmf'] < 0.0):
2159+
if (last_candle['rsi_14'] < 46.0) and (last_candle['cmf'] < 0.0):
21602160
return True, 'sell_profit_o_bear_7_1'
21612161
elif (last_candle['rsi_14'] < 50.0) and (last_candle['cmf'] < -0.4):
21622162
return True, 'sell_profit_o_bear_7_2'
21632163
elif 0.07 > current_profit >= 0.06:
2164-
if (last_candle['rsi_14'] < 43.0) and (last_candle['cmf'] < 0.0):
2164+
if (last_candle['rsi_14'] < 44.0) and (last_candle['cmf'] < 0.0):
21652165
return True, 'sell_profit_o_bear_6_1'
21662166
elif (last_candle['rsi_14'] < 54.0) and (last_candle['cmf'] < -0.4):
21672167
return True, 'sell_profit_o_bear_6_2'
21682168
elif 0.06 > current_profit >= 0.05:
2169-
if (last_candle['rsi_14'] < 41.0) and (last_candle['cmf'] < 0.0):
2169+
if (last_candle['rsi_14'] < 42.0) and (last_candle['cmf'] < 0.0):
21702170
return True, 'sell_profit_o_bear_5_1'
21712171
elif (last_candle['rsi_14'] < 58.0) and (last_candle['cmf'] < -0.4):
21722172
return True, 'sell_profit_o_bear_5_2'
21732173
elif 0.05 > current_profit >= 0.04:
2174-
if (last_candle['rsi_14'] < 39.0) and (last_candle['cmf'] < 0.0):
2174+
if (last_candle['rsi_14'] < 40.0) and (last_candle['cmf'] < 0.0):
21752175
return True, 'sell_profit_o_bear_4_1'
21762176
elif (last_candle['rsi_14'] < 62.0) and (last_candle['cmf'] < -0.4):
21772177
return True, 'sell_profit_o_bear_4_2'
21782178
elif 0.04 > current_profit >= 0.03:
2179-
if (last_candle['rsi_14'] < 37.0) and (last_candle['cmf'] < 0.0):
2179+
if (last_candle['rsi_14'] < 38.0) and (last_candle['cmf'] < 0.0):
21802180
return True, 'sell_profit_o_bear_3_1'
21812181
elif (last_candle['rsi_14'] < 56.0) and (last_candle['cmf'] < -0.4):
21822182
return True, 'sell_profit_o_bear_3_2'
21832183
elif 0.03 > current_profit >= 0.02:
2184-
if (last_candle['rsi_14'] < 34.0) and (last_candle['cmf'] < 0.0):
2184+
if (last_candle['rsi_14'] < 35.0) and (last_candle['cmf'] < 0.0):
21852185
return True, 'sell_profit_o_bear_2_1'
21862186
elif (last_candle['rsi_14'] < 50.0) and (last_candle['cmf'] < -0.4):
21872187
return True, 'sell_profit_o_bear_2_2'
21882188
elif 0.02 > current_profit >= 0.012:
2189-
if (last_candle['rsi_14'] < 33.0) and (last_candle['cmf'] < 0.0):
2189+
if (last_candle['rsi_14'] < 34.0) and (last_candle['cmf'] < 0.0):
21902190
return True, 'sell_profit_o_bear_1_1'
21912191
elif (last_candle['rsi_14'] < 44.0) and (last_candle['cmf'] < -0.4):
21922192
return True, 'sell_profit_o_bear_1_2'

0 commit comments

Comments
 (0)