From 5846a4fea8d6a993466a792977128d21a18587bc Mon Sep 17 00:00:00 2001 From: Alexander M Pickering Date: Sun, 26 Jan 2025 15:12:19 -0600 Subject: Actual final commit --- src/menu/main.moon | 4 +--- src/menu/settings.moon | 16 ++++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) (limited to 'src/menu') diff --git a/src/menu/main.moon b/src/menu/main.moon index ee33dc9..f7ead73 100644 --- a/src/menu/main.moon +++ b/src/menu/main.moon @@ -14,6 +14,7 @@ buttons_data = { { text: "Start" on: () => + @.text = "Loading..." menu.destroy! require("worldgen") --require("menu.join").initalize! @@ -22,12 +23,9 @@ buttons_data = { menu.initalize = () -> starty = -200 for i = starty, ((#buttons_data-1) * (64 + 32)) + starty, 64 + 32 - print("making button", #buttons + 1) buttons[#buttons + 1] = ui.button(-200,i,400,64,buttons_data[#buttons + 1].text) buttons[#buttons].on = buttons_data[#buttons].on - print("intalize") - menu.destroy = () -> for button in *buttons ui.delete(button) diff --git a/src/menu/settings.moon b/src/menu/settings.moon index 1f21cc3..b3be124 100644 --- a/src/menu/settings.moon +++ b/src/menu/settings.moon @@ -6,6 +6,13 @@ menu = {} buttons = {} buttons_data = { + { + text: "Done" + on: () => + menu.destroy! + require("menu.main").initalize! + type: "button" + } { text: "Streamer" on: (depressed) => @@ -23,13 +30,6 @@ buttons_data = { type: "slider" } - { - text: "Done" - on: () => - menu.destroy! - require("menu.main").initalize! - type: "button" - } } menu.initalize = () -> starty = -200 @@ -39,7 +39,7 @@ menu.initalize = () -> buttons[#buttons + 1] = ui.checkbox(-200,i,400,64,button_data.text) buttons[#buttons].on = button_data.on elseif button_data.type == "slider" - buttons[#buttons + 1] = ui.textbox(-200,i,400,64,settings.volume) + buttons[#buttons + 1] = ui.textbox(-200,i,400,64,settings.volume, "volume") buttons[#buttons].on = button_data.on elseif button_data.type == "button" buttons[#buttons + 1] = ui.button(-200,i,400,64,button_data.text) -- cgit v1.2.3-70-g09d2