From 7d9d2fe39d0e7d8cb2fea0f8a89b82aeba247f10 Mon Sep 17 00:00:00 2001 From: poikilos <7557867+poikilos@users.noreply.github.com> Date: Wed, 27 Mar 2019 15:24:23 -0400 Subject: [PATCH] add area to Getting Started, CenterOfTheSun-only world settings --- CHANGELOG.md | 6 + overrides/worlds/CenterOfTheSun/world.conf | 189 ++++++++++++++++++ .../worlds/CenterOfTheSun/world.conf.1st | 188 +++++++++++++++++ overrides/worlds/CenterOfTheSun/world.mt | 6 + patches/subgame/minetest.server-example.conf | 41 +++- webapp/install-mts.sh | 22 ++ webapp/views/pages/getting-started.ejs | 138 ++++++++++--- 7 files changed, 556 insertions(+), 34 deletions(-) create mode 100644 overrides/worlds/CenterOfTheSun/world.conf create mode 100644 overrides/worlds/CenterOfTheSun/world.conf.1st create mode 100644 overrides/worlds/CenterOfTheSun/world.mt diff --git a/CHANGELOG.md b/CHANGELOG.md index 40f2a4b..68807e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [git] - 2018-03-27 +### Added +* overrides for world.conf and world.mt (only if you have the directory + ~/.minetest/worlds/CenterOfTheSun) +* (Getting Started page in web app) areas (self-protection) instructions + ## [git] - 2018-03-25 **This is the first Changelog entry for the new Bucket_Game-based ENLIVEN.** diff --git a/overrides/worlds/CenterOfTheSun/world.conf b/overrides/worlds/CenterOfTheSun/world.conf new file mode 100644 index 0000000..f1ac85e --- /dev/null +++ b/overrides/worlds/CenterOfTheSun/world.conf @@ -0,0 +1,189 @@ +#--------------------------------------------------------------------- +# "_game" mode. + +enable_bucket_city = false +enable_moontest = false +enable_wonder = false + +#--------------------------------------------------------------------- +# Server announcement and description. + +# motd = Wonder Build is a Dream Fulfilled + +# These settings are only for online copies. +# +# port = 30023 +# public_serverlist = true +# server_address = minebest.org +# server_announce = true +# server_dedicated = true +# server_description = Wonder Build +# server_name = Wonder +# server_url = https://forum.minetest.org/ +# serverlist_url = http://38.126.148.144:32000 + +#--------------------------------------------------------------------- +# Other online settings. + +# These settings are only for online copies. +# +# irc.channel = #minetest-general +# irc.nick = Wonder +# irc.server = irc.oldcoder.org +# irc.crossworld = false +# +# name = OldCoder +# remote_media = http://oldcoder.org/minemedia/ + +#--------------------------------------------------------------------- +# Areas. + +areas.self_protection = true +areas.self_protection_max_areas = 3 +areas.self_protection_max_size = { x=100, y=100, z=100 } +areas.self_protection_privilege = build + +#--------------------------------------------------------------------- +# General server parameters. + +curl_timeout = 150000 +debug_log_level = error +disallow_empty_password = true +enable_rollback_recording = false +max_users = 30 +log_mod = true +log_mods = true +restriction_exempted_names = FMK,pgrytdal +strict_protocol_version_checking = false +secure.enable_security = false +unlimited_player_transfer_distance = false +vehicles_nodes = true + +#--------------------------------------------------------------------- +# Nature of world. + +codersea_drowning = true +codersea_monster_jellyfish = true +codersea_monster_shark = true +creative_mode = false +dayspeed = 60 +default_privs = build, interact, shout +disable_anticheat = true +disable_fire = true +disable_drowning = false +disable_multispawn = true +enable_damage = true +give_initial_stuff = true +hunger_tick = 80 +mgflat_spflags = lakes, nohills +mgv7_spflags = caverns, nomountains, noridges, nofloatlands +nightspeed = 90 +sapling_grow_chance = 2 +sapling_grow_interval = 50 +static_spawn_point = 0, 2.5, 0 +enable_pvp = false +movement_acceleration_air = 2 +movement_speed_crouch = 2 +movement_speed_fast = 20 +movement_speed_walk = 6 + +#--------------------------------------------------------------------- +# Tourist /teleport commands: Realms. + +#static_bron_point = 0, 5502, 0 +#static_tron_point = 0, 5502, 0 +#static_planetoid_point = 0, 18500, 0 +#static_planetoids_point = 0, 18500, 0 +#static_asteroid_point = 0, 21400, 0 +#static_asteroids_point = 0, 21400, 0 +#static_earth_point = 0, 29050, 0 +#static_earth2_point = 0, 29050, 0 + +#--------------------------------------------------------------------- +# Performance. + +active_block_range = 2 +active_object_send_range_blocks = 4 +max_block_generate_distance = 2 +max_block_send_distance = 4 +cache_block_before_spawn = true +dedicated_server_step = 0.1 +max_simultaneous_block_sends_per_client = 15 +max_simultaneous_block_sends_server_total = 250 +nodetimer_interval = 0.1 +sqlite_synchronous = 0 +time_send_interval = 3 + +#--------------------------------------------------------------------- + +# To enable one or more of the 3D natural animals, set the correspond- +# ing parameters below to true. + +codermobs_enable_badger = true +codermobs_enable_bat = true +codermobs_enable_bear = true +codermobs_enable_bee = true + +codermobs_enable_beetle = true +codermobs_enable_bird = true +codermobs_enable_bug = true +codermobs_enable_bunny = true + +codermobs_enable_butterfly = true +codermobs_enable_chicken = true +codermobs_enable_cow = true +codermobs_enable_dog = true + +codermobs_enable_elephant = true +codermobs_enable_farhorse = true +codermobs_enable_goat = true +codermobs_enable_hedgehog = true + +codermobs_enable_jeraf = false +codermobs_enable_kitten = true +codermobs_enable_mammoth = true +codermobs_enable_owl = true + +codermobs_enable_panda = true +codermobs_enable_penguin = true +codermobs_enable_rat = true +codermobs_enable_rat_better = true + +codermobs_enable_sheep = true +codermobs_enable_snake_garter = false +codermobs_enable_snake_ice = false +codermobs_enable_whinny = false + +codermobs_enable_wolf = true +codermobs_enable_zebra = true + +# Note: The "farhorse" and the "whinny" are two different categories +# of horse. The differences between the two categories of equestrian +# companions are explained in the technical documentation. + +#--------------------------------------------------------------------- + +# To enable one or more of the 3D fantasy characters, set the corre- +# sponding parameters below to true. + +codermobs_enable_dirt_monster = true +codermobs_enable_flying_pig = false +codermobs_enable_ghost = true +codermobs_enable_lava_flan = true + +codermobs_enable_lott_spider = true +codermobs_enable_oerkki = true +codermobs_enable_santa = false +codermobs_enable_snowman = false + +codermobs_enable_tree_monster = true +codermobs_enable_polar_bear = true +codermobs_enable_silverfish = true + +#--------------------------------------------------------------------- + +# To enable the whimsical 2D characters, set the parameter below to +# true. + +codermobs_enable_critters = false +codermobs_enable_petores = false diff --git a/overrides/worlds/CenterOfTheSun/world.conf.1st b/overrides/worlds/CenterOfTheSun/world.conf.1st new file mode 100644 index 0000000..75746c9 --- /dev/null +++ b/overrides/worlds/CenterOfTheSun/world.conf.1st @@ -0,0 +1,188 @@ +#--------------------------------------------------------------------- +# "_game" mode. + +enable_bucket_city = false +enable_moontest = false +enable_wonder = false + +#--------------------------------------------------------------------- +# Server announcement and description. + +# motd = Wonder Build is a Dream Fulfilled + +# These settings are only for online copies. +# +# port = 30023 +# public_serverlist = true +# server_address = minebest.org +# server_announce = true +# server_dedicated = true +# server_description = Wonder Build +# server_name = Wonder +# server_url = https://forum.minetest.org/ +# serverlist_url = http://38.126.148.144:32000 + +#--------------------------------------------------------------------- +# Other online settings. + +# These settings are only for online copies. +# +# irc.channel = #minetest-general +# irc.nick = Wonder +# irc.server = irc.oldcoder.org +# irc.crossworld = false +# +# name = OldCoder +# remote_media = http://oldcoder.org/minemedia/ + +#--------------------------------------------------------------------- +# Areas. + +areas.self_protection = true +areas.self_protection_max_areas = 3 +areas.self_protection_max_size = { x=100, y=100, z=100 } + +#--------------------------------------------------------------------- +# General server parameters. + +curl_timeout = 150000 +debug_log_level = error +disallow_empty_password = true +enable_rollback_recording = false +max_users = 30 +log_mod = true +log_mods = true +restriction_exempted_names = FMK,pgrytdal +strict_protocol_version_checking = false +secure.enable_security = false +unlimited_player_transfer_distance = false +vehicles_nodes = true + +#--------------------------------------------------------------------- +# Nature of world. + +codersea_drowning = true +codersea_monster_jellyfish = true +codersea_monster_shark = true +creative_mode = false +dayspeed = 60 +default_privs = build, interact, shout +disable_anticheat = true +disable_fire = true +disable_drowning = false +disable_multispawn = true +enable_damage = true +give_initial_stuff = true +hunger_tick = 80 +mgflat_spflags = lakes, nohills +mgv7_spflags = caverns, nomountains, noridges, nofloatlands +nightspeed = 90 +sapling_grow_chance = 2 +sapling_grow_interval = 50 +static_spawn_point = 50, 2.5, 50 +enable_pvp = false +movement_acceleration_air = 2 +movement_speed_crouch = 2 +movement_speed_fast = 20 +movement_speed_walk = 6 + +#--------------------------------------------------------------------- +# Tourist /teleport commands: Realms. + +#static_bron_point = 0, 5502, 0 +#static_tron_point = 0, 5502, 0 +#static_planetoid_point = 0, 18500, 0 +#static_planetoids_point = 0, 18500, 0 +#static_asteroid_point = 0, 21400, 0 +#static_asteroids_point = 0, 21400, 0 +#static_earth_point = 0, 29050, 0 +#static_earth2_point = 0, 29050, 0 + +#--------------------------------------------------------------------- +# Performance. + +active_block_range = 2 +active_object_send_range_blocks = 4 +max_block_generate_distance = 2 +max_block_send_distance = 4 +cache_block_before_spawn = true +dedicated_server_step = 0.1 +max_simultaneous_block_sends_per_client = 15 +max_simultaneous_block_sends_server_total = 250 +nodetimer_interval = 0.1 +sqlite_synchronous = 0 +time_send_interval = 3 + +#--------------------------------------------------------------------- + +# To enable one or more of the 3D natural animals, set the correspond- +# ing parameters below to true. + +codermobs_enable_badger = true +codermobs_enable_bat = true +codermobs_enable_bear = true +codermobs_enable_bee = true + +codermobs_enable_beetle = true +codermobs_enable_bird = true +codermobs_enable_bug = true +codermobs_enable_bunny = true + +codermobs_enable_butterfly = true +codermobs_enable_chicken = true +codermobs_enable_cow = true +codermobs_enable_dog = true + +codermobs_enable_elephant = true +codermobs_enable_farhorse = true +codermobs_enable_goat = true +codermobs_enable_hedgehog = true + +codermobs_enable_jeraf = false +codermobs_enable_kitten = true +codermobs_enable_mammoth = true +codermobs_enable_owl = true + +codermobs_enable_panda = true +codermobs_enable_penguin = true +codermobs_enable_rat = true +codermobs_enable_rat_better = true + +codermobs_enable_sheep = true +codermobs_enable_snake_garter = false +codermobs_enable_snake_ice = false +codermobs_enable_whinny = false + +codermobs_enable_wolf = true +codermobs_enable_zebra = true + +# Note: The "farhorse" and the "whinny" are two different categories +# of horse. The differences between the two categories of equestrian +# companions are explained in the technical documentation. + +#--------------------------------------------------------------------- + +# To enable one or more of the 3D fantasy characters, set the corre- +# sponding parameters below to true. + +codermobs_enable_dirt_monster = true +codermobs_enable_flying_pig = false +codermobs_enable_ghost = true +codermobs_enable_lava_flan = true + +codermobs_enable_lott_spider = true +codermobs_enable_oerkki = true +codermobs_enable_santa = false +codermobs_enable_snowman = false + +codermobs_enable_tree_monster = true +codermobs_enable_polar_bear = true +codermobs_enable_silverfish = true + +#--------------------------------------------------------------------- + +# To enable the whimsical 2D characters, set the parameter below to +# true. + +codermobs_enable_critters = false +codermobs_enable_petores = false diff --git a/overrides/worlds/CenterOfTheSun/world.mt b/overrides/worlds/CenterOfTheSun/world.mt new file mode 100644 index 0000000..ce4879f --- /dev/null +++ b/overrides/worlds/CenterOfTheSun/world.mt @@ -0,0 +1,6 @@ +creative_mode = false +player_backend = sqlite3 +gameid = ENLIVEN +enable_damage = true +backend = sqlite3 +auth_backend = sqlite3 diff --git a/patches/subgame/minetest.server-example.conf b/patches/subgame/minetest.server-example.conf index 63b628c..7ca4b76 100644 --- a/patches/subgame/minetest.server-example.conf +++ b/patches/subgame/minetest.server-example.conf @@ -1,8 +1,16 @@ # In case user of an Enliven server wants to start their own server via the graphical user interface: + + +# This file should be considered unimportant in Final Minetest, as now +# the server configuration can be done on a per-world basis. However, +# The CenterOfTheSun server overrides the settings below. +# See "EnlivenMinetest/overrides/worlds/CenterOfTheSun/world.conf" +# instead. + protector_radius = 7 protector_flip = true protector_pvp = true -#protector_pvp_spawn = 10 +# protector_pvp_spawn = 10 # protector_drop = false # true can allow item duplication (option not available in later ~2018 versions of mobs redo) protector_drop = false protector_hurt = 3 @@ -12,12 +20,29 @@ 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 + + +# region IGNORED in CenterOfTheSun +# - see overrides/worlds/CenterOfTheSun/world.conf +enable_pvp = false +give_initial_stuff = true +nightspeed = 90 +# The fast priv can allow glitch-jumping over or through protected walls +# by skipping across water or jumping out of water. +# This is overridden (adding build usually) by world.conf if using +# minetest.org releases: +default_privs = interact, shout +# limiting default privs is recommended as whitelist is not added by +# default in the new ENLIVEN. +# endregion IGNORED in CenterOfTheSun +# 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" -motd = "Actions and chat messages are logged. Use inventory to see recipes." +# endregion + + + +# 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" +motd = "Actions and chat messages are logged. Use inventory to see recipes. Priveleges may be limited for new users, so ask a moderator to /grant priveleges." disallow_empty_passwords = true secure.trusted_mods = advanced_npc @@ -41,8 +66,8 @@ playeranim.model_version = MTG_4_Nov_2017 enable_bones_logging = true enable_bones_chat_msg = true -# DEPRECATED? see Bucket_Game/mods/codercore/fallback_spawn -static_spawnpoint = 0, 11, 0 +# Set this in world.conf if using codercore/fallback_spawn +# static_spawnpoint = 0, 11, 0 # only for minetest.org releases: disable_classic_sneak = true diff --git a/webapp/install-mts.sh b/webapp/install-mts.sh index caa22e0..f4daca3 100755 --- a/webapp/install-mts.sh +++ b/webapp/install-mts.sh @@ -173,6 +173,7 @@ if [ ! -f "$client_example_dest" ]; then cp -f "patches/subgame/minetest.client-example.conf" "$client_example_dest" fi server_minetest_conf_dest="$HOME/minetest/games/ENLIVEN/minetest.conf" + if [ -f "$server_minetest_conf_dest" ]; then echo echo "NOTE: $server_minetest_conf_dest will be overwritten (minetest.org releases allow you to put a world.conf file in your world, so that should be customized instead)..." @@ -189,6 +190,27 @@ else fi echo "" >> "$server_minetest_conf_dest" echo "" >> "$server_minetest_conf_dest" + + +world_override_src="overrides/worlds/CenterOfTheSun" +world_override_dst="$HOME/.minetest/worlds/CenterOfTheSun" +world_conf_src="$world_override_src/world.conf" +world_conf_dst="$world_override_dst/world.conf" +world_mt_src="$world_override_src/world.mt" +world_mt_dst="$world_override_dst/world.mt" +if [ -d "$world_override_dst" ]; then + echo "You have the CenterOfTheSun world. Listing any changes..." + if [ -f "$world_conf_src" ]; then + if [ -f "$world_conf_dst" ]; then + echo " * overwrite world.conf with $world_conf_src" + else + echo " * add the world.conf from $world_conf_src" + fi + cp -f "$world_conf_src" "$world_conf_dst" + fi +fi + + enable_clear_icon_cache=false if [ "@$enable_client" = "@true" ]; then dest_icons=$HOME/.local/share/applications diff --git a/webapp/views/pages/getting-started.ejs b/webapp/views/pages/getting-started.ejs index 040bb2e..842d4fd 100644 --- a/webapp/views/pages/getting-started.ejs +++ b/webapp/views/pages/getting-started.ejs @@ -24,19 +24,29 @@

