Skip to content

Commit 155fb6c

Browse files
committed
sell_over_main: rework.
1 parent 19bb2b7 commit 155fb6c

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

NostalgiaForInfinityX.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class NostalgiaForInfinityX(IStrategy):
107107
INTERFACE_VERSION = 2
108108

109109
def version(self) -> str:
110-
return "v10.8.40"
110+
return "v10.8.41"
111111

112112
# ROI table:
113113
minimal_roi = {
@@ -2306,7 +2306,7 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
23062306
return True, 'sell_profit_o_bull_12_2'
23072307
elif (last_candle['rsi_14'] < 43.0) and (last_candle['cmf'] < -0.0) and (last_candle['cmf_15m'] < -0.0) and (last_candle['cmf_1h'] < -0.0):
23082308
return True, 'sell_profit_o_bull_12_3'
2309-
elif (last_candle['rsi_14'] < 40.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
2309+
elif (last_candle['rsi_14'] < 41.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
23102310
return True, 'sell_profit_o_bull_12_4'
23112311
elif (last_candle['rsi_14'] < 44.0) and (last_candle['cmf'] < -0.1) and (last_candle['cmf_15m'] < -0.1) and (last_candle['cmf_1h'] < -0.1):
23122312
return True, 'sell_profit_o_bull_12_5'
@@ -2319,7 +2319,7 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
23192319
return True, 'sell_profit_o_bull_11_2'
23202320
elif (last_candle['rsi_14'] < 45.0) and (last_candle['cmf'] < -0.0) and (last_candle['cmf_15m'] < -0.0) and (last_candle['cmf_1h'] < -0.0):
23212321
return True, 'sell_profit_o_bull_11_3'
2322-
elif (last_candle['rsi_14'] < 42.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
2322+
elif (last_candle['rsi_14'] < 43.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
23232323
return True, 'sell_profit_o_bull_11_4'
23242324
elif (last_candle['rsi_14'] < 46.0) and (last_candle['cmf'] < -0.1) and (last_candle['cmf_15m'] < -0.1) and (last_candle['cmf_1h'] < -0.1):
23252325
return True, 'sell_profit_o_bull_11_5'
@@ -2332,7 +2332,7 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
23322332
return True, 'sell_profit_o_bull_10_2'
23332333
elif (last_candle['rsi_14'] < 47.0) and (last_candle['cmf'] < -0.0) and (last_candle['cmf_15m'] < -0.0) and (last_candle['cmf_1h'] < -0.0):
23342334
return True, 'sell_profit_o_bull_10_3'
2335-
elif (last_candle['rsi_14'] < 44.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
2335+
elif (last_candle['rsi_14'] < 45.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
23362336
return True, 'sell_profit_o_bull_10_4'
23372337
elif (last_candle['rsi_14'] < 48.0) and (last_candle['cmf'] < -0.1) and (last_candle['cmf_15m'] < -0.1) and (last_candle['cmf_1h'] < -0.1):
23382338
return True, 'sell_profit_o_bull_10_5'
@@ -2345,7 +2345,7 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
23452345
return True, 'sell_profit_o_bull_9_2'
23462346
elif (last_candle['rsi_14'] < 49.0) and (last_candle['cmf'] < -0.0) and (last_candle['cmf_15m'] < -0.0) and (last_candle['cmf_1h'] < -0.0):
23472347
return True, 'sell_profit_o_bull_9_3'
2348-
elif (last_candle['rsi_14'] < 46.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
2348+
elif (last_candle['rsi_14'] < 47.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
23492349
return True, 'sell_profit_o_bull_9_4'
23502350
elif (last_candle['rsi_14'] < 50.0) and (last_candle['cmf'] < -0.1) and (last_candle['cmf_15m'] < -0.1) and (last_candle['cmf_1h'] < -0.1):
23512351
return True, 'sell_profit_o_bull_9_5'
@@ -2358,7 +2358,7 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
23582358
return True, 'sell_profit_o_bull_8_2'
23592359
elif (last_candle['rsi_14'] < 51.0) and (last_candle['cmf'] < -0.0) and (last_candle['cmf_15m'] < -0.0) and (last_candle['cmf_1h'] < -0.0):
23602360
return True, 'sell_profit_o_bull_8_3'
2361-
elif (last_candle['rsi_14'] < 48.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
2361+
elif (last_candle['rsi_14'] < 49.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
23622362
return True, 'sell_profit_o_bull_8_4'
23632363
elif (last_candle['rsi_14'] < 52.0) and (last_candle['cmf'] < -0.1) and (last_candle['cmf_15m'] < -0.1) and (last_candle['cmf_1h'] < -0.1):
23642364
return True, 'sell_profit_o_bull_8_5'
@@ -2371,7 +2371,7 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
23712371
return True, 'sell_profit_o_bull_7_2'
23722372
elif (last_candle['rsi_14'] < 49.0) and (last_candle['cmf'] < -0.0) and (last_candle['cmf_15m'] < -0.0) and (last_candle['cmf_1h'] < -0.0):
23732373
return True, 'sell_profit_o_bull_7_3'
2374-
elif (last_candle['rsi_14'] < 46.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
2374+
elif (last_candle['rsi_14'] < 47.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
23752375
return True, 'sell_profit_o_bull_7_4'
23762376
elif (last_candle['rsi_14'] < 50.0) and (last_candle['cmf'] < -0.1) and (last_candle['cmf_15m'] < -0.1) and (last_candle['cmf_1h'] < -0.1):
23772377
return True, 'sell_profit_o_bull_7_5'
@@ -2384,7 +2384,7 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
23842384
return True, 'sell_profit_o_bull_6_2'
23852385
elif (last_candle['rsi_14'] < 47.0) and (last_candle['cmf'] < -0.0) and (last_candle['cmf_15m'] < -0.0) and (last_candle['cmf_1h'] < -0.0):
23862386
return True, 'sell_profit_o_bull_6_3'
2387-
elif (last_candle['rsi_14'] < 44.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
2387+
elif (last_candle['rsi_14'] < 45.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
23882388
return True, 'sell_profit_o_bull_6_4'
23892389
elif (last_candle['rsi_14'] < 48.0) and (last_candle['cmf'] < -0.1) and (last_candle['cmf_15m'] < -0.1) and (last_candle['cmf_1h'] < -0.1):
23902390
return True, 'sell_profit_o_bull_6_5'
@@ -2397,7 +2397,7 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
23972397
return True, 'sell_profit_o_bull_5_2'
23982398
elif (last_candle['rsi_14'] < 45.0) and (last_candle['cmf'] < -0.0) and (last_candle['cmf_15m'] < -0.0) and (last_candle['cmf_1h'] < -0.0):
23992399
return True, 'sell_profit_o_bull_5_3'
2400-
elif (last_candle['rsi_14'] < 42.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
2400+
elif (last_candle['rsi_14'] < 43.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
24012401
return True, 'sell_profit_o_bull_5_4'
24022402
elif (last_candle['rsi_14'] < 46.0) and (last_candle['cmf'] < -0.1) and (last_candle['cmf_15m'] < -0.1) and (last_candle['cmf_1h'] < -0.1):
24032403
return True, 'sell_profit_o_bull_5_5'
@@ -2410,7 +2410,7 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
24102410
return True, 'sell_profit_o_bull_4_2'
24112411
elif (last_candle['rsi_14'] < 43.0) and (last_candle['cmf'] < -0.0) and (last_candle['cmf_15m'] < -0.0) and (last_candle['cmf_1h'] < -0.0):
24122412
return True, 'sell_profit_o_bull_4_3'
2413-
elif (last_candle['rsi_14'] < 40.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
2413+
elif (last_candle['rsi_14'] < 41.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
24142414
return True, 'sell_profit_o_bull_4_4'
24152415
elif (last_candle['rsi_14'] < 44.0) and (last_candle['cmf'] < -0.1) and (last_candle['cmf_15m'] < -0.1) and (last_candle['cmf_1h'] < -0.1):
24162416
return True, 'sell_profit_o_bull_4_5'
@@ -2423,7 +2423,7 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
24232423
return True, 'sell_profit_o_bull_3_2'
24242424
elif (last_candle['rsi_14'] < 41.0) and (last_candle['cmf'] < -0.0) and (last_candle['cmf_15m'] < -0.0) and (last_candle['cmf_1h'] < -0.0):
24252425
return True, 'sell_profit_o_bull_3_3'
2426-
elif (last_candle['rsi_14'] < 38.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
2426+
elif (last_candle['rsi_14'] < 39.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
24272427
return True, 'sell_profit_o_bull_3_4'
24282428
elif (last_candle['rsi_14'] < 42.0) and (last_candle['cmf'] < -0.1) and (last_candle['cmf_15m'] < -0.1) and (last_candle['cmf_1h'] < -0.1):
24292429
return True, 'sell_profit_o_bull_3_5'
@@ -2436,7 +2436,7 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
24362436
return True, 'sell_profit_o_bull_2_2'
24372437
elif (last_candle['rsi_14'] < 39.0) and (last_candle['cmf'] < -0.0) and (last_candle['cmf_15m'] < -0.0) and (last_candle['cmf_1h'] < -0.0):
24382438
return True, 'sell_profit_o_bull_2_3'
2439-
elif (last_candle['rsi_14'] < 35.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
2439+
elif (last_candle['rsi_14'] < 36.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
24402440
return True, 'sell_profit_o_bull_2_4'
24412441
elif (last_candle['rsi_14'] < 40.0) and (last_candle['cmf'] < -0.1) and (last_candle['cmf_15m'] < -0.1) and (last_candle['cmf_1h'] < -0.1):
24422442
return True, 'sell_profit_o_bull_2_5'
@@ -2449,7 +2449,7 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
24492449
return True, 'sell_profit_o_bull_1_2'
24502450
elif (last_candle['rsi_14'] < 37.0) and (last_candle['cmf'] < -0.0) and (last_candle['cmf_15m'] < -0.0) and (last_candle['cmf_1h'] < -0.0):
24512451
return True, 'sell_profit_o_bull_1_3'
2452-
elif (last_candle['rsi_14'] < 34.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
2452+
elif (last_candle['rsi_14'] < 35.0) and (last_candle['cmf'] < -0.2) and (last_candle['cmf_1h'] < -0.0):
24532453
return True, 'sell_profit_o_bull_1_4'
24542454
elif (last_candle['rsi_14'] < 38.0) and (last_candle['cmf'] < -0.1) and (last_candle['cmf_15m'] < -0.1) and (last_candle['cmf_1h'] < -0.1):
24552455
return True, 'sell_profit_o_bull_1_5'

0 commit comments

Comments
 (0)