Skip to content

Commit dee88f0

Browse files
committed
Buy 40: rework.
1 parent fdcdd5a commit dee88f0

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

NostalgiaForInfinityNext.py

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,9 +1189,9 @@ class NostalgiaForInfinityNext(IStrategy):
11891189
},
11901190
40: {
11911191
"ema_fast" : True,
1192-
"ema_fast_len" : "12",
1193-
"ema_slow" : False,
1194-
"ema_slow_len" : "25",
1192+
"ema_fast_len" : "50",
1193+
"ema_slow" : True,
1194+
"ema_slow_len" : "12",
11951195
"close_above_ema_fast" : False,
11961196
"close_above_ema_fast_len" : "200",
11971197
"close_above_ema_slow" : True,
@@ -1202,14 +1202,14 @@ class NostalgiaForInfinityNext(IStrategy):
12021202
"sma200_1h_rising_val" : "20",
12031203
"safe_dips" : True,
12041204
"safe_dips_type" : "130",
1205-
"safe_pump" : False,
1206-
"safe_pump_type" : "50",
1205+
"safe_pump" : True,
1206+
"safe_pump_type" : "100",
12071207
"safe_pump_period" : "48",
12081208
"btc_1h_not_downtrend" : True,
12091209
"close_over_pivot_type" : "none", # pivot, sup1, sup2, sup3, res1, res2, res3
12101210
"close_over_pivot_offset" : 1.0,
12111211
"close_under_pivot_type" : "none", # pivot, sup1, sup2, sup3, res1, res2, res3
1212-
"close_under_pivot_offset" : 1.0
1212+
"close_under_pivot_offset" : 1.2
12131213
},
12141214
41: {
12151215
"ema_fast" : False,
@@ -1852,10 +1852,9 @@ class NostalgiaForInfinityNext(IStrategy):
18521852
buy_39_cti_1h_min = -0.1
18531853
buy_39_cti_1h_max = 0.4
18541854

1855-
buy_40_crsi_max = 50.0
1856-
buy_40_cci_max = -250.0
1857-
buy_40_rsi_max = 36.0
1858-
buy_40_r_14_max = -90.0
1855+
buy_40_cci_max = -150.0
1856+
buy_40_rsi_max = 30.0
1857+
buy_40_r_14_max = -99.9
18591858
buy_40_cti_max = -0.8
18601859

18611860
buy_41_ewo_1h_min = 4.0
@@ -3856,7 +3855,7 @@ def custom_sell(self, pair: str, trade: 'Trade', current_time: 'datetime', curre
38563855
return f"{signal_name} ( {buy_tag} )"
38573856

38583857
# Stoplosses
3859-
if any(c in ['empty', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31', '40', '41', '42', '44', '45', '46', '47', '48'] for c in buy_tags):
3858+
if any(c in ['empty', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31', '41', '42', '44', '45', '46', '47', '48'] for c in buy_tags):
38603859
sell, signal_name = self.sell_stoploss_atr(current_profit, last_candle, previous_candle_1, trade, current_time)
38613860
if sell and (signal_name is not None):
38623861
return f"{signal_name} ( {buy_tag} )"
@@ -5135,13 +5134,12 @@ def populate_buy_trend(self, dataframe: DataFrame, metadata: dict) -> DataFrame:
51355134
(dataframe['leading_senkou_span_a_1h'].shift(12) < dataframe['leading_senkou_span_b_1h'].shift(12))
51365135
)
51375136

5138-
# Condition #40 - ZLEMA X buy
5137+
# Condition #40
51395138
elif index == 40:
51405139
# Non-Standard protections (add below)
51415140

51425141
# Logic
5143-
item_buy_logic.append(qtpylib.crossed_above(dataframe['zlema_2'], dataframe['zlema_4']))
5144-
item_buy_logic.append(dataframe['crsi'] < self.buy_40_crsi_max)
5142+
item_buy_logic.append(dataframe['momdiv_buy_1h'] == True)
51455143
item_buy_logic.append(dataframe['cci'] < self.buy_40_cci_max)
51465144
item_buy_logic.append(dataframe['rsi_14'] < self.buy_40_rsi_max)
51475145
item_buy_logic.append(dataframe['r_14'] < self.buy_40_r_14_max)

0 commit comments

Comments
 (0)