Animal Farming

Mining

Maximum Mining Depths

-You must go below the maximum to get the material. Many materials also have a deeper level below which they are more common. -Only a few materials stop occurring at lower depths (see "Minimum" column). +You must go below the maximum to get the material. Many materials also +have a deeper level below which they are more common. +Only a few materials stop occurring at lower depths (see "Minimum" +column). <%/* comment */%> @@ -47,7 +57,7 @@ width: 100% border: 1px solid #B0B0B0; } #table-6 tbody { -/* Kind of irrelevant unless your .css is alreadt doing something else */ +/* Kind of irrelevant unless your .css is already doing something else */ margin: 0; padding: 0; border: 0; @@ -102,39 +112,115 @@ background: #F2F2F2;
-Bring food (and wood to make torches and other tools) to survive deep underground.
-Set home and go home using the inventory menu. The house button with the red -arrow sets home. If you die you can always click the house button with the green arrow to go back home.
-You can set additional homes by typing: /sethome, or /sethome2; then return by typing /home, or /home2. +Bring food (and wood to make torches and other tools) to survive deep +underground.
+Set home and go home using the inventory menu. The house button with the +red +arrow sets home. If you die you can always click the house button with +the green arrow +to go back home.
+You can set additional homes by typing: /sethome, or /sethome2; then +return by typing /home, or /home2.

