Skip to content

Commit

Permalink
some more tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
None authored and None committed May 23, 2023
1 parent 0d0bc92 commit 18af814
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 36 deletions.
63 changes: 34 additions & 29 deletions MiniPyFlyff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ def create_tooltip(widget, text):

menu.add_command(label="Save Keys", command=lambda: saveConfigs.save_key_configs(entry_alt_control_keys,
entry_macro_loop_key,
entry_macro_loop_timers,
entry_macro_loop_delays,
entry_macro_loop_shortcut,
checkbox_var.get(),
lambda:
toolControl.start_stop_mini_ftool(
button_macro_loop_start_stop),
entry_buffer,
entry_buffer_keys,
entry_buffs_hotbar,
entry_previous_hotbar,
entry_buffer_delay,
Expand All @@ -49,7 +49,8 @@ def create_tooltip(widget, text):
button_buffer_start_stop,
button_macro_loop_enable_disable),
entry_GT_key,
entry_GT_timer))
entry_GT_delay,
entry_GT_hotbar))

menu_bar.add_cascade(label="Menu", menu=menu)

Expand All @@ -70,10 +71,10 @@ def create_tooltip(widget, text):
root.iconbitmap("icon/PyFlyff.ico")
root.resizable(False, False)

validation_timers = root.register(miscs.validate_input_timers)
validation_delays = root.register(miscs.validate_input_timers)
validation_keys = root.register(miscs.validate_input_keys)

validation_buffer_timer = root.register(miscs.validate_input_buffer_timer)
validation_buffer_delays = root.register(miscs.validate_input_buffer_timer)
validation_buffer_key = root.register(miscs.validate_input_buffer_key)

checkbox_var = IntVar()
Expand All @@ -99,11 +100,11 @@ def create_tooltip(widget, text):
entry_macro_loop_key = Entry(validate="none")
entry_macro_loop_key.pack(fill=X, padx=1, pady=1)

label_macro_loop_timers = Label(text="Macro Loop Delay(s):")
label_macro_loop_timers.pack(fill=X, padx=1, pady=1)
label_macro_loop_delays = Label(text="Macro Loop Delay(s):")
label_macro_loop_delays.pack(fill=X, padx=1, pady=1)

entry_macro_loop_timers = Entry(validate="none")
entry_macro_loop_timers.pack(fill=X, padx=1, pady=1)
entry_macro_loop_delays = Entry(validate="none")
entry_macro_loop_delays.pack(fill=X, padx=1, pady=1)

label_macro_loop_shortcut = Label(text="Macro Loop Shortcut:")
label_macro_loop_shortcut.pack(fill=X, padx=1, pady=1)
Expand All @@ -129,11 +130,11 @@ def create_tooltip(widget, text):
button_macro_loop_enable_disable.config(
command=lambda: toolControl.enable_disable_mini_ftool(button_macro_loop_enable_disable))

label_buffer = Label(text="Buffer Key(s):")
label_buffer.pack(fill=X, padx=1, pady=1)
label_buffer_keys = Label(text="Buffer Key(s):")
label_buffer_keys.pack(fill=X, padx=1, pady=1)

entry_buffer = Entry(validate="none")
entry_buffer.pack(fill=X, padx=1, pady=1)
entry_buffer_keys = Entry(validate="none")
entry_buffer_keys.pack(fill=X, padx=1, pady=1)

frame_buffer_1 = Frame(root)
frame_buffer_1.pack(fill=X, padx=1, pady=1)
Expand Down Expand Up @@ -204,37 +205,38 @@ def create_tooltip(widget, text):
entry_GT_hotbar.pack(side=LEFT, padx=1, pady=1)
create_tooltip(entry_GT_hotbar, "The hotbar where your GT is.")

label_GT_timer = Label(frame_buffer_2, text="Delay:")
label_GT_timer.pack(side=LEFT, padx=1, pady=1)
create_tooltip(label_GT_timer, "Delay to use GT")
label_GT_delay = Label(frame_buffer_2, text="Delay:")
label_GT_delay.pack(side=LEFT, padx=1, pady=1)
create_tooltip(label_GT_delay, "Delay to use GT")

entry_GT_timer = Entry(frame_buffer_2, width=5, validate="none")
entry_GT_timer.pack(side=LEFT, padx=1, pady=1)
create_tooltip(entry_GT_timer, "Delay to use GT")
entry_GT_delay = Entry(frame_buffer_2, width=5, validate="none")
entry_GT_delay.pack(side=LEFT, padx=1, pady=1)
create_tooltip(entry_GT_delay, "Delay to use GT")

