Skip to content

Commit 7dafd65

Browse files
iterativviterativv
committed
sell_over_main: rework.
1 parent 6bd756a commit 7dafd65

File tree

1 file changed

+48
-0
lines changed

1 file changed

+48
-0
lines changed

‎NostalgiaForInfinityNext.py‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2400,22 +2400,32 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
24002400
if current_profit >= 0.20:
24012401
if last_candle['rsi_14'] < 30.0 and (last_candle['cmf'] < 0.0):
24022402
return True, 'signal_profit_o_bull_12_1'
2403+
elif (last_candle['rsi_14'] < 27.0):
2404+
return True, 'signal_profit_o_bull_12_9'
24032405
elif 0.20 > current_profit >= 0.12:
24042406
if last_candle['rsi_14'] < 42.0 and (last_candle['cmf'] < 0.0):
24052407
return True, 'signal_profit_o_bull_11_1'
2408+
elif (last_candle['rsi_14'] < 39.0):
2409+
return True, 'signal_profit_o_bull_11_9'
24062410
elif 0.12 > current_profit >= 0.1:
24072411
if last_candle['rsi_14'] < 46.0 and (last_candle['cmf'] < 0.0):
24082412
return True, 'signal_profit_o_bull_10_1'
2413+
elif (last_candle['rsi_14'] < 48.0):
2414+
return True, 'signal_profit_o_bull_10_9'
24092415
elif 0.1 > current_profit >= 0.09:
24102416
if last_candle['rsi_14'] < 50.0 and (last_candle['cmf'] < 0.0):
24112417
return True, 'signal_profit_o_bull_9_1'
2418+
elif (last_candle['rsi_14'] < 49.0):
2419+
return True, 'signal_profit_o_bull_9_9'
24122420
elif 0.09 > current_profit >= 0.08:
24132421
if (last_candle['rsi_14'] < 57.0) and (last_candle['cmf'] < 0.0):
24142422
return True, 'signal_profit_o_bull_8_1'
24152423
elif (last_candle['rsi_14'] < 56.0) and (last_candle['cmf'] < -0.4):
24162424
return True, 'signal_profit_o_bull_8_3'
24172425
elif (last_candle['rsi_14'] < 58.0) and (last_candle['r_14'] == 0.0):
24182426
return True, 'signal_profit_o_bull_8_4'
2427+
elif (last_candle['rsi_14'] < 48.0):
2428+
return True, 'signal_profit_o_bull_8_9'
24192429
elif 0.08 > current_profit >= 0.07:
24202430
if (last_candle['rsi_14'] < 51.0) and (last_candle['cmf'] < 0.0):
24212431
return True, 'signal_profit_o_bull_7_1'
@@ -2425,6 +2435,8 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
24252435
return True, 'signal_profit_o_bull_7_3'
24262436
elif (last_candle['rsi_14'] < 55.0) and (last_candle['r_14'] == 0.0):
24272437
return True, 'signal_profit_o_bull_7_4'
2438+
elif (last_candle['rsi_14'] < 45.0):
2439+
return True, 'signal_profit_o_bull_7_9'
24282440
elif 0.07 > current_profit >= 0.06:
24292441
if (last_candle['rsi_14'] < 50.0) and (last_candle['cmf'] < 0.0):
24302442
return True, 'signal_profit_o_bull_6_1'
@@ -2436,6 +2448,8 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
24362448
return True, 'signal_profit_o_bull_6_4'
24372449
elif (last_candle['cti'] > 0.95):
24382450
return True, 'signal_profit_o_bull_6_5'
2451+
elif (last_candle['rsi_14'] < 42.0):
2452+
return True, 'signal_profit_o_bull_6_9'
24392453
elif 0.06 > current_profit >= 0.05:
24402454
if (last_candle['rsi_14'] < 46.0) and (last_candle['cmf'] < 0.0):
24412455
return True, 'signal_profit_o_bull_5_1'
@@ -2449,6 +2463,8 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
24492463
return True, 'signal_profit_o_bull_5_5'
24502464
elif (last_candle['rsi_14'] < 50.0) and (last_candle['sma_200_dec_20_1h']) and (last_candle['cmf'] < 0.0):
24512465
return True, 'signal_profit_o_bull_5_6'
2466+
elif (last_candle['rsi_14'] < 41.0):
2467+
return True, 'signal_profit_o_bull_5_9'
24522468
elif 0.05 > current_profit >= 0.04:
24532469
if (last_candle['rsi_14'] < 45.0) and (last_candle['cmf'] < 0.0):
24542470
return True, 'signal_profit_o_bull_4_1'
@@ -2460,6 +2476,8 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
24602476
return True, 'signal_profit_o_bull_4_5'
24612477
elif (last_candle['rsi_14'] < 48.0) and (last_candle['sma_200_dec_20_1h']) and (last_candle['cmf'] < 0.0):
24622478
return True, 'signal_profit_o_bull_4_6'
2479+
elif (last_candle['rsi_14'] < 40.0):
2480+
return True, 'signal_profit_o_bull_4_9'
24632481
elif 0.04 > current_profit >= 0.03:
24642482
if (last_candle['rsi_14'] < 37.0) and (last_candle['cmf'] < 0.0):
24652483
return True, 'signal_profit_o_bull_3_1'
@@ -2471,6 +2489,8 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
24712489
return True, 'signal_profit_o_bull_3_5'
24722490
elif (last_candle['rsi_14'] < 43.0) and (last_candle['sma_200_dec_20_1h']) and (last_candle['cmf'] < 0.0):
24732491
return True, 'signal_profit_o_bull_3_6'
2492+
elif (last_candle['rsi_14'] < 35.0):
2493+
return True, 'signal_profit_o_bull_3_9'
24742494
elif 0.03 > current_profit >= 0.02:
24752495
if (last_candle['rsi_14'] < 36.0) and (last_candle['cmf'] < 0.0):
24762496
return True, 'signal_profit_o_bull_2_1'
@@ -2486,6 +2506,8 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
24862506
return True, 'signal_profit_o_bull_2_7'
24872507
elif last_candle['rsi_14'] < 40.0 and (last_candle['cmf'] < -0.25):
24882508
return True, 'signal_profit_o_bull_2_8'
2509+
elif (last_candle['rsi_14'] < 34.0):
2510+
return True, 'signal_profit_o_bull_2_9'
24892511
elif 0.02 > current_profit >= 0.012:
24902512
if (last_candle['rsi_14'] < 34.0) and (last_candle['cmf'] < 0.0):
24912513
return True, 'signal_profit_o_bull_1_1'
@@ -2501,21 +2523,31 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
25012523
return True, 'signal_profit_o_bull_1_7'
25022524
elif last_candle['rsi_14'] < 39.0 and (last_candle['cmf'] < -0.25):
25032525
return True, 'signal_profit_o_bull_1_8'
2526+
elif (last_candle['rsi_14'] < 32.0):
2527+
return True, 'signal_profit_o_bull_1_9'
25042528
else:
25052529
if current_profit >= 0.20:
25062530
if last_candle['rsi_14'] < 30.0 and (last_candle['cmf'] < 0.0):
25072531
return True, 'signal_profit_o_bear_12_1'
2532+
elif (last_candle['rsi_14'] < 28.0):
2533+
return True, 'signal_profit_o_bear_12_9'
25082534
elif 0.20 > current_profit >= 0.12:
25092535
if last_candle['rsi_14'] < 42.0 and (last_candle['cmf'] < 0.0):
25102536
return True, 'signal_profit_o_bear_11_1'
2537+
elif (last_candle['rsi_14'] < 40.0):
2538+
return True, 'signal_profit_o_bear_11_9'
25112539
elif 0.12 > current_profit >= 0.10:
25122540
if last_candle['rsi_14'] < 46.0 and (last_candle['cmf'] < 0.0):
25132541
return True, 'signal_profit_o_bear_10_1'
2542+
elif (last_candle['rsi_14'] < 49.0):
2543+
return True, 'signal_profit_o_bear_10_9'
25142544
elif 0.10 > current_profit >= 0.09:
25152545
if last_candle['rsi_14'] < 55.0 and (last_candle['cmf'] < 0.0):
25162546
return True, 'signal_profit_o_bear_9_1'
25172547
elif (last_candle['rsi_14'] > 75.5):
25182548
return True, 'signal_profit_o_bear_9_2'
2549+
elif (last_candle['rsi_14'] < 50.0):
2550+
return True, 'signal_profit_o_bear_9_9'
25192551
elif 0.09 > current_profit >= 0.08:
25202552
if (last_candle['rsi_14'] < 57.0) and (last_candle['cmf'] < 0.0):
25212553
return True, 'signal_profit_o_bear_8_1'
@@ -2525,6 +2557,8 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
25252557
return True, 'signal_profit_o_bear_8_3'
25262558
elif (last_candle['rsi_14'] < 59.0) and (last_candle['r_14'] == 0.0):
25272559
return True, 'signal_profit_o_bear_8_4'
2560+
elif (last_candle['rsi_14'] < 49.0):
2561+
return True, 'signal_profit_o_bear_8_9'
25282562
elif 0.08 > current_profit >= 0.07:
25292563
if (last_candle['rsi_14'] < 52.0) and (last_candle['cmf'] < 0.0):
25302564
return True, 'signal_profit_o_bear_7_1'
@@ -2534,6 +2568,8 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
25342568
return True, 'signal_profit_o_bear_7_3'
25352569
elif (last_candle['rsi_14'] < 57.0) and (last_candle['r_14'] == 0.0):
25362570
return True, 'signal_profit_o_bear_7_4'
2571+
elif (last_candle['rsi_14'] < 46.0):
2572+
return True, 'signal_profit_o_bear_7_9'
25372573
elif 0.07 > current_profit >= 0.06:
25382574
if (last_candle['rsi_14'] < 51.0) and (last_candle['cmf'] < 0.0):
25392575
return True, 'signal_profit_o_bear_6_1'
@@ -2545,6 +2581,8 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
25452581
return True, 'signal_profit_o_bear_6_4'
25462582
elif (last_candle['cti'] > 0.94):
25472583
return True, 'signal_profit_o_bear_6_5'
2584+
elif (last_candle['rsi_14'] < 43.0):
2585+
return True, 'signal_profit_o_bear_6_9'
25482586
elif 0.06 > current_profit >= 0.05:
25492587
if (last_candle['rsi_14'] < 49.0) and (last_candle['cmf'] < 0.0):
25502588
return True, 'signal_profit_o_bear_5_1'
@@ -2556,6 +2594,8 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
25562594
return True, 'signal_profit_o_bear_5_5'
25572595
elif (last_candle['rsi_14'] < 50.0) and (last_candle['sma_200_dec_20_1h']) and (last_candle['cmf'] < 0.0):
25582596
return True, 'signal_profit_o_bear_5_6'
2597+
elif (last_candle['rsi_14'] < 42.0):
2598+
return True, 'signal_profit_o_bear_5_9'
25592599
elif 0.05 > current_profit >= 0.04:
25602600
if (last_candle['rsi_14'] < 46.0) and (last_candle['cmf'] < 0.0):
25612601
return True, 'signal_profit_o_bear_4_1'
@@ -2567,6 +2607,8 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
25672607
return True, 'signal_profit_o_bear_4_5'
25682608
elif (last_candle['rsi_14'] < 48.0) and (last_candle['sma_200_dec_20_1h']) and (last_candle['cmf'] < 0.0):
25692609
return True, 'signal_profit_o_bear_4_6'
2610+
elif (last_candle['rsi_14'] < 41.0):
2611+
return True, 'signal_profit_o_bear_4_9'
25702612
elif 0.04 > current_profit >= 0.03:
25712613
if (last_candle['rsi_14'] < 38.0) and (last_candle['cmf'] < 0.0):
25722614
return True, 'signal_profit_o_bear_3_1'
@@ -2578,6 +2620,8 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
25782620
return True, 'signal_profit_o_bear_3_5'
25792621
elif (last_candle['rsi_14'] < 44.0) and (last_candle['sma_200_dec_20_1h']) and (last_candle['cmf'] < 0.0):
25802622
return True, 'signal_profit_o_bear_3_6'
2623+
elif (last_candle['rsi_14'] < 36.0):
2624+
return True, 'signal_profit_o_bear_3_9'
25812625
elif 0.03 > current_profit >= 0.02:
25822626
if (last_candle['rsi_14'] < 37.0) and (last_candle['cmf'] < 0.0):
25832627
return True, 'signal_profit_o_bear_2_1'
@@ -2591,6 +2635,8 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
25912635
return True, 'signal_profit_o_bear_2_6'
25922636
elif (last_candle['rsi_14'] < 43.0) and (last_candle['cmf_1h'] < -0.05) and (last_candle['cti_1h'] > 0.85):
25932637
return True, 'signal_profit_o_bear_2_7'
2638+
elif (last_candle['rsi_14'] < 35.0):
2639+
return True, 'signal_profit_o_bear_2_9'
25942640
elif 0.02 > current_profit >= 0.012:
25952641
if (last_candle['rsi_14'] < 35.0) and (last_candle['cmf'] < 0.0):
25962642
return True, 'signal_profit_o_bear_1_1'
@@ -2604,6 +2650,8 @@ def sell_over_main(self, current_profit: float, last_candle) -> tuple:
26042650
return True, 'signal_profit_o_bear_1_6'
26052651
elif (last_candle['rsi_14'] < 43.0) and (last_candle['cmf_1h'] < -0.05) and (last_candle['cti_1h'] > 0.85):
26062652
return True, 'signal_profit_o_bear_1_7'
2653+
elif (last_candle['rsi_14'] < 33.0):
2654+
return True, 'signal_profit_o_bear_1_9'
26072655

26082656
return False, None
26092657

0 commit comments

Comments
 (0)