Protecting Your Builds and Items

+

Area Self-Protection

+To remove an area or remove a player from an area: + +To add additional players to your area: + +

+Your server's "areas.self_protection_privilege" may differ. For example, +it is build and you don't have the build privelege, you will getting a +message saying "required privelege: build." You should consult the +policies of the server you are on. You may be able to ask a moderator +with the basic_privs privelege to type "/grant playername build" where +"playername" is your player name. +

+

Protection Blocks

+Protection blocks are an easy way to protect the area around them. +

Issues

-Only if your server uses ENLIVEN, report issues at github.com/poikilos/EnlivenMinetest/issues and include a screenshot (F12 saves screenshot to the minetest/bin folder). You can often show what node the item is by pointing at it and turning on the debug screen with F5. Otherwise, report them to a moderator of your server (if you report it to a moderator first, the issue is likely to be resolved faster). +Only if your server uses ENLIVEN, report issues at + +github.com/poikilos/EnlivenMinetest/issues +and include a screenshot (F12 saves screenshot to the minetest/bin +folder). You can often show what node the item is by pointing at it and +turning on the debug screen with F5. Otherwise, report them to a +moderator of your server (if you report it to a moderator first, the +issue is likely to be resolved faster).

Minetest Settings

-All of the settings below can be followed from the Minetest Settings tab (exit to menu if you are in-game, then click Settings). +All of the settings below can be followed from the Minetest Settings tab +(exit to menu if you are in-game, then click Settings).