entry_alt_control_keys.insert(END, saveConfigs.open_json_config()[0])
entry_macro_loop_key.insert(END, saveConfigs.open_json_config()[1])
entry_macro_loop_timers.insert(END, saveConfigs.open_json_config()[2])
entry_macro_loop_delays.insert(END, saveConfigs.open_json_config()[2])
entry_macro_loop_shortcut.insert(END, saveConfigs.open_json_config()[3])
entry_buffer.insert(END, saveConfigs.open_json_config()[5])
entry_buffer_keys.insert(END, saveConfigs.open_json_config()[5])
entry_buffs_hotbar.insert(END, saveConfigs.open_json_config()[6])
entry_previous_hotbar.insert(END, saveConfigs.open_json_config()[7])
entry_buffer_delay.insert(END, saveConfigs.open_json_config()[8])
entry_buffer_shortcut.insert(END, saveConfigs.open_json_config()[9])
entry_GT_key.insert(END, saveConfigs.open_json_config()[10])
entry_GT_timer.insert(END, saveConfigs.open_json_config()[11])
entry_GT_delay.insert(END, saveConfigs.open_json_config()[11])
entry_GT_hotbar.insert(END, saveConfigs.open_json_config()[12])

entry_alt_control_keys.config(validate="key")
entry_alt_control_keys.config(validatecommand=(validation_keys, "%S"))

entry_macro_loop_key.config(validate="key")
entry_macro_loop_key.config(validatecommand=(validation_keys, "%S"))

entry_macro_loop_timers.config(validate="key")
entry_macro_loop_timers.config(validatecommand=(validation_timers, "%S"))
entry_macro_loop_delays.config(validate="key")
entry_macro_loop_delays.config(validatecommand=(validation_delays, "%S"))

entry_buffer.config(validate="key")
entry_buffer.config(validatecommand=(validation_keys, "%S"))
entry_buffer_keys.config(validate="key")
entry_buffer_keys.config(validatecommand=(validation_keys, "%S"))

entry_buffs_hotbar.config(validate="key")
entry_buffs_hotbar.config(validatecommand=(validation_buffer_key, "%S"))
Expand All @@ -243,13 +245,16 @@ def create_tooltip(widget, text):
entry_previous_hotbar.config(validatecommand=(validation_buffer_key, "%S"))

entry_buffer_delay.config(validate="key")
entry_buffer_delay.config(validatecommand=(validation_buffer_timer, "%S"))
entry_buffer_delay.config(validatecommand=(validation_buffer_delays, "%S"))

entry_GT_key.config(validate="key")
entry_GT_key.config(validatecommand=(validation_buffer_key, "%S"))

entry_GT_timer.config(validate="key")
entry_GT_timer.config(validatecommand=(validation_buffer_timer, "%S"))
entry_GT_delay.config(validate="key")
entry_GT_delay.config(validatecommand=(validation_buffer_delays, "%S"))

entry_GT_hotbar.config(validate="key")
entry_GT_hotbar.config(validatecommand=(validation_buffer_key, "%S"))

checkbox_var.set(int(saveConfigs.open_json_config()[4]))

Expand Down
18 changes: 11 additions & 7 deletions saveConfigs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


def create_json_config(entry1, entry2, entry3, entry4, checkbox_value, entry5, entry6, entry7, entry8, entry9, entry10,
entry11):
entry11, entry12):
data = {
"value1": entry1,
"value2": entry2,
Expand All @@ -18,7 +18,8 @@ def create_json_config(entry1, entry2, entry3, entry4, checkbox_value, entry5, e
"value9": entry8,
"value10": entry9,
"value11": entry10,
"value12": entry11
"value12": entry11,
"value13": entry12
}

with open("config.json", "w") as json_file:
Expand All @@ -45,18 +46,19 @@ def open_json_config():
value10 = data['value10']
value11 = data['value11']
value12 = data['value12']
value13 = data['value13']

return value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12
return value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13
else:
return "", "", "", "", 0, "", "", "", "", "", "", ""
return "", "", "", "", 0, "", "", "", "", "", "", "", ""
except Exception as e:
print(e)
os.remove("config.json")
return "", "", "", "", 0, "", "", "", "", "", "", ""
return "", "", "", "", 0, "", "", "", "", "", "", "", ""


def save_key_configs(entry1, entry2, entry3, entry4, checkbox, function, entry5, entry6, entry7, entry8, entry9,
function2, entry10, entry11):
function2, entry10, entry11, entry12):
globalVariables.alt_control_key_list = entry1.get().split(",")

globalVariables.macro_loop_keys = entry2.get().split(",")
Expand All @@ -78,5 +80,7 @@ def save_key_configs(entry1, entry2, entry3, entry4, checkbox, function, entry5,

globalVariables.gt_buffer_delay = entry11.get()

globalVariables.gt_buffer_hotbar = entry12.get()

create_json_config(entry1.get(), entry2.get(), entry3.get(), entry4.get(), checkbox, entry5.get(), entry6.get(),
entry7.get(), entry8.get(), entry9.get(), entry10.get(), entry11.get())
entry7.get(), entry8.get(), entry9.get(), entry10.get(), entry11.get(), entry12.get())

0 comments on commit 18af814

Please sign in to comment.