some about page, default settings, some textures etc. not yet compiled or tested

This commit is contained in:
Looki2000 2023-02-20 00:03:47 +01:00
parent eb8783c20c
commit 8dbdfeeac6
21 changed files with 77 additions and 45 deletions

View File

@ -2,8 +2,10 @@
-- handled by the engine. -- handled by the engine.
core.register_on_death(function() core.register_on_death(function()
local formspec = "size[11,5.5]bgcolor[#320000b4;true]" .. --local formspec = "size[11,5.5]bgcolor[#320000b4;true]" ..
"label[4.85,1.35;" .. fgettext("You died") .. -- change color to black
local formspec = "size[11,5.5]bgcolor[#000000b4;true]" ..
"label[4.85,1.35;" .. fgettext("You died :(") ..
"]button_exit[4,3;3,0.5;btn_respawn;".. fgettext("Respawn") .."]" "]button_exit[4,3;3,0.5;btn_respawn;".. fgettext("Respawn") .."]"
core.show_formspec("bultin:death", formspec) core.show_formspec("bultin:death", formspec)
end) end)

View File

@ -99,9 +99,9 @@ local function init_globals()
tv_main:set_autosave_tab(true) tv_main:set_autosave_tab(true)
tv_main:add(tabs.local_game) tv_main:add(tabs.local_game)
tv_main:add(tabs.play_online) --tv_main:add(tabs.play_online)
tv_main:add(tabs.content) --tv_main:add(tabs.content)
tv_main:add(tabs.settings) tv_main:add(tabs.settings)
tv_main:add(tabs.about) tv_main:add(tabs.about)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -16,7 +16,14 @@
--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-- https://github.com/orgs/minetest/teams/engine/members -- https://github.com/orgs/minetest/teams/engine/members
local sussycraft_authors = {
"SussyCraft Game Authors:",
"Kacper Kostka (kacperks) <kacperks@cubesoftware.xyz> (Programming, Textures)",
"Łukasz Brzostowski (Looki2000) <electro.brzostek@gmail.com or looki2000@cubesoftware.xyz> (Programming, Textures, 3D Models, Soundtrack, Sound)",
"Karol Rostek (karoltoja200) discord:karoltoja200#6809 (Textures)",
"Dawid Cholewiusz (D47 0_o) discord:D46 0_o#8952 (Structures builder)",
"Kacper Brzostowski (wooden plank texture)",
}
local core_developers = { local core_developers = {
"Perttu Ahola (celeron55) <celeron55@gmail.com> [Project founder]", "Perttu Ahola (celeron55) <celeron55@gmail.com> [Project founder]",
"sfan5 <sfan5@live.de>", "sfan5 <sfan5@live.de>",
@ -122,9 +129,14 @@ return {
local logofile = defaulttexturedir .. "logo.png" local logofile = defaulttexturedir .. "logo.png"
local version = core.get_version() local version = core.get_version()
local credit_list = {} local credit_list = {}
table.insert_all(credit_list, { table.insert_all(credit_list, {
core.colorize("#ff0", fgettext("Core Developers")) core.colorize("#ff0", fgettext("SussyCraft Developers"))
})
prepare_credits(credit_list, sussycraft_authors)
table.insert_all(credit_list, {
core.colorize("#ff0", fgettext("Minetest Engine Developers"))
}) })
prepare_credits(credit_list, core_developers) prepare_credits(credit_list, core_developers)
table.insert_all(credit_list, { table.insert_all(credit_list, {
@ -154,8 +166,8 @@ return {
local fs = "image[1.5,0.6;2.5,2.5;" .. core.formspec_escape(logofile) .. "]" .. local fs = "image[1.5,0.6;2.5,2.5;" .. core.formspec_escape(logofile) .. "]" ..
"style[label_button;border=false]" .. "style[label_button;border=false]" ..
"button[0.1,3.4;5.3,0.5;label_button;" .. "button[0.1,3.4;5.3,0.5;label_button;" ..
core.formspec_escape(version.project .. " " .. version.string) .. "]" .. core.formspec_escape("SussyCraft 0.8") .. "]" ..
"button[1.5,4.1;2.5,0.8;homepage;minetest.net]" .. "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;" .. "scroll_container[5.5,0.1;9.5,6.9;scroll_credits;vertical;" ..
tostring(scroll_height / 1000) .. "]" .. credit_fs .. tostring(scroll_height / 1000) .. "]" .. credit_fs ..
"scroll_container_end[]".. "scroll_container_end[]"..
@ -168,19 +180,16 @@ return {
core.formspec_escape(core.get_screen_info().render_info) .. "]" core.formspec_escape(core.get_screen_info().render_info) .. "]"
if PLATFORM == "Android" then if PLATFORM == "Android" then
fs = fs .. "button[0.5,5.1;4.5,0.8;share_debug;" .. fgettext("Share debug log") .. "]"
else else
fs = fs .. "tooltip[userdata;" ..
fgettext("Opens the directory that contains user-provided worlds, games, mods,\n" ..
"and texture packs in a file manager / explorer.") .. "]"
fs = fs .. "button[0.5,5.1;4.5,0.8;userdata;" .. fgettext("Open User Data Directory") .. "]"
end end
return fs, "size[15.5,7.1,false]real_coordinates[true]" return fs, "size[15.5,7.1,false]real_coordinates[true]"
end, end,
cbf_button_handler = function(this, fields, name, tabdata) cbf_button_handler = function(this, fields, name, tabdata)
if fields.homepage then if fields.homepage then
core.open_url("https://www.minetest.net") core.open_url("https://cubesoftware.xyz/sussycraft/privacy.html")
end end
if fields.share_debug then if fields.share_debug then

View File

@ -18,9 +18,9 @@
local current_game, singleplayer_refresh_gamebar local current_game, singleplayer_refresh_gamebar
local valid_disabled_settings = { local valid_disabled_settings = {
["enable_damage"]=true, ["enable_damage"]=false,
["creative_mode"]=true, ["creative_mode"]=true,
["enable_server"]=true, ["enable_server"]=false,
} }
-- Currently chosen game in gamebar for theming and filtering -- Currently chosen game in gamebar for theming and filtering
@ -100,11 +100,11 @@ function singleplayer_refresh_gamebar()
text = text .. "\n" .. part3 text = text .. "\n" .. part3
end end
end end
btnbar:add_button(btn_name, text, image, tooltip) --btnbar:add_button(btn_name, text, image, tooltip)
end end
local plus_image = core.formspec_escape(defaulttexturedir .. "plus.png") --local plus_image = core.formspec_escape(defaulttexturedir .. "plus.png")
btnbar:add_button("game_open_cdb", "", plus_image, fgettext("Install games from ContentDB")) --btnbar:add_button("game_open_cdb", "", plus_image, fgettext("Install games from ContentDB"))
end end
local function get_disabled_settings(game) local function get_disabled_settings(game)
@ -165,14 +165,14 @@ local function get_formspec(tabview, name, tabdata)
y = y + yo y = y + yo
end end
if disabled_settings["enable_server"] == nil then if disabled_settings["enable_server"] == nil then
host = "checkbox[0,"..y..";cb_server;".. fgettext("Host Server") ..";" .. --host = "checkbox[0,"..y..";cb_server;".. fgettext("Host Server") ..";" ..
dump(core.settings:get_bool("enable_server")) .. "]" -- dump(core.settings:get_bool("enable_server")) .. "]"
y = y + yo --y = y + yo
end end
retval = retval .. retval = retval ..
"button[3.9,3.8;2.8,1;world_delete;".. fgettext("Delete") .. "]" .. "button[3.9,3.8;2.8,1;world_delete;".. fgettext("Delete") .. "]" ..
"button[6.55,3.8;2.8,1;world_configure;".. fgettext("Select Mods") .. "]" .. --"button[6.55,3.8;2.8,1;world_configure;".. fgettext("Select Mods") .. "]" ..
"button[9.2,3.8;2.8,1;world_create;".. fgettext("New") .. "]" .. "button[9.2,3.8;2.8,1;world_create;".. fgettext("New") .. "]" ..
"label[3.9,-0.05;".. fgettext("Select World:") .. "]".. "label[3.9,-0.05;".. fgettext("Select World:") .. "]"..
creative .. creative ..

View File

@ -110,12 +110,12 @@ safe_dig_and_place (Safe digging and placing) bool false
invert_mouse (Invert mouse) bool false invert_mouse (Invert mouse) bool false
# Mouse sensitivity multiplier. # 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] [*Touchscreen]
# The length in pixels it takes for touch screen interaction to start. # 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. # (Android) Fixes the position of virtual joystick.
# If disabled, virtual joystick will center to first-touch's position. # 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 # If FPS would go higher than this, limit it by sleeping
# to not waste CPU power for no benefit. # 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. # 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. # 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 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 tooltip_append_itemname (Append item name) bool false
# Use a cloud animation for the main menu background. # Use a cloud animation for the main menu background.
menu_clouds (Clouds in menu) bool true menu_clouds (Clouds in menu) bool false
[**HUD] [**HUD]
@ -565,7 +565,7 @@ contentdb_max_concurrent_downloads (ContentDB Max Concurrent Downloads) int 3 1
enable_local_map_saving (Saving map received from server) bool false enable_local_map_saving (Saving map received from server) bool false
# URL to the server list displayed in the Multiplayer Tab. # URL to the server list displayed in the Multiplayer Tab.
serverlist_url (Serverlist URL) string servers.minetest.net serverlist_url (Serverlist URL) string servers.cubesoftware.xyz
# If enabled, account registration is separate from login in the UI. # If enabled, account registration is separate from login in the UI.
# If disabled, new accounts will be registered automatically when logging in. # If disabled, new accounts will be registered automatically when logging in.
@ -609,7 +609,7 @@ server_url (Server URL) string https://minetest.net
server_announce (Announce server) bool false server_announce (Announce server) bool false
# Announce to this serverlist. # 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. # Message of the day displayed to players connecting.
motd (Message of the day) string 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_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 of the default font where 1 unit = 1 pixel at 96 DPI
font_size (Font size) int 16 5 72 font_size (Font size) int 32 5 72
# For pixel-style fonts that do not scale well, this ensures that font sizes used # 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, # with this font will always be divisible by this value, in pixels. For instance,
@ -1683,7 +1683,7 @@ font_size_divisible_by (Font size divisible by) int 1 1
# Path to the default font. Must be a TrueType font. # Path to the default font. Must be a TrueType font.
# The fallback font will be used if the font cannot be loaded. # The fallback font will be used if the font cannot be loaded.
font_path (Regular font path) filepath fonts/Arimo-Regular.ttf font_path (Regular font path) filepath fonts/monogram-extended.ttf
font_path_bold (Bold font path) filepath fonts/Arimo-Bold.ttf font_path_bold (Bold font path) filepath fonts/Arimo-Bold.ttf
font_path_italic (Italic font path) filepath fonts/Arimo-Italic.ttf font_path_italic (Italic font path) filepath fonts/Arimo-Italic.ttf

BIN
fonts/monogram-extended.ttf Normal file

Binary file not shown.

View File

@ -0,0 +1,21 @@
settingtypes.txt:
fps_max (Maximum FPS) int 4294967295 1 4294967295
vsync (VSync) bool true
serverlist_url (Serverlist URL) string servers.cubesoftware.xyz <=== WARNING!! THERE ARE 2 THE SAME LINES FOR SOME REASON
font_size (Font size) int 32 5 72
font_path (Regular font path) filepath fonts/monogram-extended.ttf
touchscreen_threshold (Touch screen threshold) int 5 0 100
mouse_sensitivity (Mouse sensitivity) float 0.1 0.001 10.0
menu_clouds (Clouds in menu) bool false
defaultsettings.cpp:
settings->setDefault("smooth_lighting", "true"); // comment to be able to find this line from settings_modified_for_sussycraft.txt
settings->setDefault("fps_max", "4294967295"); // fps is "unlimited" because vsync is on
settings->setDefault("vsync", "true"); // comment to be able to find this line from settings_modified_for_sussycraft.txt
settings->setDefault("serverlist_url", "servers.cubesoftware.xyz"); // comment to be able to find this line from settings_modified_for_sussycraft.txt
settings->setDefault("font_size", "32"); // comment to be able to find this line from settings_modified_for_sussycraft.txt (1)
settings->setDefault("font_size", "32"); // comment to be able to find this line from settings_modified_for_sussycraft.txt (2)
settings->setDefault("font_size", "32"); // comment to be able to find this line from settings_modified_for_sussycraft.txt (3)
settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "monogram-extended.ttf")); // comment to be able to find this line from settings_modified_for_sussycraft.txt
settings->setDefault("touchscreen_threshold","5"); // comment to be able to find this line from settings_modified_for_sussycraft.txt
settings->setDefault("menu_clouds", "false"); // comment to be able to find this line from settings_modified_for_sussycraft.txt

View File

@ -35,7 +35,7 @@ void set_default_settings()
settings->setDefault("language", ""); settings->setDefault("language", "");
settings->setDefault("name", ""); settings->setDefault("name", "");
settings->setDefault("bind_address", ""); settings->setDefault("bind_address", "");
settings->setDefault("serverlist_url", "servers.minetest.net"); settings->setDefault("serverlist_url", "servers.cubesoftware.xyz"); // comment to be able to find this line from settings_modified_for_sussycraft.txt
// Client // Client
settings->setDefault("address", ""); settings->setDefault("address", "");
@ -168,7 +168,7 @@ void set_default_settings()
settings->setDefault("3d_paralax_strength", "0.025"); settings->setDefault("3d_paralax_strength", "0.025");
settings->setDefault("tooltip_show_delay", "400"); settings->setDefault("tooltip_show_delay", "400");
settings->setDefault("tooltip_append_itemname", "false"); settings->setDefault("tooltip_append_itemname", "false");
settings->setDefault("fps_max", "60"); settings->setDefault("fps_max", "4294967295"); // fps is "unlimited" because vsync is on
settings->setDefault("fps_max_unfocused", "20"); settings->setDefault("fps_max_unfocused", "20");
settings->setDefault("viewing_range", "190"); settings->setDefault("viewing_range", "190");
#if ENABLE_GLES #if ENABLE_GLES
@ -178,7 +178,7 @@ void set_default_settings()
settings->setDefault("screen_h", "600"); settings->setDefault("screen_h", "600");
settings->setDefault("autosave_screensize", "true"); settings->setDefault("autosave_screensize", "true");
settings->setDefault("fullscreen", "false"); settings->setDefault("fullscreen", "false");
settings->setDefault("vsync", "false"); settings->setDefault("vsync", "true"); // comment to be able to find this line from settings_modified_for_sussycraft.txt
settings->setDefault("fov", "72"); settings->setDefault("fov", "72");
settings->setDefault("leaves_style", "fancy"); settings->setDefault("leaves_style", "fancy");
settings->setDefault("connected_glass", "false"); settings->setDefault("connected_glass", "false");
@ -209,7 +209,7 @@ void set_default_settings()
settings->setDefault("fall_bobbing_amount", "0.03"); settings->setDefault("fall_bobbing_amount", "0.03");
settings->setDefault("enable_3d_clouds", "true"); settings->setDefault("enable_3d_clouds", "true");
settings->setDefault("cloud_radius", "12"); settings->setDefault("cloud_radius", "12");
settings->setDefault("menu_clouds", "true"); settings->setDefault("menu_clouds", "false"); // comment to be able to find this line from settings_modified_for_sussycraft.txt
settings->setDefault("opaque_water", "false"); settings->setDefault("opaque_water", "false");
settings->setDefault("console_height", "0.6"); settings->setDefault("console_height", "0.6");
settings->setDefault("console_color", "(0,0,0)"); settings->setDefault("console_color", "(0,0,0)");
@ -279,7 +279,7 @@ void set_default_settings()
// Input // Input
settings->setDefault("invert_mouse", "false"); settings->setDefault("invert_mouse", "false");
settings->setDefault("mouse_sensitivity", "0.2"); settings->setDefault("mouse_sensitivity", "0.1"); // comment to be able to find this line from settings_modified_for_sussycraft.txt
settings->setDefault("repeat_place_time", "0.25"); settings->setDefault("repeat_place_time", "0.25");
settings->setDefault("safe_dig_and_place", "false"); settings->setDefault("safe_dig_and_place", "false");
settings->setDefault("random_input", "false"); settings->setDefault("random_input", "false");
@ -304,7 +304,7 @@ void set_default_settings()
settings->setDefault("serverlist_file", "favoriteservers.json"); settings->setDefault("serverlist_file", "favoriteservers.json");
// General font settings // General font settings
settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "Arimo-Regular.ttf")); settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "monogram-extended.ttf")); // comment to be able to find this line from settings_modified_for_sussycraft.txt
settings->setDefault("font_path_italic", porting::getDataPath("fonts" DIR_DELIM "Arimo-Italic.ttf")); settings->setDefault("font_path_italic", porting::getDataPath("fonts" DIR_DELIM "Arimo-Italic.ttf"));
settings->setDefault("font_path_bold", porting::getDataPath("fonts" DIR_DELIM "Arimo-Bold.ttf")); settings->setDefault("font_path_bold", porting::getDataPath("fonts" DIR_DELIM "Arimo-Bold.ttf"));
settings->setDefault("font_path_bold_italic", porting::getDataPath("fonts" DIR_DELIM "Arimo-BoldItalic.ttf")); settings->setDefault("font_path_bold_italic", porting::getDataPath("fonts" DIR_DELIM "Arimo-BoldItalic.ttf"));
@ -466,7 +466,7 @@ void set_default_settings()
#ifdef HAVE_TOUCHSCREENGUI #ifdef HAVE_TOUCHSCREENGUI
settings->setDefault("touchtarget", "true"); settings->setDefault("touchtarget", "true");
settings->setDefault("touchscreen_threshold","20"); settings->setDefault("touchscreen_threshold","5"); // comment to be able to find this line from settings_modified_for_sussycraft.txt
settings->setDefault("fixed_virtual_joystick", "false"); settings->setDefault("fixed_virtual_joystick", "false");
settings->setDefault("virtual_joystick_triggers_aux1", "false"); settings->setDefault("virtual_joystick_triggers_aux1", "false");
settings->setDefault("clickable_chat_weblinks", "false"); settings->setDefault("clickable_chat_weblinks", "false");
@ -478,7 +478,7 @@ void set_default_settings()
settings->setDefault("screen_w", "0"); settings->setDefault("screen_w", "0");
settings->setDefault("screen_h", "0"); settings->setDefault("screen_h", "0");
settings->setDefault("fullscreen", "true"); settings->setDefault("fullscreen", "true");
settings->setDefault("smooth_lighting", "false"); settings->setDefault("smooth_lighting", "true"); // comment to be able to find this line from settings_modified_for_sussycraft.txt
settings->setDefault("performance_tradeoffs", "true"); settings->setDefault("performance_tradeoffs", "true");
settings->setDefault("max_simultaneous_block_sends_per_client", "10"); settings->setDefault("max_simultaneous_block_sends_per_client", "10");
settings->setDefault("emergequeue_limit_diskonly", "16"); settings->setDefault("emergequeue_limit_diskonly", "16");
@ -502,15 +502,15 @@ void set_default_settings()
if (x_inches < 3.7f) { if (x_inches < 3.7f) {
settings->setDefault("hud_scaling", "0.6"); settings->setDefault("hud_scaling", "0.6");
settings->setDefault("font_size", "14"); settings->setDefault("font_size", "32"); // comment to be able to find this line from settings_modified_for_sussycraft.txt (1)
settings->setDefault("mono_font_size", "14"); settings->setDefault("mono_font_size", "14");
} else if (x_inches < 4.5f) { } else if (x_inches < 4.5f) {
settings->setDefault("hud_scaling", "0.7"); settings->setDefault("hud_scaling", "0.7");
settings->setDefault("font_size", "14"); settings->setDefault("font_size", "32"); // comment to be able to find this line from settings_modified_for_sussycraft.txt (2)
settings->setDefault("mono_font_size", "14"); settings->setDefault("mono_font_size", "14");
} else if (x_inches < 6.0f) { } else if (x_inches < 6.0f) {
settings->setDefault("hud_scaling", "0.85"); settings->setDefault("hud_scaling", "0.85");
settings->setDefault("font_size", "14"); settings->setDefault("font_size", "32"); // comment to be able to find this line from settings_modified_for_sussycraft.txt (3)
settings->setDefault("mono_font_size", "14"); settings->setDefault("mono_font_size", "14");
} }
// Tablets >= 6.0 use non-Android defaults for these settings // Tablets >= 6.0 use non-Android defaults for these settings

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 230 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 124 B

After

Width:  |  Height:  |  Size: 224 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 617 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 194 B

BIN
textures/base/pack/play.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 B

After

Width:  |  Height:  |  Size: 170 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 140 B

After

Width:  |  Height:  |  Size: 140 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 763 B

After

Width:  |  Height:  |  Size: 156 B