Brightness

-All Settings, Graphics, In-Game, Advanced, "Light Curve Mid Boost = 0.5" (default 0.2). -(recommended when using Filmic Tone Mapping (In-game, Shaders, Tone -Mapping, Filmic tone mapping), which makes dark areas almost black in -caves where there is no moonlight. Caves are dark. Make torches. -Changing your settings so you can mine in the dark is "cheaty." Doing -things that are "cheaty" lead to an immature pointless game of getting -more blocks than anyone else. Make a cool mine with cool torches. +All Settings, Graphics, In-Game, Advanced, "Light Curve Mid Boost = 0.5" +(default 0.2): recommended when using Filmic Tone Mapping (In-game, +Shaders, Tone Mapping, Filmic tone mapping), which makes dark areas +almost black in caves where there is no moonlight. Caves are dark. Make +torches. Changing your settings so you can mine in the dark is "cheaty." +Doing things that are "cheaty" lead to an immature +pointless game of getting more blocks than anyone else. Make a cool mine +with cool torches. Make an awesome railway that you and other players +can ride (remember to protect it--see above).

Screenshot Location & Format

-All Settings, Graphics, Menus, then change "Screenshot folder" and "Screenshot format" if desired (recommended: make a Screenshots directory in your computer's Pictures folder and use that, and use jpg format to save space). +All Settings, Graphics, Menus, then change "Screenshot folder" and +"Screenshot format" if desired (recommended: make a Screenshots +directory in your computer's Pictures folder and use that, and use jpg +format to save space).

Feature Requests

-If you feel like something is lacking such as features found in other games, and your server uses ENLIVEN, consider visiting the Not in Minetest - Feedback Forum issue on the EnlivenMinetest GitHub project. Otherwise, contact a moderator of your server (you can still visit the link to get an idea of what mods are available for Minetest servers). +If you feel like something is lacking such as features found in other +games, and your server uses ENLIVEN, consider visiting the +Not in +Minetest - Feedback Forum issue on the EnlivenMinetest GitHub +project. Otherwise, contact a moderator of your server (you can still +visit the link to get an idea of what mods are available for Minetest +servers).