diff --git a/builtin/mainmenu/game_theme.lua b/builtin/mainmenu/game_theme.lua index 02ea678..89e1b66 100644 --- a/builtin/mainmenu/game_theme.lua +++ b/builtin/mainmenu/game_theme.lua @@ -64,8 +64,7 @@ function mm_game_theme.reset() if not have_bg then if core.settings:get_bool("menu_clouds") then - --core.set_clouds(true) - mm_game_theme.set_dirt_bg() + core.set_clouds(true) else mm_game_theme.set_dirt_bg() end @@ -199,6 +198,6 @@ function mm_game_theme.set_music(gamedetails) if mm_game_theme.music_handle ~= nil then core.sound_stop(mm_game_theme.music_handle) end - local music_path = "amogus_incomming" + local music_path = gamedetails.path .. DIR_DELIM .. "menu" .. DIR_DELIM .. "theme" mm_game_theme.music_handle = core.sound_play(music_path, true) -end \ No newline at end of file +end diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua index d9e7065..6ce92ce 100644 --- a/builtin/mainmenu/init.lua +++ b/builtin/mainmenu/init.lua @@ -92,7 +92,7 @@ local function init_globals() end mm_game_theme.init() - mm_game_theme.set_music("amogus_incomming.ogg") + -- Create main tabview local tv_main = tabview_create("maintab", {x = 12, y = 5.4}, {x = 0, y = 0}) -- note: size would be 15.5,7.1 in real coordinates mode @@ -108,7 +108,6 @@ local function init_globals() tv_main:set_global_event_handler(main_event_handler) tv_main:set_fixed_size(false) - local last_tab = core.settings:get("maintab_LAST") if last_tab and tv_main.current_tab ~= last_tab then tv_main:set_tab(last_tab) diff --git a/builtin/mainmenu/tab_about.lua b/builtin/mainmenu/tab_about.lua index d253cc3..004b6df 100644 --- a/builtin/mainmenu/tab_about.lua +++ b/builtin/mainmenu/tab_about.lua @@ -15,6 +15,7 @@ --with this program; if not, write to the Free Software Foundation, Inc., --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +-- IMPORTANT! some lines had to be split up to new lines because they didn't fit in the window local sussycraft_authors = { "SussyCraft Game Authors:", @@ -33,6 +34,8 @@ local sussycraft_authors = { "Kacper Brzostowski (wooden plank texture)", } + +-- https://github.com/orgs/minetest/teams/engine/members local core_developers = { "Perttu Ahola (celeron55) [Project founder]", "sfan5 ", @@ -140,34 +143,36 @@ return { local credit_list = {} table.insert_all(credit_list, { - core.colorize("#ff0", fgettext("SussyCraft Developers")) + core.colorize("#ffdd33", fgettext("SussyCraft Developers")) }) prepare_credits(credit_list, sussycraft_authors) table.insert_all(credit_list, { - core.colorize("#ff0", fgettext("Minetest Engine Developers")) + core.colorize("#ffdd33", fgettext("Minetest Engine Developers")) }) prepare_credits(credit_list, core_developers) table.insert_all(credit_list, { "", - core.colorize("#ff0", fgettext("Core Team")) + core.colorize("#ffdd33", fgettext("Core Team")) }) prepare_credits(credit_list, core_team) table.insert_all(credit_list, { "", - core.colorize("#ff0", fgettext("Active Contributors")) + core.colorize("#ffdd33", fgettext("Active Contributors")) }) prepare_credits(credit_list, active_contributors) table.insert_all(credit_list, { "", - core.colorize("#ff0", fgettext("Previous Core Developers")) + core.colorize("#ffdd33", fgettext("Previous Core Developers")) }) prepare_credits(credit_list, previous_core_developers) table.insert_all(credit_list, { "", - core.colorize("#ff0", fgettext("Previous Contributors")) + core.colorize("#ffdd33", fgettext("Previous Contributors")) }) prepare_credits(credit_list, previous_contributors) + + -- SUS local excamation_marks_count = math.random(1, 30) table.insert_all(credit_list, { "", @@ -183,18 +188,15 @@ return { "style[label_button;border=false]" .. "button[0.1,3.4;5.3,0.5;label_button;" .. core.formspec_escape("SussyCraft 0.8") .. "]" .. - "button[1.5,4.1;3.5,0.9;homepage;Privacy Policy]" .. + "button[1.5,4.1;2.5,0.8;homepage;Privacy Policy]" .. "scroll_container[5.5,0.1;9.5,6.9;scroll_credits;vertical;" .. tostring(scroll_height / 1000) .. "]" .. credit_fs .. "scroll_container_end[]".. - "scrollbar[15,0.1;0.4,6.9;vertical;scroll_credits;0]".. - - "button[1.5,5.1;3.5,0.8;discord;Discord]" + "scrollbar[15,0.1;0.4,6.9;vertical;scroll_credits;0]" -- Render information fs = fs .. "style[label_button2;border=false]" .. "button[0.1,6;5.3,1;label_button2;" .. - fgettext("Active renderer:") .. "\n" .. core.formspec_escape(core.get_screen_info().render_info) .. "]" @@ -211,9 +213,6 @@ return { core.open_url("https://cubesoftware.xyz/sussycraft/privacy.html") end - if fields.discord then - core.open_url("https://discord.gg/aJmhBN74sh") - end if fields.share_debug then local path = core.get_user_path() .. DIR_DELIM .. "debug.txt" core.share_file(path) diff --git a/builtin/mainmenu/tab_local.lua b/builtin/mainmenu/tab_local.lua index 48af877..b8b95cb 100644 --- a/builtin/mainmenu/tab_local.lua +++ b/builtin/mainmenu/tab_local.lua @@ -205,7 +205,7 @@ local function get_formspec(tabview, name, tabdata) end else retval = retval .. - "button[7.9,4.75;4.1,1;play;" .. fgettext("Play Game") .. "]" + "button[7.9,4.75;4.1,1;play;" .. fgettext("Play Selected World") .. "]" end return retval diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua index 21c77aa..1568a30 100644 --- a/builtin/mainmenu/tab_settings.lua +++ b/builtin/mainmenu/tab_settings.lua @@ -201,8 +201,8 @@ local function formspec(tabview, name, tabdata) if core.settings:get("touchscreen_threshold") ~= nil then tab_string = tab_string .. "label[4.25,3.5;" .. fgettext("Touch threshold (px):") .. "]" .. - "dropdown[4.25,3.95;3.5;dd_touchthreshold;0,10,20,30,40,50;" .. - ((tonumber(core.settings:get("touchscreen_threshold")) / 10) + 1) .. + "dropdown[4.25,3.95;3.5;dd_touchthreshold;0,5,10,15,20,25,30,35,40,45,50;" .. + ((tonumber(core.settings:get("touchscreen_threshold")) / 5) + 1) .. "]" else tab_string = tab_string .. diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 8176099..fb661d8 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -110,12 +110,12 @@ safe_dig_and_place (Safe digging and placing) bool false invert_mouse (Invert mouse) bool false # Mouse sensitivity multiplier. -mouse_sensitivity (Mouse sensitivity) float 0.2 0.001 10.0 +mouse_sensitivity (Mouse sensitivity) float 0.1 0.001 10.0 [*Touchscreen] # The length in pixels it takes for touch screen interaction to start. -touchscreen_threshold (Touch screen threshold) int 20 0 100 +touchscreen_threshold (Touch screen threshold) int 5 0 100 # (Android) Fixes the position of virtual joystick. # If disabled, virtual joystick will center to first-touch's position. @@ -152,10 +152,10 @@ pause_on_lost_focus (Pause on lost window focus) bool false # If FPS would go higher than this, limit it by sleeping # to not waste CPU power for no benefit. -fps_max (Maximum FPS) int 60 1 4294967295 +fps_max (Maximum FPS) int 240 1 4294967295 # Vertical screen synchronization. -vsync (VSync) bool false +vsync (VSync) bool true # Maximum FPS when the window is not focused, or when the game is paused. fps_max_unfocused (FPS when unfocused or paused) int 20 1 4294967295 @@ -499,7 +499,7 @@ tooltip_show_delay (Tooltip delay) int 400 0 18446744073709551615 tooltip_append_itemname (Append item name) bool false # Use a cloud animation for the main menu background. -menu_clouds (Clouds in menu) bool true +menu_clouds (Clouds in menu) bool false [**HUD] @@ -609,7 +609,7 @@ server_url (Server URL) string https://minetest.net server_announce (Announce server) bool false # Announce to this serverlist. -serverlist_url (Serverlist URL) string servers.minetest.net +serverlist_url (Serverlist URL) string servers.cubesoftware.xyz # Message of the day displayed to players connecting. motd (Message of the day) string @@ -1673,7 +1673,7 @@ font_shadow (Font shadow) int 1 0 65535 font_shadow_alpha (Font shadow alpha) int 127 0 255 # Font size of the default font where 1 unit = 1 pixel at 96 DPI -font_size (Font size) int 32 5 72 +font_size (Font size) int 16 5 72 # For pixel-style fonts that do not scale well, this ensures that font sizes used # with this font will always be divisible by this value, in pixels. For instance,