From 263bb070cd401f3c14f17c5dfd6f679a3d5f2d37 Mon Sep 17 00:00:00 2001 From: Nio Date: Fri, 22 Oct 2021 14:00:00 +1100 Subject: [PATCH] prolonger, magenta, catch numbers --- desktop_fang.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/desktop_fang.py b/desktop_fang.py index 87bc6aa..fbf8e47 100644 --- a/desktop_fang.py +++ b/desktop_fang.py @@ -26,7 +26,7 @@ blushy_boop2_num = [36] blushy_boop3_num = [37] #basic events, cap 30 -neutral_num = [1, 2, 3, 4, 5, 6, 7, 8, 9, 21, 22, 23, 24, 26, 27, 28, 29, 30] +neutral_num = [1, 2, 3, 4, 5, 6, 7, 8, 9, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30] blankiemode_num = [10, 11] glasspress_num = [12] feathermess_num = [13, 14] @@ -184,11 +184,18 @@ def gif_work(cycle, frames, event_number, first_num, last_num): nugger = 0 else: if event_number in [10, 11] and old_event_number not in [10, 11]: + print('blankie cozy') prolong = prolong + 3 - if prolong > 3 and event_number not in [31, 32, 33, 34, 35, 36, 37, 38] and old_event_number not in [31, 32, 33, 34, 35, 36, 37, 38]: + if prolong > 3 and old_event_number not in [31, 32, 33, 34, 35, 36, 37, 38] and \ + event_number not in [31, 32, 33, 34, 35, 36, 37, 38] and \ + old_event_number not in [1, 2, 3, 4, 5, 6, 7, 8, 9, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30]: + print('other activities prolong') event_number = old_event_number else: - if event_number not in [1, 2, 3, 4, 5, 6, 7, 8, 9, 21, 22, 23, 24, 26, 27, 28, 29, 30] and old_event_number not in [1, 2, 3, 4, 5, 6, 7, 8, 9, 21, 22, 23, 24, 26, 27, 28, 29, 30] and old_event_number != event_number \ + print('back to idle') + if event_number not in [1, 2, 3, 4, 5, 6, 7, 8, 9, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30] and \ + old_event_number not in [1, 2, 3, 4, 5, 6, 7, 8, 9, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30] and \ + old_event_number != event_number \ and event_number not in [31, 32, 33, 34, 35, 36, 37, 38]: event_number = 4 @@ -696,9 +703,9 @@ anticipating_nugs2_large = list(map(mapfunc_scaler, [tk.PhotoImage(data=anticipa # window configuration window.config(highlightbackground='black') # window.geometry('200x200') -label = tk.Label(window, bd=0, bg='red') +label = tk.Label(window, bd=0, bg='#FF00FF') window.overrideredirect(True) -window.wm_attributes('-transparentcolor', 'red') +window.wm_attributes('-transparentcolor', '#FF00FF') window.wm_attributes('-topmost', True) label.pack()