diff --git a/minetest.conf.lanclient b/minetest.conf.lanclient deleted file mode 100644 index c97fc70..0000000 --- a/minetest.conf.lanclient +++ /dev/null @@ -1,5 +0,0 @@ -fallback_font_size = 22 -address = fcalocal -name = fcalocal -font_size = 22 -serverlist_url = diff --git a/patches/subgame/minetest.LAN-client-example.conf b/patches/subgame/minetest.LAN-client-example.conf new file mode 100644 index 0000000..216c89d --- /dev/null +++ b/patches/subgame/minetest.LAN-client-example.conf @@ -0,0 +1,9 @@ +maintab_LAST = online +fallback_font_size = 22 +# address = fcalocal +# name = fcalocal +font_size = 22 +serverlist_url = +# serverlist_file = favoriteservers.txt +public_serverlist = false +enable_local_map_saving = true diff --git a/minetest.conf.client b/patches/subgame/minetest.client-example.conf similarity index 90% rename from minetest.conf.client rename to patches/subgame/minetest.client-example.conf index 4fbd009..189726e 100644 --- a/minetest.conf.client +++ b/patches/subgame/minetest.client-example.conf @@ -1,4 +1,4 @@ -# address = +# address = ambient_occlusion_gamma = 2.2 anisotropic_filter = true cinematic = true @@ -25,7 +25,7 @@ fallback_font_shadow = 1 fallback_font_shadow_alpha = 255 fallback_font_size = 16 fast_move = true -#fixed_map_seed = +#fixed_map_seed = font_shadow = 1 font_shadow_alpha = 255 font_size = 16 @@ -37,7 +37,7 @@ mainmenu_last_selected_world = 2 #optional (maintab_LAST note: local tab was formerly called singleplayer) maintab_LAST = local menu_clouds = true -# name = +# name = optional: menu_last_game = ENLIVEN mg_name = v7 @@ -48,11 +48,11 @@ pause_fps_max = 20 #optional: public_serverlist = true remote_port = 30000 -#selected_world_path = +#selected_world_path = server_announce = false server_dedicated = false -serverlist_file = favoriteservers.txt -serverlist_url = servers.minetest.net +# serverlist_file = favoriteservers.txt +# serverlist_url = smooth_lighting = true texture_clean_transparent = true #texture_min_size = 64 diff --git a/patches/subgame/minetest.conf b/patches/subgame/minetest.conf index 5a18f82..fc98308 100644 --- a/patches/subgame/minetest.conf +++ b/patches/subgame/minetest.conf @@ -1,20 +1,5 @@ -# In case user of an Enliven server wants to start their own server via the graphical user interface: -protector_flip = true -protector_radius = 7 -protector_pvp = true -#protector_pvp_spawn = 10 -#protector_drop false since can allow glitch jumping -protector_drop = false -protector_hurt = 3 -#optional: -map_generation_limit = 5000 -#do not give fast priv for default_privs, since that can allow glitch-jumping over or through protected walls by jumping across or out of water -default_privs = interact,shout,home -#optional: max_users default is 15 -max_users = 50 -motd = "Actions and chat messages are logged. Recipes are in unified inventory mod. Otherwise visit the server's website for more info about mods and live map if available--if not, see http://wiki.minetest.net/Main_Page and https://github.com/minetest-technic/technic/wiki" -disallow_empty_passwords = true -#not all settings can be changed in this minetest.conf (see -#minetest.conf.example in THIS folder) some settings can only be changed -#in client's local copy of minetest.conf (see login scripts on network) +# DON'T USE THIS -- instead, see: +# * minetest.client-example.conf +# * minetest.LAN-client-example.conf +# * minetest.server-example.conf (should be installed by install scripts) diff --git a/minetest.conf.server b/patches/subgame/minetest.server-example.conf similarity index 76% rename from minetest.conf.server rename to patches/subgame/minetest.server-example.conf index 742bc0d..9bd1a70 100644 --- a/minetest.conf.server +++ b/patches/subgame/minetest.server-example.conf @@ -3,13 +3,15 @@ protector_radius = 7 protector_flip = true protector_pvp = true #protector_pvp_spawn = 10 -#protector_drop false since can allow glitch jumping (deprecated in latest git version) +# protector_drop = false # true can allow item duplication (option not available in later ~2018 versions of mobs redo) protector_drop = false protector_hurt = 3 #optional: map_generation_limit = 4096 + #only for worldedge mod: world_edge = 4096 + #do not give fast priv for default_privs, since that can allow glitch-jumping over or through protected walls by jumping across or out of water default_privs = interact,shout,home #optional: max_users default is 15 @@ -18,11 +20,17 @@ max_users = 50 motd = "Actions and chat messages are logged. Use inventory to see recipes." disallow_empty_passwords = true secure.trusted_mods = advanced_npc -server_dedicated = false -hudbars_bar_type = statbar_modern -sprint_speed = 2.25 -sprint_jump = 1.25 -sprint_stamina_drain = .5 + +# server_dedicated is added by the install script, true/false +# conditionally (see install script): +# server_dedicated = false + +# DEPRECATED?? +# hudbars_bar_type = statbar_modern +# sprint_speed = 2.25 +# sprint_jump = 1.25 +# sprint_stamina_drain = .5 + #player_model_version = default_character_v3 #playeranim.model_version = MTG_4_Jun_2017 playeranim.model_version = MTG_4_Nov_2017 @@ -32,4 +40,6 @@ playeranim.model_version = MTG_4_Nov_2017 #in client's local copy of minetest.conf (see login scripts on network) enable_bones_logging = true enable_bones_chat_msg = true + +# DEPRECATED? see Bucket_Game/mods/codercore/fallback_spawn static_spawnpoint = 0, 11, 0 diff --git a/webapp/install-mts.sh b/webapp/install-mts.sh index db3fca8..2a730c0 100755 --- a/webapp/install-mts.sh +++ b/webapp/install-mts.sh @@ -132,3 +132,13 @@ echo "updating '$HOME/minetest/games/ENLIVEN/menu'..." rsync -rt "patches/subgame/menu/" "$HOME/minetest/games/ENLIVEN/menu" echo "updating '$HOME/minetest/games/ENLIVEN'..." rsync -rt "patches/Bucket_Game-patched/" "$HOME/minetest/games/ENLIVEN" +if [ ! -f "$HOME/minetest/minetest.Bucket_Game-example.conf" ]; then + cp -f "$HOME/minetest/minetest.conf" "$HOME/minetest/minetest.Bucket_Game-example.conf" +fi +cp -f "patches/subgame/minetest.client-example.conf" "$HOME/minetest/minetest.conf" +cp -f "patches/subgame/minetest.server-example.conf" "$HOME/minetest/games/ENLIVEN/minetest.conf" +if [ -f "/home/owner/i_am_dedicated_minetest_server" ]; then + echo "server_dedicated = true" >> "$HOME/minetest/games/ENLIVEN/minetest.conf" +else + echo "server_dedicated = false" >> "$HOME/minetest/games/ENLIVEN/minetest.conf" +fi diff --git a/webapp/reset-minetest.sh b/webapp/reset-minetest.sh index 91f34af..65fcea0 100755 --- a/webapp/reset-minetest.sh +++ b/webapp/reset-minetest.sh @@ -56,5 +56,7 @@ cd .. echo "Check libraries.log for errors, then..." echo "- Run the following manually for SERVER only (no graphical client):" echo " bash install-mts.sh" +echo "- Run the following manually for both minetestserver and minetest:" +echo " bash install-mts.sh --client" echo echo